nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 23:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Enhance] Provision to backflush raw materials from WIP warehouse (#15184)

Browse Source
This commit is contained in:
rohitwaghchaure
2018-08-24 11:27:41 +05:30
committed by Nabin Hait
parent 2b2712bb9e
commit c5cf428d00
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
erpnext/manufacturing/doctype/work_order/work_order.json
View File

@@ -519,6 +519,39 @@
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "skip_transfer",
"fieldname": "from_wip_warehouse",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Backflush raw materials from work-in-progress warehouse",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
@@ -1606,7 +1639,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-07-19 11:08:32.198681", "modified": "2018-08-21 18:25:04.157070",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Work Order", "name": "Work Order",

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

@@ -689,8 +689,9 @@ class StockEntry(StockController):
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 itervalues(item_dict): for item in itervalues(item_dict):
if self.pro_doc and not self.pro_doc.skip_transfer: if self.pro_doc and (cint(self.pro_doc.from_wip_warehouse) or 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 #Get Reserve Warehouse from PO
if self.purchase_order and self.purpose=="Subcontract": if self.purchase_order and self.purpose=="Subcontract":