-
Notifications
You must be signed in to change notification settings - Fork 7.9k
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: Amount for debit and credit notes with 0 qty line items #33902
Merged
deepeshgarg007
merged 1 commit into
frappe:develop
from
deepeshgarg007:revert_calculate-line-item-amount
Feb 11, 2023
Merged
fix: Amount for debit and credit notes with 0 qty line items #33902
deepeshgarg007
merged 1 commit into
frappe:develop
from
deepeshgarg007:revert_calculate-line-item-amount
Feb 11, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mergify bot
pushed a commit
that referenced
this pull request
Feb 11, 2023
(cherry picked from commit 47c9132)
deepeshgarg007
added a commit
that referenced
this pull request
Feb 11, 2023
frappe-pr-bot
pushed a commit
that referenced
this pull request
Feb 14, 2023
# [14.16.0](v14.15.1...v14.16.0) (2023-02-14) ### Bug Fixes * `amount` in `Material Request` ([f1dd923](f1dd923)) * `get_picked_items_details` ([7afbd92](7afbd92)) * `pymysql.err.ProgrammingError` ([aa3dd33](aa3dd33)) * Add missing 1 required positional argument: 'bill_date' ([ced9274](ced9274)) * add payment hook to point of sale JS ([#33988](#33988)) ([49fd712](49fd712)) * allow PI cancel if linked asset is cancelled ([c98b2b5](c98b2b5)) * Amount for debit and credit notes with 0 qty line items ([#33902](#33902)) ([87a8c17](87a8c17)) * Amount validation in Payment Request against Purchase Order ([#34042](#34042)) ([c7c6123](c7c6123)) * BOM import failed as importer use same label field for Raw MaterialsItem table and Scrap Item table ([47d17f4](47d17f4)) * Concurrency issues in Sales and Purchase returns ([#34019](#34019)) ([087333a](087333a)) * consider `stock_qty` if `picked_qty` is zero ([df72e4a](df72e4a)) * consider existing pick list ([466a791](466a791)) * currency formatting in item-wise sales history ([#33903](#33903)) ([8e2d7bb](8e2d7bb)) * default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month) ([c8c9c50](c8c9c50)) * **ecommerce:** throw invalid doctype error in shop by category ([#33901](#33901)) ([1d0e71b](1d0e71b)) * failed test, convert date time to string ([7228a49](7228a49)) * german chart of accounts "SKR03" ([#33909](#33909)) ([02c4c55](02c4c55)) * Ignore mandatory fields while creating tax templates for new companies ([#34005](#34005)) ([b0ed3c8](b0ed3c8)) * Ignore Payment Ledger Entry on dunning cancel (backport [#34025](#34025)) ([#34028](#34028)) ([699e93e](699e93e)) * incorrect actual qty in Bin ([01ff6a1](01ff6a1)) * IntegrityError while cancelling journals against cr note ([c71d035](c71d035)) * list view for Terms and Conditions ([#33925](#33925)) ([bb8e232](bb8e232)) * negative stock error ([e0cd6c2](e0cd6c2)) * set per_billed based on hours when amounts are zero ([#33984](#33984)) ([5270fbe](5270fbe)) * should never get cutomer price on purchase document ([#34002](#34002)) ([6fe7600](6fe7600)), closes [#33998](#33998) * stock entry from item dashboard (stock levels) ([04a474d](04a474d)) * **test:** `test_pick_list_for_items_with_multiple_UOM()` ([7124c0c](7124c0c)) * unwanted difference amount calculation on cr note and invoice with same currency ([#34020](#34020)) ([cbafc51](cbafc51)) ### Features * Add filters in Loan Interest Report ([#33907](#33907)) ([52bfb66](52bfb66)) * add incoterm named place to RFQ ([68a1615](68a1615)) * mandatory and mandatory depends on in inventory dimension ([3aca84c](3aca84c)) * Setting to allow Sales Order creation against expired quotation ([#33952](#33952)) ([4d0e27e](4d0e27e)) ### Performance Improvements * reduce memory usage by paging through records ([3ce8dc7](3ce8dc7)) * reduce memory usage while migrating remarks ([c191a3f](c191a3f))
mergify bot
pushed a commit
that referenced
this pull request
Feb 18, 2023
(cherry picked from commit 47c9132)
deepeshgarg007
added a commit
that referenced
this pull request
Feb 19, 2023
frappe-pr-bot
pushed a commit
that referenced
this pull request
Feb 21, 2023
# [13.47.0](v13.46.1...v13.47.0) (2023-02-21) ### Bug Fixes * add missing import ([8add12d](8add12d)) * Amount for debit and credit notes with 0 qty line items (backport [#33902](#33902)) ([#34123](#34123)) ([2408966](2408966)) * asset repair status after deletion and asset status after manual depr entry ([922b30a](922b30a)) * asset_depreciation_and_balances report doesn't reflect manual depr entries ([6227c16](6227c16)) * check for duplicate in pos closing and pos merge log entry ([92da1ed](92da1ed)) * don't get chart data if data is empty ([acdf7fd](acdf7fd)) * **ecommerce:** throw invalid doctype error in shop by category ([#33901](#33901)) ([de87786](de87786)) * Filters in item-wise sales history report ([#34145](#34145)) ([9826245](9826245)) * fiscal year error for existing assets in fixed asset register ([1fb3a28](1fb3a28)) * opening_accumulated_depreciation and precision in charts ([4f10f48](4f10f48)) * should never get cutomer price on purchase document ([#34002](#34002)) ([117dbe3](117dbe3)), closes [#33998](#33998) * update `reserved_qty` when `Sales Order` marked as `Hold` ([2391c37](2391c37)) * Use normal rounding for Tax Withholding Category ([#34114](#34114)) ([26ed460](26ed460)) * **ux:** `ReferenceError: me is not defined` Delivery Note ([495d1b2](495d1b2)) ### Features * **UX:** Add option to disable consolidating leave types in balance reports ([ccd2568](ccd2568))
SaiFi0102
pushed a commit
to ServerManagementERPNext/erpnext
that referenced
this pull request
Feb 22, 2023
…frappe#33902) (frappe#34123) fix: Amount for debit and credit notes with 0 qty line items (frappe#33902) (cherry picked from commit 47c9132) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
SaiFi0102
pushed a commit
to ServerManagementERPNext/erpnext
that referenced
this pull request
Feb 22, 2023
# [13.47.0](frappe/erpnext@v13.46.1...v13.47.0) (2023-02-21) ### Bug Fixes * add missing import ([8add12d](frappe@8add12d)) * Amount for debit and credit notes with 0 qty line items (backport [frappe#33902](frappe#33902)) ([frappe#34123](frappe#34123)) ([2408966](frappe@2408966)) * asset repair status after deletion and asset status after manual depr entry ([922b30a](frappe@922b30a)) * asset_depreciation_and_balances report doesn't reflect manual depr entries ([6227c16](frappe@6227c16)) * check for duplicate in pos closing and pos merge log entry ([92da1ed](frappe@92da1ed)) * don't get chart data if data is empty ([acdf7fd](frappe@acdf7fd)) * **ecommerce:** throw invalid doctype error in shop by category ([frappe#33901](frappe#33901)) ([de87786](frappe@de87786)) * Filters in item-wise sales history report ([frappe#34145](frappe#34145)) ([9826245](frappe@9826245)) * fiscal year error for existing assets in fixed asset register ([1fb3a28](frappe@1fb3a28)) * opening_accumulated_depreciation and precision in charts ([4f10f48](frappe@4f10f48)) * should never get cutomer price on purchase document ([frappe#34002](frappe#34002)) ([117dbe3](frappe@117dbe3)), closes [frappe#33998](frappe#33998) * update `reserved_qty` when `Sales Order` marked as `Hold` ([2391c37](frappe@2391c37)) * Use normal rounding for Tax Withholding Category ([frappe#34114](frappe#34114)) ([26ed460](frappe@26ed460)) * **ux:** `ReferenceError: me is not defined` Delivery Note ([495d1b2](frappe@495d1b2)) ### Features * **UX:** Add option to disable consolidating leave types in balance reports ([ccd2568](frappe@ccd2568))
Closed
BevanTony1
pushed a commit
to BevanTony1/eso-erpnext
that referenced
this pull request
Mar 23, 2023
# [13.47.0](frappe/erpnext@v13.46.1...v13.47.0) (2023-02-21) ### Bug Fixes * add missing import ([8add12d](frappe@8add12d)) * Amount for debit and credit notes with 0 qty line items (backport [frappe#33902](frappe#33902)) ([frappe#34123](frappe#34123)) ([2408966](frappe@2408966)) * asset repair status after deletion and asset status after manual depr entry ([922b30a](frappe@922b30a)) * asset_depreciation_and_balances report doesn't reflect manual depr entries ([6227c16](frappe@6227c16)) * check for duplicate in pos closing and pos merge log entry ([92da1ed](frappe@92da1ed)) * don't get chart data if data is empty ([acdf7fd](frappe@acdf7fd)) * **ecommerce:** throw invalid doctype error in shop by category ([frappe#33901](frappe#33901)) ([de87786](frappe@de87786)) * Filters in item-wise sales history report ([frappe#34145](frappe#34145)) ([9826245](frappe@9826245)) * fiscal year error for existing assets in fixed asset register ([1fb3a28](frappe@1fb3a28)) * opening_accumulated_depreciation and precision in charts ([4f10f48](frappe@4f10f48)) * should never get cutomer price on purchase document ([frappe#34002](frappe#34002)) ([117dbe3](frappe@117dbe3)), closes [frappe#33998](frappe#33998) * update `reserved_qty` when `Sales Order` marked as `Hold` ([2391c37](frappe@2391c37)) * Use normal rounding for Tax Withholding Category ([frappe#34114](frappe#34114)) ([26ed460](frappe@26ed460)) * **ux:** `ReferenceError: me is not defined` Delivery Note ([495d1b2](frappe@495d1b2)) ### Features * **UX:** Add option to disable consolidating leave types in balance reports ([ccd2568](frappe@ccd2568))
@deepeshgarg007 one of our customers ran into this issue again. It freaks people out to see |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Partially reverts: #33739
There are scenarios where the user creates Debit and Credit notes with 0 qty just to adjust the amount against a previously issued invoice. No goods are returned or shipped in these scenarios just the amount against that item is adjusted.