nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-02 21:18:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42748 from frappe/mergify/bp/version-14-hotfix/pr-42221

Browse Source 
fix: Force Fetching updates on Subscriptions (backport #42221)
This commit is contained in:
ruthra kumar
2024-08-13 17:24:50 +05:30
committed by GitHub
parent 456f5b644b 2d0dca943a
commit 367b4177c6
3 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/doctype/subscription/subscription.js
View File

@@ -37,6 +37,12 @@ frappe.ui.form.on("Subscription", {
frm.add_custom_button(__("Fetch Subscription Updates"), () =>
frm.events.get_subscription_updates(frm)
);
frm.add_custom_button(
__("Force-Fetch Subscription Updates"),
() => frm.trigger("force_fetch_subscription_updates"),
__("Actions")
);
} else if (frm.doc.status === "Cancelled") {
frm.add_custom_button(__("Restart Subscription"), () =>
frm.events.renew_this_subscription(frm)
@@ -96,4 +102,11 @@ frappe.ui.form.on("Subscription", {
},
});
},
force_fetch_subscription_updates: function (frm) {
frm.call("force_fetch_subscription_updates").then((r) => {
if (!r.exec) {
frm.reload_doc();
}
});
},
});

25
erpnext/accounts/doctype/subscription/subscription.py
View File

@@ -674,6 +674,31 @@ class Subscription(Document):
if invoice:
return invoice.precision("grand_total")
@frappe.whitelist()
def force_fetch_subscription_updates(self):
"""
Process Subscription and create Invoices even if current date doesn't lie between current_invoice_start and currenct_invoice_end
It makes use of 'Proces Subscription' to force processing in a specific 'posting_date'
"""
# Don't process future subscriptions
if nowdate() < self.current_invoice_start:
frappe.msgprint(_("Subscription for Future dates cannot be processed."))
return
processing_date = None
if self.generate_invoice_at == "Beginning of the current subscription period":
processing_date = self.current_invoice_start
elif self.generate_invoice_at == "End of the current subscription period":
processing_date = self.current_invoice_end
elif self.generate_invoice_at == "Days before the current subscription period":
processing_date = add_days(self.current_invoice_start, -self.number_of_days)
process_subscription = frappe.new_doc("Process Subscription")
process_subscription.posting_date = processing_date
process_subscription.subscription = self.name
process_subscription.save().submit()
def get_calendar_months(billing_interval):
calendar_months = []

15
erpnext/accounts/doctype/subscription/test_subscription.py
View File

@@ -712,3 +712,18 @@ class TestSubscription(FrappeTestCase):
self.assertEqual(pi.total, 55333.33)
subscription.delete()
def test_future_subscription(self):
"""Force-Fetch should not process future subscriptions"""
subscription = frappe.new_doc("Subscription")
subscription.party_type = "Customer"
subscription.party = "_Test Customer"
subscription.generate_invoice_at_period_start = 1
subscription.generate_new_invoices_past_due_date = 1
subscription.start_date = add_months(nowdate(), 1)
subscription.append("plans", {"plan": "_Test Plan Name", "qty": 1})
subscription.save()
subscription.force_fetch_subscription_updates()
subscription.reload()
self.assertEqual(len(subscription.invoices), 0)