nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: set tr currency dr & cr directly on parent document

Browse Source 
(cherry picked from commit e9af567033)
This commit is contained in:
ruthra kumar
2025-02-21 15:42:01 +05:30
committed by Mergify
parent 5c47c35a0f
commit 1e5fbc0a48
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -871,8 +871,14 @@ class PurchaseInvoice(BuyingController):
self.make_payment_gl_entries(gl_entries) self.make_payment_gl_entries(gl_entries)
self.make_write_off_gl_entry(gl_entries) self.make_write_off_gl_entry(gl_entries)
self.make_gle_for_rounding_adjustment(gl_entries) self.make_gle_for_rounding_adjustment(gl_entries)
self.set_transaction_currency_rate(gl_entries)
return gl_entries return gl_entries
def set_transaction_currency_rate(self, gl_entries):
for x in gl_entries:
x["transaction_currency"] = self.currency
x["transaction_exchange_rate"] = self.get("conversion_rate") or 1
def check_asset_cwip_enabled(self): def check_asset_cwip_enabled(self):
# Check if there exists any item with cwip accounting enabled in it's asset category # Check if there exists any item with cwip accounting enabled in it's asset category
for item in self.get("items"): for item in self.get("items"):
@@ -916,6 +922,7 @@ class PurchaseInvoice(BuyingController):
"credit_in_account_currency": base_grand_total "credit_in_account_currency": base_grand_total
if self.party_account_currency == self.company_currency if self.party_account_currency == self.company_currency
else grand_total, else grand_total,
"credit_in_transaction_currency": grand_total,
"against_voucher": against_voucher, "against_voucher": against_voucher,
"against_voucher_type": self.doctype, "against_voucher_type": self.doctype,
"project": self.project, "project": self.project,
@@ -1054,7 +1061,9 @@ class PurchaseInvoice(BuyingController):
# Amount added through landed-cost-voucher # Amount added through landed-cost-voucher
if landed_cost_entries: if landed_cost_entries:
if (item.item_code, item.name) in landed_cost_entries: if (item.item_code, item.name) in landed_cost_entries:
for account, amount in landed_cost_entries[(item.item_code, item.name)].items(): for account, base_amount in landed_cost_entries[
(item.item_code, item.name)
].items():
gl_entries.append( gl_entries.append(
self.get_gl_dict( self.get_gl_dict(
{ {
@@ -1062,8 +1071,8 @@ class PurchaseInvoice(BuyingController):
"against": item.expense_account, "against": item.expense_account,
"cost_center": item.cost_center, "cost_center": item.cost_center,
"remarks": self.get("remarks") or _("Accounting Entry for Stock"), "remarks": self.get("remarks") or _("Accounting Entry for Stock"),
"credit": flt(amount["base_amount"]), "credit": flt(base_amount["base_amount"]),
"credit_in_account_currency": flt(amount["amount"]), "credit_in_account_currency": flt(base_amount["amount"]),
"project": item.project or self.project, "project": item.project or self.project,
}, },
item=item, item=item,
@@ -1099,7 +1108,7 @@ class PurchaseInvoice(BuyingController):
else item.deferred_expense_account else item.deferred_expense_account
) )
dummy, amount = self.get_amount_and_base_amount(item, None) amount, base_amount = self.get_amount_and_base_amount(item, None)
if provisional_accounting_for_non_stock_items: if provisional_accounting_for_non_stock_items:
self.make_provisional_gl_entry(gl_entries, item) self.make_provisional_gl_entry(gl_entries, item)
@@ -1110,7 +1119,8 @@ class PurchaseInvoice(BuyingController):
{ {
"account": expense_account, "account": expense_account,
"against": self.supplier, "against": self.supplier,
"debit": amount, "debit": base_amount,
"debit_in_transaction_currency": amount,
"cost_center": item.cost_center, "cost_center": item.cost_center,
"project": item.project or self.project, "project": item.project or self.project,
}, },
@@ -1332,6 +1342,7 @@ class PurchaseInvoice(BuyingController):
dr_or_cr + "_in_account_currency": base_amount dr_or_cr + "_in_account_currency": base_amount
if account_currency == self.company_currency if account_currency == self.company_currency
else amount, else amount,
dr_or_cr + "_in_transaction_currency": amount,
"cost_center": tax.cost_center, "cost_center": tax.cost_center,
}, },
account_currency, account_currency,
@@ -1460,6 +1471,7 @@ class PurchaseInvoice(BuyingController):
"debit_in_account_currency": self.base_paid_amount "debit_in_account_currency": self.base_paid_amount
if self.party_account_currency == self.company_currency if self.party_account_currency == self.company_currency
else self.paid_amount, else self.paid_amount,
"debit_in_transaction_currency": self.paid_amount,
"against_voucher": self.return_against "against_voucher": self.return_against
if cint(self.is_return) and self.return_against if cint(self.is_return) and self.return_against
else self.name, else self.name,
@@ -1481,6 +1493,7 @@ class PurchaseInvoice(BuyingController):
"credit_in_account_currency": self.base_paid_amount "credit_in_account_currency": self.base_paid_amount
if bank_account_currency == self.company_currency if bank_account_currency == self.company_currency
else self.paid_amount, else self.paid_amount,
"credit_in_transaction_currency": self.paid_amount,
"cost_center": self.cost_center, "cost_center": self.cost_center,
}, },
bank_account_currency, bank_account_currency,
@@ -1505,6 +1518,7 @@ class PurchaseInvoice(BuyingController):
"debit_in_account_currency": self.base_write_off_amount "debit_in_account_currency": self.base_write_off_amount
if self.party_account_currency == self.company_currency if self.party_account_currency == self.company_currency
else self.write_off_amount, else self.write_off_amount,
"debit_in_transaction_currency": self.write_off_amount,
"against_voucher": self.return_against "against_voucher": self.return_against
if cint(self.is_return) and self.return_against if cint(self.is_return) and self.return_against
else self.name, else self.name,
@@ -1525,6 +1539,7 @@ class PurchaseInvoice(BuyingController):
"credit_in_account_currency": self.base_write_off_amount "credit_in_account_currency": self.base_write_off_amount
if write_off_account_currency == self.company_currency if write_off_account_currency == self.company_currency
else self.write_off_amount, else self.write_off_amount,
"credit_in_transaction_currency": self.write_off_amount,
"cost_center": self.cost_center or self.write_off_cost_center, "cost_center": self.cost_center or self.write_off_cost_center,
}, },
item=self, item=self,