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

Merge pull request #51047 from aerele/fix/disassembly-stock-entry

Browse Source 
fix(manufacturing): get items for disassembly order
This commit is contained in:
rohitwaghchaure
2025-12-12 11:44:12 +05:30
committed by GitHub
parent 7ad123592c 99148a2aba
commit 3c032e1f35
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/doctype/work_order/work_order.js
View File

@@ -439,6 +439,10 @@ frappe.ui.form.on("Work Order", {
erpnext.work_order erpnext.work_order
.show_prompt_for_qty_input(frm, "Disassemble") .show_prompt_for_qty_input(frm, "Disassemble")
.then((data) => { .then((data) => {
if (flt(data.qty) <= 0) {
frappe.msgprint(__("Disassemble Qty cannot be less than or equal to <b>0</b>."));
return;
}
return frappe.xcall("erpnext.manufacturing.doctype.work_order.work_order.make_stock_entry", { return frappe.xcall("erpnext.manufacturing.doctype.work_order.work_order.make_stock_entry", {
work_order_id: frm.doc.name, work_order_id: frm.doc.name,
purpose: "Disassemble", purpose: "Disassemble",

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

@@ -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()

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

@@ -2158,7 +2158,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:
@@ -2171,7 +2171,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,
) )
@@ -2188,8 +2188,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
@@ -2225,12 +2225,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"))