Unifield Server

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

  1. US-8312
  2. Merge into trunk
Proposed by jftempo
Status: Needs review
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/US-8312
Merge into: lp:unifield-server
Diff against target: 51 lines (+13/-3)
2 files modified
bin/addons/procurement_cycle/replenishment_report.xml (+1/-0)
bin/addons/procurement_cycle/report/chronogram.py (+12/-3)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/US-8312
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+398455@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/procurement_cycle/replenishment_report.xml'
2--- bin/addons/procurement_cycle/replenishment_report.xml 2020-12-28 15:50:51 +0000
3+++ bin/addons/procurement_cycle/replenishment_report.xml 2021-02-22 14:05:00 +0000
4@@ -7,6 +7,7 @@
5 model="replenishment.parent.segment"
6 name="report_replenishment_parent_segment_chronogram_xls"
7 file="procurement_cycle/report/chronogram.mako"
8+ target_filename="Chronogram_%(year)s_%(month)s_%(day)s"
9 report_type="webkit"
10 menu="True"
11 />
12
13=== modified file 'bin/addons/procurement_cycle/report/chronogram.py'
14--- bin/addons/procurement_cycle/report/chronogram.py 2020-12-28 15:50:51 +0000
15+++ bin/addons/procurement_cycle/report/chronogram.py 2021-02-22 14:05:00 +0000
16@@ -39,7 +39,10 @@
17 returns the number of empty cells before the Order Preperation Date
18
19 '''
20- dt = datetime.strptime(o.date_preparing, '%Y-%m-%d')
21+ if not o.date_preparing.val:
22+ dt = datetime.now()
23+ else:
24+ dt = datetime.strptime(o.date_preparing, '%Y-%m-%d')
25 if cycle > 1:
26 dt += relativedelta.relativedelta(**normalize_td(o.time_unit_lt, (cycle-1) * (o.order_coverage or 0)))
27 if calendar_start == dt:
28@@ -50,7 +53,10 @@
29 divisor = (calendar_start + relativedelta.relativedelta(months=1, day=1, days=-1)).day
30 elif o.time_unit_lt == 'w':
31 divisor = 7.
32- return self.get_cells((dt-calendar_start).days / float(divisor), o.time_unit_lt) - 1
33+ ret = self.get_cells((dt-calendar_start).days / float(divisor), o.time_unit_lt) - 1
34+ if ret < 0:
35+ return False
36+ return ret
37
38
39 def num_cells_in_month(self, dt):
40@@ -83,7 +89,10 @@
41 ][nb]
42
43 def get_start(self, o):
44- date_preparing = datetime.strptime(o.date_preparing, '%Y-%m-%d')
45+ if not o.date_preparing.val:
46+ date_preparing = datetime.now()
47+ else:
48+ date_preparing = datetime.strptime(o.date_preparing, '%Y-%m-%d')
49
50 if o.time_unit_lt == 'w':
51 cols = 0

Subscribers

People subscribed via source and target branches