minor fixes

erpnext/controllers/accounts_controller.py

@@ -84,11 +84,13 @@ class AccountsController(TransactionBase):
 		exchange = "%s-%s" % (from_currency, to_currency)
 		return flt(webnotes.conn.get_value("Currency Exchange", exchange, "exchange_rate"))
 
-	def set_missing_item_details(self, get_item_details):
+	def set_missing_item_details(self):
 		"""set missing item values"""
+		from erpnext.stock.get_item_details import get_item_details
 		for item in self.doclist.get({"parentfield": self.fname}):
 			if item.fields.get("item_code"):
 				args = item.fields.copy().update(self.doc.fields)
+				args.price_list = args.selling_price_list or args.buying_price_list
 				ret = get_item_details(args)
 				for fieldname, value in ret.items():
 					if self.meta.get_field(fieldname, parentfield=self.fname) and \

erpnext/controllers/buying_controller.py

@@ -5,7 +5,6 @@ from __future__ import unicode_literals
 import webnotes
 from webnotes import _, msgprint
 from webnotes.utils import flt, _round
-from erpnext.buying.utils import get_item_details
 from erpnext.setup.utils import get_company_currency
 from erpnext.accounts.party import get_party_details
 
@@ -35,7 +34,7 @@ class BuyingController(StockController):
 		if self.doc.supplier:
 			self.doc.update_if_missing(get_party_details(self.doc.supplier, party_type="Supplier"))
 
-		self.set_missing_item_details(get_item_details)
+		self.set_missing_item_details()
 		if self.doc.fields.get("__islocal"):
 			self.set_taxes("other_charges", "taxes_and_charges")
 
@@ -257,7 +256,6 @@ class BuyingController(StockController):
 			d.rm_supp_cost = raw_materials_cost
 
 	def get_items_from_default_bom(self, item_code):
-		# print webnotes.conn.sql("""select name from `tabBOM` where item = '_Test FG Item'""")
 		bom_items = webnotes.conn.sql("""select t2.item_code, t2.qty_consumed_per_unit, 
 			t2.rate, t2.stock_uom, t2.name, t2.description 
 			from `tabBOM` t1, `tabBOM Item` t2 

erpnext/controllers/selling_controller.py

@@ -5,7 +5,6 @@ from __future__ import unicode_literals
 import webnotes
 from webnotes.utils import cint, flt, comma_or, _round, cstr
 from erpnext.setup.utils import get_company_currency
-from erpnext.selling.utils import get_item_details
 from webnotes import msgprint, _
 
 from erpnext.controllers.stock_controller import StockController
@@ -42,7 +41,7 @@ class SellingController(StockController):
 						
 	def set_price_list_and_item_details(self):
 		self.set_price_list_currency("Selling")
-		self.set_missing_item_details(get_item_details)
+		self.set_missing_item_details()
 										
 	def apply_shipping_rule(self):
 		if self.doc.shipping_rule:
@@ -288,7 +287,7 @@ class SellingController(StockController):
 	def get_item_list(self):
 		il = []
 		for d in self.doclist.get({"parentfield": self.fname}):
-			warehouse = ""
+			reserved_warehouse = ""
 			reserved_qty_for_main_item = 0
 			
 			if self.doc.doctype == "Sales Order":
@@ -296,7 +295,7 @@ class SellingController(StockController):
 					self.has_sales_bom(d.item_code)) and not d.warehouse:
 						webnotes.throw(_("Please enter Reserved Warehouse for item ") + 
 							d.item_code + _(" as it is stock Item or packing item"))
-				warehouse = d.warehouse
+				reserved_warehouse = d.warehouse
 				if flt(d.qty) > flt(d.delivered_qty):
 					reserved_qty_for_main_item = flt(d.qty) - flt(d.delivered_qty)
 				
@@ -306,7 +305,7 @@ class SellingController(StockController):
 				
 				already_delivered_qty = self.get_already_delivered_qty(self.doc.name, 
 					d.against_sales_order, d.prevdoc_detail_docname)
-				so_qty, warehouse = self.get_so_qty_and_warehouse(d.prevdoc_detail_docname)
+				so_qty, reserved_warehouse = self.get_so_qty_and_warehouse(d.prevdoc_detail_docname)
 				
 				if already_delivered_qty + d.qty > so_qty:
 					reserved_qty_for_main_item = -(so_qty - already_delivered_qty)
@@ -319,7 +318,7 @@ class SellingController(StockController):
 						# the packing details table's qty is already multiplied with parent's qty
 						il.append(webnotes._dict({
 							'warehouse': p.warehouse,
-							'warehouse': warehouse,
+							'reserved_warehouse': reserved_warehouse,
 							'item_code': p.item_code,
 							'qty': flt(p.qty),
 							'reserved_qty': (flt(p.qty)/flt(d.qty)) * reserved_qty_for_main_item,
@@ -331,7 +330,7 @@ class SellingController(StockController):
 			else:
 				il.append(webnotes._dict({
 					'warehouse': d.warehouse,
-					'warehouse': warehouse,
+					'reserved_warehouse': reserved_warehouse,
 					'item_code': d.item_code,
 					'qty': d.qty,
 					'reserved_qty': reserved_qty_for_main_item,