From 2d30b36ccaef9a07ca38f503c8187dc5c022ccb7 Mon Sep 17 00:00:00 2001 From: codezart Date: Mon, 10 Oct 2022 11:24:42 -0400 Subject: [PATCH 1/2] fix: number of months subscription plan --- .../accounts/doctype/subscription_plan/subscription_plan.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/subscription_plan/subscription_plan.py b/erpnext/accounts/doctype/subscription_plan/subscription_plan.py index a95e0a9c2d..dcd40b11df 100644 --- a/erpnext/accounts/doctype/subscription_plan/subscription_plan.py +++ b/erpnext/accounts/doctype/subscription_plan/subscription_plan.py @@ -8,6 +8,7 @@ from frappe.model.document import Document from frappe.utils import date_diff, flt, get_first_day, get_last_day, getdate from erpnext.utilities.product import get_price +from dateutil import relativedelta class SubscriptionPlan(Document): @@ -49,7 +50,7 @@ def get_plan_rate( start_date = getdate(start_date) end_date = getdate(end_date) - no_of_months = (end_date.year - start_date.year) * 12 + (end_date.month - start_date.month) + 1 + no_of_months = relativedelta.relativedelta(end_date, start_date).months + 1 cost = plan.cost * no_of_months # Adjust cost if start or end date is not month start or end From 1ca472cc8a795fed132979a9ba3a2538ab13ca0a Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Thu, 20 Oct 2022 12:09:42 +0530 Subject: [PATCH 2/2] chore: Linting issues --- erpnext/accounts/doctype/subscription_plan/subscription_plan.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/subscription_plan/subscription_plan.py b/erpnext/accounts/doctype/subscription_plan/subscription_plan.py index dcd40b11df..f3acdc5aa8 100644 --- a/erpnext/accounts/doctype/subscription_plan/subscription_plan.py +++ b/erpnext/accounts/doctype/subscription_plan/subscription_plan.py @@ -3,12 +3,12 @@ import frappe +from dateutil import relativedelta from frappe import _ from frappe.model.document import Document from frappe.utils import date_diff, flt, get_first_day, get_last_day, getdate from erpnext.utilities.product import get_price -from dateutil import relativedelta class SubscriptionPlan(Document):