fix: multiple issues in Payment Request #42427
Merged
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
|
@Abdeali099 Is this ready or you still working on it? |
Abdeali099
force-pushed
the
handle-multiple-issues-of-payment-request
branch
from
3c5ef05
to
a5f0dfa
Compare
sagarvora
force-pushed
the
handle-multiple-issues-of-payment-request
branch
from
a5f0dfa
to
bc6acd3
Compare
…r `Purchase Invoice`
…t for Link field
…t for Link field
vorasmit
requested review from
deepeshgarg007,
rohitwaghchaure and
ruthra-kumar
as code owners
vorasmit
added
backport version-15-hotfix
and removed
needs-tests
mergify bot
pushed a commit
that referenced
this pull request
Sep 21, 2024
* fix: multiple issues in Payment Request * chore: minor changes * fix: remove bug * fix: replace `round` with `flt` * fix: update `set_advance_payment_status()` logic * fix: removed bug of `set_advance_payment_status` * fix: changes as per review * refactor: replace sql query of `matched_payment_requests` to query builder * fix: replace `locals` with `get_doc` in set_query * fix: changes during review * fix: minor review changes * fix: remove unnecessary code for setting payment entry received amount * fix: logic for ser payment_request if PE made from transaction * fix: Use rounded total to make Payment Request from `Sales Invoice` or `Purchase Invoice` * refactor: enhance logic of `set_open_payment_requests_to_references` * fix: added one optional arg `created_from_payment_request` * fix: handle multiple allocation of PR at PE's reference * fix: logic for PR if outstanding docs fetch * fix: formatted Link field for `Payment Request` for PE's references * fix: replace `get_all()` with `get_list()` for getting Payment Request for Link field * fix: replace `get_all()` with `get_list()` for getting Payment Request for Link field * chore: format `payment_entry.js` file * style: Show preview popup of `Payment Request` * fix: remove minor bug * fix: add virtual field for Payment Term and Request `outstanding_amount` in PE's reference * fix: get outstanding amount in PE's reference on realtime * fix: move allocation of allocated_amount to server side (no change) * fix: some minor changes to allocation * fix: Split `Payment Request` if PE is created from PR and there are `Payment Terms` * fix: minor logic changes * fix: Allocation of allocated_amount if `paid_amount` is changes * fix: improve logic of allocation * fix: set matched payment request if unset * fix: minor changes * fix: Allocate single Payment Request if PE created from PR * fix: improve code logic * fix: Removed duplication code * fix: proper message title * refactor: Rename method of Allocation Amount to References * refactor: Changing `grand_total` description based on `party_type` * refactor: update Payment Request * fix: Remove virtual property of payment_term_oustanding from references * fix: fetch party account currency for creating payment request * fix: use transaction currency as base in payment request * fix: party amount for creating payment entry * fix: allow for proportional amount paid by bank * fix: Changed field order in Payment Request * fix: Minor refactor in Payment Entry Reference table data * test: Added test cases for allow Payment at `Partially Paid` status for PR * test: Update partial paid status test case * test: Update test case for same currency PR * refactor: Wider the `msgprint` dialog for after save PE * test: Update PR test cases * chore: Remove dirty lines * test: Checking `Advance Payment Status` * fix: formatting update * fix: Use `flt` where doing subtraction * test: PR test case with Payment Term for same currency * fix: remove redundant `flt` * test: Add test cases for PR --------- Co-authored-by: Sagar Vora <[email protected]> (cherry picked from commit 93f8675) # Conflicts: # erpnext/accounts/doctype/payment_entry/payment_entry.py # erpnext/accounts/doctype/payment_request/payment_request.json # erpnext/accounts/doctype/payment_request/payment_request.py # erpnext/controllers/accounts_controller.py
Abdeali099
added a commit
to Abdeali099/erpnext
that referenced
this pull request
Sep 27, 2024
* fix: multiple issues in Payment Request * chore: minor changes * fix: remove bug * fix: replace `round` with `flt` * fix: update `set_advance_payment_status()` logic * fix: removed bug of `set_advance_payment_status` * fix: changes as per review * refactor: replace sql query of `matched_payment_requests` to query builder * fix: replace `locals` with `get_doc` in set_query * fix: changes during review * fix: minor review changes * fix: remove unnecessary code for setting payment entry received amount * fix: logic for ser payment_request if PE made from transaction * fix: Use rounded total to make Payment Request from `Sales Invoice` or `Purchase Invoice` * refactor: enhance logic of `set_open_payment_requests_to_references` * fix: added one optional arg `created_from_payment_request` * fix: handle multiple allocation of PR at PE's reference * fix: logic for PR if outstanding docs fetch * fix: formatted Link field for `Payment Request` for PE's references * fix: replace `get_all()` with `get_list()` for getting Payment Request for Link field * fix: replace `get_all()` with `get_list()` for getting Payment Request for Link field * chore: format `payment_entry.js` file * style: Show preview popup of `Payment Request` * fix: remove minor bug * fix: add virtual field for Payment Term and Request `outstanding_amount` in PE's reference * fix: get outstanding amount in PE's reference on realtime * fix: move allocation of allocated_amount to server side (no change) * fix: some minor changes to allocation * fix: Split `Payment Request` if PE is created from PR and there are `Payment Terms` * fix: minor logic changes * fix: Allocation of allocated_amount if `paid_amount` is changes * fix: improve logic of allocation * fix: set matched payment request if unset * fix: minor changes * fix: Allocate single Payment Request if PE created from PR * fix: improve code logic * fix: Removed duplication code * fix: proper message title * refactor: Rename method of Allocation Amount to References * refactor: Changing `grand_total` description based on `party_type` * refactor: update Payment Request * fix: Remove virtual property of payment_term_oustanding from references * fix: fetch party account currency for creating payment request * fix: use transaction currency as base in payment request * fix: party amount for creating payment entry * fix: allow for proportional amount paid by bank * fix: Changed field order in Payment Request * fix: Minor refactor in Payment Entry Reference table data * test: Added test cases for allow Payment at `Partially Paid` status for PR * test: Update partial paid status test case * test: Update test case for same currency PR * refactor: Wider the `msgprint` dialog for after save PE * test: Update PR test cases * chore: Remove dirty lines * test: Checking `Advance Payment Status` * fix: formatting update * fix: Use `flt` where doing subtraction * test: PR test case with Payment Term for same currency * fix: remove redundant `flt` * test: Add test cases for PR --------- Co-authored-by: Sagar Vora <[email protected]>
Abdeali099
added a commit
to Abdeali099/erpnext
that referenced
this pull request
Oct 7, 2024
Abdeali099
added a commit
to Abdeali099/erpnext
that referenced
this pull request
Oct 7, 2024
vorasmit
added a commit
that referenced
this pull request
Oct 7, 2024
fix: multiple issues in Payment Request (#42427)
mergify bot
pushed a commit
that referenced
this pull request
Oct 7, 2024
* fix: multiple issues in Payment Request * chore: minor changes * fix: remove bug * fix: replace `round` with `flt` * fix: update `set_advance_payment_status()` logic * fix: removed bug of `set_advance_payment_status` * fix: changes as per review * refactor: replace sql query of `matched_payment_requests` to query builder * fix: replace `locals` with `get_doc` in set_query * fix: changes during review * fix: minor review changes * fix: remove unnecessary code for setting payment entry received amount * fix: logic for ser payment_request if PE made from transaction * fix: Use rounded total to make Payment Request from `Sales Invoice` or `Purchase Invoice` * refactor: enhance logic of `set_open_payment_requests_to_references` * fix: added one optional arg `created_from_payment_request` * fix: handle multiple allocation of PR at PE's reference * fix: logic for PR if outstanding docs fetch * fix: formatted Link field for `Payment Request` for PE's references * fix: replace `get_all()` with `get_list()` for getting Payment Request for Link field * fix: replace `get_all()` with `get_list()` for getting Payment Request for Link field * chore: format `payment_entry.js` file * style: Show preview popup of `Payment Request` * fix: remove minor bug * fix: add virtual field for Payment Term and Request `outstanding_amount` in PE's reference * fix: get outstanding amount in PE's reference on realtime * fix: move allocation of allocated_amount to server side (no change) * fix: some minor changes to allocation * fix: Split `Payment Request` if PE is created from PR and there are `Payment Terms` * fix: minor logic changes * fix: Allocation of allocated_amount if `paid_amount` is changes * fix: improve logic of allocation * fix: set matched payment request if unset * fix: minor changes * fix: Allocate single Payment Request if PE created from PR * fix: improve code logic * fix: Removed duplication code * fix: proper message title * refactor: Rename method of Allocation Amount to References * refactor: Changing `grand_total` description based on `party_type` * refactor: update Payment Request * fix: Remove virtual property of payment_term_oustanding from references * fix: fetch party account currency for creating payment request * fix: use transaction currency as base in payment request * fix: party amount for creating payment entry * fix: allow for proportional amount paid by bank * fix: Changed field order in Payment Request * fix: Minor refactor in Payment Entry Reference table data * test: Added test cases for allow Payment at `Partially Paid` status for PR * test: Update partial paid status test case * test: Update test case for same currency PR * refactor: Wider the `msgprint` dialog for after save PE * test: Update PR test cases * chore: Remove dirty lines * test: Checking `Advance Payment Status` * fix: formatting update * fix: Use `flt` where doing subtraction * test: PR test case with Payment Term for same currency * fix: remove redundant `flt` * test: Add test cases for PR --------- Co-authored-by: Sagar Vora <[email protected]> (cherry picked from commit ea69ba7) # Conflicts: # erpnext/accounts/doctype/payment_entry/payment_entry.js # erpnext/accounts/doctype/payment_entry/payment_entry.py # erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json # erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.py # erpnext/accounts/doctype/payment_request/payment_request.json # erpnext/accounts/doctype/payment_request/payment_request.py
mergify bot
pushed a commit
that referenced
this pull request
Oct 7, 2024
(cherry picked from commit 62cc861)
frappe-pr-bot
pushed a commit
that referenced
this pull request
Oct 9, 2024
## [15.38.1](v15.38.0...v15.38.1) (2024-10-09) ### Bug Fixes * 'NoneType' object has no attribute 'has_serial_no' (backport [#43514](#43514)) ([#43574](#43574)) ([60508a9](60508a9)) * [#42014](#42014) --resolve conflicts ([85d7405](85d7405)) * Accepted and Rejected warehouse cannot be same (backport [#43568](#43568)) ([#43573](#43573)) ([83ce3dd](83ce3dd)) * add include closed orders option in so/po trends report v15 ([5660e8b](5660e8b)) * add parenttype condition for item table in Purchase Register Report ([8ce81a0](8ce81a0)) * Add removed test code `https://github.com/frappe/erpnext/commit/b41f10c1b98b01a181a6f9dbdf2531b108dc3bae` ([30fd11f](30fd11f)) * allow to change the batch in the subcontracting receipt (backport [#43584](#43584)) ([#43588](#43588)) ([9e109ac](9e109ac)) * create Account Closing Balance even though there are no transaction in period ([d6f70f5](d6f70f5)) * creation of contact, customer, opportunity, quotation and prospect from lead ([ef10c4e](ef10c4e)) * creation of contact, customer, opportunity, quotation and prospect from lead --prettier ([5a2a404](5a2a404)) * deduct advances adjusted for threshold check for tcs ([6decb7c](6decb7c)) * do not include advances for tds vouchers ([ee8485a](ee8485a)) * frappe dependency update ([0a70b3f](0a70b3f)) * include parent item group in query ([55464c7](55464c7)) * make LCV button not working for PI and PR (backport [#43592](#43592)) ([#43593](#43593)) ([120b481](120b481)) * multiple issues in Payment Request ([#42427](#42427)) ([ea69ba7](ea69ba7)) * production plan bom error (backport [#43591](#43591)) ([#43594](#43594)) ([029021f](029021f)) * read only filters in multidialog fields (backport [#43503](#43503)) ([#43513](#43513)) ([d69a974](d69a974)) * Remove `advance_payment_status` uses ([907e3af](907e3af)) * Remove unreference method ([770bc1c](770bc1c)) * Remove unused field ([e785928](e785928)) * Remove unused function `get_paid_amount_against_order` ([7591662](7591662)) * Separate `on_submit` and `before_submit` of PR ([dbd7b83](dbd7b83)) * the purchase receipt trends and delivery note trends report (backport [#43585](#43585)) ([#43587](#43587)) ([355ba2f](355ba2f)) * Unknown column 'serial_no' in 'field list' (backport [#43515](#43515)) ([#43569](#43569)) ([fc9a3c0](fc9a3c0)) * Update Values before `after_mapping` hook is called ([#42682](#42682)) ([6770610](6770610)) * validation for corrective job card (backport [#43555](#43555)) ([#43558](#43558)) ([cf0fa0d](cf0fa0d))
frappe-pr-bot
pushed a commit
that referenced
this pull request
Oct 10, 2024
## [14.74.4](v14.74.3...v14.74.4) (2024-10-10) ### Bug Fixes * add parenttype condition for item table in Purchase Register Report ([4586f03](4586f03)) * Add removed test code `https://github.com/frappe/erpnext/commit/b41f10c1b98b01a181a6f9dbdf2531b108dc3bae` ([8f5c191](8f5c191)) * create Account Closing Balance even though there are no transaction in period ([2fc776d](2fc776d)) * deduct advances adjusted for threshold check for tcs ([de15728](de15728)) * do not include advances for tds vouchers ([9d950a9](9d950a9)) * get company from ref doc as it's not available in payment request ([078eb46](078eb46)) * multiple issues in Payment Request ([#42427](#42427)) ([ef52be2](ef52be2)) * Remove `advance_payment_status` uses ([36b4f68](36b4f68)) * Remove unreference method ([d4421da](d4421da)) * Remove unused field ([3a51cf4](3a51cf4)) * Remove unused function `get_paid_amount_against_order` ([677aadd](677aadd)) * Separate `on_submit` and `before_submit` of PR ([d828ea6](d828ea6))
This was referenced Oct 14, 2024
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.
closes #42280