nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32920 from frappe/mergify/bp/version-13-hotfix/pr-32918

Browse Source 
fix: WO Skip Material Transfer to WIP Warehouse (backport #32918)
This commit is contained in:
Sagar Sharma
2022-11-10 18:42:25 +05:30
committed by GitHub
parent 972893d00e f09e4273d9
commit fcb6ee22ba
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/manufacturing/doctype/job_card/job_card.py
View File

@@ -54,6 +54,9 @@ class JobCard(Document):
self.set_onload("job_card_excess_transfer", excess_transfer) self.set_onload("job_card_excess_transfer", excess_transfer)
self.set_onload("work_order_stopped", self.is_work_order_stopped()) self.set_onload("work_order_stopped", self.is_work_order_stopped())
def before_validate(self):
self.set_wip_warehouse()
def validate(self): def validate(self):
self.validate_time_logs() self.validate_time_logs()
self.set_status() self.set_status()
@@ -639,6 +642,12 @@ class JobCard(Document):
if update_status: if update_status:
self.db_set("status", self.status) self.db_set("status", self.status)
def set_wip_warehouse(self):
if not self.wip_warehouse:
self.wip_warehouse = frappe.db.get_single_value(
"Manufacturing Settings", "default_wip_warehouse"
)
def validate_operation_id(self): def validate_operation_id(self):
if ( if (
self.get("operation_id") self.get("operation_id")

2
erpnext/manufacturing/doctype/work_order/work_order.py
View File

@@ -145,7 +145,7 @@ class WorkOrder(Document):
frappe.throw(_("Sales Order {0} is {1}").format(self.sales_order, status)) frappe.throw(_("Sales Order {0} is {1}").format(self.sales_order, status))
def set_default_warehouse(self): def set_default_warehouse(self):
if not self.wip_warehouse: if not self.wip_warehouse and not self.skip_transfer:
self.wip_warehouse = frappe.db.get_single_value( self.wip_warehouse = frappe.db.get_single_value(
"Manufacturing Settings", "default_wip_warehouse" "Manufacturing Settings", "default_wip_warehouse"
) )