nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fixed test case

Browse Source
This commit is contained in:
rohitwaghchaure
2025-07-22 12:51:29 +05:30
committed by Rohit Waghchaure
parent 4453e447dc
commit c2140625f5
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/controllers/buying_controller.py
View File

@@ -310,9 +310,12 @@ class BuyingController(SubcontractingController):
stock_and_asset_items_qty, stock_and_asset_items_amount = 0, 0 stock_and_asset_items_qty, stock_and_asset_items_amount = 0, 0
last_item_idx = 1 last_item_idx = 1
total_rejected_qty = 0
for d in self.get("items"): for d in self.get("items"):
if d.item_code and d.item_code in stock_and_asset_items: if d.item_code and d.item_code in stock_and_asset_items:
stock_and_asset_items_qty += flt(d.qty) stock_and_asset_items_qty += flt(d.qty)
total_rejected_qty += flt(d.get("rejected_qty", 0))
stock_and_asset_items_amount += flt(d.base_net_amount) stock_and_asset_items_amount += flt(d.base_net_amount)
last_item_idx = d.idx last_item_idx = d.idx
@@ -324,12 +327,19 @@ class BuyingController(SubcontractingController):
valuation_amount_adjustment = total_valuation_amount valuation_amount_adjustment = total_valuation_amount
for i, item in enumerate(self.get("items")): for i, item in enumerate(self.get("items")):
if item.item_code and item.qty and item.item_code in stock_and_asset_items: if (
item_proportion = ( item.item_code
flt(item.base_net_amount) / stock_and_asset_items_amount and (item.qty or item.get("rejected_qty"))
if stock_and_asset_items_amount and item.item_code in stock_and_asset_items
else flt(item.qty) / stock_and_asset_items_qty ):
) if stock_and_asset_items_qty:
item_proportion = (
flt(item.base_net_amount) / stock_and_asset_items_amount
if stock_and_asset_items_amount
else flt(item.qty) / stock_and_asset_items_qty
)
elif total_rejected_qty:
item_proportion = flt(item.get("rejected_qty")) / flt(total_rejected_qty)
if i == (last_item_idx - 1): if i == (last_item_idx - 1):
item.item_tax_amount = flt( item.item_tax_amount = flt(