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: don't set default payment amount in case of invoice return #35645

Merged
merged 1 commit into from
Jun 12, 2023
Merged

fix: don't set default payment amount in case of invoice return #35645

merged 1 commit into from
Jun 12, 2023

Conversation

anandbaburajan
Copy link
Contributor

@anandbaburajan anandbaburajan commented Jun 12, 2023

This is the payment methods table of a POS profile:
image

So, when a POS invoice is created, the default method of cash is chosen and the respective amount is set. One user wanted to go with another method, such as wire transfer, in which case, the payments table of the invoice looks like:
image

Now the issue is that when a return for that POS invoice was created, the default method of cash is chosen along with the other method chosen for the original invoice:
image

@anandbaburajan anandbaburajan added backport version-13-hotfix backport develop instructs mergify to frontport PR to develop branch labels Jun 12, 2023
@anandbaburajan anandbaburajan merged commit 79483cc into frappe:version-14-hotfix Jun 12, 2023
mergify bot pushed a commit that referenced this pull request Jun 12, 2023
mergify bot pushed a commit that referenced this pull request Jun 12, 2023
(cherry picked from commit 79483cc)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
anandbaburajan added a commit that referenced this pull request Jun 12, 2023
…port #35645) (#35647)

fix: don't set default payment amount in case of invoice return (#35645)

(cherry picked from commit 79483cc)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
anandbaburajan added a commit that referenced this pull request Jun 12, 2023
…port #35645) (#35648)

* fix: don't set default payment amount in case of invoice return (#35645)

(cherry picked from commit 79483cc)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js

* chore: fixing conflict

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Jun 14, 2023
## [14.27.2](v14.27.1...v14.27.2) (2023-06-14)

### Bug Fixes

* `enqueue_after_commit` wherever it makes sense (backport [#35588](#35588)) ([#35590](#35590)) ([e505516](e505516))
* `TypeError` in Closing Stock Balance ([32e5bbb](32e5bbb))
* **accounts:** validate payment entry references with latest data. ([#31166](#31166)) ([4add1b4](4add1b4))
* added process loss in job card ([6a21d61](6a21d61))
* allow user to set rounding loss allowance for accounts balance ([cf14858](cf14858))
* attribute error on payment reconciliation tool ([25b3c77](25b3c77))
* based on status_update.py update opportunity status to converted… ([#35145](#35145)) ([dee8275](dee8275))
* calculate wdv depr schedule properly for existing assets [v14] ([#35613](#35613)) ([feb5d00](feb5d00))
* conflicts ([2060a00](2060a00))
* CSS not applied to product title ([#35630](#35630)) ([2cf871c](2cf871c))
* don't set default payment amount in case of invoice return ([#35645](#35645)) ([79483cc](79483cc))
* Lower deduction certificate not getting applied ([#35667](#35667)) ([6f59fa9](6f59fa9))
* Make difference entry button not working ([#35622](#35622)) ([043815e](043815e))
* make showing taxes as table in print configurable (backport [#35672](#35672)) ([#35678](#35678)) ([f39ae9d](f39ae9d))
* Payment against credit notes will be considered as payment against parent invoice in Accounts Receivable/Payable report ([#35642](#35642)) ([81ef2ba](81ef2ba))
* Project in item-wise sales register ([#35596](#35596)) ([7737b90](7737b90))
* Stock Reconciliation document update while reposting ([8b617fb](8b617fb))
* test case ([7af0380](7af0380))
* Update de.csv ([#35278](#35278)) ([2077f6e](2077f6e))
* Validation for delivery date in Sales Order ([#35597](#35597)) ([4a8ce22](4a8ce22))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.27.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

frappe-pr-bot pushed a commit that referenced this pull request Jun 14, 2023
## [13.51.2](v13.51.1...v13.51.2) (2023-06-14)

### Bug Fixes

* **accounts:** validate payment entry references with latest data. (backport [#31166](#31166)) ([#35674](#35674)) ([4d4f218](4d4f218))
* Asset Depreciation Ledger Report - Add Total Row Checkbox Enabled ([3831c79](3831c79))
* calculate wdv depr schedule properly for existing assets [v13] ([#35615](#35615)) ([97f4af8](97f4af8))
* CSS not applied to product title (backport [#35582](#35582)) ([#35635](#35635)) ([1b69b37](1b69b37))
* don't set default payment amount in case of invoice return (backport [#35645](#35645)) ([#35648](#35648)) ([8e3636f](8e3636f))
* Lower deduction certificate not getting applied ([#35667](#35667)) ([c2bf8e3](c2bf8e3))
* make showing taxes as table in print configurable ([#35672](#35672)) ([4c2c037](4c2c037))
* Project in item-wise sales register ([#35596](#35596)) ([9d5b500](9d5b500))
* savepoint policy assignment submission, log errors & inform the user about failures ([#35507](#35507)) ([4a35ff0](4a35ff0))

### Performance Improvements

* refactor `get_all_nodes` in Org Chart ([986a90e](986a90e))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport develop instructs mergify to frontport PR to develop branch backport version-13-hotfix released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants