From 10123ce0c5edf450f72bfcefe76e4744456c5b0c Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Thu, 30 Jan 2014 18:47:11 +0100
Subject: [PATCH] [IMP] Revert commit 9498 to have split between tracking of
 packages and tracking of serial numbers / lots /...

bzr revid: jco@openerp.com-20140130174711-2sl1rvnkx2ju2tef
---
 addons/mrp/mrp_view.xml                       |  8 +++----
 addons/mrp_repair/mrp_repair_view.xml         |  4 ++--
 addons/stock/res_config.py                    |  5 +++-
 addons/stock/res_config_view.xml              | 10 +++++---
 addons/stock/security/stock_security.xml      |  7 +++++-
 addons/stock/stock_view.xml                   | 24 +++++++++----------
 .../wizard/stock_change_product_qty_view.xml  |  2 +-
 addons/stock/wizard/stock_move_view.xml       |  5 ++--
 .../wizard/stock_return_picking_view.xml      |  4 ++--
 9 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index fffd68fdeaf..cc7ab58eb85 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -560,7 +560,7 @@
             <field name="inherit_id" ref="stock.product_form_view_procurement_button"/>
             <field name="arch" type="xml">
                  <xpath expr="//group[@name='lot']" position="inside">
-                    <field name="track_production" groups="stock.group_tracking_lot" attrs="{'invisible': [('track_all', '=', True)]}"/>
+                    <field name="track_production" groups="stock.group_production_lot" attrs="{'invisible': [('track_all', '=', True)]}"/>
                 </xpath>
             </field>
         </record>
@@ -737,7 +737,7 @@
                                                    string="Split in Serial Numbers"
                                                    type="action" icon="gtk-justify-fill"
                                                    states="draft,waiting,confirmed,assigned" 
-                                                   groups="stock.group_tracking_lot"/>
+                                                   groups="stock.group_production_lot"/>
                                             <button name="%(stock.move_scrap)d"
                                                 string="Scrap Products" type="action"
                                                 icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
@@ -751,7 +751,7 @@
                                            <field name="product_id" readonly="1"/>
                                            <field name="product_qty" readonly="1"/>
                                            <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
-                                           <!--<field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_tracking_lot"/>-->
+                                           <!--<field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_production_lot"/>-->
                                            <field name="state" invisible="1"/>
                                            <field name="scrapped" invisible="1"/>
                                        </tree>
@@ -779,7 +779,7 @@
                                             <field name="product_qty" readonly="1"/>
                                             <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
                                             <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection" groups="stock.group_locations"/>
-                                            <!--<field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_tracking_lot"/>-->
+                                            <!--<field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_production_lot"/>-->
                                             <field name="scrapped" invisible="1"/>
                                             <field name="state" invisible="1"/>
                                             <button name="%(stock.track_line)d"
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index aaa860fa793..86029a085d6 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -49,7 +49,7 @@
                                 <field name="product_qty" class="oe_inline"/> 
                                 <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(product_id, product_uom)" class="oe_inline"/>
                             </div>
-                            <field name="lot_id" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}" groups="stock.group_tracking_lot"/>
+                            <field name="lot_id" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}" groups="stock.group_production_lot"/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)" attrs="{'required':[('invoice_method','!=','none')]}"/>
                             <field name="address_id" groups="sale.group_delivery_invoice_address"/>
                         </group>
@@ -96,7 +96,7 @@
                                 <field name="type" on_change="onchange_operation_type(type,parent.guarantee_limit,parent.company_id,context)"/>
                                 <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
                                 <field name='name'/>
