schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: ignore scrap items while distribute additional cost

Browse Source
This commit is contained in:
s-aga-r
2023-08-25 20:18:30 +05:30
parent 879d31a588
commit 1504ff8b6c
4 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/controllers/subcontracting_controller.py
View File

@@ -895,19 +895,24 @@ class SubcontractingController(StockController):
if self.total_additional_costs:
if self.distribute_additional_costs_based_on == "Amount":
total_amt = sum(flt(item.amount) for item in self.get("items"))
total_amt = sum(
flt(item.amount) for item in self.get("items") if not item.get("is_scrap_item")
)
for item in self.items:
item.additional_cost_per_qty = (
(item.amount * self.total_additional_costs) / total_amt
) / item.qty
if not item.get("is_scrap_item"):
item.additional_cost_per_qty = (
(item.amount * self.total_additional_costs) / total_amt
) / item.qty
else:
total_qty = sum(flt(item.qty) for item in self.get("items"))
total_qty = sum(flt(item.qty) for item in self.get("items") if not item.get("is_scrap_item"))
additional_cost_per_qty = self.total_additional_costs / total_qty
for item in self.items:
item.additional_cost_per_qty = additional_cost_per_qty
if not item.get("is_scrap_item"):
item.additional_cost_per_qty = additional_cost_per_qty
else:
for item in self.items:
item.additional_cost_per_qty = 0
if not item.get("is_scrap_item"):
item.additional_cost_per_qty = 0
@frappe.whitelist()
def get_current_stock(self):