From f0ba091358d5d64eee2e8f2c7ac999ad86823369 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Thu, 20 Mar 2014 12:06:51 +0100
Subject: [PATCH 1/6] [IMP] Put product_ul on package

bzr revid: jco@openerp.com-20140320110651-ql2gtlkz1t4mzglx
---
 addons/stock/stock.py       |  1 +
 addons/stock/stock_view.xml | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b0c19c1a25b..8719c5ff856 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -3313,6 +3313,7 @@ class stock_package(osv.osv):
         'parent_left': fields.integer('Left Parent', select=1),
         'parent_right': fields.integer('Right Parent', select=1),
         'packaging_id': fields.many2one('product.packaging', 'Type of Packaging'),
+        'ul_id': fields.many2one('product.ul', 'Type of Package'),
         'location_id': fields.function(_get_package_info, type='many2one', relation='stock.location', string='Location', multi="package",
                                     store={
                                        'stock.quant': (_get_packages, ['location_id'], 10),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ede38e6058a..c81fdce2e14 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1970,7 +1970,8 @@
                         </div>
                         <group>
                             <group>
-                            <field name="packaging_id"/>
+                               <field name="ul_id"/>
+                               <field name="packaging_id"/>
                                <field name='company_id' groups="base.group_multi_company"/>
                                <field name='owner_id' groups="stock.group_tracking_owner"/>
                             </group>
@@ -1978,7 +1979,6 @@
                             <field name="location_id"/>
                             <field name="parent_id"/>
                             </group>
-                            
                         </group>
                         <notebook>
                             <page string="Content">
@@ -1999,6 +1999,7 @@
                                 <field name="children_ids">
                                     <tree string="Contained Packages">
                                         <field name="complete_name"/>
+                                        <field name="ul_id"/>
                                         <field name="packaging_id"/>
                                         <field name="location_id"/>
                                     </tree>
@@ -2006,7 +2007,6 @@
                             </page>
                         </notebook> 
                     </sheet>
-
                 </form>
             </field>
         </record>
@@ -2019,6 +2019,7 @@
             <field name="arch" type="xml">
                 <tree string="Package">
                     <field name="complete_name"/>
+                    <field name="ul_id"/>
                     <field name="packaging_id"/>
                     <field name="location_id"/>
                     <field name="company_id"/>
@@ -2028,11 +2029,12 @@
         <record id="quant_package_search_view" model="ir.ui.view">
             <field name="name">stock.quant.package.search</field>
             <field name="model">stock.quant.package</field>
-            <field eval="10" name="priority"/>            
+            <field eval="10" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Package">
                     <field name="name" string="Package Name"/>
                     <field name="location_id"/>
+                    <field name="ul_id"/>
                     <field name="packaging_id"/>
                     <group  expand='0' string='Group by...'>
                        <filter string='Location' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'location_id'}"/>

From 9ac4fd4bcc28eda37fa55ca2bf290f29017d2292 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Thu, 20 Mar 2014 13:13:35 +0100
Subject: [PATCH 2/6] [IMP] Add ul for palletization on packaging and put
 dimensions on ul

bzr revid: jco@openerp.com-20140320121335-cnjfecg115t8fa7t
---
 addons/product/product.py       |  9 +++++----
 addons/product/product_view.xml | 19 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 9169ec99ead..2d568e05bb6 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -219,6 +219,10 @@ class product_ul(osv.osv):
     _columns = {
         'name' : fields.char('Name', select=True, required=True, translate=True),
         'type' : fields.selection([('unit','Unit'),('pack','Pack'),('box', 'Box'), ('pallet', 'Pallet')], 'Type', required=True),
+        'height': fields.float('Height', help='The height of the package'),
+        'width': fields.float('Width', help='The width of the package'),
+        'length': fields.float('Length', help='The length of the package'),
+        'weight': fields.float('Empty Package Weight'),
     }
 
 
@@ -937,6 +941,7 @@ class product_packaging(osv.osv):
             help="The total number of products you can put by pallet or box."),
         'ul' : fields.many2one('product.ul', 'Type of Package', required=True),
         'ul_qty' : fields.integer('Package by layer', help='The number of packages by layer'),
