Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: gl entries for exchange gain loss (#26734)

Browse Source
This commit is contained in:
Saqib 2021-07-30 11:21:49 +05:30 committed by GitHub
parent 50b4b70589
commit d4ae1febe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
View File

@ -997,8 +997,8 @@ class TestPurchaseInvoice(unittest.TestCase):
expected_gle = [ expected_gle = [
["_Test Account Cost for Goods Sold - _TC", 37500.0], ["_Test Account Cost for Goods Sold - _TC", 37500.0],
["_Test Payable USD - _TC", -40000.0], ["_Test Payable USD - _TC", -35000.0],
["Exchange Gain/Loss - _TC", 2500.0] ["Exchange Gain/Loss - _TC", -2500.0]
] ]
gl_entries = frappe.db.sql(""" gl_entries = frappe.db.sql("""
@ -1028,8 +1028,8 @@ class TestPurchaseInvoice(unittest.TestCase):
expected_gle = [ expected_gle = [
["_Test Account Cost for Goods Sold - _TC", 36500.0], ["_Test Account Cost for Goods Sold - _TC", 36500.0],
["_Test Payable USD - _TC", -38000.0], ["_Test Payable USD - _TC", -35000.0],
["Exchange Gain/Loss - _TC", 1500.0] ["Exchange Gain/Loss - _TC", -1500.0]
] ]
gl_entries = frappe.db.sql(""" gl_entries = frappe.db.sql("""

13
erpnext/controllers/accounts_controller.py
View File

@ -674,17 +674,22 @@ class AccountsController(TransactionBase):
if self.get('doctype') in ['Purchase Invoice', 'Sales Invoice']: if self.get('doctype') in ['Purchase Invoice', 'Sales Invoice']:
for d in self.get("advances"): for d in self.get("advances"):
if d.exchange_gain_loss: if d.exchange_gain_loss:
party = self.supplier if self.get('doctype') == 'Purchase Invoice' else self.customer is_purchase_invoice = self.get('doctype') == 'Purchase Invoice'
party_account = self.credit_to if self.get('doctype') == 'Purchase Invoice' else self.debit_to party = self.supplier if is_purchase_invoice else self.customer
party_type = "Supplier" if self.get('doctype') == 'Purchase Invoice' else "Customer" party_account = self.credit_to if is_purchase_invoice else self.debit_to
party_type = "Supplier" if is_purchase_invoice else "Customer"
gain_loss_account = frappe.db.get_value('Company', self.company, 'exchange_gain_loss_account') gain_loss_account = frappe.db.get_value('Company', self.company, 'exchange_gain_loss_account')
if not gain_loss_account:
frappe.throw(_("Please set Default Exchange Gain/Loss Account in Company {}")
.format(self.get('company')))
account_currency = get_account_currency(gain_loss_account) account_currency = get_account_currency(gain_loss_account)
if account_currency != self.company_currency: if account_currency != self.company_currency:
frappe.throw(_("Currency for {0} must be {1}").format(d.account, self.company_currency)) frappe.throw(_("Currency for {0} must be {1}").format(gain_loss_account, self.company_currency))
# for purchase # for purchase
dr_or_cr = 'debit' if d.exchange_gain_loss > 0 else 'credit' dr_or_cr = 'debit' if d.exchange_gain_loss > 0 else 'credit'
if not is_purchase_invoice:
# just reverse for sales? # just reverse for sales?
dr_or_cr = 'debit' if dr_or_cr == 'credit' else 'credit' dr_or_cr = 'debit' if dr_or_cr == 'credit' else 'credit'