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

refactor: cancel gain/loss JE on Journal as payment cancellation

Browse Source
This commit is contained in:
ruthra kumar 2023-07-11 12:21:10 +05:30
parent f119a1e115
commit 6e18bb6456
4 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@ -87,9 +87,8 @@ class JournalEntry(AccountsController):
self.update_invoice_discounting()
def on_cancel(self):
from erpnext.accounts.utils import unlink_ref_doc_from_payment_entries
unlink_ref_doc_from_payment_entries(self)
# References for this Journal are removed on the `on_cancel` event in accounts_controller
super(JournalEntry, self).on_cancel()
self.ignore_linked_doctypes = (
"GL Entry",
"Stock Ledger Entry",

2
erpnext/accounts/utils.py
View File

@ -655,7 +655,7 @@ def cancel_exchange_gain_loss_journal(parent_doc: dict | object) -> None:
"""
Cancel Exchange Gain/Loss for Sales/Purchase Invoice, if they have any.
"""
if parent_doc.doctype in ["Sales Invoice", "Purchase Invoice", "Payment Entry"]:
if parent_doc.doctype in ["Sales Invoice", "Purchase Invoice", "Payment Entry", "Journal Entry"]:
journals = frappe.db.get_all(
"Journal Entry Account",
filters={

11
erpnext/controllers/accounts_controller.py
View File

@ -991,10 +991,11 @@ class AccountsController(TransactionBase):
party_account_currency = frappe.get_cached_value(
"Account", party_account, "account_currency"
)
dr_or_cr = "debit" if arg.get("difference_amount") > 0 else "credit"
if arg.reference_doctype == "Purchase Invoice":
dr_or_cr = "debit" if dr_or_cr == "credit" else "credit"
dr_or_cr = "debit" if arg.get("party_type") == "Customer" else "credit"
# if arg.reference_doctype == "Purchase Invoice":
# dr_or_cr = "debit" if dr_or_cr == "credit" else "credit"
reverse_dr_or_cr = "debit" if dr_or_cr == "credit" else "credit"
@ -1038,6 +1039,7 @@ class AccountsController(TransactionBase):
"exchange_rate": 1,
"cost_center": erpnext.get_default_cost_center(self.company),
# TODO: figure out a way to pass reference
# TODO: add reference_detail_no field in payment ledger
# throws 'Journal Entry doesn't have {account} or doesn't have matched account'
"reference_type": self.doctype,
"reference_name": self.name,
@ -1163,6 +1165,7 @@ class AccountsController(TransactionBase):
journal_entry.save()
journal_entry.submit()
# frappe.throw("stopping...")
def update_against_document_in_jv(self):
"""
@ -1229,7 +1232,7 @@ class AccountsController(TransactionBase):
unlink_ref_doc_from_payment_entries,
)
if self.doctype in ["Sales Invoice", "Purchase Invoice", "Payment Entry"]:
if self.doctype in ["Sales Invoice", "Purchase Invoice", "Payment Entry", "Journal Entry"]:
# Cancel Exchange Gain/Loss Journal before unlinking
cancel_exchange_gain_loss_journal(self)

34
erpnext/controllers/tests/test_accounts_controller.py
View File

@ -11,6 +11,7 @@ from frappe.utils import add_days, flt, nowdate
from erpnext import get_default_cost_center
from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
from erpnext.accounts.party import get_party_account
from erpnext.stock.doctype.item.test_item import create_item
@ -20,7 +21,7 @@ def make_customer(customer_name, currency=None):
if not frappe.db.exists("Customer", customer_name):
customer = frappe.new_doc("Customer")
customer.customer_name = customer_name
customer.type = "Individual"
customer.customer_type = "Individual"
if currency:
customer.default_currency = currency
@ -30,7 +31,22 @@ def make_customer(customer_name, currency=None):
return customer_name
class TestAccountsController(FrappeTestCase):
def make_supplier(supplier_name, currency=None):
if not frappe.db.exists("Supplier", supplier_name):
supplier = frappe.new_doc("Supplier")
supplier.supplier_name = supplier_name
supplier.supplier_type = "Individual"
if currency:
supplier.default_currency = currency
supplier.save()
return supplier.name
else:
return supplier_name
# class TestAccountsController(FrappeTestCase):
class TestAccountsController(unittest.TestCase):
"""
Test Exchange Gain/Loss booking on various scenarios
"""
@ -39,11 +55,12 @@ class TestAccountsController(FrappeTestCase):
self.create_company()
self.create_account()
self.create_item()
self.create_customer()
self.create_parties()
self.clear_old_entries()
def tearDown(self):
frappe.db.rollback()
# frappe.db.rollback()
pass
def create_company(self):
company_name = "_Test Company MC"
@ -80,9 +97,16 @@ class TestAccountsController(FrappeTestCase):
)
self.item = item if isinstance(item, str) else item.item_code
def create_parties(self):
self.create_customer()
self.create_supplier()
def create_customer(self):
self.customer = make_customer("_Test MC Customer USD", "USD")
def create_supplier(self):
self.supplier = make_supplier("_Test MC Supplier USD", "USD")
def create_account(self):
account_name = "Debtors USD"
if not frappe.db.get_value(
@ -215,7 +239,7 @@ class TestAccountsController(FrappeTestCase):
return journals
def test_01_payment_against_invoice(self):
# Invoice in Foreign Currency
# Sales Invoice in Foreign Currency
si = self.create_sales_invoice(qty=1, rate=1)
# Payment
pe = self.create_payment_entry(amount=1, source_exc_rate=75).save()