Merge pull request #96 from Som-Energia/IMP_refund_0_kwh_early_exit

Early exit when apply or refund gkwh and fix dependencies
Som-Energia · Apr 6, 2022 · 1a5c9ef · 1a5c9ef
2 parents a73bc6a + cea305f
commit 1a5c9ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/generationkwh/usagetracker.py b/generationkwh/usagetracker.py
@@ -32,6 +32,9 @@ def use_kwh(self, member, start, end, fare, period, kwh):
     def use_kwh_with_dates_dict(self, member, start, end, fare, period, kwh):
         assert type(start) == datetime.date
         assert type(end) == datetime.date
+        if kwh == 0:
+            return 0, {}
+
         rights = self._rights.rights_kwh(member, start, end)
         periodMask = self._periodMask.periodMask(fare, period, start, end)
         usage = self._usage.usage(member, start, end)
@@ -59,6 +62,9 @@ def refund_kwh(self, member, start, end, fare, period, kwh):
     def refund_kwh_with_dates_dict(self, member, start, end, fare, period, kwh):
         assert type(start) == datetime.date
         assert type(end) == datetime.date
+        if kwh == 0:
+            return 0, {}
+
         rights = self._rights.rights_kwh(member, start, end)
         periodMask = self._periodMask.periodMask(fare, period, start, end)
         usage = self._usage.usage(member, start, end)

diff --git a/som_generationkwh/__terp__.py b/som_generationkwh/__terp__.py
@@ -23,6 +23,7 @@
     'www_som',
     'c2c_webkit_report',
     'async_reports',
+    'custom_search',
     ],
   "init_xml": [],
   "demo_xml": [