-                                <field name="lot_id" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}" groups="stock.group_tracking_lot"/>
+                                <field name="lot_id" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}" groups="stock.group_production_lot"/>
                                 <field name="location_id" groups="stock.group_locations"/>
                                 <field name="location_dest_id" groups="stock.group_locations"/>
                                 <field name="product_uom_qty" string="Quantity"/>
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 952407f59b3..2428e6a69f7 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -67,7 +67,10 @@ This installs the module product_expiry."""),
         'group_stock_packaging': fields.boolean("Allow to define several packaging methods on products",
             implied_group='product.group_stock_packaging',
             help="""Allows you to create and manage your packaging dimensions and types you want to be maintained in your system."""),
-        'group_stock_tracking_lot': fields.boolean("Track serial number on products",
+        'group_stock_production_lot': fields.boolean("Track lots or serial numbers of the products",
+            implied_group='stock.group_production_lot',
+            help="""This allows you to assign a lot (or serial number) to the pickings and moves.  This can make it possible to know which production lot was sent to a certain client, ..."""),
+        'group_stock_tracking_lot': fields.boolean("Use logistic carriers: packages, pallets, boxes, ...",
             implied_group='stock.group_tracking_lot',
             help="""This allows you to manage products by using serial numbers. When you select a serial number on product moves, you can get the traceability of that product."""),
         'group_stock_tracking_owner': fields.boolean("Manage owner on stock", 
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index f8d154e3dd9..fcff9e45221 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -27,13 +27,17 @@
                         <label for="id" string="Traceability"/>
                         <div>
                             <div>
-                                <field name="group_stock_tracking_lot" class="oe_inline"/>
-                                <label for="group_stock_tracking_lot"/>
+                                <field name="group_stock_production_lot" class="oe_inline"/>
+                                <label for="group_stock_production_lot"/>
                             </div>
-                            <div attrs="{'invisible': [('group_stock_tracking_lot','=',False)]}">
+                            <div attrs="{'invisible': [('group_stock_production_lot','=',False)]}">
                                 <field name="module_product_expiry" class="oe_inline"/>
                                 <label for="module_product_expiry"/>
                             </div>
+                            <div>
+                                <field name="group_stock_tracking_lot" class="oe_inline"/>
+                                <label for="group_stock_tracking_lot"/>
+                            </div>
                             <div>
                                 <field name="group_stock_tracking_owner" class="oe_inline"/>
                                 <label for="group_stock_tracking_owner"/>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 343235e8265..e1ee269b2ba 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -19,8 +19,13 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
+    <record id="group_production_lot" model="res.groups">
+        <field name="name">Manage Lots / Serial Numbers</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
     <record id="group_tracking_lot" model="res.groups">
-        <field name="name">Manage Serial Numbers</field>
+        <field name="name">Manage Logistic Carriers</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index dd1694535c9..42a1ba7b33f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -111,7 +111,7 @@
                         </group>
                         <group>
                             <field name="product_id" domain="[('type','=','product')]" attrs="{'invisible': [('filter', 'not in', ('product', 'product_owner'))]}"/>
-                            <field name="lot_id" attrs="{'invisible': [('filter', '!=', 'lot')]}" groups="stock.group_tracking_lot" />
+                            <field name="lot_id" attrs="{'invisible': [('filter', '!=', 'lot')]}" groups="stock.group_production_lot" />
                             <field name="partner_id" attrs="{'invisible': [('filter', 'not in', ('owner', 'product_owner'))]}" groups="stock.group_tracking_owner"/>
                             <field name="package_id" attrs="{'invisible': [('filter', '!=', 'pack')]}" groups="stock.group_tracking_lot"/>
                         </group>
@@ -124,7 +124,7 @@
                                     <field context="{'location':location_id, 'uom':product_uom_id, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)" domain="[('type','=','product')]"/>
                                     <field name="product_uom_id" groups="product.group_uom" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)"/>
                                     <field domain="[('usage','=','internal')]" name="location_id" groups="stock.group_locations" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)"/>
-                                    <field name="prod_lot_id" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}"  groups="stock.group_tracking_lot"/>
+                                    <field name="prod_lot_id" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}"  groups="stock.group_production_lot"/>
                                     <field name="package_id" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)" groups="stock.group_tracking_lot"/>
                                     <field name="partner_id" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)" groups="stock.group_tracking_owner"/>
                                     <field name="th_qty" readonly="1"/>
@@ -270,7 +270,7 @@
             </field>
         </record>
         <menuitem action="action_production_lot_form" id="menu_action_production_lot_form"
-            parent="menu_traceability" groups="stock.group_tracking_lot"
+            parent="menu_traceability" groups="stock.group_production_lot"
             sequence="1"/>
 
         #
@@ -798,7 +798,7 @@
                                 <tree editable="top">   
                                     <field name="product_id" on_change='product_id_change(product_id, product_uom_id, product_qty, context)'/>
                                     <field name="product_uom_id" groups="product.group_uom" on_change='on_change_tests(product_id, product_uom_id, product_qty, context)'/>
-                                    <field name="lot_id" domain="[('product_id','=?', product_id)]" context="{'product_id': product_id}" groups="stock.group_tracking_lot"/>
+                                    <field name="lot_id" domain="[('product_id','=?', product_id)]" context="{'product_id': product_id}" groups="stock.group_production_lot"/>
                                     <field name="package_id" groups="stock.group_tracking_lot"/>
                                     <field name="owner_id" groups="stock.group_tracking_owner"/>
                                     <field name="product_qty" attrs="{'required': [('product_id', '!=', False)]}" on_change='on_change_tests(product_id, product_uom_id, product_qty, context)'/>
@@ -1741,7 +1741,7 @@
                     <field name="product_id"/>
                     <field name="location_id"/>
                     <field name="package_id" groups="stock.group_tracking_lot"/>
-                    <field name="lot_id" groups="stock.group_tracking_lot"/>
+                    <field name="lot_id" groups="stock.group_production_lot"/>
                     <field name="owner_id" groups="stock.group_tracking_owner"/>
                     <group expand='0' string='Filters'>
                         <filter name='internal_loc' string="Internal Locations" domain="[('location_id.usage','=', 'internal')]"/>
@@ -1749,7 +1749,7 @@
                     <group expand='0' string='Group by...'>
                        <filter name="productgroup" string='Product' context="{'group_by' : 'product_id'}"/>
                        <filter string='Owner' context="{'group_by' : 'owner_id'}" groups="stock.group_tracking_owner"/>
-                       <filter string='Lot' context="{'group_by' : 'lot_id'}" groups="stock.group_tracking_lot"/>
+                       <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"/>
@@ -1779,7 +1779,7 @@
                     <group>
                         <field name="product_id"/>
                         <field name="qty"/>
-                        <field name="lot_id" groups="stock.group_tracking_lot"/>
+                        <field name="lot_id" groups="stock.group_production_lot"/>
                         <field name="package_id" groups="stock.group_tracking_lot"/>
                         <field name="location_id"/>
                         <field name="in_date"/>
@@ -1802,7 +1802,7 @@
                     <field name="qty"/>
                     <field name="location_id"/>
                     <field name="owner_id" groups="stock.group_tracking_owner"/>
-                    <field name="lot_id" groups="stock.group_tracking_lot"/>
+                    <field name="lot_id" groups="stock.group_production_lot"/>
                     <field name="package_id" groups="stock.group_tracking_lot"/>
                     <field name="packaging_type_id" invisible="1"/>
                     <field name="in_date"/>
@@ -1942,10 +1942,10 @@
                         <field name="outgoing_qty" class="oe_inline"/>
                         <field name="virtual_available" class="oe_inline"/>
                     </group>
-                    <group name="lot" groups="stock.group_tracking_lot,stock.group_tracking_lot" string="Lots">
-                        <field name="track_all" groups="stock.group_tracking_lot"/>
-                        <field name="track_incoming" groups="stock.group_tracking_lot" attrs="{'invisible': [('track_all', '=', True)]}"/>
-                        <field name="track_outgoing" groups="stock.group_tracking_lot" attrs="{'invisible': [('track_all', '=', True)]}"/>
+                    <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
+                        <field name="track_all" groups="stock.group_production_lot"/>
+                        <field name="track_incoming" groups="stock.group_production_lot" attrs="{'invisible': [('track_all', '=', True)]}"/>
+                        <field name="track_outgoing" groups="stock.group_production_lot" attrs="{'invisible': [('track_all', '=', True)]}"/>
                     </group>
                 </group>
             </field>
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index 81016e467e9..935374fae4b 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -10,7 +10,7 @@
                         <field name="new_quantity" />
                         <field name="product_id" invisible="1"/>
                         <field name="location_id" groups="stock.group_locations"/>
-                        <field name="lot_id"  context="{'search_default_product_id':product_id,'default_product_id':product_id}" groups="stock.group_tracking_lot"/>
+                        <field name="lot_id"  context="{'search_default_product_id':product_id,'default_product_id':product_id}" groups="stock.group_production_lot"/>
                     </group>
                     <footer>
                         <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 0a567be651e..f4d3412c758 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -15,8 +15,9 @@
                             <field name="product_qty" class="oe_inline"/>
                             <field name="product_uom" class="oe_inline" readonly="1" groups="product.group_uom"/>
                         </div>
-                        <field name="restrict_lot_id" domain="[('product_id','=',product_id)]" groups="stock.group_tracking_lot"
+                        <field name="restrict_lot_id" domain="[('product_id','=',product_id)]" groups="stock.group_production_lot"
                             context="{'default_product_id': product_id}"/>
+
                         <field name="location_id" groups="stock.group_locations"/>
                     </group>
                     <footer>
@@ -50,7 +51,7 @@
                             <field name="product_qty" class="oe_inline"/>
                             <field name="product_uom" class="oe_inline" readonly="1" groups="product.group_uom"/>
                         </div>
-                        <field name="restrict_lot_id" domain="[('product_id','=',product_id)]" groups="stock.group_tracking_lot"
+                        <field name="restrict_lot_id" domain="[('product_id','=',product_id)]" groups="stock.group_production_lot"
                             context="{'default_product_id': product_id}"/>
                         <field name="location_id" string="Scrap Location" widget="selection"
                             domain="[('usage','!=','view'),('scrap_location','=',True)]" groups="stock.group_locations"/>
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index 49b0c9a0e5c..d6af408ae6a 100644
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -16,7 +16,7 @@
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Product Moves">
                     <field name="product_id" />
-                    <field name="lot_id" groups="stock.group_tracking_lot"/>
+                    <field name="lot_id" groups="stock.group_production_lot"/>
                     <field name="quantity" />
                 </tree>
             </field>
@@ -29,7 +29,7 @@
                 <form string="Return Picking Memory" version="7.0">
                     <group col="4">
                         <field name="product_id" />
-                        <field name="lot_id" groups="stock.group_tracking_lot"/>
+                        <field name="lot_id" groups="stock.group_production_lot"/>
                         <field name="quantity" />
                     </group>
                  </form>