Skip to content

Commit

Permalink
refactor: delink gl entry from reconciliation
Browse files Browse the repository at this point in the history
  • Loading branch information
ruthra-kumar committed May 29, 2022
1 parent 285f2ff commit 54be392
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 7 deletions.
15 changes: 12 additions & 3 deletions erpnext/accounts/doctype/journal_entry/journal_entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -800,9 +800,7 @@ def set_total_amount(self, amt, currency):

self.total_amount_in_words = money_in_words(amt, currency)

def make_gl_entries(self, cancel=0, adv_adj=0):
from erpnext.accounts.general_ledger import make_gl_entries

def build_gl_map(self, cancel=0):
gl_map = []
for d in self.get("accounts"):
if d.debit or d.credit:
Expand Down Expand Up @@ -838,7 +836,18 @@ def make_gl_entries(self, cancel=0, adv_adj=0):
item=d,
)
)
return gl_map

def make_payment_ledger_entries(self, cancel=0):
from erpnext.accounts.utils import create_payment_ledger_entry

gl_map = self.build_gl_map(cancel)
create_payment_ledger_entry(gl_map, cancel)

def make_gl_entries(self, cancel=0, adv_adj=0):
from erpnext.accounts.general_ledger import make_gl_entries

gl_map = self.build_gl_map(cancel)
if self.voucher_type in ("Deferred Revenue", "Deferred Expense"):
update_outstanding = "No"
else:
Expand Down
18 changes: 16 additions & 2 deletions erpnext/accounts/doctype/payment_entry/payment_entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@
)
from erpnext.accounts.general_ledger import make_gl_entries, process_gl_map
from erpnext.accounts.party import get_party_account
from erpnext.accounts.utils import get_account_currency, get_balance_on, get_outstanding_invoices
from erpnext.accounts.utils import (
create_payment_ledger_entry,
get_account_currency,
get_balance_on,
get_outstanding_invoices,
)
from erpnext.controllers.accounts_controller import (
AccountsController,
get_supplier_block_status,
Expand Down Expand Up @@ -785,7 +790,7 @@ def set_remarks(self):

self.set("remarks", "\n".join(remarks))

def make_gl_entries(self, cancel=0, adv_adj=0):
def build_gl_map(self):
if self.payment_type in ("Receive", "Pay") and not self.get("party_account_field"):
self.setup_party_account_field()

Expand All @@ -794,7 +799,16 @@ def make_gl_entries(self, cancel=0, adv_adj=0):
self.add_bank_gl_entries(gl_entries)
self.add_deductions_gl_entries(gl_entries)
self.add_tax_gl_entries(gl_entries)
return gl_entries

def make_payment_ledger_entries(self, cancel=0):
# used only on reconciliation
gl_entries = self.build_gl_map()
gl_entries = process_gl_map(gl_entries)
create_payment_ledger_entry(gl_entries, cancel)

def make_gl_entries(self, cancel=0, adv_adj=0):
gl_entries = self.build_gl_map()
gl_entries = process_gl_map(gl_entries)
make_gl_entries(gl_entries, cancel=cancel, adv_adj=adv_adj)

Expand Down
4 changes: 2 additions & 2 deletions erpnext/accounts/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ def reconcile_against_document(args):
# cancel advance entry
doc = frappe.get_doc(voucher_type, voucher_no)
frappe.flags.ignore_party_validation = True
doc.make_gl_entries(cancel=1, adv_adj=1)
doc.make_payment_ledger_entries(cancel=1)

for entry in entries:
check_if_advance_entry_modified(entry)
Expand All @@ -440,7 +440,7 @@ def reconcile_against_document(args):
doc.save(ignore_permissions=True)
# re-submit advance entry
doc = frappe.get_doc(entry.voucher_type, entry.voucher_no)
doc.make_gl_entries(cancel=0, adv_adj=1)
doc.make_payment_ledger_entries(cancel=0)
frappe.flags.ignore_party_validation = False

if entry.voucher_type in ("Payment Entry", "Journal Entry"):
Expand Down

0 comments on commit 54be392

Please sign in to comment.