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

fix: bill all months across a year boundary in Monthly Rate plans

Browse Source
This commit is contained in:
Nabin Hait
2026-07-03 14:08:20 +05:30
parent 832b5a56bf
commit 196730c535
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,9 @@ def get_plan_rate(
start_date = getdate(start_date)
end_date = getdate(end_date)
no_of_months = relativedelta.relativedelta(end_date, start_date).months + 1
delta = relativedelta.relativedelta(end_date, start_date)
# include the years component so cross-year spans aren't under-counted
no_of_months = delta.years * 12 + delta.months + 1
cost = plan.cost * no_of_months
# Adjust cost if start or end date is not month start or end

10
erpnext/accounts/doctype/subscription_plan/test_subscription_plan.py
View File

@@ -45,12 +45,10 @@ class TestSubscriptionPlan(ERPNextTestSuite):
rate = get_plan_rate(plan.name, start_date="2026-01-01", end_date="2026-03-31")
self.assertEqual(rate, 300)
def test_monthly_rate_across_year_boundary_underbills(self):
# SUSPECTED BUG: no_of_months uses relativedelta(end, start).months, which drops
# the years component, so a 14-month span (Jan 2026 to Feb 2027) that should bill
# 1400 (14 x 100) is billed as only 200 (2 months). Locking the current (wrong)
# value so a fix trips this test; the correct expectation is 1400.
def test_monthly_rate_across_year_boundary(self):
# a 14-month span (Jan 2026 to Feb 2027) bills all 14 months, not just the
# 2-month remainder that relativedelta.months alone would give
plan = self.make_plan(price_determination="Monthly Rate", cost=100)
plan.insert()
rate = get_plan_rate(plan.name, start_date="2026-01-01", end_date="2027-02-28")
self.assertEqual(rate, 200)
self.assertEqual(rate, 1400)