Merge pull request #32918 from s-aga-r/fix/github-issue/28336
fix: WO Skip Material Transfer to WIP Warehouse
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index fb94e8a..75e652e 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -54,6 +54,9 @@
self.set_onload("job_card_excess_transfer", excess_transfer)
self.set_onload("work_order_closed", self.is_work_order_closed())
+ def before_validate(self):
+ self.set_wip_warehouse()
+
def validate(self):
self.validate_time_logs()
self.set_status()
@@ -639,6 +642,12 @@
if update_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):
if (
self.get("operation_id")
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index 0735133..8167385 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -146,7 +146,7 @@
frappe.throw(_("Sales Order {0} is {1}").format(self.sales_order, status))
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(
"Manufacturing Settings", "default_wip_warehouse"
)