Merge branch 'develop' into payment-terms

2017-10-26 13:35:42 +01:00
parent c8d2361b81 c83413134d
commit 14e97ce0c8
75 changed files with 1087 additions and 2000 deletions
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -546,11 +546,7 @@ 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);
-			}
-		);
+		this.frm.set_df_property("conversion_rate", "read_only", erpnext.stale_rate_allowed());
 	},

 	set_actual_charges_based_on_currency: function() {