schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into payment-terms

Browse Source
This commit is contained in:
tunde
2017-09-21 11:21:05 +01:00
parent 951092eecd 2851dfad99
commit 82de375ba0
38 changed files with 751 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -523,6 +523,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
},
conversion_rate: function() {
const me = this.frm;
if(this.frm.doc.currency === this.get_company_currency()) {
this.frm.set_value("conversion_rate", 1.0);
}
@@ -540,6 +541,12 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}
}
// Make read only if Accounts Settings doesn't allow stale rates
frappe.model.get_value("Accounts Settings", null, "allow_stale",
function(d){
me.set_df_property("conversion_rate", "read_only", cint(d.allow_stale) ? 0 : 1);
}
);
},
set_actual_charges_based_on_currency: function() {