Merge pull request #34694 from ruthra-kumar/recalculate_difference_on_allocation_change
fix(ui): recalculate difference amount on allocation change
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
index d986f32..caffac5 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@@ -272,4 +272,32 @@
}
};
+frappe.ui.form.on('Payment Reconciliation Allocation', {
+ allocated_amount: function(frm, cdt, cdn) {
+ let row = locals[cdt][cdn];
+ // filter invoice
+ let invoice = frm.doc.invoices.filter((x) => (x.invoice_number == row.invoice_number));
+ // filter payment
+ let payment = frm.doc.payments.filter((x) => (x.reference_name == row.reference_name));
+
+ frm.call({
+ doc: frm.doc,
+ method: 'calculate_difference_on_allocation_change',
+ args: {
+ payment_entry: payment,
+ invoice: invoice,
+ allocated_amount: row.allocated_amount
+ },
+ callback: (r) => {
+ if (r.message) {
+ row.difference_amount = r.message;
+ frm.refresh();
+ }
+ }
+ });
+ }
+});
+
+
+
extend_cscript(cur_frm.cscript, new erpnext.accounts.PaymentReconciliationController({frm: cur_frm}));
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index c9e3998..d8082d0 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -234,6 +234,15 @@
return difference_amount
@frappe.whitelist()
+ def calculate_difference_on_allocation_change(self, payment_entry, invoice, allocated_amount):
+ invoice_exchange_map = self.get_invoice_exchange_map(invoice, payment_entry)
+ invoice[0]["exchange_rate"] = invoice_exchange_map.get(invoice[0].get("invoice_number"))
+ new_difference_amount = self.get_difference_amount(
+ payment_entry[0], invoice[0], allocated_amount
+ )
+ return new_difference_amount
+
+ @frappe.whitelist()
def allocate_entries(self, args):
self.validate_entries()