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

code improvements

Browse Source
This commit is contained in:
pawan 2017-11-30 12:23:46 +05:30
parent 11398fd572
commit abc5523405
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -560,10 +560,18 @@ class StockEntry(StockController):
frappe.throw(_("Manufacturing Quantity is mandatory")) frappe.throw(_("Manufacturing Quantity is mandatory"))
item_dict = self.get_bom_raw_materials(self.fg_completed_qty) item_dict = self.get_bom_raw_materials(self.fg_completed_qty)
#Get PO Supplied Items Details
if self.purchase_order and self.purpose == "Subcontract":
#Get PO Supplied Items Details
item_wh = frappe._dict(frappe.db.sql("""select rm_item_code, reserve_warehouse
from `tabPurchase Order` po, `tabPurchase Order Item Supplied` poitemsup
where po.name = poitemsup.parent
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
#Get Reserve Warehouse from PO
item["from_warehouse"] = item_wh.get(item.item_code)
item["to_warehouse"] = self.to_warehouse if self.purpose=="Subcontract" else "" item["to_warehouse"] = self.to_warehouse if self.purpose=="Subcontract" else ""
self.add_to_stock_entry_detail(item_dict) self.add_to_stock_entry_detail(item_dict)
@ -810,17 +818,18 @@ 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
po_doc = frappe.get_doc("Purchase Order",self.purchase_order) item_wh = frappe._dict(frappe.db.sql("""select rm_item_code, reserve_warehouse
po_supplied_items = po_doc.get("supplied_items") from `tabPurchase Order` po, `tabPurchase Order Item Supplied` poitemsup
where po.name = poitemsup.parent
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"):
if item.s_warehouse: reserve_warehouse = item_wh.get(item.item_code)
for d in po_supplied_items: if item.s_warehouse != reserve_warehouse:
if item.item_code == d.rm_item_code and item.s_warehouse != d.reserve_warehouse: frappe.throw(_("In case of Sub Contract Stock Entry, Source Warehouse: {0} should match with Reserved Warehouse: {1} entered on Purchase Order {2}").format(item.s_warehouse,reserve_warehouse,self.purchase_order))
frappe.throw(_("In case of Sub Contract Stock Entry, Source Warehouse: {0} should match with Reserved Warehouse: {1} on PO").format(item.s_warehouse,d.reserve_warehouse))
#Update reserved sub contracted quantity in bin based on Supplied Item Details #Update reserved sub contracted quantity in bin based on Supplied Item Details
for d in po_supplied_items: for d in self.get("items"):
stock_bin = get_bin(d.rm_item_code, d.reserve_warehouse) stock_bin = get_bin(d.item_code, d.s_warehouse)
stock_bin.update_reserved_qty_for_sub_contracting() stock_bin.update_reserved_qty_for_sub_contracting()
@frappe.whitelist() @frappe.whitelist()