From 9fcd89d45693b8a36cde18221d83037c11a70d12 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 24 Jan 2024 13:27:31 +0530 Subject: [PATCH] refactor: use generic name for advance doctypes variable --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 4 ++-- erpnext/accounts/doctype/payment_entry/payment_entry.py | 8 ++++---- .../accounts/doctype/payment_request/payment_request.py | 8 ++++---- erpnext/accounts/utils.py | 8 ++++---- erpnext/controllers/accounts_controller.py | 8 ++++---- erpnext/hooks.py | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 7579da86cd..f722c907be 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -187,8 +187,8 @@ class JournalEntry(AccountsController): def update_advance_paid(self): advance_paid = frappe._dict() advance_payment_doctypes = frappe.get_hooks( - "advance_payment_customer_doctypes" - ) + frappe.get_hooks("advance_payment_supplier_doctypes") + "advance_payment_receivable_doctypes" + ) + frappe.get_hooks("advance_payment_payable_doctypes") for d in self.get("accounts"): if d.is_advance: if d.reference_type in advance_payment_doctypes: diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index cfe0d9c9df..a298b89935 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -927,8 +927,8 @@ class PaymentEntry(AccountsController): def calculate_base_allocated_amount_for_reference(self, d) -> float: base_allocated_amount = 0 advance_payment_doctypes = frappe.get_hooks( - "advance_payment_customer_doctypes" - ) + frappe.get_hooks("advance_payment_supplier_doctypes") + "advance_payment_receivable_doctypes" + ) + frappe.get_hooks("advance_payment_payable_doctypes") if d.reference_doctype in advance_payment_doctypes: # When referencing Sales/Purchase Order, use the source/target exchange rate depending on payment type. # This is so there are no Exchange Gain/Loss generated for such doctypes @@ -1428,8 +1428,8 @@ class PaymentEntry(AccountsController): def update_advance_paid(self): if self.payment_type in ("Receive", "Pay") and self.party: advance_payment_doctypes = frappe.get_hooks( - "advance_payment_customer_doctypes" - ) + frappe.get_hooks("advance_payment_supplier_doctypes") + "advance_payment_receivable_doctypes" + ) + frappe.get_hooks("advance_payment_payable_doctypes") for d in self.get("references"): if d.allocated_amount and d.reference_doctype in advance_payment_doctypes: frappe.get_doc( diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 839348a541..a18104eeb5 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -170,8 +170,8 @@ class PaymentRequest(Document): self.request_phone_payment() advance_payment_doctypes = frappe.get_hooks( - "advance_payment_customer_doctypes" - ) + frappe.get_hooks("advance_payment_supplier_doctypes") + "advance_payment_receivable_doctypes" + ) + frappe.get_hooks("advance_payment_payable_doctypes") if self.reference_doctype in advance_payment_doctypes: # set advance payment status ref_doc.set_total_advance_paid() @@ -216,8 +216,8 @@ class PaymentRequest(Document): ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name) advance_payment_doctypes = frappe.get_hooks( - "advance_payment_customer_doctypes" - ) + frappe.get_hooks("advance_payment_supplier_doctypes") + "advance_payment_receivable_doctypes" + ) + frappe.get_hooks("advance_payment_payable_doctypes") if self.reference_doctype in advance_payment_doctypes: # set advance payment status ref_doc.set_total_advance_paid() diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index 65b3abafdb..6b0a5e3891 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -619,8 +619,8 @@ def update_reference_in_journal_entry(d, journal_entry, do_not_save=False): # Update Advance Paid in SO/PO since they might be getting unlinked advance_payment_doctypes = frappe.get_hooks( - "advance_payment_customer_doctypes" - ) + frappe.get_hooks("advance_payment_supplier_doctypes") + "advance_payment_receivable_doctypes" + ) + frappe.get_hooks("advance_payment_payable_doctypes") if jv_detail.get("reference_type") in advance_payment_doctypes: frappe.get_doc(jv_detail.reference_type, jv_detail.reference_name).set_total_advance_paid() @@ -696,8 +696,8 @@ def update_reference_in_payment_entry( # Update Advance Paid in SO/PO since they are getting unlinked advance_payment_doctypes = frappe.get_hooks( - "advance_payment_customer_doctypes" - ) + frappe.get_hooks("advance_payment_supplier_doctypes") + "advance_payment_receivable_doctypes" + ) + frappe.get_hooks("advance_payment_payable_doctypes") if existing_row.get("reference_doctype") in advance_payment_doctypes: frappe.get_doc( existing_row.reference_doctype, existing_row.reference_name diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index afbea61052..e7f0fe8773 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -1761,9 +1761,9 @@ class AccountsController(TransactionBase): def set_total_advance_paid(self): ple = frappe.qb.DocType("Payment Ledger Entry") - if self.doctype in frappe.get_hooks("advance_payment_customer_doctypes"): + if self.doctype in frappe.get_hooks("advance_payment_receivable_doctypes"): party = self.customer - if self.doctype in frappe.get_hooks("advance_payment_supplier_doctypes"): + if self.doctype in frappe.get_hooks("advance_payment_payable_doctypes"): party = self.supplier advance = ( frappe.qb.from_(ple) @@ -1829,9 +1829,9 @@ class AccountsController(TransactionBase): "docstatus": 1, }, ) - if self.doctype in frappe.get_hooks("advance_payment_customer_doctypes"): + if self.doctype in frappe.get_hooks("advance_payment_receivable_doctypes"): new_status = "Requested" if prs else "Not Requested" - if self.doctype in frappe.get_hooks("advance_payment_supplier_doctypes"): + if self.doctype in frappe.get_hooks("advance_payment_payable_doctypes"): new_status = "Initiated" if prs else "Not Initiated" if new_status == self.advance_payment_status: diff --git a/erpnext/hooks.py b/erpnext/hooks.py index f33fff0076..14b7656491 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -481,8 +481,8 @@ payment_gateway_enabled = "erpnext.accounts.utils.create_payment_gateway_account communication_doctypes = ["Customer", "Supplier"] -advance_payment_customer_doctypes = ["Sales Order"] -advance_payment_supplier_doctypes = ["Purchase Order"] +advance_payment_receivable_doctypes = ["Sales Order"] +advance_payment_payable_doctypes = ["Purchase Order"] invoice_doctypes = ["Sales Invoice", "Purchase Invoice"]