Skip to content

Commit

Permalink
Merge pull request #29145 from frappe/mergify/bp/version-13-pre-relea…
Browse files Browse the repository at this point in the history
…se/pr-29142

fix: map Accounting Dimensions for Bank Entry against Payroll Entry (backport #29142)
  • Loading branch information
deepeshgarg007 committed Jan 4, 2022
2 parents 0b07fbd + 1eccb83 commit f90b49a
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions erpnext/payroll/doctype/payroll_entry/payroll_entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,23 +350,24 @@ def create_journal_entry(self, je_payment_amount, user_remark):
currencies = []
multi_currency = 0
company_currency = erpnext.get_company_currency(self.company)
accounting_dimensions = get_accounting_dimensions() or []

exchange_rate, amount = self.get_amount_and_exchange_rate_for_journal_entry(self.payment_account, je_payment_amount, company_currency, currencies)
accounts.append({
accounts.append(self.update_accounting_dimensions({
"account": self.payment_account,
"bank_account": self.bank_account,
"credit_in_account_currency": flt(amount, precision),
"exchange_rate": flt(exchange_rate),
})
}, accounting_dimensions))

exchange_rate, amount = self.get_amount_and_exchange_rate_for_journal_entry(payroll_payable_account, je_payment_amount, company_currency, currencies)
accounts.append({
accounts.append(self.update_accounting_dimensions({
"account": payroll_payable_account,
"debit_in_account_currency": flt(amount, precision),
"exchange_rate": flt(exchange_rate),
"reference_type": self.doctype,
"reference_name": self.name
})
}, accounting_dimensions))

if len(currencies) > 1:
multi_currency = 1
Expand Down

0 comments on commit f90b49a

Please sign in to comment.