From 3f6290b8c4b15ef8bf9c2d96abb3ae5f637232d0 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 17 Mar 2014 10:47:22 +0100
Subject: [PATCH 1/2] [FIX]refactor package report

bzr revid: csn@openerp.com-20140317094722-etwze4uvx3wnejfw
---
 addons/stock/__openerp__.py                   |  1 +
 addons/stock/stock_report.xml                 |  2 +-
 addons/stock/views/report_package_barcode.xml | 53 +++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 addons/stock/views/report_package_barcode.xml

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 20a6ee1ccfd..cc4392b006d 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -88,6 +88,7 @@ Dashboard / Reports for Warehouse Management will include:
         'report/report_stock_view.xml',
         'board_warehouse_view.xml',
         'res_config_view.xml',
+        'views/report_package_barcode.xml',
     ],
     'test': [
         'test/inventory.yml',
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index d5a78efa370..bc32f14579b 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -3,7 +3,7 @@
     <data>
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Stock Level Forecast"/>
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list.internal" string="Picking Slip" rml="stock/report/picking_internal.rml"/>
-        <report id="report_quant_package_barcode" model="stock.quant.package" name="stock.quant.package.barcode" string="Package BarCode" rml="stock/report/package_barcode.rml"/>
+        <report id="action_report_quant_package_barcode" model="stock.quant.package" report_type="qweb-pdf" name="stock.report_package_barcode" string="Package BarCode" file="stock.report_package_barcode"/>
         <report id="report_picking_list_in" model="stock.pickin" name="stock.picking.list" string="Receipt Slip" rml="stock/report/picking.rml"/>
         <report id="report_picking_list_out" model="stock.picking" name="stock.picking.list" string="Delivery Slip" rml="stock/report/picking.rml"/>
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
diff --git a/addons/stock/views/report_package_barcode.xml b/addons/stock/views/report_package_barcode.xml
new file mode 100644
index 00000000000..841486e8293
--- /dev/null
+++ b/addons/stock/views/report_package_barcode.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+<template id="report_package_barcode">
+    <t t-call="report.html_container">
+        <t t-foreach="docs" t-as="o">
+            <t>
+                <div class="page">
+                    <div class="oe_structure"/>
+                    <div class="row">
+                        <div class="col-xs-8">
+                            <table class="table table-condensed" style="border-bottom: 0px solid white !important;">
+                                <thead>
+                                    <tr>
+                                        <th>Product</th>
+                                        <th class="text-right">Quantity</th>
+                                        <th>Lot</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr t-foreach="o.quant_ids" t-as="l">
+                                        <td>
+                                           <span  t-field="l.product_id.name"/>
+                                        </td>
+                                        <td class="text-right">
+                                            <span t-field="l.qty"/>
+                                            <span groups="product.group_uom" t-field="l.product_id.uom_id.name"/>
+                                        </td>
+                                        <td>
+                                            <t t-if="l.lot_id"><span t-field="l.lot_id.name"/></t>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <div class="col-xs-4">
+                            <img class="image" t-att-src="'data:image/png;base64,%s' % res_company.logo" style="border:auto;"/>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-xs-12 mt32">
+                            <table class="table table-condensed" style="border-bottom: 3px solid black !important;"><thead><th> </th></thead></table>
+                            <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Standard39', o.name, 800, 40)" style="width:100%;"/>
+                            <p class="text-center" t-field="o.name"></p>
+                        </div>
+                    </div>
+                </div>
+            </t>
+        </t>
+    </t>
+</template>
+</data>
+</openerp>

From 1855e687a8746f2999983d558bc1c64c97b07959 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 17 Mar 2014 11:01:54 +0100
Subject: [PATCH 2/2] [FIX]remove old package report

bzr revid: csn@openerp.com-20140317100154-iitknhqcje6finl0
---
 addons/stock/report/package_barcode.rml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 addons/stock/report/package_barcode.rml

diff --git a/addons/stock/report/package_barcode.rml b/addons/stock/report/package_barcode.rml
deleted file mode 100644
index a0967d7ca01..00000000000
--- a/addons/stock/report/package_barcode.rml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Packing BarCode.pdf">
-  <template pageSize="(595.0,842.0)" title="Packing BarCode" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>
-    </pageTemplate>
-  </template>
-  <story>
-    <barCode code="code128" quiet="9" fontName="Times-Roman" fontSize="50" alignment="CENTER"> [[ packaging_id.product_id.ean13 ]] </barCode>
-  </story>
-</document>