+        'ul_container': fields.many2one('product.ul', 'Container Type of Package'),
         'rows' : fields.integer('Number of Layers', required=True,
             help='The number of layers on a pallet or box'),
         'product_id' : fields.many2one('product.product', 'Product', select=1, ondelete='cascade', required=True),
@@ -944,10 +949,6 @@ class product_packaging(osv.osv):
         'code' : fields.char('Code', help="The code of the transport unit."),
         'weight': fields.float('Total Package Weight',
             help='The weight of a full package, pallet or box.'),
-        'weight_ul': fields.float('Empty Package Weight'),
-        'height': fields.float('Height', help='The height of the package'),
-        'width': fields.float('Width', help='The width of the package'),
-        'length': fields.float('Length', help='The length of the package'),
     }
 
 
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 756fa6619a0..ef5c2cd71cd 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -180,15 +180,11 @@
                                             <newline/>
                                             <field name="qty"/>
                                             <field name="ul"/>
-                                            <field name="weight_ul"/>
                                             <separator colspan="4" string="Palletization"/>
+                                            <field name="ul_container"/>
                                             <field name="ul_qty"/>
                                             <field name="rows"/>
                                             <field name="weight"/>
-                                            <separator colspan="4" string="Pallet Dimension"/>
-                                            <field name="height"/>
-                                            <field name="width"/>
-                                            <field name="length"/>
                                         </group>
                                         <separator colspan="4" string="Description"/>
                                         <field name="name"/>
@@ -585,6 +581,12 @@
                         <field name="name"/>
                         <field name="type"/>
                     </group>
+                    <group>
+                        <field name="height"/>
+                        <field name="width"/>
+                        <field name="length"/>
+                        <field name="weight"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -626,6 +628,7 @@
                     <field name="ean"/>
                     <field name="qty"/>
                     <field name="ul"/>
+                    <field name="ul_container"/>
                 </tree>
             </field>
         </record>
@@ -643,15 +646,11 @@
                         <newline/>
                         <field name="qty"/>
                         <field name="ul"/>
-                        <field name="weight_ul"/>
                         <separator colspan="4" string="Palletization"/>
+                        <field name="ul_container"/>
                         <field name="ul_qty"/>
                         <field name="rows"/>
                         <field name="weight"/>
-                        <separator colspan="4" string="Pallet Dimension"/>
-                        <field name="height"/>
-                        <field name="width"/>
-                        <field name="length"/>
                         <separator colspan="4" string="Other Info"/>
                         <field colspan="4" name="name"/>
                     </group>

From e374eb4309096a244205c5fef6d16dacd5372a84 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Thu, 20 Mar 2014 15:09:59 +0100
Subject: [PATCH 3/6] [IMP] Adapt nomenclature

bzr revid: jco@openerp.com-20140320140959-d2mr2aic4ei0j5h1
---
 addons/product/product.py       |  8 ++++----
 addons/product/product_view.xml | 18 +++++++++---------
 addons/stock/stock.py           |  4 ++--
 addons/stock/stock_view.xml     |  4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 2d568e05bb6..544952914f3 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -215,7 +215,7 @@ class product_uom(osv.osv):
 
 class product_ul(osv.osv):
     _name = "product.ul"
-    _description = "Shipping Unit"
+    _description = "Logistic Unit"
     _columns = {
         'name' : fields.char('Name', select=True, required=True, translate=True),
         'type' : fields.selection([('unit','Unit'),('pack','Pack'),('box', 'Box'), ('pallet', 'Pallet')], 'Type', required=True),
@@ -728,7 +728,7 @@ class product_product(osv.osv):
         'is_only_child': fields.function(
             _is_only_child, type='boolean', string='Sole child of the parent template'),
         'ean13': fields.char('EAN13 Barcode', size=13, help="International Article Number used for product identification."),
-        'packaging': fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
+        'packaging': fields.one2many('product.packaging', 'product_id', 'Packaging', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
         'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price'), help="Price Extra: Extra price for the variant on sale price. eg. 200 price extra, 1000 + 200 = 1200."),
         'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price'), help="Price Margin: Margin in percentage amount on sale price for the variant. eg. 10 price margin, 1000 * 1.1 = 1100."),
         'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
