schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #40849 from deepeshgarg007/transaction_currency_values

Browse Source 
fix: Values in transaction currency
This commit is contained in:
Deepesh Garg
2024-04-10 20:42:08 +05:30
committed by GitHub
parent 9905b9e4b0 a3c9fd6567
commit 20f20db179
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/controllers/accounts_controller.py
View File

@@ -1032,10 +1032,10 @@ class AccountsController(TransactionBase):
"transaction_currency": self.get("currency") or self.company_currency, "transaction_currency": self.get("currency") or self.company_currency,
"transaction_exchange_rate": self.get("conversion_rate", 1), "transaction_exchange_rate": self.get("conversion_rate", 1),
"debit_in_transaction_currency": self.get_value_in_transaction_currency( "debit_in_transaction_currency": self.get_value_in_transaction_currency(
account_currency, args, "debit" account_currency, gl_dict, "debit"
), ),
"credit_in_transaction_currency": self.get_value_in_transaction_currency( "credit_in_transaction_currency": self.get_value_in_transaction_currency(
account_currency, args, "credit" account_currency, gl_dict, "credit"
), ),
} }
) )
@@ -1067,11 +1067,11 @@ class AccountsController(TransactionBase):
return "Debit Note" return "Debit Note"
return self.doctype return self.doctype
def get_value_in_transaction_currency(self, account_currency, args, field): def get_value_in_transaction_currency(self, account_currency, gl_dict, field):
if account_currency == self.get("currency"): if account_currency == self.get("currency"):
return args.get(field + "_in_account_currency") return gl_dict.get(field + "_in_account_currency")
else: else:
return flt(args.get(field, 0) / self.get("conversion_rate", 1)) return flt(gl_dict.get(field, 0) / self.get("conversion_rate", 1))
def validate_zero_qty_for_return_invoices_with_stock(self): def validate_zero_qty_for_return_invoices_with_stock(self):
rows = [] rows = []