From e52ee553c0b1302db6799901d25ba1b9aa122302 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 2 Sep 2015 10:55:32 +0530 Subject: [PATCH 1/2] Removed debug flag --- erpnext/controllers/queries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index 04c12f7803..6c98202826 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -268,7 +268,7 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters): {0} {match_conditions} order by expiry_date, name desc - limit %(start)s, %(page_len)s""".format(cond, match_conditions=get_match_cond(doctype)), args, debug=1) + limit %(start)s, %(page_len)s""".format(cond, match_conditions=get_match_cond(doctype)), args) def get_account_list(doctype, txt, searchfield, start, page_len, filters): filter_list = [] From 906bf64f04446ac5dcac33dfa1bc5d7a260b3740 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 2 Sep 2015 11:32:07 +0530 Subject: [PATCH 2/2] [fix] Insert Item Price automatically based on Rate in Stock UOM --- erpnext/stock/get_item_details.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 0cec77b4ef..40c2729028 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -212,7 +212,7 @@ def get_price_list_rate(args, item_doc, out): price_list_rate = get_price_list_rate_for(args, item_doc.name) if not price_list_rate and item_doc.variant_of: price_list_rate = get_price_list_rate_for(args, item_doc.variant_of) - + if not price_list_rate: if args.price_list and args.rate: insert_item_price(args) @@ -231,12 +231,16 @@ def insert_item_price(args): if frappe.db.get_value("Price List", args.price_list, "currency") == args.currency \ and cint(frappe.db.get_single_value("Stock Settings", "auto_insert_price_list_rate_if_missing")): if frappe.has_permission("Item Price", "write"): + + price_list_rate = args.rate / args.conversion_factor \ + if args.get("conversion_factor") else args.rate + item_price = frappe.get_doc({ "doctype": "Item Price", "price_list": args.price_list, "item_code": args.item_code, "currency": args.currency, - "price_list_rate": args.rate + "price_list_rate": price_list_rate }) item_price.insert() frappe.msgprint("Item Price added for {0} in Price List {1}".format(args.item_code,