nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Prorata factor fixes in subscription (#24638)

Browse Source 
* fix: Prorata factor fixes in subscription

* fix: Test Case
This commit is contained in:
Deepesh Garg
2021-02-16 07:50:05 +05:30
committed by GitHub
parent f452ab56c6
commit be65ae7c86
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -298,7 +298,8 @@ class Subscription(Document):
Returns the `Item`s linked to `Subscription Plan` Returns the `Item`s linked to `Subscription Plan`
""" """
if prorate: if prorate:
prorate_factor = get_prorata_factor(self.current_invoice_end, self.current_invoice_start) prorate_factor = get_prorata_factor(self.current_invoice_end, self.current_invoice_start,
self.generate_invoice_at_period_start)
items = [] items = []
customer = self.customer customer = self.customer
@@ -468,11 +469,13 @@ class Subscription(Document):
if invoice: if invoice:
return invoice.precision('grand_total') return invoice.precision('grand_total')
def get_prorata_factor(period_end, period_start, is_prepaid):
def get_prorata_factor(period_end, period_start): if is_prepaid:
diff = flt(date_diff(nowdate(), period_start) + 1) prorate_factor = 1
plan_days = flt(date_diff(period_end, period_start) + 1) else:
prorate_factor = diff / plan_days diff = flt(date_diff(nowdate(), period_start) + 1)
plan_days = flt(date_diff(period_end, period_start) + 1)
prorate_factor = diff / plan_days
return prorate_factor return prorate_factor

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

@@ -291,7 +291,8 @@ class TestSubscription(unittest.TestCase):
self.assertEqual( self.assertEqual(
flt( flt(
get_prorata_factor(subscription.current_invoice_end, subscription.current_invoice_start), get_prorata_factor(subscription.current_invoice_end, subscription.current_invoice_start,
subscription.generate_invoice_at_period_start),
2), 2),
flt(prorate_factor, 2) flt(prorate_factor, 2)
) )
@@ -528,9 +529,7 @@ class TestSubscription(unittest.TestCase):
current_inv = subscription.get_current_invoice() current_inv = subscription.get_current_invoice()
self.assertEqual(current_inv.status, "Unpaid") self.assertEqual(current_inv.status, "Unpaid")
diff = flt(date_diff(nowdate(), subscription.current_invoice_start) + 1) prorate_factor = 1
plan_days = flt(date_diff(subscription.current_invoice_end, subscription.current_invoice_start) + 1)
prorate_factor = flt(diff / plan_days)
self.assertEqual(flt(current_inv.grand_total, 2), flt(prorate_factor * 900, 2)) self.assertEqual(flt(current_inv.grand_total, 2), flt(prorate_factor * 900, 2))