mirror of
https://github.com/frappe/erpnext.git
synced 2026-09-17 02:26:33 +00:00
refactor: introduce Journal Entry GL composer
Move the Journal Entry GL assembly into a new JournalEntryGLComposer( BaseGLComposer); compose() projects the accounts child rows into GL dicts, mirroring the former build_gl_map, which is now a thin shim delegating to the composer. Drop the now-unused get_advance_payment_doctypes import.
This commit is contained in:
Nabin Hait
@@ -24,7 +24,6 @@ from erpnext.accounts.party import get_party_account
|
|||||||
from erpnext.accounts.utils import (
|
from erpnext.accounts.utils import (
|
||||||
cancel_exchange_gain_loss_journal,
|
cancel_exchange_gain_loss_journal,
|
||||||
get_account_currency,
|
get_account_currency,
|
||||||
get_advance_payment_doctypes,
|
|
||||||
get_balance_on,
|
get_balance_on,
|
||||||
get_stock_accounts,
|
get_stock_accounts,
|
||||||
get_stock_and_account_balance,
|
get_stock_and_account_balance,
|
||||||
@@ -1120,87 +1119,9 @@ class JournalEntry(AccountsController):
|
|||||||
self.total_amount_in_words = money_in_words(amt, currency)
|
self.total_amount_in_words = money_in_words(amt, currency)
|
||||||
|
|
||||||
def build_gl_map(self):
|
def build_gl_map(self):
|
||||||
gl_map = []
|
from erpnext.accounts.doctype.journal_entry.services.gl_composer import JournalEntryGLComposer
|
||||||
|
|
||||||
company_currency = erpnext.get_company_currency(self.company)
|
return JournalEntryGLComposer(self).compose()
|
||||||
self.transaction_currency = company_currency
|
|
||||||
self.transaction_exchange_rate = 1
|
|
||||||
if self.multi_currency:
|
|
||||||
for row in self.get("accounts"):
|
|
||||||
if row.account_currency != company_currency:
|
|
||||||
# Journal assumes the first foreign currency as transaction currency
|
|
||||||
self.transaction_currency = row.account_currency
|
|
||||||
self.transaction_exchange_rate = row.exchange_rate
|
|
||||||
break
|
|
||||||
|
|
||||||
advance_doctypes = get_advance_payment_doctypes()
|
|
||||||
|
|
||||||
for d in self.get("accounts"):
|
|
||||||
if d.debit or d.credit or (self.voucher_type == "Exchange Gain Or Loss"):
|
|
||||||
r = [d.user_remark, self.remark]
|
|
||||||
r = [x for x in r if x]
|
|
||||||
remarks = "\n".join(r)
|
|
||||||
|
|
||||||
row = {
|
|
||||||
"account": d.account,
|
|
||||||
"party_type": d.party_type,
|
|
||||||
"due_date": self.due_date,
|
|
||||||
"party": d.party,
|
|
||||||
"against": d.against_account,
|
|
||||||
"debit": flt(d.debit, d.precision("debit")),
|
|
||||||
"credit": flt(d.credit, d.precision("credit")),
|
|
||||||
"account_currency": d.account_currency,
|
|
||||||
"debit_in_account_currency": flt(
|
|
||||||
d.debit_in_account_currency, d.precision("debit_in_account_currency")
|
|
||||||
),
|
|
||||||
"credit_in_account_currency": flt(
|
|
||||||
d.credit_in_account_currency, d.precision("credit_in_account_currency")
|
|
||||||
),
|
|
||||||
"transaction_currency": self.transaction_currency,
|
|
||||||
"transaction_exchange_rate": self.transaction_exchange_rate,
|
|
||||||
"debit_in_transaction_currency": flt(
|
|
||||||
d.debit_in_account_currency, d.precision("debit_in_account_currency")
|
|
||||||
)
|
|
||||||
if self.transaction_currency == d.account_currency
|
|
||||||
else flt(d.debit, d.precision("debit")) / self.transaction_exchange_rate,
|
|
||||||
"credit_in_transaction_currency": flt(
|
|
||||||
d.credit_in_account_currency, d.precision("credit_in_account_currency")
|
|
||||||
)
|
|
||||||
if self.transaction_currency == d.account_currency
|
|
||||||
else flt(d.credit, d.precision("credit")) / self.transaction_exchange_rate,
|
|
||||||
"against_voucher_type": d.reference_type,
|
|
||||||
"against_voucher": d.reference_name,
|
|
||||||
"remarks": remarks,
|
|
||||||
"voucher_detail_no": d.reference_detail_no,
|
|
||||||
"cost_center": d.cost_center,
|
|
||||||
"project": d.project,
|
|
||||||
"finance_book": self.finance_book,
|
|
||||||
"advance_voucher_type": d.advance_voucher_type,
|
|
||||||
"advance_voucher_no": d.advance_voucher_no,
|
|
||||||
}
|
|
||||||
|
|
||||||
if d.reference_type in advance_doctypes:
|
|
||||||
row.update(
|
|
||||||
{
|
|
||||||
"against_voucher_type": self.doctype,
|
|
||||||
"against_voucher": self.name,
|
|
||||||
"advance_voucher_type": d.reference_type,
|
|
||||||
"advance_voucher_no": d.reference_name,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
# set flag to skip party validation
|
|
||||||
account_type = frappe.get_cached_value("Account", d.account, "account_type")
|
|
||||||
if account_type in ["Receivable", "Payable"] and self.party_not_required:
|
|
||||||
frappe.flags.party_not_required = True
|
|
||||||
|
|
||||||
gl_map.append(
|
|
||||||
self.get_gl_dict(
|
|
||||||
row,
|
|
||||||
item=d,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
return gl_map
|
|
||||||
|
|
||||||
def make_gl_entries(self, cancel=0, adv_adj=0):
|
def make_gl_entries(self, cancel=0, adv_adj=0):
|
||||||
from erpnext.accounts.general_ledger import make_gl_entries
|
from erpnext.accounts.general_ledger import make_gl_entries
|
||||||
|
|||||||
103
erpnext/accounts/doctype/journal_entry/services/gl_composer.py
Normal file
103
erpnext/accounts/doctype/journal_entry/services/gl_composer.py
Normal file
@@ -0,0 +1,103 @@
|
|||||||
|
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
|
||||||
|
# License: GNU General Public License v3. See license.txt
|
||||||
|
|
||||||
|
import frappe
|
||||||
|
from frappe.utils import flt
|
||||||
|
|
||||||
|
import erpnext
|
||||||
|
from erpnext.accounts.services.base_gl_composer import BaseGLComposer
|
||||||
|
from erpnext.accounts.utils import get_advance_payment_doctypes
|
||||||
|
|
||||||
|
|
||||||
|
class JournalEntryGLComposer(BaseGLComposer):
|
||||||
|
"""Assembles the GL entries for a Journal Entry.
|
||||||
|
|
||||||
|
A Journal Entry already carries its ledger rows in the ``accounts`` child
|
||||||
|
table, so composing is a straight projection of those rows into GL dicts
|
||||||
|
via ``self.doc.get_gl_dict``. The transaction currency/rate are resolved
|
||||||
|
from the first foreign-currency row (mirroring the former build_gl_map).
|
||||||
|
"""
|
||||||
|
|
||||||
|
def compose(self):
|
||||||
|
doc = self.doc
|
||||||
|
gl_map = []
|
||||||
|
|
||||||
|
company_currency = erpnext.get_company_currency(doc.company)
|
||||||
|
doc.transaction_currency = company_currency
|
||||||
|
doc.transaction_exchange_rate = 1
|
||||||
|
if doc.multi_currency:
|
||||||
|
for row in doc.get("accounts"):
|
||||||
|
if row.account_currency != company_currency:
|
||||||
|
# Journal assumes the first foreign currency as transaction currency
|
||||||
|
doc.transaction_currency = row.account_currency
|
||||||
|
doc.transaction_exchange_rate = row.exchange_rate
|
||||||
|
break
|
||||||
|
|
||||||
|
advance_doctypes = get_advance_payment_doctypes()
|
||||||
|
|
||||||
|
for d in doc.get("accounts"):
|
||||||
|
if d.debit or d.credit or (doc.voucher_type == "Exchange Gain Or Loss"):
|
||||||
|
r = [d.user_remark, doc.remark]
|
||||||
|
r = [x for x in r if x]
|
||||||
|
remarks = "\n".join(r)
|
||||||
|
|
||||||
|
row = {
|
||||||
|
"account": d.account,
|
||||||
|
"party_type": d.party_type,
|
||||||
|
"due_date": doc.due_date,
|
||||||
|
"party": d.party,
|
||||||
|
"against": d.against_account,
|
||||||
|
"debit": flt(d.debit, d.precision("debit")),
|
||||||
|
"credit": flt(d.credit, d.precision("credit")),
|
||||||
|
"account_currency": d.account_currency,
|
||||||
|
"debit_in_account_currency": flt(
|
||||||
|
d.debit_in_account_currency, d.precision("debit_in_account_currency")
|
||||||
|
),
|
||||||
|
"credit_in_account_currency": flt(
|
||||||
|
d.credit_in_account_currency, d.precision("credit_in_account_currency")
|
||||||
|
),
|
||||||
|
"transaction_currency": doc.transaction_currency,
|
||||||
|
"transaction_exchange_rate": doc.transaction_exchange_rate,
|
||||||
|
"debit_in_transaction_currency": flt(
|
||||||
|
d.debit_in_account_currency, d.precision("debit_in_account_currency")
|
||||||
|
)
|
||||||
|
if doc.transaction_currency == d.account_currency
|
||||||
|
else flt(d.debit, d.precision("debit")) / doc.transaction_exchange_rate,
|
||||||
|
"credit_in_transaction_currency": flt(
|
||||||
|
d.credit_in_account_currency, d.precision("credit_in_account_currency")
|
||||||
|
)
|
||||||
|
if doc.transaction_currency == d.account_currency
|
||||||
|
else flt(d.credit, d.precision("credit")) / doc.transaction_exchange_rate,
|
||||||
|
"against_voucher_type": d.reference_type,
|
||||||
|
"against_voucher": d.reference_name,
|
||||||
|
"remarks": remarks,
|
||||||
|
"voucher_detail_no": d.reference_detail_no,
|
||||||
|
"cost_center": d.cost_center,
|
||||||
|
"project": d.project,
|
||||||
|
"finance_book": doc.finance_book,
|
||||||
|
"advance_voucher_type": d.advance_voucher_type,
|
||||||
|
"advance_voucher_no": d.advance_voucher_no,
|
||||||
|
}
|
||||||
|
|
||||||
|
if d.reference_type in advance_doctypes:
|
||||||
|
row.update(
|
||||||
|
{
|
||||||
|
"against_voucher_type": doc.doctype,
|
||||||
|
"against_voucher": doc.name,
|
||||||
|
"advance_voucher_type": d.reference_type,
|
||||||
|
"advance_voucher_no": d.reference_name,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
# set flag to skip party validation
|
||||||
|
account_type = frappe.get_cached_value("Account", d.account, "account_type")
|
||||||
|
if account_type in ["Receivable", "Payable"] and doc.party_not_required:
|
||||||
|
frappe.flags.party_not_required = True
|
||||||
|
|
||||||
|
gl_map.append(
|
||||||
|
doc.get_gl_dict(
|
||||||
|
row,
|
||||||
|
item=d,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
return gl_map
|
||||||
Reference in New Issue
Block a user