Merge lp:~agilebg/stock-logistic-report/7_fix_1331543 into lp:stock-logistic-report

Proposed by Nicola Malcontenti - Agile BG
Status: Merged
Merged at revision: 10
Proposed branch: lp:~agilebg/stock-logistic-report/7_fix_1331543
Merge into: lp:stock-logistic-report
Diff against target: 52 lines (+22/-6)
1 file modified
stock_picking_webkit/report.xml (+22/-6)
To merge this branch: bzr merge lp:~agilebg/stock-logistic-report/7_fix_1331543
Reviewer Review Type Date Requested Status
Lorenzo Battistini (community) code review Approve
Alex Comba - Agile BG (community) code review, no test Approve
Pedro Manuel Baeza code review Approve
Review via email: mp+223878@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM.

Regards.

review: Approve (code review)
Revision history for this message
Alex Comba - Agile BG (tafaru) :
review: Approve (code review, no test)
Revision history for this message
Lorenzo Battistini (elbati) :
review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stock_picking_webkit/report.xml'
2--- stock_picking_webkit/report.xml 2013-12-23 14:23:14 +0000
3+++ stock_picking_webkit/report.xml 2014-06-20 09:32:01 +0000
4@@ -9,8 +9,7 @@
5 file="stock_picking_webkit/report/picking.html.mako"
6 string="Aggregated pickings"
7 report_type="webkit"
8- header="False"
9- webkit_header="base_headers_webkit.base_minimum_reports_portrait_header" />
10+ header="False"/>
11 <report id="webkit_aggregated_delivery"
12 name="webkit.aggregated_delivery"
13 auto="False"
14@@ -18,8 +17,7 @@
15 file="stock_picking_webkit/report/delivery.html.mako"
16 string="Aggregated deliveries"
17 report_type="webkit"
18- header="False"
19- webkit_header="base_headers_webkit.base_minimum_reports_portrait_header" />
20+ header="False"/>
21 <report id="stock.report_picking_list_out"
22 name="webkit.delivery_slip"
23 auto="False"
24@@ -27,8 +25,26 @@
25 file="stock_picking_webkit/report/delivery_slip.mako"
26 string="Delivery Order"
27 report_type="webkit"
28- header="True"
29- webkit_header="base_headers_webkit.base_reports_portrait_header" />
30+ header="True"/>
31
32 </data>
33+
34+ <data noupdate="1">
35+ <record id="webkit_aggregated_picking" model="ir.actions.report.xml">
36+ <field name="webkit_header" ref="base_headers_webkit.base_minimum_reports_portrait_header"></field>
37+ </record>
38+ </data>
39+
40+ <data noupdate="1">
41+ <record id="webkit_aggregated_delivery" model="ir.actions.report.xml">
42+ <field name="webkit_header" ref="base_headers_webkit.base_minimum_reports_portrait_header"></field>
43+ </record>
44+ </data>
45+
46+ <data noupdate="1">
47+ <record id="stock.report_picking_list_out" model="ir.actions.report.xml">
48+ <field name="webkit_header" ref="base_headers_webkit.base_reports_portrait_header"></field>
49+ </record>
50+ </data>
51+
52 </openerp>

Subscribers

People subscribed via source and target branches