Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: timesheet per billed state edge case #40010

Merged
merged 1 commit into from
Feb 21, 2024

Conversation

ankush
Copy link
Member

@ankush ankush commented Feb 21, 2024

If value is 100.0000x then it won't set status correctly but will set it the next time it's loaded from db.

closes #40006

If value is 100.0000x then it won't set status correctly but will set it the next time it's loaded from db.
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Feb 21, 2024
@ankush ankush enabled auto-merge (squash) February 21, 2024 15:16
@ankush ankush merged commit 38e88db into frappe:develop Feb 21, 2024
15 checks passed
@ankush ankush deleted the fix_timesheet_status branch February 22, 2024 05:03
mergify bot pushed a commit that referenced this pull request Feb 22, 2024
If value is 100.0000x then it won't set status correctly but will set it the next time it's loaded from db.

(cherry picked from commit 38e88db)
mergify bot pushed a commit that referenced this pull request Feb 22, 2024
If value is 100.0000x then it won't set status correctly but will set it the next time it's loaded from db.

(cherry picked from commit 38e88db)
ankush added a commit that referenced this pull request Feb 22, 2024
fix: timesheet per billed state edge case (#40010)

If value is 100.0000x then it won't set status correctly but will set it the next time it's loaded from db.

(cherry picked from commit 38e88db)

Co-authored-by: Ankush Menat <ankush@frappe.io>
ankush added a commit that referenced this pull request Feb 22, 2024
fix: timesheet per billed state edge case (#40010)

If value is 100.0000x then it won't set status correctly but will set it the next time it's loaded from db.

(cherry picked from commit 38e88db)

Co-authored-by: Ankush Menat <ankush@frappe.io>
frappe-pr-bot pushed a commit that referenced this pull request Feb 28, 2024
# [14.64.0](v14.63.3...v14.64.0) (2024-02-28)

### Bug Fixes

* add flags for repost to ensure correct accounting from India Compliance App ([8c772cf](8c772cf))
* amount label according to party type ([bb3a7cd](bb3a7cd))
* Cannot read properties of undefined (backport [#40081](#40081)) ([#40082](#40082)) ([579b27d](579b27d))
* capacity planning issue in the job card (backport [#40092](#40092)) ([#40100](#40100)) ([8a573a1](8a573a1))
* check_credit_limit on_update_after_submit of Sales Order ([3112fca](3112fca))
* communication_date in party dashboards (backport [#40005](#40005)) ([#40020](#40020)) ([b364fe7](b364fe7))
* Completed Work Orders report not working ([c8e1409](c8e1409))
* Cr/Dr notes with POS Payments ([e5098c5](e5098c5))
* default taxable value for item not found in item list ([30315ab](30315ab))
* Delete linked asset movement record on cancellation of purchase receipt/invoice ([11bddc1](11bddc1))
* Delete orphaned asset movement item records ([46cd929](46cd929))
* delete PLE containing invoice in against ([08459ce](08459ce))
* do not make MR against raw materials of available sub assemblies (backport [#40085](#40085)) ([#40086](#40086)) ([e461185](e461185))
* incorrect item name in MR (backport [#40018](#40018)) ([#40023](#40023)) ([079ba76](079ba76))
* linter issue ([ea1a0b3](ea1a0b3))
* linting issue ([65a2adf](65a2adf))
* linting issue ([e289aef](e289aef))
* negative stock error while making stock reconciliation (backport [#40016](#40016)) ([#40025](#40025)) ([865cba4](865cba4))
* on unreconciliation, update advance paid ([fe88a11](fe88a11))
* only check for delinked PLEs ([3d243a7](3d243a7))
* only consider contributed qty towards achieved targets ([0484857](0484857))
* parent warehouse checks in the production plan for sub-assemblies (backport [#40150](#40150)) ([#40156](#40156)) ([9a85ab4](9a85ab4))
* remove cancelled payment entry from Payment Period Based On Invoice Date ([2fc490a](2fc490a))
* remove cancelled payment entry from PPBOID report ([a1c0c23](a1c0c23))
* remove config for default bank account in test ([ad60677](ad60677))
* sales funnel text color in light/dark theme ([#40132](#40132)) ([193cd0d](193cd0d))
* skip max discount validation for rate adjustment ([8c7d0d4](8c7d0d4))
* skip SO & DN validation for debit note ([882cf98](882cf98))
* test for plaid bank account validation ([22db6f6](22db6f6))
* timesheet per billed state edge case (backport [#40010](#40010)) ([#40028](#40028)) ([2a2f314](2a2f314))
* translatable columns in Sales Pipeline Analytics report ([3c170b9](3c170b9))
* unique gl account for plaid bank accounts ([8638d14](8638d14))
* use correct variable name for hotfix branches ([812eebf](812eebf))
* Webpages not working without login ([d6fad08](d6fad08))

### Features

* show contributed qty in transaction summary ([89d1942](89d1942))
* update billed amount in PO and PR ([019d8f9](019d8f9))
frappe-pr-bot pushed a commit that referenced this pull request Feb 28, 2024
# [15.15.0](v15.14.7...v15.15.0) (2024-02-28)

### Bug Fixes

* add flags for repost to ensure correct accounting from India Compliance App ([7d14ecf](7d14ecf))
* amount label according to party type ([d541ba3](d541ba3))
* Cannot read properties of undefined (backport [#40081](#40081)) ([#40083](#40083)) ([53d943e](53d943e))
* capacity planning issue in the job card (backport [#40092](#40092)) ([#40101](#40101)) ([27703b5](27703b5))
* change label name ([824df72](824df72))
* check for pricing rules on item ([32d9642](32d9642))
* check_credit_limit on_update_after_submit of Sales Order ([83d7111](83d7111))
* communication_date in party dashboards (backport [#40005](#40005)) ([#40021](#40021)) ([4269ef8](4269ef8))
* Completed Work Orders report not working ([ca03e9c](ca03e9c))
* Cr/Dr notes with POS Payments ([2e07b03](2e07b03))
* currency symbol in landed cost voucher and material request (backport [#40138](#40138)) ([#40141](#40141)) ([57bb031](57bb031))
* Data too long for column 'serial_no' at row 1 (backport [#40098](#40098)) ([#40139](#40139)) ([9d19ec4](9d19ec4))
* default taxable value for item not found in item list ([7e43f6b](7e43f6b))
* delete PLE containing invoice in against ([190bd45](190bd45))
* do not make MR against raw materials of available sub assemblies (backport [#40085](#40085)) ([#40087](#40087)) ([cf5fa21](cf5fa21))
* Fiscal Year exception on demo data setup ([56ee843](56ee843))
* incorrect item name in MR (backport [#40018](#40018)) ([#40024](#40024)) ([9f8f3db](9f8f3db))
* Issues regarding asset cancellation and deletion ([8eb2f67](8eb2f67))
* negative stock error while making stock reconciliation (backport [#40016](#40016)) ([#40026](#40026)) ([c964c45](c964c45))
* on unreconciliation, update advance paid ([4d1f56c](4d1f56c))
* only check for delinked PLEs ([a75a69a](a75a69a))
* only consider contributed qty towards achieved targets ([194f46b](194f46b))
* parent warehouse checks in the production plan for sub-assemblies (backport [#40150](#40150)) ([#40157](#40157)) ([4784117](4784117))
* remove cancelled payment entry from Payment Period Based On Invoice Date ([72da308](72da308))
* remove cancelled payment entry from PPBOID report ([0be5203](0be5203))
* remove config for default bank account in test ([36b442a](36b442a))
* remove microsecond from posting datetime (backport [#40017](#40017)) ([#40022](#40022)) ([eaa3849](eaa3849))
* removed unwanted patch ([ee2d108](ee2d108))
* resolved conflict ([6928674](6928674))
* resolved conflict ([a0c0ab7](a0c0ab7))
* skip max discount validation for rate adjustment ([3b96aae](3b96aae))
* skip SO & DN validation for debit note ([cd42089](cd42089))
* Supplier users not able to see RFQ on the Portal (backport [#40161](#40161)) ([#40165](#40165)) ([6a63a6c](6a63a6c))
* timesheet per billed state edge case (backport [#40010](#40010)) ([#40029](#40029)) ([a543bf4](a543bf4))
* translatable columns in Sales Pipeline Analytics report ([1c5a7e2](1c5a7e2))
* type error for missing frm obj ([6b5e1cf](6b5e1cf))
* unique gl account for plaid bank accounts ([65853da](65853da))
* use correct variable name on hotfix branches ([0694fd1](0694fd1))
* use frm instead of cur_frm ([341f903](341f903))
* use serial batch fields for packed items (backport [#40140](#40140)) ([#40142](#40142)) ([1860399](1860399))

### Features

* show contributed qty in transaction summary ([38abfdb](38abfdb))
* update billed amount in PO and PR ([e7e8149](e7e8149))

### Performance Improvements

* new column Posting Datetime in SLE to optimize stock ledger related queries (backport [#39800](#39800)) ([#40004](#40004)) ([b9181e8](b9181e8))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-14-hotfix backport to version 14 backport version-15-hotfix needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Flaky behavior of db_update function in base_document.py
1 participant