Merge branch 'develop' into payment-terms

2017-09-29 13:30:22 +01:00
parent f65e55064b 6488645d42
commit c49e748c85
18 changed files with 285 additions and 74 deletions
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -382,7 +382,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 			if(me.frm.doc.company && me.frm.fields_dict.currency) {
 				var company_currency = me.get_company_currency();
 				var company_doc = frappe.get_doc(":Company", me.frm.doc.company);
-				if (!me.frm.doc.currency) {
+
+				if (!me.frm.doc.currency || me.frm.doc.currency != company_currency) {
 					me.frm.set_value("currency", company_currency);
 				}