fixes in purchase price list
diff --git a/buying/doctype/purchase_common/purchase_common.js b/buying/doctype/purchase_common/purchase_common.js
index 4b88425..9fe3edc 100644
--- a/buying/doctype/purchase_common/purchase_common.js
+++ b/buying/doctype/purchase_common/purchase_common.js
@@ -74,8 +74,15 @@
use_for: "buying"
}},
callback: function(r) {
- if(!r.exc && r.message.price_list_currency) {
- me.price_list_currency();
+ if(!r.exc) {
+ // for now, setting it as 1.0
+ if(me.frm.doc.price_list_currency === me.get_company_currency())
+ me.frm.set_value("plc_conversion_rate", 1.0);
+ else if(me.frm.doc.price_list_currency === me.frm.doc.currency)
+ me.frm.set_value("plc_conversion_rate", me.frm.doc.conversion_rate);
+
+ if(r.message.price_list_currency)
+ me.price_list_currency();
}
}
});
diff --git a/buying/utils.py b/buying/utils.py
index b299c5e..d623020 100644
--- a/buying/utils.py
+++ b/buying/utils.py
@@ -80,7 +80,8 @@
out.purchase_ref_rate = out.discount_rate = out.purchase_rate = \
out.import_ref_rate = out.import_rate = 0.0
- if args.doctype in ["Purchase Order", "Purchase Invoice", "Purchase Receipt"]:
+ if args.doctype in ["Purchase Order", "Purchase Invoice", "Purchase Receipt",
+ "Supplier Quotation"]:
# try fetching from price list
if args.price_list_name and args.price_list_currency:
rates_as_per_price_list = get_rates_as_per_price_list(args, item_wrapper.doclist)
@@ -100,7 +101,8 @@
item_doclist = webnotes.model_wrapper("Item", args.item_code).doclist
result = item_doclist.get({"parentfield": "ref_rate_details",
- "price_list_name": args.price_list_name, "ref_currency": args.price_list_currency})
+ "price_list_name": args.price_list_name, "ref_currency": args.price_list_currency,
+ "buying": 1})
if result:
purchase_ref_rate = flt(result[0].ref_rate) * flt(args.plc_conversion_rate)