Skip to content

feat: enhance invoice item processing with conversion rate and improved discount handling #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodlyft-hello merged 1 commit into from
Jun 11, 2026
Merged

feat: enhance invoice item processing with conversion rate and improved discount handling #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions di/integrations/di_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@ def _build_invoice_items(doc):
"""Transform invoice line items to FBR DI format."""
item_taxes = _get_taxes(doc.taxes)
invoice_items = []
conversion_rate = _as_decimal(doc.get("conversion_rate") or 1)

for line in doc.items:
item_code = line.get("item_code")
Expand All @@ -389,7 +390,7 @@ def _build_invoice_items(doc):
extra_tax = tax_data.get("Advance Tax", {"percentage": 0.0, "amount": 0.0})

qty = flt(line.get("qty", 0))
value_excl_st = _round_currency(line.get("net_amount", 0))
value_excl_st = _round_currency(line.get("base_net_amount") or line.get("net_amount", 0))

sales_tax = _round_currency(
_as_decimal(value_excl_st) * _as_decimal(gst["percentage"]) / Decimal("100")
Expand All @@ -398,7 +399,11 @@ def _build_invoice_items(doc):
extra_tax_amt = _round_currency(extra_tax["amount"])

qty_decimal = _as_decimal(qty)
fixed_price = _round_currency(_as_decimal(value_excl_st) / qty_decimal) if qty_decimal else 0.0
fixed_price = _round_currency(line.get("base_price_list_rate") or 0)
if not fixed_price:
fixed_price = _round_currency(_as_decimal(value_excl_st) / qty_decimal) if qty_decimal else 0.0

discount = _as_decimal(line.get("discount_amount", 0)) * qty_decimal * conversion_rate

total_values = _round_currency(
_as_decimal(value_excl_st)
Expand All @@ -410,8 +415,8 @@ def _build_invoice_items(doc):
sale_type = line.get("di_sale_type") or ""

invoice_item = InvoiceItem(
discount=max(_round_currency(line.get("discount_amount", 0)), 0.0),
fedPayable=_round_currency(line.get("di_fed_payable", 0)),
discount=max(_round_currency(discount), 0.0),
fedPayable=_round_currency(_as_decimal(line.get("di_fed_payable", 0)) * conversion_rate),
furtherTax=further_tax_amt,
hsCode=_safe_str(line.get("di_hs_code", "")),
extraTax=extra_tax_amt,
Expand Down
Loading