@@ -939,9 +939,9 @@ class product_packaging(osv.osv):
         'name' : fields.text('Description'),
         'qty' : fields.float('Quantity by Package',
             help="The total number of products you can put by pallet or box."),
-        'ul' : fields.many2one('product.ul', 'Type of Package', required=True),
+        'ul' : fields.many2one('product.ul', 'Package Logistic Unit', required=True),
         'ul_qty' : fields.integer('Package by layer', help='The number of packages by layer'),
-        'ul_container': fields.many2one('product.ul', 'Container Type of Package'),
+        'ul_container': fields.many2one('product.ul', 'Pallet Logistic Unit'),
         'rows' : fields.integer('Number of Layers', required=True,
             help='The number of layers on a pallet or box'),
         'product_id' : fields.many2one('product.product', 'Product', select=1, ondelete='cascade', required=True),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ef5c2cd71cd..04d6f4b2fe7 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -181,8 +181,8 @@
                                             <field name="qty"/>
                                             <field name="ul"/>
                                             <separator colspan="4" string="Palletization"/>
-                                            <field name="ul_container"/>
                                             <field name="ul_qty"/>
+                                            <field name="ul_container"/>
                                             <field name="rows"/>
                                             <field name="weight"/>
                                         </group>
@@ -576,7 +576,7 @@
             <field name="name">product.ul.form.view</field>
             <field name="model">product.ul</field>
             <field name="arch" type="xml">
-                <form string="Packaging" version="7.0">
+                <form string="Logistic Units" version="7.0">
                     <group>
                         <field name="name"/>
                         <field name="type"/>
@@ -594,25 +594,25 @@
             <field name="name">product.ul.tree</field>
             <field name="model">product.ul</field>
             <field name="arch" type="xml">
-                <tree string="Packaging">
+                <tree string="Logistic Units">
                     <field name="name"/>
                     <field name="type"/>
                 </tree>
             </field>
         </record>
         <record id="product_ul_form_action" model="ir.actions.act_window">
-            <field name="name">Packaging</field>
+            <field name="name">Logistic Units</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.ul</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to add a new packaging type.
+                Click to add a new Logistic Unit
               </p><p>
-                The packaging type define the dimensions as well as the number
-                of products per package. This will ensure salesperson sell the
-                right number of products according to the package selected.
+                The logistic unit defines the container used for the package.  
+                It has a type (e.g. pallet, box, ...) and you can specify its 
+                size. 
               </p>
             </field>
         </record>
@@ -647,9 +647,9 @@
                         <field name="qty"/>
                         <field name="ul"/>
                         <separator colspan="4" string="Palletization"/>
-                        <field name="ul_container"/>
                         <field name="ul_qty"/>
                         <field name="rows"/>
+                        <field name="ul_container"/>
                         <field name="weight"/>
                         <separator colspan="4" string="Other Info"/>
                         <field colspan="4" name="name"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 8719c5ff856..c35d99150c0 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -3312,8 +3312,8 @@ class stock_package(osv.osv):
         'complete_name': fields.function(_complete_name, type='char', string="Package Name",),
         'parent_left': fields.integer('Left Parent', select=1),
         'parent_right': fields.integer('Right Parent', select=1),
-        'packaging_id': fields.many2one('product.packaging', 'Type of Packaging'),
-        'ul_id': fields.many2one('product.ul', 'Type of Package'),
+        'packaging_id': fields.many2one('product.packaging', 'Packaging'),
+        'ul_id': fields.many2one('product.ul', 'Logistic Unit'),
         'location_id': fields.function(_get_package_info, type='many2one', relation='stock.location', string='Location', multi="package",
                                     store={
                                        'stock.quant': (_get_packages, ['location_id'], 10),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c81fdce2e14..f57d856be97 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1753,8 +1753,8 @@
                        <filter string='Owner' context="{'group_by' : 'owner_id'}" groups="stock.group_tracking_owner"/>
                        <filter string='Lot' context="{'group_by' : 'lot_id'}" groups="stock.group_production_lot"/>
                        <filter name="locationgroup" string='Location' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'location_id'}"/>
-                       <filter string='Packaging' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'package_id'}" groups="stock.group_tracking_lot"/>
-                       <filter string='Packaging Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'packaging_type_id'}" groups="stock.group_tracking_lot"/>
+                       <filter string='Package' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'package_id'}" groups="stock.group_tracking_lot"/>
+                       <filter string='Packaging' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'packaging_type_id'}" groups="stock.group_tracking_lot"/>
                        <filter string='Company' icon="terp-go-home" domain="[]" context="{'group_by' : 'company_id'}" groups="base.group_multi_company"/>
                    </group>
                 </search>

