mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-12 17:51:20 +00:00
refactor: get advance payment doctypes from hooks
This commit is contained in:
@@ -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
|
||||||
):
|
):
|
||||||
|
|||||||
@@ -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,8 @@ 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"]:
|
# todo use get advanced dotypes hooks
|
||||||
|
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
|
||||||
|
|||||||
Reference in New Issue
Block a user