Skip to content

Commit

Permalink
fix: remove rows with zero consumed qty
Browse files Browse the repository at this point in the history
  • Loading branch information
s-aga-r committed Dec 21, 2023
1 parent d375164 commit f2f4100
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion erpnext/controllers/subcontracting_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,11 @@ def __set_batch_nos(self, bom_item, item_row, rm_obj, qty):
self.__set_batch_no_as_per_qty(item_row, new_rm_obj, batch_no, batch_qty)
self.available_materials[key]["batch_no"][batch_no] = 0

if abs(qty) > 0 and not new_rm_obj:
if new_rm_obj:
self.remove(rm_obj)
elif abs(qty) > 0:
self.__set_consumed_qty(rm_obj, qty)

else:
self.__set_consumed_qty(rm_obj, qty, bom_item.required_qty or qty)
self.__set_serial_nos(item_row, rm_obj)
Expand Down Expand Up @@ -525,13 +528,18 @@ def __set_supplied_items(self):
(row.item_code, row.get(self.subcontract_data.order_field))
] -= row.qty

def __reset_idx(self):
for idx, item in enumerate(self.get(self.raw_material_table)):
item.idx = idx + 1

def __prepare_supplied_items(self):
self.initialized_fields()
self.__get_subcontract_orders()
self.__get_pending_qty_to_receive()
self.get_available_materials()
self.__remove_changed_rows()
self.__set_supplied_items()
self.__reset_idx()

def __validate_batch_no(self, row, key):
if row.get("batch_no") and row.get("batch_no") not in self.__transferred_items.get(key).get(
Expand Down

0 comments on commit f2f4100

Please sign in to comment.