-
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: credit note creation during pos invoice consolidation #46277
Merged
nabinhait
merged 5 commits into
frappe:develop
from
diptanilsaha:fix-pos-return-consolidation
Mar 12, 2025
Merged
fix: credit note creation during pos invoice consolidation #46277
nabinhait
merged 5 commits into
frappe:develop
from
diptanilsaha:fix-pos-return-consolidation
Mar 12, 2025
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
nabinhait
approved these changes
Mar 12, 2025
mergify bot
pushed a commit
that referenced
this pull request
Mar 12, 2025
* fix: credit note creation during pos invoice consolidation * fix: added check to skip merging empty list of return pos invoices * fix: sql query * fix: using return invoice name instead of return invoice object * fix: added pos invoice field in sales invoice item (cherry picked from commit 8ba4ac3) # Conflicts: # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
nabinhait
reviewed
Mar 12, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add test coverage for this in a separate PR.
diptanilsaha
added a commit
that referenced
this pull request
Mar 12, 2025
…46277) (#46469) * fix: credit note creation during pos invoice consolidation (#46277) * fix: credit note creation during pos invoice consolidation * fix: added check to skip merging empty list of return pos invoices * fix: sql query * fix: using return invoice name instead of return invoice object * fix: added pos invoice field in sales invoice item (cherry picked from commit 8ba4ac3) # Conflicts: # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json * chore: resolve conflict --------- Co-authored-by: Diptanil Saha <diptanil@frappe.io>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Mar 12, 2025
## [15.54.4](v15.54.3...v15.54.4) (2025-03-12) ### Bug Fixes * `base_net_rate` Required to Check Valid Range (backport [#46332](#46332)) ([#46382](#46382)) ([877d5bd](877d5bd)) * **account:** update account number from parent company ([428aedc](428aedc)) * Allow rename prospect doctype ([#46352](#46352)) ([de46165](de46165)) * auto email report creation ([#46343](#46343)) ([5cc251a](5cc251a)) * backport translations from develop ([#46428](#46428)) ([9c70376](9c70376)) * calculate due date based on payment term (backport [#46416](#46416)) ([#46479](#46479)) ([7f14744](7f14744)) * change fieldname for cash_flow to export (backport [#46353](#46353)) ([#46366](#46366)) ([23c4252](23c4252)) * check if set_landed_cost_based_on_purchase_invoice_rate is enabled before running patch ([7047fe2](7047fe2)) * clear cashe on employee hierarchy change to reflect updated permissions ([4dfdb2b](4dfdb2b)) * consider account freeze date in recalculate_amount_difference_field patch ([8b67527](8b67527)) * consider stock freeze date in recalculate_amount_difference_field patch ([8264d42](8264d42)) * credit note creation during pos invoice consolidation (backport [#46277](#46277)) ([#46469](#46469)) ([a4b8b4c](a4b8b4c)) * do not recalculate qty for batch items during reposting ([bac36f3](bac36f3)) * doctype name ([1dcbdf3](1dcbdf3)) * enable no copy for serial no field ([3f9df2f](3f9df2f)) * error in production analytics report ([db6ae61](db6ae61)) * error when creating delivery note from pick list ([#46417](#46417)) ([0b92101](0b92101)) * filter batches that going to be zero ([ac97489](ac97489)) * incorrect category in list ([002685f](002685f)) * make 'company_tax_id' and 'company_fiscal_code' as mandatory ([229f4d3](229f4d3)) * not able to save work order with alternative item ([9554a49](9554a49)) * **payment entry:** fetch default bank account based on company (backport [#46379](#46379)) ([#46471](#46471)) ([1371199](1371199)) * pricing rule not ignored in Sales Order ([#46248](#46248)) ([8def42f](8def42f)) * rare precision issue preventing submission of subcontracting order ([6419d02](6419d02)) * recalculate_amount_difference_field patch ([f247f02](f247f02)) * remove no copy for serial no field of purchase receipt item ([baa564f](baa564f)) * rename sla fields patch ([73f11cf](73f11cf)) * rename sla fields patch ([#46465](#46465)) ([5edbd88](5edbd88)) * rename_sla_fields patch ([7bc7557](7bc7557)) * run bank reconciliation as a background job to prevent request timeout ([739cd18](739cd18)) * set correct account currency for deferred expence account in PI ([f96848a](f96848a)) * show remaining qty on 'Complete Job' button instead of full qty ([79e6550](79e6550)) * sla fields patch ([0d044bc](0d044bc)) * stock balance in and out value ([c2001e9](c2001e9)) * **test:** incorrect transaction exchange rate in test case ([b76c968](b76c968)) * typo in sales_invoice_print ([b610621](b610621)) * uom reverts to default upon selecting do not explode ([#45693](#45693)) ([6b1d209](6b1d209)) * validate accounting dimension company in Journal Entry & Stock Entry (backport [#46204](#46204)) ([#46369](#46369)) ([c816f9b](c816f9b)) * validate last_gl_update exists before comparing (backport [#46464](#46464)) ([#46468](#46468)) ([3cef94e](3cef94e)) * validations and account type filter for `Tax Withholding Category` ([#46207](#46207)) ([cc30a01](cc30a01))
Sure. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The current workflow for creating a credit note while consolidating the POS invoice is broken as the workflow creates only one Credit Note, even though some Return POS Invoice is generated from a Consolidated POS Invoice. However, it should create a separate Credit Note for the consolidated POS Invoices.
Also, this solves the issue of incorrectly linking Sales Invoice Item while creating the Credit Note.
Fixes: 32974 32065