unifield-wm

Merge lp:~unifield-team/unifield-wm/us-34 into lp:unifield-wm

  1. us-34
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2416
Proposed branch: lp:~unifield-team/unifield-wm/us-34
Merge into: lp:unifield-wm
Diff against target: 146 lines (+33/-14)
2 files modified
msf_supply_doc_export/msf_supply_doc_export.py (+19/-4)
msf_supply_doc_export/report/report_po_follow_up_xls.mako (+14/-10)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/us-34
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+252718@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 'msf_supply_doc_export/msf_supply_doc_export.py'
2--- msf_supply_doc_export/msf_supply_doc_export.py 2014-11-14 10:45:42 +0000
3+++ msf_supply_doc_export/msf_supply_doc_export.py 2015-03-12 10:46:41 +0000
4@@ -383,9 +383,6 @@
5 def getRunParmsRML(self,key):
6 return self.datas['report_parms'][key]
7
8- def getPOLineHeaders(self):
9- return ['Item','Code','Description','Qty ordered','UoM','Qty received','IN','Qty backorder','Unit Price','IN unit price','Destination','Cost Center']
10-
11 def printAnalyticLines(self, analytic_lines):
12 res = []
13 # if additional analytic lines print them here.
14@@ -412,12 +409,14 @@
15 # TODO the multiplier is the value populated for no change in stock_move.price_unit
16 # TODO it probably should be 1
17 multiplier = 1.0000100000000001
18+ po_obj = self.pool.get('purchase.order')
19 pol_obj = self.pool.get('purchase.order.line')
20 prod_obj = self.pool.get('product.product')
21 uom_obj = self.pool.get('product.uom')
22 po_line_ids = pol_obj.search(self.cr, self.uid, [('order_id','=',po_id)], order='line_number')
23 po_lines = pol_obj.browse(self.cr, self.uid, po_line_ids)
24 report_lines = []
25+ order = po_obj.browse(self.cr, self.uid, po_id)
26 for line in po_lines:
27 in_lines = self.getAllLineIN(line.id)
28 analytic_lines = self.getAnalyticLines(line)
29@@ -438,6 +437,10 @@
30 # Display information of the initial reception
31 if not same_product_same_uom:
32 report_line = {
33+ 'order_ref': order.name or '',
34+ 'order_created': order.date_order or '',
35+ 'order_confirmed_date': order.delivery_confirmed_date or '',
36+ 'order_status': self._get_states().get(order.state, ''),
37 'item': line.line_number or '',
38 'code': line.product_id.default_code or '',
39 'description': line.product_id.name or '',
40@@ -457,6 +460,10 @@
41
42 for spsul in same_product_same_uom:
43 report_line = {
44+ 'order_ref': order.name or '',
45+ 'order_created': order.date_order or '',
46+ 'order_confirmed_date': order.delivery_confirmed_date or '',
47+ 'order_status': self._get_states().get(order.state, ''),
48 'item': first_line and line.line_number or '',
49 'code': first_line and line.product_id.default_code or '',
50 'description': first_line and line.product_id.name or '',
51@@ -481,6 +488,10 @@
52
53 for spl in same_product:
54 report_line = {
55+ 'order_ref': order.name or '',
56+ 'order_created': order.date_order or '',
57+ 'order_confirmed_date': order.delivery_confirmed_date or '',
58+ 'order_status': self._get_states().get(order.state, ''),
59 'item': first_line and line.line_number or '',
60 'code': first_line and line.product_id.default_code or '',
61 'description': first_line and line.product_id.name or '',
62@@ -505,6 +516,10 @@
63 for ol in other_product:
64 prod_brw = prod_obj.browse(self.cr, self.uid, ol.get('product_id'))
65 report_line = {
66+ 'order_ref': order.name or '',
67+ 'order_created': order.date_order or '',
68+ 'order_confirmed_date': order.delivery_confirmed_date or '',
69+ 'order_status': self._get_states().get(order.state, ''),
70 'item': line.line_number or '',
71 'code': prod_brw.default_code or '',
72 'description': prod_brw.name or '',
73@@ -560,7 +575,7 @@
74 return self.datas.get('report_header')[1]
75
76 def getPOLineHeaders(self):
77- return ['Item','Code','Description','Qty ordered','UoM','Qty received','IN','Qty backorder','Unit Price','IN unit price','Destination','Cost Center']
78+ return ['Order Ref', 'Item','Code','Description','Qty ordered','UoM','Qty received','IN','Qty backorder','Unit Price','IN unit price', 'Created', 'Confirmed Delivery', 'Status', 'Destination','Cost Center']
79
80
81
82
83=== modified file 'msf_supply_doc_export/report/report_po_follow_up_xls.mako'
84--- msf_supply_doc_export/report/report_po_follow_up_xls.mako 2014-11-07 10:52:52 +0000
85+++ msf_supply_doc_export/report/report_po_follow_up_xls.mako 2015-03-12 10:46:41 +0000
86@@ -81,6 +81,8 @@
87 ## definition of the columns' size
88 <% nb_of_columns = 12 %>
89 <Table x:FullColumns="1" x:FullRows="1">
90+ # Order name
91+ <Column ss:AutoFitWidth="1" ss:Width="65" />
92 # Item
93 <Column ss:AutoFitWidth="1" ss:Width="40" />
94 # Code
95@@ -101,6 +103,12 @@
96 <Column ss:AutoFitWidth="1" ss:Width="95" />
97 # IN Unit Price
98 <Column ss:AutoFitWidth="1" ss:Width="95" />
99+ # Created (order)
100+ <Columns ss:AutoFitWidth="1" ss:Width="95" />
101+ # Delivery Confirmed (order)
102+ <Columns ss:AutoFitWidth="1" ss:Width="95" />
103+ # Status (order)
104+ <Columns ss:AutoFitWidth="1" ss:Width="95" />
105 # Destination
106 <Column ss:AutoFitWidth="1" ss:Width="95" />
107 # Cost Center
108@@ -116,16 +124,6 @@
109 <Cell ss:MergeAcross="1" ss:StyleID="mainheader"><Data ss:Type="String">Supplier: ${getRunParms()['supplier'] or '' |x}</Data></Cell>
110 <Cell ss:MergeAcross="2" ss:StyleID="mainheader"><Data ss:Type="String">PO State: ${getRunParms()['state'] or '' | x}</Data></Cell>
111 </Row>
112-<Row></Row>
113-<Row></Row>
114-
115-% for o in objects:
116-
117- <Row ss:AutoFitHeight="0" ss:Height="36">
118- % for header in getHeaderLine(o):
119- <Cell ss:MergeAcross="1" ss:StyleID="poheader"><Data ss:Type="String">${header |x}</Data></Cell>
120- % endfor
121- </Row>
122
123 <Row ss:AutoFitHeight="1" >
124 % for header in getPOLineHeaders():
125@@ -133,8 +131,11 @@
126 % endfor
127 </Row>
128
129+% for o in objects:
130+
131 % for line in getPOLines(o.id):
132 <Row ss:AutoFitHeight="1">
133+ <Cell ss:StyleID="line"><Data ss:Type="String">${(line['order_ref'])|x}</Data></Cell>
134 <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['item'])|x}</Data></Cell>
135 <Cell ss:StyleID="line"><Data ss:Type="String">${(line['code'])|x}</Data></Cell>
136 <Cell ss:StyleID="line"><Data ss:Type="String">${(line['description'])|x}</Data></Cell>
137@@ -145,6 +146,9 @@
138 <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['qty_backordered'])|x}</Data></Cell>
139 <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['unit_price'])|x}</Data></Cell>
140 <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['in_unit_price'])|x}</Data></Cell>
141+ <Cell ss:StyleID="line"><Data ss:Type="String">${(line['order_created'])|x}</Data></Cell>
142+ <Cell ss:StyleID="line"><Data ss:Type="String">${(line['order_confirmed_date'])|x}</Data></Cell>
143+ <Cell ss:StyleID="line"><Data ss:Type="String">${(line['order_status'])|x}</Data></Cell>
144 <Cell ss:StyleID="line"><Data ss:Type="String">${(line['destination'])|x}</Data></Cell>
145 <Cell ss:StyleID="line"><Data ss:Type="String">${(line['cost_centre'])|x}</Data></Cell>
146 </Row>

Subscribers

People subscribed via source and target branches