Unifield Server

Merge lp:~mallorymarcot/unifield-server/us-1758 into lp:unifield-server

  1. us-1758
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5049
Proposed branch: lp:~mallorymarcot/unifield-server/us-1758
Merge into: lp:unifield-server
Diff against target: 35 lines (+6/-1)
2 files modified
bin/addons/msf_supply_doc_export/report/report_purchase_order_xls.mako (+6/-0)
bin/addons/purchase/purchase_view.xml (+0/-1)
To merge this branch: bzr merge lp:~mallorymarcot/unifield-server/us-1758
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+350945@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/msf_supply_doc_export/report/report_purchase_order_xls.mako'
2--- bin/addons/msf_supply_doc_export/report/report_purchase_order_xls.mako 2018-04-23 09:09:50 +0000
3+++ bin/addons/msf_supply_doc_export/report/report_purchase_order_xls.mako 2018-07-25 16:11:39 +0000
4@@ -80,6 +80,9 @@
5 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Justification Coordination')}</Data></Cell>
6 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('HQ Remarks')}</Data></Cell>
7 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Justification Y/N')}</Data></Cell>
8+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Cold chain type')}</Data></Cell>
9+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Dangerous Good Type')}</Data></Cell>
10+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Controlled Substance Type')}</Data></Cell>
11 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Status')}</Data></Cell>
12 </Row>
13 % for line in o.order_line:
14@@ -104,6 +107,9 @@
15 <Cell ss:StyleID="line" ><Data ss:Type="String"></Data></Cell>
16 <Cell ss:StyleID="line" ><Data ss:Type="String"></Data></Cell>
17 <Cell ss:StyleID="line" ><Data ss:Type="String"></Data></Cell>
18+ <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.product_id and line.product_id.heat_sensitive_item and line.product_id.heat_sensitive_item.code == 'yes' and line.product_id.cold_chain and line.product_id.cold_chain.code or '')|x}</Data></Cell>
19+ <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.product_id and line.product_id.dangerous_goods != 'False' and getSel(line.product_id, 'dangerous_goods') or '')|x}</Data></Cell>
20+ <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.product_id and (line.product_id.controlled_substance == 'True' and 'CS / NP' or line.product_id.controlled_substance) or '')|x}</Data></Cell>
21 <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(line, 'state_to_display') or '')|x}</Data></Cell>
22 </Row>
23 % endfor
24
25=== modified file 'bin/addons/purchase/purchase_view.xml'
26--- bin/addons/purchase/purchase_view.xml 2018-06-01 08:17:49 +0000
27+++ bin/addons/purchase/purchase_view.xml 2018-07-25 16:11:39 +0000
28@@ -230,7 +230,6 @@
29 <field name="product_uom"/>
30 <field name="date_planned"/>
31 <field name="confirmed_delivery_date"/>
32- <field name="kc_dg"/>
33 <field name="stock_take_date"/>
34 <field name="price_subtotal"/>
35 <field name="currency_id"/>

Subscribers

People subscribed via source and target branches