Skip to content

Commit

Permalink
fix: Remove advance_payment_status uses
Browse files Browse the repository at this point in the history
  • Loading branch information
Abdeali099 committed Sep 28, 2024
1 parent ea69ba7 commit 907e3af
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 56 deletions.
11 changes: 0 additions & 11 deletions erpnext/accounts/doctype/payment_request/payment_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,6 @@ def before_submit(self):
self.send_email()
self.make_communication_entry()

def on_submit(self):
self.update_reference_advance_payment_status()

def request_phone_payment(self):
controller = _get_payment_gateway_controller(self.payment_gateway)
request_amount = self.get_request_amount()
Expand Down Expand Up @@ -458,14 +455,6 @@ def create_subscription(self, payment_provider, gateway_controller, data):

return create_stripe_subscription(gateway_controller, data)

def update_reference_advance_payment_status(self):
advance_payment_doctypes = frappe.get_hooks("advance_payment_receivable_doctypes") + frappe.get_hooks(
"advance_payment_payable_doctypes"
)
if self.reference_doctype in advance_payment_doctypes:
ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
ref_doc.set_advance_payment_status()

def _allocate_payment_request_to_pe_references(self, references):
"""
Allocate the Payment Request to the Payment Entry references based on\n
Expand Down
13 changes: 0 additions & 13 deletions erpnext/accounts/doctype/payment_request/test_payment_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,6 @@ def test_conversion_on_foreign_currency_accounts(self):
def test_multiple_payment_if_partially_paid_for_same_currency(self):
so = make_sales_order(currency="INR", qty=1, rate=1000)

self.assertEqual(so.advance_payment_status, "Not Requested")

pr = make_payment_request(
dt="Sales Order",
dn=so.name,
Expand All @@ -300,7 +298,6 @@ def test_multiple_payment_if_partially_paid_for_same_currency(self):
self.assertEqual(pr.status, "Requested")

so.load_from_db()
self.assertEqual(so.advance_payment_status, "Requested")

# to make partial payment
pe = pr.create_payment_entry(submit=False)
Expand All @@ -311,7 +308,6 @@ def test_multiple_payment_if_partially_paid_for_same_currency(self):
self.assertEqual(pe.references[0].payment_request, pr.name)

so.load_from_db()
self.assertEqual(so.advance_payment_status, "Partially Paid")

pr.load_from_db()
self.assertEqual(pr.status, "Partially Paid")
Expand All @@ -327,7 +323,6 @@ def test_multiple_payment_if_partially_paid_for_same_currency(self):
self.assertEqual(pe.references[0].payment_request, pr.name)

so.load_from_db()
self.assertEqual(so.advance_payment_status, "Fully Paid")

pr.load_from_db()
self.assertEqual(pr.status, "Paid")
Expand Down Expand Up @@ -409,8 +404,6 @@ def test_single_payment_with_payment_term_for_same_currency(self):
po.save()
po.submit()

self.assertEqual(po.advance_payment_status, "Not Initiated")

pr = make_payment_request(
dt="Purchase Order",
dn=po.name,
Expand All @@ -425,7 +418,6 @@ def test_single_payment_with_payment_term_for_same_currency(self):
self.assertEqual(pr.status, "Initiated")

po.load_from_db()
self.assertEqual(po.advance_payment_status, "Initiated")

pe = pr.create_payment_entry()

Expand All @@ -441,7 +433,6 @@ def test_single_payment_with_payment_term_for_same_currency(self):
self.assertEqual(pe.references[1].payment_request, pr.name)

po.load_from_db()
self.assertEqual(po.advance_payment_status, "Fully Paid")

pr.load_from_db()
self.assertEqual(pr.status, "Paid")
Expand Down Expand Up @@ -491,7 +482,6 @@ def test_single_payment_with_payment_term_for_multi_currency(self):

def test_payment_cancel_process(self):
so = make_sales_order(currency="INR", qty=1, rate=1000)
self.assertEqual(so.advance_payment_status, "Not Requested")

pr = make_payment_request(
dt="Sales Order",
Expand All @@ -506,7 +496,6 @@ def test_payment_cancel_process(self):
self.assertEqual(pr.outstanding_amount, pr.grand_total)

so.load_from_db()
self.assertEqual(so.advance_payment_status, "Requested")

pe = pr.create_payment_entry(submit=False)
pe.paid_amount = 800
Expand All @@ -516,7 +505,6 @@ def test_payment_cancel_process(self):
self.assertEqual(pe.references[0].payment_request, pr.name)

so.load_from_db()
self.assertEqual(so.advance_payment_status, "Partially Paid")

pr.load_from_db()
self.assertEqual(pr.status, "Partially Paid")
Expand All @@ -532,4 +520,3 @@ def test_payment_cancel_process(self):
self.assertEqual(pr.grand_total, 1000)

so.load_from_db()
self.assertEqual(so.advance_payment_status, "Requested")
31 changes: 0 additions & 31 deletions erpnext/controllers/accounts_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -1968,37 +1968,6 @@ def set_total_advance_paid(self):

self.db_set("advance_paid", advance_paid)

self.set_advance_payment_status()

def set_advance_payment_status(self):
new_status = None

paid_amount = frappe.get_value(
doctype="Payment Request",
filters={
"reference_doctype": self.doctype,
"reference_name": self.name,
"docstatus": 1,
},
fieldname="sum(grand_total - outstanding_amount)",
)

if not paid_amount:
if self.doctype in frappe.get_hooks("advance_payment_receivable_doctypes"):
new_status = "Not Requested" if paid_amount is None else "Requested"
elif self.doctype in frappe.get_hooks("advance_payment_payable_doctypes"):
new_status = "Not Initiated" if paid_amount is None else "Initiated"
else:
total_amount = self.get("rounded_total") or self.get("grand_total")
new_status = "Fully Paid" if paid_amount == total_amount else "Partially Paid"

if new_status == self.advance_payment_status:
return

self.db_set("advance_payment_status", new_status, update_modified=False)
self.set_status(update=True)
self.notify_update()

@property
def company_abbr(self):
if not hasattr(self, "_abbr"):
Expand Down
1 change: 0 additions & 1 deletion erpnext/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,6 @@
"Payment Entry": {
"on_submit": [
"erpnext.regional.create_transaction_log",
"erpnext.accounts.doctype.payment_request.payment_request.update_payment_req_status",
"erpnext.accounts.doctype.dunning.dunning.resolve_dunning",
],
"on_cancel": ["erpnext.accounts.doctype.dunning.dunning.resolve_dunning"],
Expand Down

0 comments on commit 907e3af

Please sign in to comment.