[fix] merge conflicts

2017-11-30 16:45:01 +05:30
parent 1b89be0c66 aa25e95510
commit 34a0e90115
8 changed files with 32 additions and 30 deletions
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -561,7 +561,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({

 		}
 		// Make read only if Accounts Settings doesn't allow stale rates
-		this.frm.set_df_property("conversion_rate", "read_only", erpnext.stale_rate_allowed());
+		this.frm.set_df_property("conversion_rate", "read_only", erpnext.stale_rate_allowed() ? 0 : 1);
 	},

 	shipping_rule: function() {