diff --git a/public/js/transaction.js b/public/js/transaction.js
index e32fe15..4ff5830 100644
--- a/public/js/transaction.js
+++ b/public/js/transaction.js
@@ -26,7 +26,7 @@
 					me.frm.set_value(fieldname, value);
 			});			
 		}
-		
+
 		if(this.other_fname) {
 			this[this.other_fname + "_remove"] = this.calculate_taxes_and_totals;
 		}
@@ -46,6 +46,7 @@
 					freeze: true,
 					callback: function(r) {
 						// remove this call when using client side mapper
+						me.frm.script_manager.trigger("company");
 						me.set_default_values();
 						me.set_dynamic_labels();
 						me.calculate_taxes_and_totals()
@@ -226,7 +227,8 @@
 	plc_conversion_rate: function() {
 		if(this.frm.doc.price_list_currency === this.get_company_currency()) {
 			this.frm.set_value("plc_conversion_rate", 1.0);
-		} else if(this.frm.doc.price_list_currency === this.frm.doc.currency) {
+		}
+		if(this.frm.doc.price_list_currency === this.frm.doc.currency) {
 			this.frm.set_value("conversion_rate", this.frm.doc.plc_conversion_rate);
 			this.calculate_taxes_and_totals();
 		}