Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "fix: get consumed_qty based on received_qty in SCR"

Browse Source 
This reverts commit 70c9b8dc50d77f7bbc3da7f7341c3e6432902a0d.
This commit is contained in:
s-aga-r 2022-11-15 14:32:16 +05:30
parent 3706a9b4dc
commit 01f56c621c
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/controllers/subcontracting_controller.py
View File

@ -100,7 +100,7 @@ class SubcontractingController(StockController):
and self._doc_before_save and self._doc_before_save
): ):
for row in self._doc_before_save.get("items"): for row in self._doc_before_save.get("items"):
item_dict[row.name] = (row.item_code, row.received_qty or row.qty) item_dict[row.name] = (row.item_code, row.qty)
return item_dict return item_dict
@ -118,9 +118,7 @@ class SubcontractingController(StockController):
for row in self.items: for row in self.items:
self.__reference_name.append(row.name) self.__reference_name.append(row.name)
if (row.name not in item_dict) or (row.item_code, row.received_qty or row.qty) != item_dict[ if (row.name not in item_dict) or (row.item_code, row.qty) != item_dict[row.name]:
row.name
]:
self.__changed_name.append(row.name) self.__changed_name.append(row.name)
if item_dict.get(row.name): if item_dict.get(row.name):
@ -463,13 +461,12 @@ class SubcontractingController(StockController):
def __get_qty_based_on_material_transfer(self, item_row, transfer_item): def __get_qty_based_on_material_transfer(self, item_row, transfer_item):
key = (item_row.item_code, item_row.get(self.subcontract_data.order_field)) key = (item_row.item_code, item_row.get(self.subcontract_data.order_field))
item_qty = item_row.received_qty or item_row.qty
if self.qty_to_be_received.get(key) == item_qty: if self.qty_to_be_received == item_row.qty:
return transfer_item.qty return transfer_item.qty
if self.qty_to_be_received: if self.qty_to_be_received:
qty = (flt(item_qty) * flt(transfer_item.qty)) / flt(self.qty_to_be_received.get(key, 0)) qty = (flt(item_row.qty) * flt(transfer_item.qty)) / flt(self.qty_to_be_received.get(key, 0))
transfer_item.item_details.required_qty = transfer_item.qty transfer_item.item_details.required_qty = transfer_item.qty
if transfer_item.serial_no or frappe.get_cached_value( if transfer_item.serial_no or frappe.get_cached_value(
@ -494,11 +491,7 @@ class SubcontractingController(StockController):
for bom_item in self.__get_materials_from_bom( for bom_item in self.__get_materials_from_bom(
row.item_code, row.bom, row.get("include_exploded_items") row.item_code, row.bom, row.get("include_exploded_items")
): ):
qty = ( qty = flt(bom_item.qty_consumed_per_unit) * flt(row.qty) * row.conversion_factor
flt(bom_item.qty_consumed_per_unit)
* flt(row.received_qty or row.qty)
* row.conversion_factor
)
bom_item.main_item_code = row.item_code bom_item.main_item_code = row.item_code
self.__update_reserve_warehouse(bom_item, row) self.__update_reserve_warehouse(bom_item, row)
self.__set_alternative_item(bom_item) self.__set_alternative_item(bom_item)