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

fix: additional-cost in items table

Browse Source
This commit is contained in:
Sagar Sharma 2022-08-18 16:45:11 +05:30
parent 86bdddd1b8
commit d7ed4093d8
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
View File

@ -83,23 +83,23 @@ class SubcontractingOrder(SubcontractingController):
self.set_missing_values_in_items() self.set_missing_values_in_items()
def set_missing_values_in_additional_costs(self): def set_missing_values_in_additional_costs(self):
if self.get("additional_costs"): self.total_additional_costs = sum(flt(item.amount) for item in self.get("additional_costs"))
self.total_additional_costs = sum(flt(item.amount) for item in self.get("additional_costs"))
if self.total_additional_costs: if self.total_additional_costs:
if self.distribute_additional_costs_based_on == "Amount": 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"))
for item in self.items: for item in self.items:
item.additional_cost_per_qty = ( item.additional_cost_per_qty = (
(item.amount * self.total_additional_costs) / total_amt (item.amount * self.total_additional_costs) / total_amt
) / item.qty ) / item.qty
else: 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"))
additional_cost_per_qty = self.total_additional_costs / total_qty additional_cost_per_qty = self.total_additional_costs / total_qty
for item in self.items: for item in self.items:
item.additional_cost_per_qty = additional_cost_per_qty item.additional_cost_per_qty = additional_cost_per_qty
else: else:
self.total_additional_costs = 0 for item in self.items:
item.additional_cost_per_qty = 0
def set_missing_values_in_service_items(self): def set_missing_values_in_service_items(self):
for idx, item in enumerate(self.get("service_items")): for idx, item in enumerate(self.get("service_items")):