ext/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-10-29 22:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(accounts): honor the full subscription grace period

Browse Source
This commit is contained in:
pandiyan
2026-10-26 12:41:07 +05:30
parent 90921e5494
commit e6bd1d88d2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
erpnext/accounts/doctype/subscription/subscription.py
+4 -4
View File
@@ -269,11 +269,11 @@ class Subscription(Document):
"""
Returns `True` if the grace period for the `Subscription` has passed
"""
if not self.current_invoice_is_past_due():
return
if not self.current_invoice_is_past_due(posting_date):
return False
grace_period = cint(frappe.get_value("Subscription Settings", None, "grace_period"))
return getdate(posting_date) >= getdate(add_days(self.current_invoice.due_date, grace_period))
return getdate(posting_date) > getdate(add_days(self.current_invoice.due_date, grace_period))
def current_invoice_is_past_due(self, posting_date: DateTimeLikeObject | None = None) -> bool:
"""
@@ -282,7 +282,7 @@ class Subscription(Document):
if not self.current_invoice or self.is_paid(self.current_invoice):
return False
return getdate(posting_date) >= getdate(self.current_invoice.due_date)
return getdate(posting_date) > getdate(self.current_invoice.due_date)
@property
def invoice_document_type(self) -> str:
erpnext/accounts/doctype/subscription_settings/subscription_settings.json
+2 -2
View File
@@ -12,7 +12,7 @@
"fields": [
{
"default": "1",
"description": "Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid",
"description": "Number of days after the invoice due date before canceling the subscription or marking it as unpaid",
"fieldname": "grace_period",
"fieldtype": "Int",
"label": "Grace Period"
@@ -32,7 +32,7 @@
],
"issingle": 1,
"links": [],
"modified": "2020-06-23 09:13:44.292792",
"modified": "2026-10-19 16:50:55.834144",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Subscription Settings",