Merge lp:~jfb-tempo-consulting/unifield-server/US-8312 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/procurement_cycle/replenishment_report.xml'
--- bin/addons/procurement_cycle/replenishment_report.xml	2020-12-28 15:50:51 +0000
+++ bin/addons/procurement_cycle/replenishment_report.xml	2021-02-22 14:05:00 +0000
@@ -7,6 +7,7 @@
             model="replenishment.parent.segment"
             name="report_replenishment_parent_segment_chronogram_xls"
             file="procurement_cycle/report/chronogram.mako"
+            target_filename="Chronogram_%(year)s_%(month)s_%(day)s"
             report_type="webkit"
             menu="True"
             />
 
=== modified file 'bin/addons/procurement_cycle/report/chronogram.py'
--- bin/addons/procurement_cycle/report/chronogram.py	2020-12-28 15:50:51 +0000
+++ bin/addons/procurement_cycle/report/chronogram.py	2021-02-22 14:05:00 +0000
@@ -39,7 +39,10 @@
             returns the number of empty cells before the Order Preperation Date
 
         '''
-        dt = datetime.strptime(o.date_preparing, '%Y-%m-%d')
+        if not o.date_preparing.val:
+            dt = datetime.now()
+        else:
+            dt = datetime.strptime(o.date_preparing, '%Y-%m-%d')
         if cycle > 1:
             dt += relativedelta.relativedelta(**normalize_td(o.time_unit_lt, (cycle-1) * (o.order_coverage or 0)))
         if calendar_start == dt:
@@ -50,7 +53,10 @@
             divisor = (calendar_start + relativedelta.relativedelta(months=1, day=1, days=-1)).day
         elif o.time_unit_lt == 'w':
             divisor = 7.
-        return self.get_cells((dt-calendar_start).days / float(divisor), o.time_unit_lt) - 1
+        ret = self.get_cells((dt-calendar_start).days / float(divisor), o.time_unit_lt) - 1
+        if ret < 0:
+            return False
+        return ret
 
 
     def num_cells_in_month(self, dt):
@@ -83,7 +89,10 @@
         ][nb]
 
     def get_start(self, o):
-        date_preparing = datetime.strptime(o.date_preparing, '%Y-%m-%d')
+        if not o.date_preparing.val:
+            date_preparing = datetime.now()
+        else:
+            date_preparing = datetime.strptime(o.date_preparing, '%Y-%m-%d')
 
         if o.time_unit_lt == 'w':
             cols = 0