feat: set dynamic labels for payment schedule fields
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 258262a..dc731ca 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -640,6 +640,10 @@
let key = item.name;
me.apply_rule_on_other_items({key: item});
}
+ },
+ () => {
+ var company_currency = me.get_company_currency();
+ me.update_item_grid_labels(company_currency);
}
]);
}
@@ -1321,11 +1325,9 @@
change_grid_labels: function(company_currency) {
var me = this;
- this.frm.set_currency_labels(["base_rate", "base_net_rate", "base_price_list_rate", "base_amount", "base_net_amount", "base_rate_with_margin"],
- company_currency, "items");
+ this.update_item_grid_labels(company_currency);
- this.frm.set_currency_labels(["rate", "net_rate", "price_list_rate", "amount", "net_amount", "stock_uom_rate", "rate_with_margin"],
- this.frm.doc.currency, "items");
+ this.toggle_item_grid_columns(company_currency);
if(this.frm.fields_dict["operations"]) {
this.frm.set_currency_labels(["operating_cost", "hour_rate"], this.frm.doc.currency, "operations");
@@ -1360,6 +1362,42 @@
this.frm.doc.party_account_currency, "advances");
}
+ this.update_payment_schedule_grid_labels(company_currency);
+
+ // set labels
+ var $wrapper = $(this.frm.wrapper);
+ },
+
+ update_item_grid_labels: function(company_currency) {
+ this.frm.set_currency_labels([
+ "base_rate", "base_net_rate", "base_price_list_rate",
+ "base_amount", "base_net_amount", "base_rate_with_margin"
+ ], company_currency, "items");
+
+ this.frm.set_currency_labels([
+ "rate", "net_rate", "price_list_rate", "amount",
+ "net_amount", "stock_uom_rate", "rate_with_margin"
+ ], this.frm.doc.currency, "items");
+ },
+
+ update_payment_schedule_grid_labels: function(company_currency) {
+ const me = this;
+ if(this.frm.fields_dict["payment_schedule"]) {
+ this.frm.set_currency_labels(["base_payment_amount", "base_outstanding", "base_paid_amount"],
+ company_currency, "payment_schedule");
+ this.frm.set_currency_labels(["payment_amount", "outstanding", "paid_amount"],
+ this.frm.doc.currency, "payment_schedule");
+
+ var schedule_grid = this.frm.fields_dict["payment_schedule"].grid;
+ $.each(["base_payment_amount", "base_outstanding", "base_paid_amount"], function(i, fname) {
+ if(frappe.meta.get_docfield(schedule_grid.doctype, fname))
+ schedule_grid.set_column_disp(fname, me.frm.doc.currency != company_currency);
+ });
+ }
+ },
+
+ toggle_item_grid_columns: function(company_currency) {
+ const me = this;
// toggle columns
var item_grid = this.frm.fields_dict["items"].grid;
$.each(["base_rate", "base_price_list_rate", "base_amount", "base_rate_with_margin"], function(i, fname) {
@@ -1379,9 +1417,6 @@
if(frappe.meta.get_docfield(item_grid.doctype, fname))
item_grid.set_column_disp(fname, (show && (me.frm.doc.currency != company_currency)));
});
-
- // set labels
- var $wrapper = $(this.frm.wrapper);
},
recalculate: function() {
@@ -2001,6 +2036,8 @@
callback: function(r) {
if(r.message && !r.exc) {
me.frm.set_value("payment_schedule", r.message);
+ const company_currency = me.get_company_currency();
+ this.update_payment_schedule_grid_labels(company_currency);
}
}
})
@@ -2010,7 +2047,6 @@
payment_term: function(doc, cdt, cdn) {
var row = locals[cdt][cdn];
if(row.payment_term) {
- debugger;
frappe.call({
method: "erpnext.controllers.accounts_controller.get_payment_term_details",
args: {
@@ -2024,6 +2060,8 @@
if(r.message && !r.exc) {
for (var d in r.message) {
frappe.model.set_value(cdt, cdn, d, r.message[d]);
+ const company_currency = me.get_company_currency();
+ this.update_payment_schedule_grid_labels(company_currency);
}
}
}