Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

alignment

Browse Source
This commit is contained in:
pawan 2017-11-30 12:31:32 +05:30
parent abc5523405
commit e43cd915e8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -564,9 +564,9 @@ class StockEntry(StockController):
if self.purchase_order and self.purpose == "Subcontract": if self.purchase_order and self.purpose == "Subcontract":
#Get PO Supplied Items Details #Get PO Supplied Items Details
item_wh = frappe._dict(frappe.db.sql("""select rm_item_code, reserve_warehouse item_wh = frappe._dict(frappe.db.sql("""select rm_item_code, reserve_warehouse
from `tabPurchase Order` po, `tabPurchase Order Item Supplied` poitemsup from `tabPurchase Order` po, `tabPurchase Order Item Supplied` poitemsup
where po.name = poitemsup.parent where po.name = poitemsup.parent
and po.name = %s""",self.purchase_order)) and po.name = %s""",self.purchase_order))
for item in item_dict.values(): for item in item_dict.values():
if self.pro_doc and not self.pro_doc.skip_transfer: if self.pro_doc and not self.pro_doc.skip_transfer:
item["from_warehouse"] = self.pro_doc.wip_warehouse item["from_warehouse"] = self.pro_doc.wip_warehouse
@ -819,9 +819,9 @@ class StockEntry(StockController):
def update_purchase_order_supplied_items(self): def update_purchase_order_supplied_items(self):
#Get PO Supplied Items Details #Get PO Supplied Items Details
item_wh = frappe._dict(frappe.db.sql("""select rm_item_code, reserve_warehouse item_wh = frappe._dict(frappe.db.sql("""select rm_item_code, reserve_warehouse
from `tabPurchase Order` po, `tabPurchase Order Item Supplied` poitemsup from `tabPurchase Order` po, `tabPurchase Order Item Supplied` poitemsup
where po.name = poitemsup.parent where po.name = poitemsup.parent
and po.name = %s""",self.purchase_order)) and po.name = %s""",self.purchase_order))
#Validate source warehouse is same as reserved warehouse #Validate source warehouse is same as reserved warehouse
for item in self.get("items"): for item in self.get("items"):
reserve_warehouse = item_wh.get(item.item_code) reserve_warehouse = item_wh.get(item.item_code)