mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-02 11:49:10 +00:00
fix(manufacturing): get items for disassembly order
This commit is contained in:
@@ -2349,7 +2349,7 @@ def make_stock_entry(
|
|||||||
|
|
||||||
stock_entry.set_stock_entry_type()
|
stock_entry.set_stock_entry_type()
|
||||||
stock_entry.is_additional_transfer_entry = is_additional_transfer_entry
|
stock_entry.is_additional_transfer_entry = is_additional_transfer_entry
|
||||||
stock_entry.get_items(qty, work_order.production_item)
|
stock_entry.get_items()
|
||||||
|
|
||||||
if purpose != "Disassemble":
|
if purpose != "Disassemble":
|
||||||
stock_entry.set_serial_no_batch_for_finished_good()
|
stock_entry.set_serial_no_batch_for_finished_good()
|
||||||
|
|||||||
@@ -2152,7 +2152,7 @@ class StockEntry(StockController, SubcontractingInwardController):
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_items_for_disassembly(self, disassemble_qty, production_item):
|
def get_items_for_disassembly(self):
|
||||||
"""Get items for Disassembly Order"""
|
"""Get items for Disassembly Order"""
|
||||||
|
|
||||||
if not self.work_order:
|
if not self.work_order:
|
||||||
@@ -2165,7 +2165,7 @@ class StockEntry(StockController, SubcontractingInwardController):
|
|||||||
items_dict = get_bom_items_as_dict(
|
items_dict = get_bom_items_as_dict(
|
||||||
self.bom_no,
|
self.bom_no,
|
||||||
self.company,
|
self.company,
|
||||||
disassemble_qty,
|
self.fg_completed_qty,
|
||||||
fetch_exploded=self.use_multi_level_bom,
|
fetch_exploded=self.use_multi_level_bom,
|
||||||
fetch_qty_in_stock_uom=False,
|
fetch_qty_in_stock_uom=False,
|
||||||
)
|
)
|
||||||
@@ -2182,8 +2182,8 @@ class StockEntry(StockController, SubcontractingInwardController):
|
|||||||
child_row.qty = bom_items.get("qty", child_row.qty)
|
child_row.qty = bom_items.get("qty", child_row.qty)
|
||||||
child_row.amount = bom_items.get("amount", child_row.amount)
|
child_row.amount = bom_items.get("amount", child_row.amount)
|
||||||
|
|
||||||
if row.item_code == production_item:
|
if row.is_finished_item:
|
||||||
child_row.qty = disassemble_qty
|
child_row.qty = self.fg_completed_qty
|
||||||
|
|
||||||
child_row.s_warehouse = (self.from_warehouse or s_warehouse) if row.is_finished_item else ""
|
child_row.s_warehouse = (self.from_warehouse or s_warehouse) if row.is_finished_item else ""
|
||||||
child_row.t_warehouse = row.s_warehouse
|
child_row.t_warehouse = row.s_warehouse
|
||||||
@@ -2219,12 +2219,12 @@ class StockEntry(StockController, SubcontractingInwardController):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def get_items(self, qty=None, production_item=None):
|
def get_items(self):
|
||||||
self.set("items", [])
|
self.set("items", [])
|
||||||
self.validate_work_order()
|
self.validate_work_order()
|
||||||
|
|
||||||
if self.purpose == "Disassemble" and qty is not None:
|
if self.purpose == "Disassemble":
|
||||||
return self.get_items_for_disassembly(qty, production_item)
|
return self.get_items_for_disassembly()
|
||||||
|
|
||||||
if not self.posting_date or not self.posting_time:
|
if not self.posting_date or not self.posting_time:
|
||||||
frappe.throw(_("Posting date and posting time is mandatory"))
|
frappe.throw(_("Posting date and posting time is mandatory"))
|
||||||
|
|||||||
Reference in New Issue
Block a user