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.

Sign up for GitHub

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

Jump to bottom

fix: Recalculate payment amounts instead of refetching the schedule. #38044

Closed
wants to merge 5 commits into from
Closed

fix: Recalculate payment amounts instead of refetching the schedule. #38044

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf6d095
Revert "fix: payment allocation in invoice payment schedule (#36440)"
bosue Nov 11, 2023
4d47bb1
Revert "fix: unable to create partial invoice with auto fetch terms e…
bosue Nov 11, 2023
b45025a
Revert "fix: Unable to allocate advance against invoice (#35007)"
bosue Nov 11, 2023
89d9fcd
test: payment allocation for payment terms
GursheenK Nov 11, 2023
479a824
fix: Always recalculate payment amounts when there is a payment sched…
bosue Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions erpnext/controllers/accounts_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1941,15 +1941,7 @@ def set_payment_schedule(self):
)
self.append("payment_schedule", data)

allocate_payment_based_on_payment_terms = frappe.db.get_value(
"Payment Terms Template", self.payment_terms_template, "allocate_payment_based_on_payment_terms"
)

if not (
automatically_fetch_payment_terms
and allocate_payment_based_on_payment_terms
and self.linked_order_has_payment_terms(po_or_so, fieldname, doctype)
):
if self.get("payment_schedule"):
for d in self.get("payment_schedule"):
if d.invoice_portion:
d.payment_amount = flt(
Expand All @@ -1963,9 +1955,6 @@ def set_payment_schedule(self):
d.base_payment_amount = flt(
d.payment_amount * self.get("conversion_rate"), d.precision("base_payment_amount")
)
else:
self.fetch_payment_terms_from_order(po_or_so, doctype)
self.ignore_default_payment_terms_template = 1

def get_order_details(self):
if self.doctype == "Sales Invoice":
Expand Down
Loading