nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49003 from asmitahase/fix-references-for-advance

Browse Source 
refactor: get advance payment doctypes from hooks
This commit is contained in:
Asmita Hase
2025-08-06 11:22:09 +05:30
committed by GitHub
parent a8d17b7590 b4f831a931
commit 28cbd18300
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py
View File

@@ -13,7 +13,7 @@ def get():
_("Bank Accounts"): {"account_type": "Bank", "is_group": 1}, _("Bank Accounts"): {"account_type": "Bank", "is_group": 1},
_("Cash In Hand"): {_("Cash"): {"account_type": "Cash"}, "account_type": "Cash"}, _("Cash In Hand"): {_("Cash"): {"account_type": "Cash"}, "account_type": "Cash"},
_("Loans and Advances (Assets)"): { _("Loans and Advances (Assets)"): {
_("Employee Advances"): {}, _("Employee Advances"): {"account_type": "Payable"},
}, },
_("Securities and Deposits"): {_("Earnest Money"): {}}, _("Securities and Deposits"): {_("Earnest Money"): {}},
_("Stock Assets"): { _("Stock Assets"): {

2
erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py
View File

@@ -20,7 +20,7 @@ def get():
"account_number": "1100", "account_number": "1100",
}, },
_("Loans and Advances (Assets)"): { _("Loans and Advances (Assets)"): {
_("Employee Advances"): {"account_number": "1610"}, _("Employee Advances"): {"account_number": "1610", "account_type": "Payable"},
"account_number": "1600", "account_number": "1600",
}, },
_("Securities and Deposits"): { _("Securities and Deposits"): {

4
erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.py
View File

@@ -4,7 +4,7 @@
import frappe import frappe
from frappe.model.document import Document from frappe.model.document import Document
from erpnext.accounts.utils import update_voucher_outstanding from erpnext.accounts.utils import get_advance_payment_doctypes, update_voucher_outstanding
class AdvancePaymentLedgerEntry(Document): class AdvancePaymentLedgerEntry(Document):
@@ -29,7 +29,7 @@ class AdvancePaymentLedgerEntry(Document):
def on_update(self): def on_update(self):
if ( if (
self.against_voucher_type in ["Purchase Order", "Sales Order"] self.against_voucher_type in get_advance_payment_doctypes()
and self.flags.update_outstanding == "Yes" and self.flags.update_outstanding == "Yes"
and not frappe.flags.is_reverse_depr_entry and not frappe.flags.is_reverse_depr_entry
): ):

4
erpnext/accounts/utils.py
View File

@@ -481,7 +481,6 @@ def reconcile_against_document(
reconciled_entries[(row.voucher_type, row.voucher_no)] = [] reconciled_entries[(row.voucher_type, row.voucher_no)] = []
reconciled_entries[(row.voucher_type, row.voucher_no)].append(row) reconciled_entries[(row.voucher_type, row.voucher_no)].append(row)
for key, entries in reconciled_entries.items(): for key, entries in reconciled_entries.items():
voucher_type, voucher_no = key voucher_type, voucher_no = key
@@ -1835,6 +1834,7 @@ def get_payment_ledger_entries(gl_entries, cancel=0):
dr_or_cr = 0 dr_or_cr = 0
account_type = None account_type = None
for gle in gl_entries: for gle in gl_entries:
if gle.account in receivable_or_payable_accounts: if gle.account in receivable_or_payable_accounts:
account_type = get_account_type(gle.account) account_type = get_account_type(gle.account)
@@ -1939,7 +1939,7 @@ def update_voucher_outstanding(voucher_type, voucher_no, account, party_type, pa
if not voucher_type or not voucher_no: if not voucher_type or not voucher_no:
return return
if voucher_type in ["Purchase Order", "Sales Order"]: if voucher_type in get_advance_payment_doctypes():
ref_doc = frappe.get_lazy_doc(voucher_type, voucher_no) ref_doc = frappe.get_lazy_doc(voucher_type, voucher_no)
ref_doc.set_total_advance_paid() ref_doc.set_total_advance_paid()
return return