[minor] [fix] price list currency read only and SO-MR mapping
diff --git a/public/js/transaction.js b/public/js/transaction.js
index 421a7a5..8770ba9 100644
--- a/public/js/transaction.js
+++ b/public/js/transaction.js
@@ -74,14 +74,9 @@
company: function() {
if(this.frm.doc.company && this.frm.fields_dict.currency) {
- var me = this;
var company_currency = this.get_company_currency();
- $.each(["currency", "price_list_currency"], function(i, fieldname) {
- if(!me.frm.doc[fieldname]) {
- me.frm.set_value(fieldname, company_currency);
- me.script_manager.trigger(fieldname);
- }
- });
+ this.frm.set_value("currency", company_currency);
+ this.frm.script_manager.trigger("currency");
}
},
@@ -123,10 +118,9 @@
if(this.frm.doc.price_list_name) {
this.frm.call({
method: "setup.utils.get_price_list_currency",
- args: { args: {
+ args: {
price_list_name: this.frm.doc.price_list_name,
- buying_or_selling: buying_or_selling
- }},
+ },
callback: function(r) {
if(!r.exc) {
me.price_list_currency();
diff --git a/public/js/utils.js b/public/js/utils.js
index 743c02b..96b312f 100644
--- a/public/js/utils.js
+++ b/public/js/utils.js
@@ -20,7 +20,7 @@
if(!company && cur_frm)
company = cur_frm.doc.company;
if(company)
- return wn.model.get(":Company", company).default_currency || wn.boot.sysdefaults.currency;
+ return wn.model.get_doc(":Company", company).default_currency || wn.boot.sysdefaults.currency;
else
return wn.boot.sysdefaults.currency;
},