changeset e3bed92096b3 in modules/sale_subscription:5.4
details: 
https://hg.tryton.org/modules/sale_subscription?cmd=changeset;node=e3bed92096b3
description:
        Take in account subscriptions end date when creating consumptions

        issue9171
        review307151002
        (grafted from a72fbf9ef893332c246a5f72f682a478920a54d6)
diffstat:

 subscription.py                      |  3 ++-
 tests/scenario_sale_subscription.rst |  4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 9fc06a66ce97 -r e3bed92096b3 subscription.py
--- a/subscription.py   Sun Mar 01 21:03:16 2020 +0100
+++ b/subscription.py   Mon Mar 23 09:16:47 2020 +0100
@@ -703,7 +703,8 @@
     def get_consumption(self, date):
         pool = Pool()
         Consumption = pool.get('sale.subscription.line.consumption')
-        if date < (self.end_date or datetime.date.max):
+        end_date = self.end_date or self.subscription.end_date
+        if date < (end_date or datetime.date.max):
             return Consumption(line=self, quantity=self.quantity, date=date)
 
     def compute_next_consumption_date(self):
diff -r 9fc06a66ce97 -r e3bed92096b3 tests/scenario_sale_subscription.rst
--- a/tests/scenario_sale_subscription.rst      Sun Mar 01 21:03:16 2020 +0100
+++ b/tests/scenario_sale_subscription.rst      Mon Mar 23 09:16:47 2020 +0100
@@ -180,7 +180,7 @@
     >>> line_consumption_create.execute('create_')
 
     >>> len(LineConsumption.find([]))
-    32
+    31
 
     >>> subscription.reload()
     >>> line, = subscription.lines
@@ -195,4 +195,4 @@
     >>> create_invoice.execute('create_')
 
     >>> len(Invoice.find([]))
-    2
+    1

Reply via email to