Skip to content

Commit

Permalink
fix: incorrect landed cost voucher amount
Browse files Browse the repository at this point in the history
(cherry picked from commit d78a1e7)
  • Loading branch information
rohitwaghchaure authored and mergify[bot] committed Feb 5, 2024
1 parent e49f8d5 commit 4a609d8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,13 @@ def set_applicable_charges_on_item(self):
self.get("items")[item_count - 1].applicable_charges += diff

def validate_applicable_charges_for_item(self):
if self.distribute_charges_based_on == "Distribute Manually" and len(self.taxes) > 1:
frappe.throw(
_(
"Please keep one Applicable Charges, when 'Distribute Charges Based On' is 'Distribute Manually'. For more charges, please create another Landed Cost Voucher."
)
)

based_on = self.distribute_charges_based_on.lower()

if based_on != "distribute manually":
Expand Down
10 changes: 5 additions & 5 deletions erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
Original file line number Diff line number Diff line change
Expand Up @@ -1200,16 +1200,16 @@ def get_item_account_wise_additional_cost(purchase_document):
for lcv in landed_cost_vouchers:
landed_cost_voucher_doc = frappe.get_doc("Landed Cost Voucher", lcv.parent)

based_on_field = None
# Use amount field for total item cost for manually cost distributed LCVs
if landed_cost_voucher_doc.distribute_charges_based_on == "Distribute Manually":
based_on_field = "amount"
else:
if landed_cost_voucher_doc.distribute_charges_based_on != "Distribute Manually":
based_on_field = frappe.scrub(landed_cost_voucher_doc.distribute_charges_based_on)

total_item_cost = 0

for item in landed_cost_voucher_doc.items:
total_item_cost += item.get(based_on_field)
if based_on_field:
for item in landed_cost_voucher_doc.items:
total_item_cost += item.get(based_on_field)

for item in landed_cost_voucher_doc.items:
if item.receipt_document == purchase_document:
Expand Down

0 comments on commit 4a609d8

Please sign in to comment.