← Back to team overview

openerp-community-reviewer team mailing list archive

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

 

Nicola Malcontenti - Agile BG has proposed merging lp:~agilebg/stock-logistic-report/7_fix_1331543 into lp:stock-logistic-report.

Requested reviews:
  Stock and Logistic Core Editors (stock-logistic-core-editors)

For more details, see:
https://code.launchpad.net/~agilebg/stock-logistic-report/7_fix_1331543/+merge/223878

In order to solve,
https://bugs.launchpad.net/stock-logistic-report/+bug/1331543
i propose this fiz
-- 
https://code.launchpad.net/~agilebg/stock-logistic-report/7_fix_1331543/+merge/223878
Your team Stock and Logistic Core Editors is requested to review the proposed merge of lp:~agilebg/stock-logistic-report/7_fix_1331543 into lp:stock-logistic-report.
=== modified file 'stock_picking_webkit/report.xml'
--- stock_picking_webkit/report.xml	2013-12-23 14:23:14 +0000
+++ stock_picking_webkit/report.xml	2014-06-20 09:32:01 +0000
@@ -9,8 +9,7 @@
             file="stock_picking_webkit/report/picking.html.mako"
             string="Aggregated pickings"
             report_type="webkit"
-            header="False"
-            webkit_header="base_headers_webkit.base_minimum_reports_portrait_header" />
+            header="False"/>
     <report id="webkit_aggregated_delivery"
             name="webkit.aggregated_delivery"
             auto="False"
@@ -18,8 +17,7 @@
             file="stock_picking_webkit/report/delivery.html.mako"
             string="Aggregated deliveries"
             report_type="webkit"
-            header="False"
-            webkit_header="base_headers_webkit.base_minimum_reports_portrait_header" />
+            header="False"/>
     <report id="stock.report_picking_list_out"
             name="webkit.delivery_slip"
             auto="False"
@@ -27,8 +25,26 @@
             file="stock_picking_webkit/report/delivery_slip.mako"
             string="Delivery Order"
             report_type="webkit"
-            header="True"
-            webkit_header="base_headers_webkit.base_reports_portrait_header" />
+            header="True"/>
 
   </data>
+
+    <data noupdate="1">
+        <record id="webkit_aggregated_picking" model="ir.actions.report.xml">
+           <field name="webkit_header" ref="base_headers_webkit.base_minimum_reports_portrait_header"></field>
+        </record>
+    </data>
+
+    <data noupdate="1">
+        <record id="webkit_aggregated_delivery" model="ir.actions.report.xml">
+           <field name="webkit_header" ref="base_headers_webkit.base_minimum_reports_portrait_header"></field>
+        </record>
+    </data>
+
+    <data noupdate="1">
+        <record id="stock.report_picking_list_out" model="ir.actions.report.xml">
+           <field name="webkit_header" ref="base_headers_webkit.base_reports_portrait_header"></field>
+        </record>
+   </data>
+
 </openerp>


Follow ups