Merge lp:~openbig/bigconsulting/added_report_barcode_check into lp:bigconsulting

[gpa(OpenERP)]

Added report and changes in the scan product wizard code scan any number of packaging.

=== modified file 'packing_barcode_check/__init__.py'
--- packing_barcode_check/__init__.py	2010-06-23 14:49:06 +0000
+++ packing_barcode_check/__init__.py	2010-06-24 12:22:25 +0000
@@ -22,4 +22,5 @@
 
 import packing_barcode_check
 import wizard
+import report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'packing_barcode_check/__terp__.py'
--- packing_barcode_check/__terp__.py	2010-06-23 14:49:06 +0000
+++ packing_barcode_check/__terp__.py	2010-06-24 12:22:25 +0000
@@ -33,6 +33,7 @@
     "init_xml" : [],
     "update_xml" : ["packing_barcode_check_view.xml",
                     "packing_barcode_check_wizard.xml",
+                    "packing_barcode_check_report.xml",
                     ],
     "active": False,
     "installable": True

=== added file 'packing_barcode_check/packing_barcode_check_report.xml'
--- packing_barcode_check/packing_barcode_check_report.xml	1970-01-01 00:00:00 +0000
+++ packing_barcode_check/packing_barcode_check_report.xml	2010-06-24 12:22:25 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+
+		<report id="report_packing_barcode_check"
+				string="Print Scanlist Report"
+				model="stock.picking"
+				name="barcode.check"
+				rml="packing_barcode_check/report/bar_code_check.rml"
+				auto="False"
+				header="False"
+				menu="True" />
+
+	</data>
+</openerp>

=== added directory 'packing_barcode_check/report'
=== added file 'packing_barcode_check/report/__init__.py'
--- packing_barcode_check/report/__init__.py	1970-01-01 00:00:00 +0000
+++ packing_barcode_check/report/__init__.py	2010-06-24 12:22:25 +0000
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2009 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
+#                       Jordi Esteve <[e-mail]>
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import bar_code_check
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'packing_barcode_check/report/bar_code_check.py'
--- packing_barcode_check/report/bar_code_check.py	1970-01-01 00:00:00 +0000
+++ packing_barcode_check/report/bar_code_check.py	2010-06-24 12:22:25 +0000
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from report import report_sxw
+
+class report_generator(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(report_generator, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+            'time': time,
+        })
+report_sxw.report_sxw('report.barcode.check','stock.picking','addons/packing_barcode_check/report/bar_code_check.rml',parser=report_generator)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'packing_barcode_check/report/bar_code_check.rml'
--- packing_barcode_check/report/bar_code_check.rml	1970-01-01 00:00:00 +0000
+++ packing_barcode_check/report/bar_code_check.rml	2010-06-24 12:22:25 +0000
@@ -0,0 +1,127 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(320.0,210.0)" rightMargin="0.0cm" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="1.5cm" y1="0.0cm" width="320.0" height="210"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_12" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_left_10" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Italic" rightIndent="0.0" leftIndent="20.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Preformatted Text" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="Standard">[[ repeatIn(objects,'picking') ]] </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(picking.move_lines,'move_lines') ]]</para>
+      <blockTable colWidths="143.0,180.0" style="Table1">
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9">Product </para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9">[[ move_lines.product_id.code or '']] </para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9">Quantity</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9">[[ move_lines.product_qty or '']]</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9">Pack</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9">[[picking.name]]</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+              <barCode code="code128" barWidth="1.4" barHeight="25">[[picking.name or removeParentNode('td')]]</barCode>
+          </td>
+          <td>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9">EAN</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9">[[ move_lines.product_packaging.ean or '']]</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+              <barCode code="code128" barWidth="1.4" barHeight="25">[[move_lines.product_packaging.ean or removeParentNode('td')]]</barCode>
+          </td>
+          <td>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9">Production Lot</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9">[[ move_lines.prodlot_id.name or '']]</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <barCode code="code128" barWidth="1.4" barHeight="25">[[move_lines.prodlot_id.name or removeParentNode('td')]]</barCode>
+          </td>
+          <td>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+  </story>
+</document>

=== modified file 'packing_barcode_check/wizard/scan_product.py'
--- packing_barcode_check/wizard/scan_product.py	2010-06-23 14:49:06 +0000
+++ packing_barcode_check/wizard/scan_product.py	2010-06-24 12:22:25 +0000
@@ -47,11 +47,13 @@
         move_data = stock_move_obj.browse(cr, uid,move_id)
         if move_data.product_qty == move_data.scaned_qty:
             continue
-        product_ean = move_data.product_id.ean13
-        
-        if product_ean == form_ean:
-            EAN_Found = True
-            return 'scan_product_number'
+        for ean_id in move_data.product_id.packaging:
+            ean_data = pool.get("product.packaging").browse(cr, uid, ean_id.id)
+            product_ean = ean_data.ean
+            if product_ean == form_ean:
+                EAN_Found = True
+                return 'scan_product_number'
+            
     if not EAN_Found:
         raise osv.except_osv(_('Warning!'),('Product does not belongs to this picking or already scanned.'))
     return {}