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

fix: sider issues

Browse Source
This commit is contained in:
Saqib Ansari 2021-04-29 14:05:20 +05:30
parent 2bde1baa38
commit 3e83542360
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1363,9 +1363,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
} }
this.update_payment_schedule_grid_labels(company_currency); this.update_payment_schedule_grid_labels(company_currency);
// set labels
var $wrapper = $(this.frm.wrapper);
}, },
update_item_grid_labels: function(company_currency) { update_item_grid_labels: function(company_currency) {
@ -1382,7 +1379,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
update_payment_schedule_grid_labels: function(company_currency) { update_payment_schedule_grid_labels: function(company_currency) {
const me = this; const me = this;
if(this.frm.fields_dict["payment_schedule"]) { if (this.frm.fields_dict["payment_schedule"]) {
this.frm.set_currency_labels(["base_payment_amount", "base_outstanding", "base_paid_amount"], this.frm.set_currency_labels(["base_payment_amount", "base_outstanding", "base_paid_amount"],
company_currency, "payment_schedule"); company_currency, "payment_schedule");
this.frm.set_currency_labels(["payment_amount", "outstanding", "paid_amount"], this.frm.set_currency_labels(["payment_amount", "outstanding", "paid_amount"],
@ -1390,7 +1387,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
var schedule_grid = this.frm.fields_dict["payment_schedule"].grid; var schedule_grid = this.frm.fields_dict["payment_schedule"].grid;
$.each(["base_payment_amount", "base_outstanding", "base_paid_amount"], function(i, fname) { $.each(["base_payment_amount", "base_outstanding", "base_paid_amount"], function(i, fname) {
if(frappe.meta.get_docfield(schedule_grid.doctype, fname)) if (frappe.meta.get_docfield(schedule_grid.doctype, fname))
schedule_grid.set_column_disp(fname, me.frm.doc.currency != company_currency); schedule_grid.set_column_disp(fname, me.frm.doc.currency != company_currency);
}); });
} }
@ -2045,6 +2042,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}, },
payment_term: function(doc, cdt, cdn) { payment_term: function(doc, cdt, cdn) {
const me = this;
var row = locals[cdt][cdn]; var row = locals[cdt][cdn];
if(row.payment_term) { if(row.payment_term) {
frappe.call({ frappe.call({
@ -2061,7 +2059,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
for (var d in r.message) { for (var d in r.message) {
frappe.model.set_value(cdt, cdn, d, r.message[d]); frappe.model.set_value(cdt, cdn, d, r.message[d]);
const company_currency = me.get_company_currency(); const company_currency = me.get_company_currency();
this.update_payment_schedule_grid_labels(company_currency); me.update_payment_schedule_grid_labels(company_currency);
} }
} }
} }