From 8c1585f5f8065e9ef3e8d8b1596d53fb077b8927 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Tue, 1 Apr 2014 10:36:03 +0200
Subject: [PATCH 4/6] [IMP] Comment point of sale report as reports will be
 replaced by qweb

bzr revid: jco@openerp.com-20140401083603-t6jb4k32t53h3yuw
---
 addons/point_of_sale/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index fa42a19e209..03df6d499cc 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -65,7 +65,7 @@ Main Features
         'wizard/pos_payment.xml',
         'wizard/pos_box.xml',
         'wizard/pos_session_opening.xml',
-        'point_of_sale_report.xml',
+        #'point_of_sale_report.xml',
         'point_of_sale_view.xml',
         'point_of_sale_data.xml',
         'report/pos_order_report_view.xml',

From 3bcd3ad6d895af4dc9de0fa7214df09aa6591260 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Tue, 1 Apr 2014 11:08:50 +0200
Subject: [PATCH 5/6] [FIX] Just comment tests

bzr revid: jco@openerp.com-20140401090850-3m0k0liyvnavuq75
---
 addons/point_of_sale/__openerp__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 03df6d499cc..ad95ed3fbb0 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -65,7 +65,7 @@ Main Features
         'wizard/pos_payment.xml',
         'wizard/pos_box.xml',
         'wizard/pos_session_opening.xml',
-        #'point_of_sale_report.xml',
+        'point_of_sale_report.xml',
         'point_of_sale_view.xml',
         'point_of_sale_data.xml',
         'report/pos_order_report_view.xml',
@@ -84,7 +84,7 @@ Main Features
     'test': [
         'test/01_order_to_payment.yml',
         'test/02_order_to_invoice.yml',
-        'test/point_of_sale_report.yml'
+        #'test/point_of_sale_report.yml'
     ],
     'installable': True,
     'application': True,

From ac03a0df6caaf4f1b89b46857993072bc0087f70 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Tue, 1 Apr 2014 14:10:37 +0200
Subject: [PATCH 6/6] [IMP] Remove weight_ul

bzr revid: jco@openerp.com-20140401121037-1yij4kqjgm2wg0y5
---
 addons/product_expiry/product_expiry_demo.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/product_expiry/product_expiry_demo.xml b/addons/product_expiry/product_expiry_demo.xml
index 237f70fc80b..bb5d4ac92de 100644
--- a/addons/product_expiry/product_expiry_demo.xml
+++ b/addons/product_expiry/product_expiry_demo.xml
@@ -19,6 +19,7 @@
             <field name="categ_id" search="[]" model="product.category"/>
             <field name="image" type="base64" file="product_expiry/static/img/product_product_jambon-image.jpg"/>
         </record>
+        
         <record id="product_package_jambon" model="product.packaging">
             <field name="name">box of 10</field>
             <field name="qty">12</field>
@@ -28,7 +29,6 @@
             <field name="product_id" ref="product_product_jambon" />
             <field name="ean"></field>
             <field name="weight">10</field>
-            <field name="weight_ul">240</field>
         </record>
 
         <record id="product_product_from" model="product.product">
@@ -57,7 +57,6 @@
             <field name="product_id" ref="product_product_from" />
             <field name="ean"></field>
             <field name="weight">10</field>
-            <field name="weight_ul">240</field>
         </record>
 
         <record id="product_product_pain" model="product.product">
@@ -86,7 +85,6 @@
             <field name="product_id" ref="product_product_pain" />
             <field name="ean"></field>
             <field name="weight">10</field>
-            <field name="weight_ul">240</field>
         </record>
 
         <record id="product_product_lait" model="product.product">
@@ -115,7 +113,6 @@
             <field name="product_id" ref="product_product_lait" />
             <field name="ean"></field>
             <field name="weight">10</field>
-            <field name="weight_ul">240</field>
         </record>
     </data>
 </openerp>