Merge pull request #32089 from frappe/mergify/bp/develop/pr-32086
fix: QR Code multi currency issue (backport #32086)
This commit is contained in:
commit
8efd305afd
@ -84,7 +84,7 @@ def create_qr_code(doc, method=None):
|
|||||||
tlv_array.append("".join([tag, length, value]))
|
tlv_array.append("".join([tag, length, value]))
|
||||||
|
|
||||||
# Invoice Amount
|
# Invoice Amount
|
||||||
invoice_amount = str(doc.grand_total)
|
invoice_amount = str(doc.base_grand_total)
|
||||||
tag = bytes([4]).hex()
|
tag = bytes([4]).hex()
|
||||||
length = bytes([len(invoice_amount)]).hex()
|
length = bytes([len(invoice_amount)]).hex()
|
||||||
value = invoice_amount.encode("utf-8").hex()
|
value = invoice_amount.encode("utf-8").hex()
|
||||||
@ -144,7 +144,7 @@ def get_vat_amount(doc):
|
|||||||
|
|
||||||
for tax in doc.get("taxes"):
|
for tax in doc.get("taxes"):
|
||||||
if tax.account_head in vat_accounts:
|
if tax.account_head in vat_accounts:
|
||||||
vat_amount += tax.tax_amount
|
vat_amount += tax.base_tax_amount
|
||||||
|
|
||||||
return vat_amount
|
return vat_amount
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user