nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-12 03:15:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove unnecessary param, and use value from self

Browse Source 
(cherry picked from commit 98dfd64f63)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py
This commit is contained in:
Smit Vora
2026-04-07 13:17:22 +05:30
committed by Mergify
parent 99df61a0d8
commit 0b0dccd294
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -312,9 +312,7 @@ class StockEntry(StockController):
scale_factor = flt(self.fg_completed_qty) / source_fg_qty if source_fg_qty else 0 scale_factor = flt(self.fg_completed_qty) / source_fg_qty if source_fg_qty else 0
bundle_data = get_voucher_wise_serial_batch_from_bundle(voucher_no=[self.source_stock_entry]) bundle_data = get_voucher_wise_serial_batch_from_bundle(voucher_no=[self.source_stock_entry])
source_rows_by_name = { source_rows_by_name = {r.name: r for r in self.get_items_from_manufacture_stock_entry()}
r.name: r for r in self.get_items_from_manufacture_stock_entry(self.source_stock_entry)
}
for row in self.items: for row in self.items:
if not row.ste_detail: if not row.ste_detail:
@@ -2110,7 +2108,6 @@ class StockEntry(StockController):
self._append_disassembly_row_from_source( self._append_disassembly_row_from_source(
disassemble_qty=disassemble_qty, disassemble_qty=disassemble_qty,
scale_factor=scale_factor, scale_factor=scale_factor,
source_stock_entry=self.source_stock_entry,
) )
def _add_items_for_disassembly_from_work_order(self): def _add_items_for_disassembly_from_work_order(self):
@@ -2131,8 +2128,8 @@ class StockEntry(StockController):
scale_factor=scale_factor, scale_factor=scale_factor,
) )
def _append_disassembly_row_from_source(self, disassemble_qty, scale_factor, source_stock_entry=None): def _append_disassembly_row_from_source(self, disassemble_qty, scale_factor):
for source_row in self.get_items_from_manufacture_stock_entry(self.source_stock_entry): for source_row in self.get_items_from_manufacture_stock_entry():
if source_row.is_finished_item: if source_row.is_finished_item:
qty = disassemble_qty qty = disassemble_qty
s_warehouse = self.from_warehouse or source_row.t_warehouse s_warehouse = self.from_warehouse or source_row.t_warehouse
@@ -2168,10 +2165,10 @@ class StockEntry(StockController):
"use_serial_batch_fields": 1 if (source_row.batch_no or source_row.serial_no) else 0, "use_serial_batch_fields": 1 if (source_row.batch_no or source_row.serial_no) else 0,
} }
if source_stock_entry: if self.source_stock_entry:
item.update( item.update(
{ {
"against_stock_entry": source_stock_entry, "against_stock_entry": self.source_stock_entry,
"ste_detail": source_row.name, "ste_detail": source_row.name,
} }
) )
@@ -2218,6 +2215,7 @@ class StockEntry(StockController):
# Finished goods # Finished goods
self.load_items_from_bom() self.load_items_from_bom()
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
def get_items_from_manufacture_entry(self): def get_items_from_manufacture_entry(self):
@@ -2253,6 +2251,9 @@ class StockEntry(StockController):
======= =======
def get_items_from_manufacture_stock_entry(self, stock_entry=None): def get_items_from_manufacture_stock_entry(self, stock_entry=None):
>>>>>>> 3cf1ce8360 (fix: manufacture entry with group_by support) >>>>>>> 3cf1ce8360 (fix: manufacture entry with group_by support)
=======
def get_items_from_manufacture_stock_entry(self):
>>>>>>> 98dfd64f63 (fix: remove unnecessary param, and use value from self)
SE = frappe.qb.DocType("Stock Entry") SE = frappe.qb.DocType("Stock Entry")
SED = frappe.qb.DocType("Stock Entry Detail") SED = frappe.qb.DocType("Stock Entry Detail")
query = frappe.qb.from_(SED).join(SE).on(SED.parent == SE.name).where(SE.docstatus == 1) query = frappe.qb.from_(SED).join(SE).on(SED.parent == SE.name).where(SE.docstatus == 1)
@@ -2277,10 +2278,10 @@ class StockEntry(StockController):
SED.bom_no, SED.bom_no,
] ]
if stock_entry: if self.source_stock_entry:
return ( return (
query.select(SED.name, SED.qty, SED.transfer_qty, *common_fields) query.select(SED.name, SED.qty, SED.transfer_qty, *common_fields)
.where(SE.name == stock_entry) .where(SE.name == self.source_stock_entry)
.orderby(SED.idx) .orderby(SED.idx)
.run(as_dict=True) .run(as_dict=True)
) )