Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Advance payment against payment terms (#34872)

Browse Source
This commit is contained in:
Deepesh Garg 2023-04-16 17:11:24 +05:30 committed by GitHub
parent f27c921783
commit 5c75894065
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/accounts_settings/accounts_settings.json
View File

@ -184,6 +184,7 @@
}, },
{ {
"default": "0", "default": "0",
"description": "Payment Terms from orders will be fetched into the invoices as is",
"fieldname": "automatically_fetch_payment_terms", "fieldname": "automatically_fetch_payment_terms",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Automatically Fetch Payment Terms from Order" "label": "Automatically Fetch Payment Terms from Order"
@ -375,7 +376,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2023-03-28 09:50:20.375233", "modified": "2023-04-14 17:22:03.680886",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounts Settings", "name": "Accounts Settings",

7
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@ -1754,7 +1754,12 @@ def get_payment_entry(
if doc.doctype == "Purchase Invoice" and doc.invoice_is_blocked(): if doc.doctype == "Purchase Invoice" and doc.invoice_is_blocked():
frappe.msgprint(_("{0} is on hold till {1}").format(doc.name, doc.release_date)) frappe.msgprint(_("{0} is on hold till {1}").format(doc.name, doc.release_date))
else: else:
if doc.doctype in ("Sales Invoice", "Purchase Invoice") and frappe.get_cached_value( if doc.doctype in (
"Sales Invoice",
"Purchase Invoice",
"Purchase Order",
"Sales Order",
) and frappe.get_cached_value(
"Payment Terms Template", "Payment Terms Template",
doc.payment_terms_template, doc.payment_terms_template,
"allocate_payment_based_on_payment_terms", "allocate_payment_based_on_payment_terms",

34
erpnext/controllers/accounts_controller.py
View File

@ -273,8 +273,8 @@ class AccountsController(TransactionBase):
self.validate_payment_schedule_dates() self.validate_payment_schedule_dates()
self.set_due_date() self.set_due_date()
self.set_payment_schedule() self.set_payment_schedule()
self.validate_payment_schedule_amount()
if not self.get("ignore_default_payment_terms_template"): if not self.get("ignore_default_payment_terms_template"):
self.validate_payment_schedule_amount()
self.validate_due_date() self.validate_due_date()
self.validate_advance_entries() self.validate_advance_entries()
@ -1607,6 +1607,7 @@ class AccountsController(TransactionBase):
base_grand_total = self.get("base_rounded_total") or self.base_grand_total base_grand_total = self.get("base_rounded_total") or self.base_grand_total
grand_total = self.get("rounded_total") or self.grand_total grand_total = self.get("rounded_total") or self.grand_total
automatically_fetch_payment_terms = 0
if self.doctype in ("Sales Invoice", "Purchase Invoice"): if self.doctype in ("Sales Invoice", "Purchase Invoice"):
base_grand_total = base_grand_total - flt(self.base_write_off_amount) base_grand_total = base_grand_total - flt(self.base_write_off_amount)
@ -1652,19 +1653,20 @@ class AccountsController(TransactionBase):
) )
self.append("payment_schedule", data) self.append("payment_schedule", data)
for d in self.get("payment_schedule"): if not automatically_fetch_payment_terms:
if d.invoice_portion: for d in self.get("payment_schedule"):
d.payment_amount = flt( if d.invoice_portion:
grand_total * flt(d.invoice_portion / 100), d.precision("payment_amount") d.payment_amount = flt(
) grand_total * flt(d.invoice_portion / 100), d.precision("payment_amount")
d.base_payment_amount = flt( )
base_grand_total * flt(d.invoice_portion / 100), d.precision("base_payment_amount") d.base_payment_amount = flt(
) base_grand_total * flt(d.invoice_portion / 100), d.precision("base_payment_amount")
d.outstanding = d.payment_amount )
elif not d.invoice_portion: d.outstanding = d.payment_amount
d.base_payment_amount = flt( elif not d.invoice_portion:
d.payment_amount * self.get("conversion_rate"), d.precision("base_payment_amount") d.base_payment_amount = flt(
) d.payment_amount * self.get("conversion_rate"), d.precision("base_payment_amount")
)
def get_order_details(self): def get_order_details(self):
if self.doctype == "Sales Invoice": if self.doctype == "Sales Invoice":
@ -1717,6 +1719,10 @@ class AccountsController(TransactionBase):
"invoice_portion": schedule.invoice_portion, "invoice_portion": schedule.invoice_portion,
"mode_of_payment": schedule.mode_of_payment, "mode_of_payment": schedule.mode_of_payment,
"description": schedule.description, "description": schedule.description,
"payment_amount": schedule.payment_amount,
"base_payment_amount": schedule.base_payment_amount,
"outstanding": schedule.outstanding,
"paid_amount": schedule.paid_amount,
} }
if schedule.discount_type == "Percentage": if schedule.discount_type == "Percentage":

4
erpnext/public/js/controllers/transaction.js
View File

@ -1920,7 +1920,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
} }
prompt_user_for_reference_date(){ prompt_user_for_reference_date(){
var me = this; let me = this;
frappe.prompt({ frappe.prompt({
label: __("Cheque/Reference Date"), label: __("Cheque/Reference Date"),
fieldname: "reference_date", fieldname: "reference_date",
@ -1947,7 +1947,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
let has_payment_schedule = this.frm.doc.payment_schedule && this.frm.doc.payment_schedule.length; let has_payment_schedule = this.frm.doc.payment_schedule && this.frm.doc.payment_schedule.length;
if(!is_eligible || !has_payment_schedule) return false; if(!is_eligible || !has_payment_schedule) return false;
let has_discount = this.frm.doc.payment_schedule.some(row => row.discount_date); let has_discount = this.frm.doc.payment_schedule.some(row => row.discount);
return has_discount; return has_discount;
} }