nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 15:39:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(subscription): add grace period status while invoice in grace period

Browse Source
This commit is contained in:
Jatin3128
2025-12-23 19:58:45 +05:30
parent 48c53c06ce
commit 489a035637
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/subscription/subscription.json
View File

@@ -51,7 +51,7 @@
"fieldtype": "Select", "fieldtype": "Select",
"label": "Status", "label": "Status",
"no_copy": 1, "no_copy": 1,
"options": "\nTrialing\nActive\nPast Due Date\nCancelled\nUnpaid\nCompleted", "options": "\nTrialing\nActive\nGrace Period\nCancelled\nUnpaid\nCompleted",
"read_only": 1 "read_only": 1
}, },
{ {
@@ -267,7 +267,7 @@
"link_fieldname": "subscription" "link_fieldname": "subscription"
} }
], ],
"modified": "2024-03-27 13:10:47.578120", "modified": "2025-12-23 19:42:52.036034",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Subscription", "name": "Subscription",
@@ -311,6 +311,7 @@
"write": 1 "write": 1
} }
], ],
"row_format": "Dynamic",
"sort_field": "creation", "sort_field": "creation",
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],

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

@@ -77,7 +77,7 @@ class Subscription(Document):
purchase_tax_template: DF.Link | None purchase_tax_template: DF.Link | None
sales_tax_template: DF.Link | None sales_tax_template: DF.Link | None
start_date: DF.Date | None start_date: DF.Date | None
status: DF.Literal["", "Trialing", "Active", "Past Due Date", "Cancelled", "Unpaid", "Completed"] status: DF.Literal["", "Trialing", "Active", "Grace Period", "Cancelled", "Unpaid", "Completed"]
submit_invoice: DF.Check submit_invoice: DF.Check
trial_period_end: DF.Date | None trial_period_end: DF.Date | None
trial_period_start: DF.Date | None trial_period_start: DF.Date | None
@@ -229,7 +229,7 @@ class Subscription(Document):
self.status = self.get_status_for_past_grace_period() self.status = self.get_status_for_past_grace_period()
self.cancelation_date = getdate(posting_date) if self.status == "Cancelled" else None self.cancelation_date = getdate(posting_date) if self.status == "Cancelled" else None
elif self.current_invoice_is_past_due() and not self.is_past_grace_period(): elif self.current_invoice_is_past_due() and not self.is_past_grace_period():
self.status = "Past Due Date" self.status = "Grace Period"
elif not self.has_outstanding_invoice(): elif not self.has_outstanding_invoice():
self.status = "Active" self.status = "Active"

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

@@ -144,17 +144,17 @@ class TestSubscription(IntegrationTestCase):
subscription = create_subscription(start_date=add_days(nowdate(), -1000)) subscription = create_subscription(start_date=add_days(nowdate(), -1000))
subscription.process(posting_date=subscription.current_invoice_end) # generate first invoice subscription.process(posting_date=subscription.current_invoice_end) # generate first invoice
self.assertEqual(subscription.status, "Past Due Date") self.assertEqual(subscription.status, "Grace Period")
subscription.process() subscription.process()
# Grace period is 1000 days so status should remain as Past Due Date # Grace period is 1000 days so status should remain as Grace Period
self.assertEqual(subscription.status, "Past Due Date") self.assertEqual(subscription.status, "Grace Period")
subscription.process() subscription.process()
self.assertEqual(subscription.status, "Past Due Date") self.assertEqual(subscription.status, "Grace Period")
subscription.process() subscription.process()
self.assertEqual(subscription.status, "Past Due Date") self.assertEqual(subscription.status, "Grace Period")
settings.grace_period = grace_period settings.grace_period = grace_period
settings.save() settings.save()