Merge lp:~mathieu-julius/stock-logistic-tracking/stock-logistic-tracking70 into lp:stock-logistic-tracking

[Mathieu Vatel - Julius Network Solutions]

Lot of modifications.

Improvements to split modules. There is now a state module (to open close packs), a child module to put packs inside a pack...

We've added some new features to be able to add product / prodlot or packs inside a pack, to swap objects inside of it too.

The stock_barcode_reader hasn't been migrated yet.

There are still some improvement to do on the stock_tracking_state (e.g. be able to swap or moving a closed pack which is not possible right now)

Maybe we can remove some modules of this branch (stock_inventory_sequence, stock_product_category_tracked)... Maybe the stock_barcode_reader can be move to another branch too. To be discussed.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Can you split your reviews into smaller chunks please?
That's a real plain to review a 6000 lines diff.

l.223-254 Why do you add 30 lines of commented code?

l.753 remove the lambda,
    'use_exist': True,

Please try to wrap the long lines to 80 chars (l.876, 877 for instance
and in _columns in general).
You can use the " continuation for that:

   'track_incoming': fields.boolean(
       'Track Incoming Lots',
       help="Forces to specify a Serial Number for all moves containing "
            "this product and coming from a Supplier Location"),

l.910-927: indentation is broken (mix tabs and spaces) (in a general
manner, check the xml files, a lot of them seems to contain tabs).

l.1170, can you remove the commented dependency if it not required anymore?

l.1254,1271,etc. use 'if context is None' instead of 'if context == None'
By the way, you don't need to initialize context to {} if you do not use it
in the body of the method

l.1269,etc. the docstring of a methods gos below the declaration, not above

l.1309,1311,etc. prefer the ternary ... if ... else form:
    move_data.name if move_data else prodlot_data.name

l.1356-1358,1482,etc. again can you clean the commented code?

l.1383 use inline comment with #

l.1419,1481 why do you not set `pack_history_id` in the `default` argument of
`copy` the line above?

l.1661-1664,1856-1861,etc. you should replace the 4 lines by using the default value of {}.get
    type = context.get('type_selection', 'product')

l.1677,1877 context.get('active_id', False)

l.1967,1968 the inline comments here are really misleading

l.2414-2418, very redundant when you can simply do active_id = context.get('active_id')

l.2780,2801,etc.: for product in product_list: (or .iterkeys())

l.2801: replace by
    product_list.set_default(x.product_id.id, 0) += x.product_qty

Do not forget to put 'installable' to True on the migrated addons.

review: Needs Fixing (code review, no test)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Previous comment:
Can you split your reviews into smaller chunks please? => the next times
s/real plain/real pain/

[Mathieu Vatel - Julius Network Solutions (mathieu-julius)]

> Previous comment:
> Can you split your reviews into smaller chunks please? => the next times
> s/real plain/real pain/

=> For sure sorry for this.
We've made a lot split inside modules to made them installable and functional... but for the next times we will split the reviews !!

[Mathieu Vatel - Julius Network Solutions (mathieu-julius)]

> l.223-254 Why do you add 30 lines of commented code?

=> This has been removed

> l.753 remove the lambda,
> 'use_exist': True,

=> done

> Please try to wrap the long lines to 80 chars (l.876, 877 for instance
> and in _columns in general).
> You can use the " continuation for that:
>
> 'track_incoming': fields.boolean(
> 'Track Incoming Lots',
> help="Forces to specify a Serial Number for all moves containing "
> "this product and coming from a Supplier Location"),

=> Try to wrap most of them, (there's maybe still some of them)

> l.910-927: indentation is broken (mix tabs and spaces) (in a general
> manner, check the xml files, a lot of them seems to contain tabs).

=> I've replace all tabs inside installable modules by spaces

> l.1170, can you remove the commented dependency if it not required anymore?

=> Done

> l.1254,1271,etc. use 'if context is None' instead of 'if context == None'

=> Done for all the installable modules

> By the way, you don't need to initialize context to {} if you do not use it
> in the body of the method

=> Of course you're right.

> l.1269,etc. the docstring of a methods gos below the declaration, not above

=> This should has been done

> l.1309,1311,etc. prefer the ternary ... if ... else form:
> move_data.name if move_data else prodlot_data.name

=> Done for the one I've found

> l.1356-1358,1482,etc. again can you clean the commented code?

=> Done

> l.1383 use inline comment with #

=> Done

> l.1419,1481 why do you not set `pack_history_id` in the `default` argument of
> `copy` the line above?

=> No, the pack_history_id is written in the move which have been copied not in the copy.

> l.1661-1664,1856-1861,etc. you should replace the 4 lines by using the default
> value of {}.get
> type = context.get('type_selection', 'product')

=> Done

> l.1677,1877 context.get('active_id', False)

=> Done

> l.1967,1968 the inline comments here are really misleading

=> I've deleted them

> l.2414-2418, very redundant when you can simply do active_id =
> context.get('active_id')

=> Done

> l.2780,2801,etc.: for product in product_list: (or .iterkeys())

=> Done rev 46

> l.2801: replace by
> product_list.set_default(x.product_id.id, 0) += x.product_qty

=> Done rev 46

> Do not forget to put 'installable' to True on the migrated addons.

=> It's done, all the module with installable False do not work fine on the 7.0

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks for your changes!

review: Approve

=== added file 'Readme'
--- Readme	1970-01-01 00:00:00 +0000
+++ Readme	2013-03-06 10:58:19 +0000
@@ -0,0 +1,104 @@
+########################################## Stock-Logistic-Tracking ######################################################
+
+-=- stock_tracking_extended -=-
+
+Depends : stock
+Presentation : 
+This module add some info into packs to get a better tracking of products and serial lots inside of these packs
+
+-=- stock_inventory_sequence -=-
+
+Depends : stock
+Presentation :
+This module adds a sequence for generating automatically inventories name
+
+<!> <!> <!> -=- stock_move_split_default -=- <!> <!> <!>
+
+Depends : stock
+Presentation :
+This module allows to define and identify package in parent or child
+
+-=- stock_product_category_tracked -=-
+
+Depends : stock
+Presentation : 
+This module adds a field into the product category to define if this should be tracked or not
+
+<!> <!> <!> -=- stock_tracking_prodlot -=- <!> <!> <!>
+
+Depends : stock
+Presentation : 
+This module allows to define and identify package in parent or child
+
+-=- stock_tracking_add_remove -=-
+
+Depends : stock, stock_tracking_extended
+Presentation :
+This module add a wizard to fill in packaging 
+This wizard is used to add or remove a product object from a package 
+Adding to the historical movements and parents objects
+
+-=- stock_tracking_child -=- 
+
+Depends : stock, stock_tracking_extended
+Presentation :
+This module allows to define and identify package in parent or child	
+
+-=- stock_move_packaging -=-
+
+Depends : stock, stock_tracking_extended
+Presentation : 
+This module allows to move packing with a wizard and adds fields for source location and destination location in history
+
+-=- stock_tracking_state -=-
+
+Depends : stock, stock_tracking_extended
+Presentation :
+This module will ad the state field to make changes of closed packed 
+
+-=- stock_tracking_swap -=-
+
+Depends : stock, stock_tracking_extended
+Presentation :
+This module add a wizard to swap products or prodlots in packaging
+This wizard is used to replace an object from a package
+Adding to the historical movements and parent objects
+
+-=- stock_tracking_add_move -=-
+
+Depends : stock, stock_tracking_extended, tr_barcode 
+Presentation :
+This module add a wizard to fill in packaging 
+This wizard is used to add or remove an object from a package
+Adding to the historical movements and parents objects
+                                                          
+-=- stock_tracking_add_remove_pack -=-
+
+Depends : stock_tracking_extended, stock_tracking_child, stock_tracking_add_product 
+Presentation :
+This module add a wizard to fill in packaging 
+This wizard is used to add or remove a pack object from a package 
+Adding to the historical movements and parents objects
+
+-=- stock_barcode_reader -=-
+
+Depends : stock, stock_tracking_extended, stock_tracking_add_move 
+Presentation : 
+This module is an ergonomic wizard to fill in package 
+Add menu for acquisition of package
+Add button in Stock picking for start acquisition 
+
+-=- stock_tracking_reopen -=-
+
+Depends : stock, stock_tracking_extended, stock_tracking_state
+Presentation : 
+This module change reference of the packaging if it's re-open
+
+-=- stock_tracking_swap_pack -=-
+
+Depends : stock, stock_tracking_extended, stock_tracking_child
+Presentation :
+This module add a wizard to swap packs in packaging
+This wizard is used to replace an object from a package
+Adding to the historical movements and parent objects
+

=== modified file 'stock_barcode_reader/__openerp__.py'
--- stock_barcode_reader/__openerp__.py	2013-02-13 08:35:37 +0000
+++ stock_barcode_reader/__openerp__.py	2013-03-06 10:58:19 +0000
@@ -45,11 +45,10 @@
          "stock_tracking_extended",
          "stock_tracking_add_move",
     ],
-    "category" : "Customs/Stock",
-    "init_xml" : [],
-    "demo_xml" : [],
+    "category" : "Warehouse Management",
     "images" : ['images/Acquisition.png'],
-    "update_xml" : [
+    "demo" : [],
+    "data" : [
         'wizard/reference_view.xml',
         'acquisition_view.xml',
         'stock_view.xml',
@@ -60,3 +59,5 @@
     'installable': False,
     'active': False,
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock_barcode_reader/package_acquisition.py'
--- stock_barcode_reader/package_acquisition.py	2012-11-07 17:52:33 +0000
+++ stock_barcode_reader/package_acquisition.py	2013-03-06 10:58:19 +0000
@@ -19,14 +19,14 @@
 #
 #################################################################################
 
-from osv import osv,fields
-from tools.translate import _
-from report import report_sxw
-from report_aeroo import report_aeroo
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+from openerp.report import report_sxw
+from openerp.addons.report_aeroo import report_aeroo
 import datetime
 from tools import misc
 
-class stock_fill_inventory(osv.osv_memory):
+class stock_fill_inventory(orm.TransientModel):
     _inherit = "stock.fill.inventory"
     def fill_inventory(self, cr, uid, ids, context=None):
         res = super(stock_fill_inventory, self).fill_inventory(cr, uid, ids, context=context)
@@ -35,9 +35,8 @@
         if stock_inventory_obj.browse(cr, uid, context.get('active_id', False), context).location_id:
             stock_inventory_obj.write(cr, uid, context.get('active_id', False), {'location_id': fill_inventory.location_id.id})
         return res
-stock_fill_inventory()
 
-class acquisition_acquisition(osv.osv):
+class acquisition_acquisition(orm.Model):
 
     _name = "acquisition.acquisition"
     _order = 'id desc'
@@ -627,9 +626,7 @@
                                  
         return res
     
-acquisition_acquisition()
-
-class acquisition_list(osv.osv):    
+class acquisition_list(orm.Model):    
     
     _name = "acquisition.list"
     _columns = {
@@ -671,9 +668,7 @@
         ['name']),
     ]
 
-acquisition_list()
-
-class acquisition_setting(osv.osv):
+class acquisition_setting(orm.Model):
 
     _name = "acquisition.setting"
     _columns = {
@@ -798,8 +793,4 @@
 #                            'product_qty': 1}
 #                    inventory_line_obj.create(cr, uid, vals)
 
-
-
-acquisition_setting()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock_barcode_reader/stock.py'
--- stock_barcode_reader/stock.py	2012-11-02 10:27:43 +0000
+++ stock_barcode_reader/stock.py	2013-03-06 10:58:19 +0000
@@ -19,10 +19,10 @@
 #
 #################################################################################
 
-from osv import osv,fields
-from tools.translate import _
+from openerp.osv import osv, fields, orm
+from openerp.tools.translate import _
 
-class stock_picking(osv.osv):
+class stock_picking(orm.Model):
     _inherit = "stock.picking"
 
     def start_acquisition(self, cr, uid, ids, context=None):
@@ -51,6 +51,4 @@
         }
         return action
 
-stock_picking()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock_barcode_reader/wizard/reference.py'
--- stock_barcode_reader/wizard/reference.py	2012-11-02 10:27:43 +0000
+++ stock_barcode_reader/wizard/reference.py	2013-03-06 10:58:19 +0000
@@ -19,10 +19,10 @@
 #
 #################################################################################
 
-from osv import osv,fields
-from tools.translate import _
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
 
-class stock_reference(osv.osv_memory):
+class stock_reference(orm.TransientModel):
 
     _name = "stock.reference"
     _description = 'Products Acquisition'
@@ -30,7 +30,7 @@
 #    _rec_name = 'reference'
 
     def _get_track_id(self, cr, uid, context=None):
-        if context == None:
+        if context is None:
             context = {}
         return context.get('active_id',False)
 
@@ -95,6 +95,4 @@
 
         return {'value': {'reference' : False, 'text' : text}}
 
-stock_reference()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'stock_inventory_sequence'
=== added file 'stock_inventory_sequence/__init__.py'
--- stock_inventory_sequence/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_inventory_sequence/__init__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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 inventory
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'stock_inventory_sequence/__openerp__.py'
--- stock_inventory_sequence/__openerp__.py	1970-01-01 00:00:00 +0000
+++ stock_inventory_sequence/__openerp__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+{
+    "name" : "Stock Inventory Sequence",
+    "version" : "1.0",
+    "author" : "Julius Network Solutions",
+    "description" : """
+
+Presentation:
+
+This module adds a sequence for generating automatically inventories name
+
+""",
+    "website" : "http://www.julius.fr",
+    "depends" : [
+        "stock",
+    ],
+    "category" : "Warehouse Management",
+    "demo" : [],
+    "data" : [
+        'inventory_sequence.xml',
+    ],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'stock_inventory_sequence/inventory.py'
--- stock_inventory_sequence/inventory.py	1970-01-01 00:00:00 +0000
+++ stock_inventory_sequence/inventory.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,31 @@
+ # -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+
+class stock_inventory(orm.Model):
+    _inherit = 'stock.inventory'
+    _defaults = {
+        'name': lambda x, y, z, c: x.pool.get('ir.sequence').next_by_code(y, z, 'stock.inventory') or '/'
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'stock_inventory_sequence/inventory_sequence.xml'
--- stock_inventory_sequence/inventory_sequence.xml	1970-01-01 00:00:00 +0000
+++ stock_inventory_sequence/inventory_sequence.xml	2013-03-06 10:58:19 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- Sequences for stock.inventory -->
+        <record id="seq_type_inventory_order" model="ir.sequence.type">
+            <field name="name">Inventory Order</field>
+            <field name="code">stock.inventory</field>
+        </record>
+
+        <record id="seq_sale_order" model="ir.sequence">
+            <field name="name">Inventory Order</field>
+            <field name="code">stock.inventory</field>
+            <field name="prefix">INV</field>
+            <field name="padding">3</field>
+        </record>
+
+    </data>
+</openerp>

=== modified file 'stock_move_packaging/__openerp__.py'
--- stock_move_packaging/__openerp__.py	2013-02-13 08:35:37 +0000
+++ stock_move_packaging/__openerp__.py	2013-03-06 10:58:19 +0000
@@ -33,18 +33,20 @@
 """,
     "website" : "http://www.julius.fr",
     "depends" : [
-                 "stock",
-                 "stock_tracking_extended",
-                 ],
-    "category" : "Customs/Stock",
-    "init_xml" : [],
-    "demo_xml" : [],
-    "images" : ['images/Move packaging.png'],
-    "update_xml" : [
-                    'stock_view.xml',
-                    'wizard/move_pack_view.xml',
+        "stock",
+        "stock_tracking_extended",
+    ],
+    "category" : "Warehouse Management",
+#    "images" : ['images/Move packaging.png'],
+    "demo" : [],
+    "data" : [
+        'stock_view.xml',
+        'wizard/move_pack_view.xml',
     ],
     'test': [],
     'installable': False,
     'active': False,
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== modified file 'stock_move_packaging/stock.py'
--- stock_move_packaging/stock.py	2012-03-07 12:56:37 +0000
+++ stock_move_packaging/stock.py	2013-03-06 10:58:19 +0000
@@ -19,10 +19,10 @@
 #
 #################################################################################
 
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
 
-class stock_tracking_history(osv.osv):
+class stock_tracking_history(orm.Model):
     
     _inherit = "stock.tracking.history"
     
@@ -30,7 +30,7 @@
         res = super(stock_tracking_history, self)._get_types(cr, uid, context)
         if not res:
             res = []
-        res = res + [('move','Move')]
+        res = res + [('move',_('Move'))]
         return res
     
     _columns = {
@@ -39,7 +39,5 @@
         'location_dest_id': fields.many2one('stock.location', 'Destination Location'),
 #        'move_ids': fields.one2many('stock.move', 'pack_history_id', 'Associated moves'),
     }
-    
-stock_tracking_history()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock_move_packaging/stock_view.xml'
--- stock_move_packaging/stock_view.xml	2012-03-07 12:56:37 +0000
+++ stock_move_packaging/stock_view.xml	2013-03-06 10:58:19 +0000
@@ -5,7 +5,6 @@
 		<record id="view_tracking_history_tree" model="ir.ui.view">
 			<field name="name">stock.tracking.history.tree</field>
 			<field name="model">stock.tracking.history</field>
-			<field name="type">tree</field>
 			<field name="inherit_id" ref="stock_tracking_extended.view_tracking_history_tree"/>
 			<field name="arch" type="xml">
 				<field name="type" position="after">
@@ -18,7 +17,6 @@
 		<record id="view_tracking_history_form" model="ir.ui.view">
 			<field name="name">stock.tracking.history.form</field>
 			<field name="model">stock.tracking.history</field>
-			<field name="type">form</field>
 			<field name="inherit_id" ref="stock_tracking_extended.view_tracking_history_form"/>
 			<field name="arch" type="xml">
 				<field name="type" position="after">
@@ -27,5 +25,6 @@
 				</field>
 			</field>
 		</record>
+
     </data>
 </openerp>

=== modified file 'stock_move_packaging/wizard/move_pack.py'
--- stock_move_packaging/wizard/move_pack.py	2012-03-20 18:24:57 +0000
+++ stock_move_packaging/wizard/move_pack.py	2013-03-06 10:58:19 +0000
@@ -19,11 +19,12 @@
 #
 #################################################################################
 
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT, DEFAULT_SERVER_DATE_FORMAT
 import time
 
-class stock_move_packaging(osv.osv_memory):
+class stock_move_packaging(orm.TransientModel):
 
     _name = "stock.move.packaging"
     
@@ -33,7 +34,7 @@
     }
     
     _defaults = {
-        'pack_id': lambda s,cr,uid,c: c.get('active_id',False),
+        'pack_id': lambda s,cr,uid,c: c.get('active_id') or False,
     }
     
     def move_pack(self, cr, uid, ids, context=None):
@@ -47,13 +48,21 @@
             context = {}
             
         context.update({'from_pack':True})
-        for obj in self.browse(cr, uid, ids):
+        for obj in self.browse(cr, uid, ids, context=context):
             pack = obj.pack_id
             if not pack or not obj.location_dest_id:
                 continue
+            """
+            This is related to the module stock_tracking_child
+            TODO: remove this from this method to be able to install it without stock_tracking_child
+            """
             if pack.parent_id:
                 raise osv.except_osv(_('Warning!'),_('You cannot move this pack because it\'s inside of an other pack: %s.') % (pack.parent_id.name))
             for child in pack.child_ids:
+                """
+                This is related to the module stock_tracking_state
+                TODO: remove this from this method to be able to install it without stock_tracking_state
+                """
                 if child.state != 'close':
                     raise osv.except_osv(_('Warning!'),_('You cannot move this pack because there is a none closed pack inside of it: %s.') % (child.name))
             current_type = pack.location_id.usage
@@ -66,7 +75,7 @@
                 pick_type = 'in'
             elif type == 'customer':
                 pick_type = 'out'
-            date = time.strftime('%Y-%m-%d %H:%M:%S'),
+            date = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
             pick_id = picking_obj.create(cr, uid, {
                     'type': pick_type,
                     'auto_picking': 'draft',
@@ -75,7 +84,7 @@
                     'invoice_state': 'none',
                     'date': date,
                     'state': 'done',
-                })
+                }, context=context)
                         
             child_packs = tracking_obj.hierarchy_ids(pack)
             for child_pack in child_packs:
@@ -84,7 +93,7 @@
                        'type': 'move',
                        'location_id': child_pack.location_id.id,
                        'location_dest_id': obj.location_dest_id.id,
-                   })
+                   }, context=context)
                 
                 for move in child_pack.current_move_ids:
                     defaults = {
@@ -96,10 +105,8 @@
                         'date_expected': date,
                     }
                     new_id = move_obj.copy(cr, uid, move.id, default=defaults, context=context)
-                    move_obj.write(cr, uid, [move.id], {'pack_history_id': hist_id, 'move_dest_id': new_id})
-                tracking_obj.write(cr, uid, [child_pack.id], {'location_id': obj.location_dest_id.id})
+                    move_obj.write(cr, uid, [move.id], {'pack_history_id': hist_id, 'move_dest_id': new_id}, context=context)
+                tracking_obj.write(cr, uid, [child_pack.id], {'location_id': obj.location_dest_id.id}, context=context)
         return {'type': 'ir.actions.act_window_close'}
-    
-stock_move_packaging()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'stock_move_packaging/wizard/move_pack_view.xml'
--- stock_move_packaging/wizard/move_pack_view.xml	2012-03-07 12:56:37 +0000
+++ stock_move_packaging/wizard/move_pack_view.xml	2013-03-06 10:58:19 +0000
@@ -5,7 +5,6 @@
 		<record id="view_move_pack" model="ir.ui.view">
 			<field name="name">Move Pack</field>
 			<field name="model">stock.move.packaging</field>
-			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Move Pack">
 					<group width="660" height="275">
@@ -34,7 +33,6 @@
 	    <record id="view_tracking_form_move_inherit" model="ir.ui.view">
 			<field name="name">stock.tracking.form.inherit</field>
 			<field name="model">stock.tracking</field>
-			<field name="type">form</field>
 			<field name="inherit_id" ref="stock_tracking_extended.view_tracking_form_inherit"/>
 			<field name="arch" type="xml">
 				<button name="set_close" position="after">

=== added directory 'stock_move_split_default'
=== added file 'stock_move_split_default/__init__.py'
--- stock_move_split_default/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_move_split_default/__init__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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 stock_tracking
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'stock_move_split_default/__openerp__.py'
--- stock_move_split_default/__openerp__.py	1970-01-01 00:00:00 +0000
+++ stock_move_split_default/__openerp__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+{
+    "name" : "Stock Tracking Split",
+    "version" : "1.0",
+    "author" : "Julius Network Solutions",
+    "description" : """
+
+Presentation:
+
+This module allows to define and identify package in parent or child
+
+""",
+    "website" : "http://www.julius.fr",
+    "depends" : [
+        "stock",
+    ],
+    "category" : "Warehouse Management",
+    "demo" : [],
+    "data" : [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'stock_move_split_default/stock_tracking.py'
--- stock_move_split_default/stock_tracking.py	1970-01-01 00:00:00 +0000
+++ stock_move_split_default/stock_tracking.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+
+class split_in_production_lot(orm.TransientModel):
+    _inherit = "stock.move.split"
+    _columns = {
+        'use_exist' : fields.boolean('Existing Lots', invisible=True),
+     }
+    _defaults = {
+        'use_exist': True,
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(split_in_production_lot, self).default_get(cr, uid, fields, context=context)
+        res.update({'use_exist': True})
+        return res
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'stock_product_category_tracked'
=== added file 'stock_product_category_tracked/__init__.py'
--- stock_product_category_tracked/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_product_category_tracked/__init__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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 product_category
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'stock_product_category_tracked/__openerp__.py'
--- stock_product_category_tracked/__openerp__.py	1970-01-01 00:00:00 +0000
+++ stock_product_category_tracked/__openerp__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+{
+    "name" : "Stock Product Category Tracked",
+    "version" : "1.0",
+    "author" : "Julius Network Solutions",
+    "description" : """
+
+Presentation:
+
+This module adds a field into the product category to define if this should be tracked or not.
+
+""",
+    "website" : "http://www.julius.fr",
+    "depends" : [
+        "stock",
+    ],
+    "category" : "Warehouse Management",
+    "demo" : [],
+    "data" : [
+        'product_category_view.xml',
+    ],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'stock_product_category_tracked/product_category.py'
--- stock_product_category_tracked/product_category.py	1970-01-01 00:00:00 +0000
+++ stock_product_category_tracked/product_category.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,51 @@
+ # -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+
+class product_category(orm.Model):
+    _inherit = 'product.category'
+    _columns = {
+        'track_incoming': fields.boolean('Track Incoming Lots',
+            help="Forces to specify a Serial Number for all moves "
+                "containing this product and coming from a Supplier Location"),
+        'track_outgoing': fields.boolean('Track Outgoing Lots',
+            help="Forces to specify a Serial Number for all moves containing "
+                "this product and going to a Customer Location"),
+    }
+
+class product_category(orm.Model):
+    
+    _inherit = 'product.product'
+    
+    def onchange_category(self, cr, uid, ids, category_id, context=None):
+        if category_id:
+            categ = self.pool.get('product.category').browse(cr, uid, category_id, context=context)
+            return {'value': {
+                'track_incoming': categ and categ.track_incoming or False,
+                'track_outgoing': categ and categ.track_outgoing or False,
+                }
+            }
+        return {}
+            
+    
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'stock_product_category_tracked/product_category_view.xml'
--- stock_product_category_tracked/product_category_view.xml	1970-01-01 00:00:00 +0000
+++ stock_product_category_tracked/product_category_view.xml	2013-03-06 10:58:19 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="product_category_tracked_form" model="ir.ui.view">
+            <field name="name">product.category.property.form.inherit</field>
+            <field name="model">product.category</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_category_form_view"/>
+            <field name="arch" type="xml">
+                <field name="type" position="after">
+                    <field name="track_incoming"/>
+                    <field name="track_outgoing"/>
+                    <newline/>
+                </field>
+            </field>
+        </record>
+
+        <record id="product_normal_onchange_category_form_view" model="ir.ui.view">
+            <field name="name">product.normal.on_change.category.form</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <field name="categ_id" position="attributes">
+                    <attribute name="on_change">onchange_category(categ_id,context)</attribute>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== modified file 'stock_tracking_add_move/__openerp__.py'
--- stock_tracking_add_move/__openerp__.py	2013-02-13 08:35:37 +0000
+++ stock_tracking_add_move/__openerp__.py	2013-03-06 10:58:19 +0000
@@ -38,11 +38,10 @@
          "stock_tracking_extended",
          "tr_barcode",
     ],
-    "category" : "Customs/Stock",
-    "init_xml" : [],
-    "demo_xml" : [],
-    "images" : ['images/Add move.png'],
-    "update_xml" : [
+    "category" : "Warehouse Management",
+#    "images" : ['images/Add move.png'],
+    "demo" : [],
+    "data" : [
         'wizard/add_move_view.xml',
         'stock_view.xml',
         "security/ir.model.access.csv",
@@ -51,3 +50,5 @@
     'installable': False,
     'active': False,
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock_tracking_add_move/stock.py'
--- stock_tracking_add_move/stock.py	2012-11-02 10:27:23 +0000
+++ stock_tracking_add_move/stock.py	2013-03-06 10:58:19 +0000
@@ -19,10 +19,10 @@
 #
 #################################################################################
 
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
 
-class stock_tracking(osv.osv):
+class stock_tracking(orm.Model):
 
     _inherit = 'stock.tracking'
 
@@ -165,9 +165,7 @@
             raise osv.except_osv(_('Warning!'),_('Barcode Not found!'))
         return {}
 
-stock_tracking()
-
-class stock_scan_to_validate(osv.osv):
+class stock_scan_to_validate(orm.Model):
 
     _name = 'stock.scan.to.validate'
     _columns = {
@@ -180,9 +178,7 @@
         ('tracking_barcode_unique', 'unique (tracking_id,barcode_id)', 'This barcode is already in the list to add or to remove !')
     ]
 
-stock_scan_to_validate()
-
-class stock_tracking_history(osv.osv):
+class stock_tracking_history(orm.Model):
 
     _inherit = "stock.tracking.history"
 
@@ -190,7 +186,7 @@
         res = super(stock_tracking_history, self)._get_types(cr, uid, context)
         if not res:
             res = []
-        res = res + [('pack_in','Add parent'),('pack_out','Unlink parent')]
+        res = res + [('pack_in',_('Add parent')),('pack_out',_('Unlink parent'))]
         return res
 
     _columns = {
@@ -198,6 +194,4 @@
         'parent_id': fields.many2one('stock.tracking', 'Parent pack'),
     }
 
-stock_tracking_history()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock_tracking_add_move/stock_view.xml'
--- stock_tracking_add_move/stock_view.xml	2012-03-07 12:56:37 +0000
+++ stock_tracking_add_move/stock_view.xml	2013-03-06 10:58:19 +0000
@@ -2,62 +2,59 @@
 <openerp>
     <data>
 
-		<record id="view_scan_to_validate_tree" model="ir.ui.view">
-			<field name="name">stock.scan.to.validate.tree</field>
-			<field name="model">stock.scan.to.validate</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="To validate">
-					<!--<field name="type"/>-->
-					<field name="barcode_id"/>
-				</tree>
-			</field>
-		</record>
-
-		<!--<record id="view_tracking_form_add_remove" model="ir.ui.view">
-			<field name="name">stock.tracking.form.add.remove</field>
-			<field name="model">stock.tracking</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="stock.view_tracking_form"/>
-			<field name="arch" type="xml">
-				<page string="Stock Moves" position="after">
-					<page string="To add" attrs="{'invisible':[('state', '=', 'close')]}">
-						<separator string="Objects to add into this pack" colspan="4"/>
-						<field name="to_add" nolabel="1" colspan="4"/>
-						<button name="add_validation" states="open" string="Confirm ADD" colspan="2" type="object" icon="gtk-ok"/>
-					</page>
-					<page string="To remove" attrs="{'invisible':[('state', '=', 'close')]}">
-						<separator string="Objects to remove from this pack" colspan="4"/>
-						<field name="to_remove" nolabel="1" colspan="4"/>
-						<button name="remove_validation" states="open" string="Confirm REMOVE" colspan="2" type="object" icon="gtk-ok"/>
-					</page>
-				</page>
-			</field>
-		</record>-->
-
-		<record id="view_tracking_history_tree" model="ir.ui.view">
-			<field name="name">stock.tracking.history.tree</field>
-			<field name="model">stock.tracking.history</field>
-			<field name="type">tree</field>
-			<field name="inherit_id" ref="stock_tracking_extended.view_tracking_history_tree"/>
-			<field name="arch" type="xml">
-				<field name="type" position="after">
-					<field name="parent_id"/>
-				</field>
-			</field>
-		</record>
-		
-		<record id="view_tracking_history_form" model="ir.ui.view">
-			<field name="name">stock.tracking.history.form</field>
-			<field name="model">stock.tracking.history</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="stock_tracking_extended.view_tracking_history_form"/>
-			<field name="arch" type="xml">
-				<field name="type" position="after">
-					<field name="parent_id"/>
-				</field>
-			</field>
-		</record>
+        <record id="view_scan_to_validate_tree" model="ir.ui.view">
+            <field name="name">stock.scan.to.validate.tree</field>
+            <field name="model">stock.scan.to.validate</field>
+            <field name="arch" type="xml">
+                <tree string="To validate">
+                    <!--<field name="type"/>-->
+                    <field name="barcode_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <!--<record id="view_tracking_form_add_remove" model="ir.ui.view">
+            <field name="name">stock.tracking.form.add.remove</field>
+            <field name="model">stock.tracking</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_tracking_form"/>
+            <field name="arch" type="xml">
+                <page string="Stock Moves" position="after">
+                    <page string="To add" attrs="{'invisible':[('state', '=', 'close')]}">
+                        <separator string="Objects to add into this pack" colspan="4"/>
+                        <field name="to_add" nolabel="1" colspan="4"/>
+                        <button name="add_validation" states="open" string="Confirm ADD" colspan="2" type="object" icon="gtk-ok"/>
+                    </page>
+                    <page string="To remove" attrs="{'invisible':[('state', '=', 'close')]}">
+                        <separator string="Objects to remove from this pack" colspan="4"/>
+                        <field name="to_remove" nolabel="1" colspan="4"/>
+                        <button name="remove_validation" states="open" string="Confirm REMOVE" colspan="2" type="object" icon="gtk-ok"/>
+                    </page>
+                </page>
+            </field>
+        </record>-->
+
+        <record id="view_tracking_history_tree" model="ir.ui.view">
+            <field name="name">stock.tracking.history.tree</field>
+            <field name="model">stock.tracking.history</field>
+            <field name="inherit_id" ref="stock_tracking_extended.view_tracking_history_tree"/>
+            <field name="arch" type="xml">
+                <field name="type" position="after">
+                    <field name="parent_id"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_tracking_history_form" model="ir.ui.view">
+            <field name="name">stock.tracking.history.form</field>
+            <field name="model">stock.tracking.history</field>
+            <field name="inherit_id" ref="stock_tracking_extended.view_tracking_history_form"/>
+            <field name="arch" type="xml">
+                <field name="type" position="after">
+                    <field name="parent_id"/>
+                </field>
+            </field>
+        </record>
 
     </data>
 </openerp>

=== modified file 'stock_tracking_add_move/wizard/add_move.py'
--- stock_tracking_add_move/wizard/add_move.py	2012-07-03 07:39:19 +0000
+++ stock_tracking_add_move/wizard/add_move.py	2013-03-06 10:58:19 +0000
@@ -19,10 +19,10 @@
 #
 #################################################################################
 
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
 
-class stock_packaging_move(osv.osv_memory):
+class stock_packaging_move(orm.TransientModel):
 
     _name = "stock.packaging.move"
     
@@ -73,7 +73,5 @@
             ''' Call for the removal function '''
             tracking_obj.remove_validation(cr, uid, [parent_id], barcode_ids, context=None) 
         return {'type': 'ir.actions.act_window_close'}    
-       
-stock_packaging_move()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'stock_tracking_add_move/wizard/add_move_view.xml'
--- stock_tracking_add_move/wizard/add_move_view.xml	2012-03-07 12:56:37 +0000
+++ stock_tracking_add_move/wizard/add_move_view.xml	2013-03-06 10:58:19 +0000
@@ -1,30 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-
-		<record id="view_pack_add_move" model="ir.ui.view">
-			<field name="name">Add object</field>
-			<field name="model">stock.packaging.move</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Add Move">
-					<group width="400" height="100">
-						<group colspan="4">
-							<field name="reference" colspan="2"/>
-							<field name="pack_id" colspan="2" invisible="1"/>
-							<newline/>
-							<separator string="Add Move" colspan="4"/>
-							<button icon='gtk-cancel' special="cancel"
-								string="Cancel" />
-							<button name="add_move" string="Add Move"
-								type="object" icon="gtk-ok"/>
-						</group>
-					</group>
-				</form>
-			</field>
-		</record>
-
-	    <record id="pack_add_move" model="ir.actions.act_window">
+    <data>
+
+        <record id="view_pack_add_move" model="ir.ui.view">
+            <field name="name">Add object</field>
+            <field name="model">stock.packaging.move</field>
+            <field name="arch" type="xml">
+                <form string="Add Move">
+                    <group width="400" height="100">
+                        <group colspan="4">
+                            <field name="reference" colspan="2"/>
+                            <field name="pack_id" colspan="2" invisible="1"/>
+                            <newline/>
+                            <separator string="Add Move" colspan="4"/>
+                            <button icon='gtk-cancel' special="cancel"
+                                string="Cancel" />
+                            <button name="add_move" string="Add Move"
+                                type="object" icon="gtk-ok"/>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="pack_add_move" model="ir.actions.act_window">
             <field name="name">Add object</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.packaging.move</field>
@@ -32,30 +31,29 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_pack_add_move"/>
             <field name="target">new</field>
-	    </record>
-	    
-		<record id="view_pack_remove_move" model="ir.ui.view">
-			<field name="name">Remove object</field>
-			<field name="model">stock.packaging.move</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Remove Move">
-					<group width="400" height="100">
-						<group colspan="4">
-							<field name="reference" colspan="2"/>
-							<newline/>
-							<separator string="Remove Move" colspan="4"/>
-							<button icon='gtk-cancel' special="cancel"
-								string="Cancel" />
-							<button name="remove_move" string="Remove Move"
-								type="object" icon="gtk-ok"/>
-						</group>
-					</group>
-				</form>
-			</field>
-		</record>
-
-	    <record id="pack_remove_move" model="ir.actions.act_window">
+        </record>
+
+        <record id="view_pack_remove_move" model="ir.ui.view">
+            <field name="name">Remove object</field>
+            <field name="model">stock.packaging.move</field>
+            <field name="arch" type="xml">
+                <form string="Remove Move">
+                    <group width="400" height="100">
+                        <group colspan="4">
+                            <field name="reference" colspan="2"/>
+                            <newline/>
+                            <separator string="Remove Move" colspan="4"/>
+                            <button icon='gtk-cancel' special="cancel"
+                                string="Cancel" />
+                            <button name="remove_move" string="Remove Move"
+                                type="object" icon="gtk-ok"/>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="pack_remove_move" model="ir.actions.act_window">
             <field name="name">Remove object</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.packaging.move</field>
@@ -63,20 +61,19 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_pack_remove_move"/>
             <field name="target">new</field>
-	    </record>
-	    
-	    <record id="view_tracking_form_inherit" model="ir.ui.view">
-			<field name="name">stock.tracking.form.inherit</field>
-			<field name="model">stock.tracking</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="stock_tracking_extended.view_tracking_form_inherit"/>
-			<field name="arch" type="xml">
-				<button name="reset_open" position="after">
-					<button name="%(pack_add_move)d" states="open" string="Add object" colspan="2" type="action" icon="gtk-ok"/>
-					<button name="%(pack_remove_move)d" states="open" string="Remove object" colspan="2" type="action" icon="gtk-ok"/>
-				</button>
-			</field>
-		</record>
-	    
+        </record>
+
+        <record id="view_tracking_form_inherit" model="ir.ui.view">
+            <field name="name">stock.tracking.form.inherit</field>
+            <field name="model">stock.tracking</field>
+            <field name="inherit_id" ref="stock_tracking_extended.view_tracking_form_inherit"/>
+            <field name="arch" type="xml">
+                <button name="reset_open" position="after">
+                    <button name="%(pack_add_move)d" states="open" string="Add object" colspan="2" type="action" icon="gtk-ok"/>
+                    <button name="%(pack_remove_move)d" states="open" string="Remove object" colspan="2" type="action" icon="gtk-ok"/>
+                </button>
+            </field>
+        </record>
+
     </data>
 </openerp>

=== added directory 'stock_tracking_add_remove'
=== added file 'stock_tracking_add_remove/__init__.py'
--- stock_tracking_add_remove/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove/__init__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Julius Network Solutions SARL <[e-mail]>
+#
+#    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 wizard
+import stock_tracking
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'stock_tracking_add_remove/__openerp__.py'
--- stock_tracking_add_remove/__openerp__.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove/__openerp__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+{
+    "name" : "Stock tracking add or remove object",
+    "version" : "1.0",
+    "author" : "Julius Network Solutions",
+    "description" : """Presentation:
+
+This module add a wizard to fill in packaging. It will also add a wizard to remove pieces from a pack
+This wizard is used to add or remove an object from a package.
+Adding to the historical movements and parent objects
+
+""",
+    "website" : "http://www.julius.fr",
+    "depends" : [
+         "stock",
+         "stock_tracking_extended",
+    ],
+    "category" : "Warehouse Management",
+    "images" : [],
+    "demo" : [],
+    "data" : [
+        "security/ir.model.access.csv",
+        "wizard/add_object_view.xml",
+        "wizard/remove_object_view.xml",
+        "data/type.xml",
+        'stock_view.xml',
+    ],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added directory 'stock_tracking_add_remove/data'
=== added file 'stock_tracking_add_remove/data/type.xml'
--- stock_tracking_add_remove/data/type.xml	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove/data/type.xml	2013-03-06 10:58:19 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+		<record id="add_type_product" model="stock.packaging.add.type">
+			<field name="code">product</field>
+			<field name="name">Product not tracked</field>
+		</record>
+
+		<record id="add_type_prodlots" model="stock.packaging.add.type">
+			<field name="code">prodlot</field>
+			<field name="name">Production lots</field>
+		</record>
+
+	</data>
+</openerp>

=== added directory 'stock_tracking_add_remove/security'
=== added file 'stock_tracking_add_remove/security/ir.model.access.csv'
--- stock_tracking_add_remove/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove/security/ir.model.access.csv	2013-03-06 10:58:19 +0000
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_stock_packaging_add_type_all,stock.packaging.add.type all,model_stock_packaging_add_type,,1,1,1,0

=== added file 'stock_tracking_add_remove/stock_tracking.py'
--- stock_tracking_add_remove/stock_tracking.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove/stock_tracking.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,278 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT, DEFAULT_SERVER_DATE_FORMAT
+import time
+
+class stock_tracking(orm.Model):
+    _inherit = 'stock.tracking'
+    
+    def _get_move_product_vals(self, cr, uid, pack_id, product, qty=False, move_data=False, context=None):
+        if context is None:
+            context = {}
+        pack = self.browse(cr, uid, pack_id, context=context)
+        vals = {
+            'name':  product.name,
+            'product_id': product.id,
+            'product_uom': product.uom_id.id,
+            'product_qty': qty,
+            'location_id': pack.location_id.id,
+            'location_dest_id': pack.location_id.id,
+            'tracking_id': pack.id,
+            'state': 'done',
+        }
+        return vals
+    
+    def _add_products(self, cr, uid, pack_id, product_ids, quantities=False, context=None):
+        """ Method to add products into a pack """
+        if context is None:
+            context = {}
+        move_obj = self.pool.get('stock.move')
+        prod_obj = self.pool.get('product.product')
+        pack_obj = self.pool.get('stock.tracking')
+        history_obj = self.pool.get('stock.tracking.history')
+        pack = pack_obj.browse(cr, uid, pack_id, context=context)
+        date = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        # Process #
+        for product in prod_obj.browse(cr, uid, product_ids, context=context):
+            # If quantity is not define , 1 by default #
+            qty = 1.0
+            if quantities and quantities[product.id]:
+                qty = quantities[product.id]
+            vals = {}
+            vals = self._get_move_product_vals(cr, uid, pack_id, product, qty, move_data=False, context=context)
+            if vals:
+                new_move_id = move_obj.create(cr, uid, vals, context=context)
+                hist_id = history_obj.create(cr, uid, {
+                       'tracking_id': pack.id,
+                       'type': 'add_product',
+                       'location_id': pack.location_id.id,
+                       'location_dest_id': pack.location_id.id,
+                       'product_id': product.id,
+                       'qty': qty,
+                       'date' : date,
+                    }, context=context)
+        self.get_products(cr, uid, [pack.id], context=context)
+        return True
+    
+    def _get_move_prodlot_vals(self, cr, uid, pack_id, prodlot_data, qty=False, move_data=False, context=None):
+        if context is None:
+            context = {}
+        pack = self.browse(cr, uid, pack_id, context=context)
+        vals = {
+            'name': move_data.name if move_data else prodlot_data.name,
+            'state': 'done',
+            'product_id': move_data and move_data.prodlot_id.product_id.id or prodlot_data.product_id.id,
+            'product_uom': move_data and move_data.product_uom.id or prodlot_data.product_id.uom_id.id,
+            'prodlot_id': move_data and move_data.prodlot_id.id or prodlot_data.id,
+            'location_id': move_data and move_data.location_dest_id.id or pack.location_id.id,
+            'location_dest_id': pack.location_id.id,
+            'tracking_id': pack.id,
+            'product_qty': qty,
+        }
+        return vals
+    
+    def _add_prodlots(self, cr, uid, pack_id, prodlot_ids, quantities=False, context=None):
+        """ Method to add prodlots into a pack """
+        if context is None:
+            context = {}
+        move_obj = self.pool.get('stock.move')
+        prodlot_obj = self.pool.get('stock.production.lot')
+        pack_obj = self.pool.get('stock.tracking')
+        history_obj = self.pool.get('stock.tracking.history')
+        pack = pack_obj.browse(cr, uid, pack_id, context=context)
+        date = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        modified = False
+        for prodlot_data in prodlot_obj.browse(cr, uid, prodlot_ids, context=context):
+            if quantities and quantities[prodlot_data.id]:
+                qty = quantities[prodlot_data.id]
+            move_ids = move_obj.search(cr, uid, [
+                            ('state', '=', 'done'),
+                            ('prodlot_id', '=', prodlot_data.id),
+                        ], order='date desc', limit=1, context=context)
+            vals = {}
+            if move_ids:
+                move_data = move_obj.browse(cr, uid, move_ids[0], context=context)
+                vals = self._get_move_prodlot_vals(cr, uid, pack_id,
+                            prodlot_data, qty, move_data=move_data, context=context)
+            else:
+                vals = self._get_move_prodlot_vals(cr, uid, pack_id,
+                            prodlot_data, qty, move_data=False, context=context)
+            if vals:
+                new_move_id = move_obj.create(cr, uid, vals, context=context)
+                hist_id = history_obj.create(cr, uid, {
+                       'tracking_id': pack.id,
+                       'type': 'add_prodlot',
+                       'location_id': pack.location_id.id,
+                       'location_dest_id': pack.location_id.id,
+                       'prodlot_id': prodlot_data.id,
+                       'qty': qty,
+                       'date' : date,
+                    }, context=context)
+        self.get_products(cr, uid, [pack_id], context=context)
+        self.get_serials(cr, uid, [pack_id], context=context)
+        return True
+
+    
+    def _remove_products(self, cr, uid, pack_id, products, context=None):
+        """ Method to remove products from a pack """
+        # Initialization #
+        move_obj = self.pool.get('stock.move')
+        history_obj = self.pool.get('stock.tracking.history')
+        prod_obj = self.pool.get('product.product')
+        date = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        if context is None:
+            context = {}
+
+        pack = self.browse(cr, uid, pack_id, context=context)
+        for product in products:
+            if not product.move_id:
+                continue
+            move_data = product.move_id
+            move_qty = move_data.product_qty
+            remove_qty = product.quantity
+            if not remove_qty:
+                continue
+            
+            #if the quantity to remove is bigger than the move quantity we only remove the move value
+            if move_qty < remove_qty:
+                remove_qty = move_qty
+
+            # Process #
+            hist_id = history_obj.create(cr, uid, {
+                   'tracking_id': pack.id,
+                   'type': 'remove_product',
+                   'location_id': pack.location_id.id,
+                   'location_dest_id': pack.location_id.id,
+                   'product_id': product.product_id.id,
+                   'qty': remove_qty,
+                   'date' : date,
+                }, context=context)
+            if remove_qty != move_qty:
+                defaults = {
+                    'location_id': pack.location_id.id,
+                    'location_dest_id': pack.location_id.id,
+                    'date': date,
+                    'date_expected': date,
+                    'tracking_id': pack.id,
+                    'product_id': product.product_id.id,
+                    'product_qty': move_qty - remove_qty,
+                    'state': 'done',
+                }
+                new_id = move_obj.copy(cr, uid, move_data.id, default=defaults, context=context)
+            defaults = {
+                'location_id': pack.location_id.id,
+                'location_dest_id': pack.location_id.id,
+                'date': date,
+                'date_expected': date,
+                'tracking_id': False,
+                'product_qty': remove_qty,
+                'state': 'done',
+            }
+            move_obj.copy(cr, uid, move_data.id, default=defaults, context=context)
+            move_obj.write(cr, uid, [move_data.id], {'pack_history_id': hist_id}, context=context)
+        self.get_products(cr, uid, [pack.id], context=context)
+        return True
+
+    def _remove_prodlot(self, cr, uid, pack_id, prodlots, context=None):
+        """ Method to remove prodlots from a pack """
+        # Initialization #
+        move_obj = self.pool.get('stock.move')
+        history_obj = self.pool.get('stock.tracking.history')
+        prodlot_obj = self.pool.get('stock.production.lot')
+        product_obj = self.pool.get('product.product')
+        date = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        if context is None:
+            context = {}
+            
+        pack = self.browse(cr, uid, pack_id, context=context)
+        for prodlot in prodlots:
+            if not prodlot.move_id:
+                continue
+            move_data = prodlot.move_id
+            move_qty = move_data.product_qty
+            remove_qty = prodlot.quantity
+            if not remove_qty:
+                continue
+            
+            #if the quantity to remove is bigger than the move quantity we only remove the move value
+            if move_qty < remove_qty:
+                remove_qty = move_qty
+        
+            # Process #
+            hist_id = history_obj.create(cr, uid, {
+               'tracking_id': pack.id,
+               'type': 'remove_prodlot',
+               'location_id': pack.location_id.id,
+               'location_dest_id': pack.location_id.id,
+               'prodlot_id': prodlot.prodlot_id.id,
+               'qty': remove_qty,
+               'date' : date,
+            }, context=context)
+            if remove_qty != move_qty:
+                defaults = {
+                    'location_id': pack.location_id.id,
+                    'location_dest_id': pack.location_id.id,
+                    'date': date,
+                    'date_expected': date,
+                    'tracking_id': pack.id,
+                    'product_id': prodlot.prodlot_id.product_id.id,
+                    'product_qty': move_qty - remove_qty,
+                    'state': 'done',
+                }
+                new_id = move_obj.copy(cr, uid, move_data.id, default=defaults, context=context)
+            defaults = {
+                'location_id': pack.location_id.id,
+                'location_dest_id': pack.location_id.id,
+                'date': date,
+                'date_expected': date,
+                'tracking_id': False,
+                'product_qty': remove_qty,
+                'state': 'done',
+            }
+            move_obj.copy(cr, uid, move_data.id, default=defaults, context=context)
+            move_obj.write(cr, uid, [move_data.id], {'pack_history_id': hist_id}, context=context)
+        self.get_serials(cr, uid, [pack.id], context=context)
+        self.get_products(cr, uid, [pack.id], context=context)
+        return True
+
+class stock_tracking_history(osv.osv):
+    
+    _inherit = "stock.tracking.history"
+    
+    def _get_types(self, cr, uid, context={}):
+        res = super(stock_tracking_history, self)._get_types(cr, uid, context)
+        if not res:
+            res = []
+        res = res + [('add_product',_('Add product')),('remove_product',_('Remove product')),
+                     ('add_prodlot',_('Add prodlot')),('remove_prodlot',_('Remove prodlot'))]
+        return res
+    
+    _columns = {
+        'type': fields.selection(_get_types, 'Type'),
+        'product_id': fields.many2one('product.product', 'Product'),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Production lot'),
+        'qty': fields.float('Quantity'),
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'stock_tracking_add_remove/stock_view.xml'
--- stock_tracking_add_remove/stock_view.xml	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove/stock_view.xml	2013-03-06 10:58:19 +0000
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_tracking_form_add_product" model="ir.ui.view">
+            <field name="name">stock.tracking.form.inherit</field>
+            <field name="model">stock.tracking</field>
+            <field name="inherit_id" ref="stock_tracking_extended.view_tracking_extended_form"/>
+            <field name="arch" type="xml">
+                <div name="product_buttons" position="inside">
+                    <button name="%(stock_tracking_add_remove.action_stock_packaging_add)d" string="Add products" colspan="2" type="action"  context="{'type_selection':'product'}"/>
+                    <button name="%(stock_tracking_add_remove.action_stock_packaging_remove)d" colspan="1" string="Remove product" type="action"  context="{'type_selection':'product'}"/>
+                </div>
+                <div name="prodlot_buttons" position="inside">
+                    <button name="%(stock_tracking_add_remove.action_stock_packaging_add)d" string="Add production lot" colspan="2" type="action" context="{'type_selection':'prodlot'}"/>
+                    <button name="%(stock_tracking_add_remove.action_stock_packaging_remove)d" colspan="1" string="Remove production lot" type="action" context="{'type_selection':'prodlot'}"/>
+                </div>
+            </field>
+        </record>
+
+
+        <record id="view_tracking_history_tree_inherit" model="ir.ui.view">
+            <field name="name">stock.tracking.history.tree</field>
+            <field name="model">stock.tracking.history</field>
+            <field name="inherit_id" ref="stock_tracking_extended.view_tracking_history_tree"/>
+            <field name="arch" type="xml">
+                <tree string="History">
+                    <field name="qty"/>
+                </tree>
+            </field>
+        </record>
+
+
+        <record id="view_tracking_history_form_inherit" model="ir.ui.view">
+            <field name="name">stock.tracking.history.form</field>
+            <field name="model">stock.tracking.history</field>
+            <field name="inherit_id" ref="stock_tracking_extended.view_tracking_history_form"/>
+            <field name="arch" type="xml">
+                <form string="History">
+                    <field name="product_id" attrs="{'invisible': [('type','!=','add_product'),('type','!=','remove_product')]}"/>
+                    <field name="prodlot_id" attrs="{'invisible': [('type','!=','add_prodlot'),('type','!=','remove_prodlot')]}"/>
+                    <field name="qty"/>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'stock_tracking_add_remove/wizard'
=== added file 'stock_tracking_add_remove/wizard/__init__.py'
--- stock_tracking_add_remove/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove/wizard/__init__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Julius Network Solutions SARL <[e-mail]>
+#
+#    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 add_object
+import remove_object
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'stock_tracking_add_remove/wizard/add_object.py'
--- stock_tracking_add_remove/wizard/add_object.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove/wizard/add_object.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,132 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+
+class stock_packaging_add_type(orm.Model):
+    _name = 'stock.packaging.add.type'
+    
+    _columns = {
+        'code': fields.char('Code', size=64),
+        'name': fields.char('Name', size=64),
+    }
+
+class stock_packaging_add(orm.TransientModel):
+
+    _name = "stock.packaging.add"
+    _description = "Add objects to a pack"
+    
+    _columns = {
+        'type_id': fields.many2one('stock.packaging.add.type', 'Type', required=True),
+        'type': fields.char('Type', size=64),
+        'pack_id': fields.many2one('stock.tracking', 'Pack', required=True),
+        'product_ids': fields.one2many('stock.packaging.add.line', 'parent_id', 'Lines'),
+        'prodlot_ids': fields.one2many('stock.packaging.add.line', 'parent_id', 'Lines'),
+    }
+
+    def _get_type_id(self, cr, uid, context):
+        if context==None:
+            context={}
+        type = context.get('type_selection', 'product')
+        type_obj = self.pool.get('stock.packaging.add.type')
+        default_type = type_obj.search(cr, uid, [('code', '=', type)], limit=1, context=context)
+        if not default_type:
+            default_type = type_obj.search(cr, uid, [], limit=1, context=context)
+        return default_type and default_type[0] or False
+
+    def _get_type(self, cr, uid, context):
+        if context==None:
+            context={}
+        type = context.get('type_selection', 'product')
+        res_type = ''
+        type_obj = self.pool.get('stock.packaging.add.type')
+        default_type = type_obj.search(cr, uid, [('code', '=', type)], limit=1, context=context)
+        if not default_type:
+            default_type = type_obj.search(cr, uid, [], limit=1, context=context)
+        if default_type and default_type[0]:
+            read_type = type_obj.read(cr, uid, default_type[0], ['code'], context=context)
+            if read_type['code']:
+                res_type = read_type['code']
+        return res_type or ''
+
+    _defaults = {
+        'pack_id': lambda self, cr, uid, context: context.get('active_id', False),
+        'type_id': lambda self, cr, uid, context: self._get_type_id(cr, uid, context),
+        'type': lambda self, cr, uid, context: self._get_type(cr, uid, context),
+    }
+    
+    def onchange_type_id(self, cr, uid, ids, type_id):
+        res = {'value': {'type': ''}}
+        if type_id:
+            type_obj = self.pool.get('stock.packaging.add.type')
+            type = type_obj.read(cr, uid, type_id, ['code'])
+            if type['code']:
+                res = {'value': {'type': type['code']}}
+        return res
+    
+    def add_object(self, cr, uid, ids, context=None):
+        # Initialization #
+        if context is None:
+            context = {}
+        tracking_obj = self.pool.get('stock.tracking')
+        # Process #
+        for current in self.browse(cr, uid, ids, context=context):
+            pack_id = current.pack_id.id
+            code_type = current.type_id.code
+            # Creation of an empty list for the product, and empty dictionary for the quantity"
+            quantities = {}
+            if code_type == 'product':
+                product_ids = []
+                for line_data in current.product_ids:
+                    # For each product added, we appends at the product_ids list the quantity added #
+                    product_ids.append(line_data.product_id.id)
+                    quantities[line_data.product_id.id]=line_data.quantity
+                # call functions add product with argument pack_id , products_ids and quantities #
+                tracking_obj._add_products(cr, uid, pack_id, product_ids, quantities, context=context)
+            elif code_type == 'prodlot':
+                prodlot_ids = []
+                for line_data in current.prodlot_ids:
+                    # For each product added, we appends at the prodlot_ids list the quantity added #
+                    prodlot_ids.append(line_data.prodlot_id.id)
+                    quantities[line_data.prodlot_id.id] = line_data.quantity
+                tracking_obj._add_prodlots(cr, uid, pack_id, prodlot_ids, quantities, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+       
+class stock_packaging_add_line(orm.TransientModel):
+
+    _name = "stock.packaging.add.line"
+    _description = "Add object to a pack"
+    
+    _columns = {
+        'product_id': fields.many2one('product.product', 'Product', domain="[('type', '!=', 'service'),('track_outgoing', '=', False)]"),
+        'parent_id': fields.many2one('stock.packaging.add', 'Parent'),
+        'location_id': fields.many2one('stock.location', 'Location'),
+        'quantity': fields.float('Quantity', required=True),
+#        'prodlot_id': fields.many2one('stock.production.lot', 'Production lot', domain="[('tracking_id','=',False)]"),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Production lot'),
+    }
+    
+    _defaults = {
+        'quantity': 1.0,
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'stock_tracking_add_remove/wizard/add_object_view.xml'
--- stock_tracking_add_remove/wizard/add_object_view.xml	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove/wizard/add_object_view.xml	2013-03-06 10:58:19 +0000
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- Add Product -->
+
+        <record id="view_stock_packaging_add_wizard" model="ir.ui.view">
+            <field name="name">Stock packaging add</field>
+            <field name="model">stock.packaging.add</field>
+            <field name="arch" type="xml">
+                <form string="Add object" version="7.0">
+                    <group colspan="4" col="4">
+                        <field name="pack_id" invisible="True"/>
+                        <field name="type_id" colspan="4" on_change="onchange_type_id(type_id)" widget="selection" invisible="True"/>
+                        <field name="type" invisible="True"/>
+                        <newline/>
+                        <group name="products" colspan="4" col="4" attrs="{'invisible':[('type','!=','product')]}">
+                            <separator string="Products" colspan="4"/>
+                            <field name="product_ids" colspan="4" nolabel="1">
+                                <tree string="Add products" editable="top">
+                                    <field name="product_id" required="True"/>
+                                    <field name="location_id"/>
+                                    <field name="quantity" required="True"/>
+                                </tree>
+                            </field>
+                        </group>
+                        <group name="prodlots" colspan="4" col="4" attrs="{'invisible':[('type','!=','prodlot')]}">
+                            <separator string="Production lots" colspan="4"/>
+                            <field name="prodlot_ids" colspan="4" nolabel="1">
+                                <tree string="Add production lots" editable="top">
+                                    <field name="prodlot_id" required="True"/>
+                                    <field name="quantity" required="True"/>
+                                </tree>
+                            </field>
+                        </group>
+                    </group>
+                    <footer>
+                        <button name="add_object" string="Add to the pack" type="object" class="oe_highlight"/>
+                         or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_stock_packaging_add" model="ir.actions.act_window">
+            <field name="name">Stock packaging add</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.packaging.add</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <record id="view_stock_packaging_add_line_wizard" model="ir.ui.view">
+            <field name="name">Stock packaging add line</field>
+            <field name="model">stock.packaging.add.line</field>
+            <field name="arch" type="xml">
+                <form string="Add line">
+                    <field name="parent_id" invisible="True"/>
+                    <field name="product_id"/>
+                    <field name="prodlot_id"/>
+                    <field name="location_id"/>
+                    <field name="quantity" required="True"/>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== added file 'stock_tracking_add_remove/wizard/remove_object.py'
--- stock_tracking_add_remove/wizard/remove_object.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove/wizard/remove_object.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,227 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+import time
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT, DEFAULT_SERVER_DATE_FORMAT
+            
+class stock_packaging_remove(orm.TransientModel):
+    _name = "stock.packaging.remove"
+    
+    _columns = {        
+        'type_id': fields.many2one('stock.packaging.add.type', 'Type', required=True),
+        'type': fields.char('Type', size=64),
+        'pack_id': fields.many2one('stock.tracking', 'Pack'),
+        'product_ids': fields.one2many('stock.packaging.remove.line', 'parent_id', 'Lines', domain=[('product_id', '!=', False)]),
+        'prodlot_ids': fields.one2many('stock.packaging.remove.line', 'parent_id', 'Lines', domain=[('prodlot_id', '!=', False)]),
+    }
+    
+    def _get_type_id(self, cr, uid, context):
+        if context is None:
+            context = {}
+        type = context.get('type_selection', 'product')
+        type_obj = self.pool.get('stock.packaging.add.type')
+        default_type = type_obj.search(cr, uid, [('code', '=', type)], limit=1, context=context)
+        if not default_type:
+            default_type = type_obj.search(cr, uid, [], limit=1, context=context)
+        return default_type and default_type[0] or False
+    
+    def _get_type(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        type = context.get('type_selection', 'product')
+        res_type = ''
+        type_obj = self.pool.get('stock.packaging.add.type')
+        default_type = type_obj.search(cr, uid, [('code', '=', type)], limit=1, context=context)
+        if not default_type:
+            default_type = type_obj.search(cr, uid, [], limit=1, context=context)
+        if default_type and default_type[0]:
+            read_type = type_obj.read(cr, uid, default_type[0], ['code'], context=context)
+            if read_type['code']:
+                res_type = read_type['code']
+        return res_type or ''
+    
+    _defaults = {
+        'pack_id': lambda self, cr, uid, context: context.get('active_id', False),
+        'type_id': lambda self, cr, uid, context: self._get_type_id(cr, uid, context),
+        'type': lambda self, cr, uid, context: self._get_type(cr, uid, context),
+    }
+    
+    def onchange_type_id(self, cr, uid, ids, type_id, pack_id):
+        product_ids = []
+        prodlot_ids = []
+        domain_product_id = []
+        domain_prodlot_id = []
+        res = {'value': {'type': ''}}
+        code_type = 'product'
+        if type_id:
+            type_obj = self.pool.get('stock.packaging.add.type')
+            type = type_obj.read(cr, uid, type_id, ['code'])
+            if type['code']:
+                code_type = type['code']
+                res = {'value': {'type': type['code']}}
+        return res
+    
+    def remove_object(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        tracking_obj = self.pool.get('stock.tracking')    
+        for current in self.browse(cr, uid, ids, context=context):
+            code_type = current.type_id.code
+            pack_id = current.pack_id.id
+            if code_type == 'product':
+                product_ids = current.product_ids
+                tracking_obj._remove_products(cr, uid, pack_id, product_ids, context=context)
+            elif code_type == 'prodlot':
+                prodlot_ids = current.prodlot_ids
+                tracking_obj._remove_prodlot(cr, uid, pack_id, prodlot_ids, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+    """
+        DO NOT DELETE THIS: maybe put this part to an other module.
+        This is getting automatically the products or prodlots found in the pack with the related quantities.
+    """
+#    def _line_data(self, cr, uid, move):
+#        data = {
+#            'product_id' : move.product_id and move.product_id.id or False,
+#            'quantity' : move.product_qty or 0,
+#            'move_id': move.id,
+#            'prodlot_id': move.prodlot_id and move.prodlot_id.id or False,
+#        }
+#        return data
+#
+#    def default_get(self, cr, uid, fields, context=None):
+#        if context is None: context = {}
+#        code_type = context.get('type_selection') or False
+#        res = super(stock_packaging_remove, self).default_get(cr, uid, fields, context=context)
+#        product_ids = []
+#        prodlot_ids = []
+#        pack_id = context.get('active_id')
+#        move_ids = context.get('active_ids', [])
+#        pack_obj = self.pool.get('stock.tracking')
+#        move_obj = self.pool.get('stock.move')
+#        if not pack_id:
+#            return res
+#        if 'product_ids' in fields and code_type == 'product':
+#            pack = pack_obj.browse(cr, uid, pack_id, context=context)
+#            move_ids = pack.current_move_ids
+#            product = [self._line_data(cr, uid, m) for m in move_ids if not m.prodlot_id]
+#            res.update(product_ids=product)
+#        if 'prodlot_ids' in fields and code_type == 'prodlot':
+#            pack = pack_obj.browse(cr, uid, pack_id, context=context)
+#            move_ids = pack.current_move_ids
+#            prodlot = [self._line_data(cr, uid, m) for m in move_ids if m.prodlot_id]
+#            res.update(prodlot_ids=prodlot)
+#        return res
+
+class stock_packaging_remove_line(orm.TransientModel):
+
+    _name = "stock.packaging.remove.line"
+    _description = "Remove object to a pack"
+    
+    _columns = {
+        'parent_id': fields.many2one('stock.packaging.remove', 'Parent'),
+        'pack_id': fields.many2one('stock.tracking', 'Pack'),
+        'product_id': fields.many2one('product.product', 'Product'),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot'),
+        'move_id': fields.many2one('stock.move', 'Move'),
+        'quantity': fields.float('Quantity'),
+    }
+    
+    def onchange_pack_id(self, cr, uid, ids, pack_id, context=None):
+        if context is None:
+            context = {}
+        res = {}
+        product_ids = []
+        prodlot_ids = []
+        domain_product_id = []
+        domain_prodlot_id = []
+        code_type = context.get('code_type') or 'product'
+        if pack_id:
+            move_ids = self.pool.get('stock.tracking').browse(cr, uid, pack_id, context=context).current_move_ids
+            for move_id in move_ids:
+                if code_type == 'product' and (move_id.product_id.id not in product_ids) and not move_id.prodlot_id:
+                    product_ids.append(move_id.product_id.id)  
+            for move_id in move_ids:
+                if code_type == 'prodlot' and move_id.prodlot_id.id not in prodlot_ids:
+                    prodlot_ids.append(move_id.prodlot_id.id)
+        if code_type == 'product':
+            var = ('id', 'in', tuple(product_ids))
+            domain_product_id.append(var)
+            res.update({
+                'domain': {
+                    'product_id': str(domain_product_id),
+                }
+            })
+        elif code_type == 'prodlot':
+            var = ('id', 'in', tuple(prodlot_ids))
+            domain_prodlot_id.append(var)
+            res.update({
+                'domain': {
+                    'prodlot_id': str(domain_prodlot_id),
+                }
+            })
+        return res
+    
+    def onchange_product_id(self, cr, uid, ids, product_id, pack_id, context=None):
+        if context is None:
+            context = {}
+        value = {}
+        if pack_id and product_id:
+            tracking_obj = self.pool.get('stock.tracking')
+            move_obj = self.pool.get('stock.move')
+            current_moves = tracking_obj.browse(cr, uid, pack_id, context=context).current_move_ids
+            current_moves_ids = [x.id for x in current_moves]
+            move_ids = move_obj.search(cr, uid, [
+                    ('id', 'in', current_moves_ids),
+                    ('product_id', '=', product_id),
+                    ('prodlot_id', '=', False)
+                ], limit=1, context=context)
+            if move_ids:
+                move = move_obj.read(cr, uid, move_ids[0], ['product_qty'], context=context)
+                value = {'quantity': move['product_qty'], 'move_id': move_ids[0]}
+        return {'value': value}
+    
+    def onchange_prodlot_id(self, cr, uid, ids, prodlot_id, pack_id, context=None):
+        if context is None:
+            context = {}
+        value = {}
+        if pack_id and prodlot_id:
+            tracking_obj = self.pool.get('stock.tracking')
+            move_obj = self.pool.get('stock.move')
+            current_moves = tracking_obj.browse(cr, uid, pack_id, context=context).current_move_ids
+            current_moves_ids = [x.id for x in current_moves]
+            move_ids = move_obj.search(cr, uid, [
+                    ('id', 'in', current_moves_ids),
+                    ('prodlot_id', '=', prodlot_id),
+                ], limit=1, context=context)
+            if move_ids:
+                move = move_obj.read(cr, uid, move_ids[0], ['product_qty'], context=context)
+                value = {'quantity': move['product_qty'], 'move_id': move_ids[0]}
+        return {'value': value}
+    
+    _defaults = {
+        'quantity': 1.0,
+        'pack_id': lambda self, cr, uid, context: context.get('active_id', False),
+    }
+    
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'stock_tracking_add_remove/wizard/remove_object_view.xml'
--- stock_tracking_add_remove/wizard/remove_object_view.xml	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove/wizard/remove_object_view.xml	2013-03-06 10:58:19 +0000
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Remove Object -->
+        <record id="view_stock_packaging_remove_wizard" model="ir.ui.view">
+            <field name="name">Stock packaging remove</field>
+            <field name="model">stock.packaging.remove</field>
+            <field name="arch" type="xml">
+                <form string="Remove object" version="7.0">
+                    <group colspan="4" col="4">
+                        <field name="type_id" colspan="1" on_change="onchange_type_id(type_id, pack_id)" widget="selection" invisible="1"/>
+                        <field name="pack_id" invisible="1"/>
+                        <field name="type" invisible="1"/>
+                    </group>
+                    <group colspan="4" col="4">
+                        <group name="products" colspan="4" col="4">
+                            <field name="product_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type','!=','product')]}" context="{'active_id':pack_id, 'code_type': type}">
+                                <tree editable="top">
+                                    <field name="pack_id" invisible="1" on_change="onchange_pack_id(pack_id, context)"/>
+                                    <field name="product_id" on_change="onchange_product_id(product_id, pack_id, context)" required="1"/>
+                                    <field name="quantity"/>
+                                    <field name="move_id" invisible="1"/>
+                                </tree>
+                            </field>
+                            <field name="prodlot_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type','!=','prodlot')]}" context="{'active_id':pack_id, 'code_type': type}">
+                                <tree editable="top">
+                                    <field name="pack_id" invisible="1" on_change="onchange_pack_id(pack_id, context)"/>
+                                    <field name="prodlot_id" on_change="onchange_prodlot_id(prodlot_id, pack_id, context)" required="1"/>
+                                    <field name="quantity"/>
+                                    <field name="move_id" invisible="1"/>
+                                </tree>
+                            </field>
+                        </group>
+                    </group>
+                    <footer>
+                        <button name="remove_object" string="Remove Object" type="object" class="oe_highlight"/>
+                         or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_stock_packaging_remove" model="ir.actions.act_window">
+            <field name="name">Stock packaging remove</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.packaging.remove</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'stock_tracking_add_remove_pack'
=== added file 'stock_tracking_add_remove_pack/__init__.py'
--- stock_tracking_add_remove_pack/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove_pack/__init__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Julius Network Solutions SARL <[e-mail]>
+#
+#    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 wizard
+import stock_tracking
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'stock_tracking_add_remove_pack/__openerp__.py'
--- stock_tracking_add_remove_pack/__openerp__.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove_pack/__openerp__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+{
+    "name" : "Stock tracking add packs",
+    "version" : "1.0",
+    "author" : "Julius Network Solutions",
+    "description" : """Presentation:
+
+This module add a wizard to fill in packaging.
+This wizard is used to add or remove an object from a package.
+Adding to the historical movements and parent objects
+
+""",
+    "website" : "http://www.julius.fr",
+    "depends" : [
+         "stock_tracking_extended",
+         "stock_tracking_child",
+         "stock_tracking_add_remove",
+    ],
+    "category" : "Warehouse Management",
+    "images" : [],
+    "demo" : [],
+    "data" : [
+        "wizard/add_pack_view.xml",
+        "wizard/remove_pack_view.xml",
+        "data/type.xml",
+        'stock_view.xml',
+    ],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'stock_tracking_add_remove_pack/data'
=== added file 'stock_tracking_add_remove_pack/data/type.xml'
--- stock_tracking_add_remove_pack/data/type.xml	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove_pack/data/type.xml	2013-03-06 10:58:19 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+		<record id="add_type_pack" model="stock.packaging.add.type">
+			<field name="code">pack</field>
+			<field name="name">Packs</field>
+		</record>
+
+	</data>
+</openerp>

=== added directory 'stock_tracking_add_remove_pack/security'
=== added file 'stock_tracking_add_remove_pack/stock_tracking.py'
--- stock_tracking_add_remove_pack/stock_tracking.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove_pack/stock_tracking.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT, DEFAULT_SERVER_DATE_FORMAT
+import time
+
+class stock_tracking(orm.Model):
+    _inherit = 'stock.tracking'
+    
+    def _add_pack(self, cr, uid, pack_id, child_ids, context=None):
+        if context is None:
+            context = {}
+        date = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        history_obj = self.pool.get('stock.tracking.history')
+        pack = self.browse(cr, uid, pack_id, context=context)
+        child = self.browse(cr, uid, child_ids, context=context)[0]
+        hist_id = history_obj.create(cr, uid, {
+           'tracking_id': pack.id,
+           'type': 'add_pack',
+           'location_id': pack.location_id.id,
+           'location_dest_id': pack.location_id.id,
+           'child_pack_id': child.id,
+           'qty': 1.0,
+           'date' : date,
+        }, context=context)
+        self.write(cr, uid, child_ids, {'parent_id': pack_id}, context=context)
+        self.get_products(cr, uid, [pack_id], context=context)
+        self.get_serials(cr, uid, [pack_id], context=context)
+        return True
+    
+    def _remove_pack(self, cr, uid, pack_id, child_ids, context=None):
+        if context is None:
+            context = {}
+        history_obj = self.pool.get('stock.tracking.history')  
+        pack = self.browse(cr, uid, pack_id, context=context)
+        child = self.browse(cr, uid, child_ids, context=context)[0]
+        hist_id = history_obj.create(cr, uid, {
+           'tracking_id': pack.id,
+           'type': 'remove_pack',
+           'location_id': pack.location_id.id,
+           'location_dest_id': pack.location_id.id,
+           'child_pack_id': child.id,
+           'qty': 1.0,
+           'date' : date,
+        }, context=context)
+        self.write(cr, uid, child_ids, {'parent_id': False}, context=context)
+        self.get_products(cr, uid, [pack_id], context=context)
+        self.get_serials(cr, uid, [pack_id], context=context)
+        return True
+
+class stock_tracking_history(osv.osv):
+    
+    _inherit = "stock.tracking.history"
+    
+    _columns = {
+        'child_pack_id': fields.many2one('stock.tracking', 'Pack'),
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'stock_tracking_add_remove_pack/stock_view.xml'
--- stock_tracking_add_remove_pack/stock_view.xml	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove_pack/stock_view.xml	2013-03-06 10:58:19 +0000
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_tracking_form_add_pack" model="ir.ui.view">
+            <field name="name">stock.tracking.form.add.pack</field>
+            <field name="model">stock.tracking</field>
+            <field name="inherit_id" ref="stock_tracking_child.view_tracking_child_form"/>
+            <field name="arch" type="xml">
+                <div name="child_buttons" position="inside">
+                    <button name="%(stock_tracking_add_remove.action_stock_packaging_add)d" string="Add packs" colspan="1" type="action" context="{'type_selection':'pack'}"/>
+                    <button name="%(stock_tracking_add_remove.action_stock_packaging_remove)d" string="Remove packs" colspan="1" type="action" context="{'type_selection':'pack'}"/>
+                </div>
+            </field>
+        </record>
+
+        <record id="view_tracking_history_form_inherit" model="ir.ui.view">
+            <field name="name">stock.tracking.history.form</field>
+            <field name="model">stock.tracking.history</field>
+            <field name="inherit_id" ref="stock_tracking_extended.view_tracking_history_form"/>
+            <field name="arch" type="xml">
+                <form string="History">
+                    <field name="child_pack_id" attrs="{'invisible': [('type','!=','add_pack'),('type','!=','remove_pack')]}"/>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'stock_tracking_add_remove_pack/wizard'
=== added file 'stock_tracking_add_remove_pack/wizard/__init__.py'
--- stock_tracking_add_remove_pack/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove_pack/wizard/__init__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Julius Network Solutions SARL <[e-mail]>
+#
+#    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 add_pack
+import remove_pack
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'stock_tracking_add_remove_pack/wizard/add_pack.py'
--- stock_tracking_add_remove_pack/wizard/add_pack.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove_pack/wizard/add_pack.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+
+class stock_packaging_add(orm.TransientModel):
+
+    _inherit = "stock.packaging.add"
+
+    _columns = {
+        'location_id': fields.many2one('stock.location', 'Location'),
+        'pack_ids': fields.many2many('stock.tracking', 'add_pack_child_rel', 'wizard_id', 'pack_id', 'Packs', domain=[('parent_id', '=', False),('state', '=', 'close')]),
+    }
+    
+    def _get_location_id(self, cr, uid, context):
+        if context==None:
+            context={}
+        location_id = False
+        active_id = context.get('active_id')
+        if active_id:
+            tracking_obj = self.pool.get('stock.tracking')
+            tracking = tracking_obj.browse(cr, uid, active_id, context=context)
+            location_id = tracking.location_id and tracking.location_id.id or False
+        return location_id
+    
+    _defaults = {
+        'location_id': lambda self, cr, uid, context: self._get_location_id(cr, uid, context),
+    }
+    
+    def add_object(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        tracking_obj = self.pool.get('stock.tracking')
+        res = super(stock_packaging_add, self).add_object(cr, uid, ids, context=context)
+        for current in self.browse(cr, uid, ids, context=context):
+            code_type = current.type_id.code
+            pack_id = current.pack_id.id
+            child_ids = [x.id for x in current.pack_ids]
+            if code_type == 'pack':
+                tracking_obj._add_pack(cr, uid, pack_id, child_ids, context=context)
+        return res
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'stock_tracking_add_remove_pack/wizard/add_pack_view.xml'
--- stock_tracking_add_remove_pack/wizard/add_pack_view.xml	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove_pack/wizard/add_pack_view.xml	2013-03-06 10:58:19 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_stock_packaging_add_wizard" model="ir.ui.view">
+            <field name="name">Stock packaging add</field>
+            <field name="model">stock.packaging.add</field>
+            <field name="inherit_id" ref="stock_tracking_add_remove.view_stock_packaging_add_wizard"/>
+            <field name="arch" type="xml">
+                <group name="products" position="after">
+                    <group name="packs" colspan="4" col="4" attrs="{'invisible':[('type','!=','pack')]}">
+                        <separator string="Add Packs" colspan="4"/>
+                        <field name="location_id" invisible="True"/>
+                        <field name="pack_ids" colspan="4" nolabel="1" domain="[('parent_id', '=', False),('state', '=', 'close'),('location_id', '=', location_id)]"/>
+                    </group>
+                </group>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== added file 'stock_tracking_add_remove_pack/wizard/remove_pack.py'
--- stock_tracking_add_remove_pack/wizard/remove_pack.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove_pack/wizard/remove_pack.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+
+class stock_packaging_remove(orm.TransientModel):
+
+    _inherit = "stock.packaging.remove"
+
+    _columns = {
+        'pack_ids': fields.many2many('stock.tracking', 'remove_pack_child_rel', 'wizard_id', 'pack_id', 'Packs', domain="[('parent_id', '=', pack_id)]"),
+    }
+
+    def remove_object(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        tracking_obj = self.pool.get('stock.tracking')
+        res = super(stock_packaging_remove, self).remove_object(cr, uid, ids, context=context)
+        for current in self.browse(cr, uid, ids, context=context):
+            code_type = current.type_id.code
+            pack_id = current.pack_id.id
+            child_ids = [x.id for x in current.pack_ids]
+            if code_type == 'pack':
+                tracking_obj._remove_pack(cr, uid, pack_id, child_ids, context=context)
+        return res
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'stock_tracking_add_remove_pack/wizard/remove_pack_view.xml'
--- stock_tracking_add_remove_pack/wizard/remove_pack_view.xml	1970-01-01 00:00:00 +0000
+++ stock_tracking_add_remove_pack/wizard/remove_pack_view.xml	2013-03-06 10:58:19 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_stock_packaging_remove_wizard" model="ir.ui.view">
+            <field name="name">Stock packaging remove</field>
+            <field name="model">stock.packaging.remove</field>
+            <field name="inherit_id" ref="stock_tracking_add_remove.view_stock_packaging_remove_wizard"/>
+            <field name="arch" type="xml">
+                <group name="products" position="after">
+                    <group name="packs" colspan="4" col="4" attrs="{'invisible':[('type','!=','pack')]}">
+                        <field name="pack_ids" colspan="4" nolabel="1"/>
+                    </group>
+                </group>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'stock_tracking_child'
=== added file 'stock_tracking_child/__init__.py'
--- stock_tracking_child/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_child/__init__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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 stock_tracking
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'stock_tracking_child/__openerp__.py'
--- stock_tracking_child/__openerp__.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_child/__openerp__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+{
+    "name" : "Stock Tracking Child",
+    "version" : "1.0",
+    "author" : "Julius Network Solutions",
+    "description" : """
+
+Presentation:
+
+This module allows to define and identify package in parent or child
+
+""",
+    "website" : "http://www.julius.fr",
+    "depends" : [
+        "stock",
+        "stock_tracking_extended",
+    ],
+    "category" : "Warehouse Management",
+    "demo" : [],
+    "data" : [
+        'stock_tracking_view.xml',
+    ],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'stock_tracking_child/i18n'
=== added file 'stock_tracking_child/i18n/fr.po'
--- stock_tracking_child/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ stock_tracking_child/i18n/fr.po	2013-03-06 10:58:19 +0000
@@ -0,0 +1,72 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* stock_tracking_child
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-15 11:58+0000\n"
+"PO-Revision-Date: 2013-02-15 11:58+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: stock_tracking_child
+#: field:stock.tracking,ul_id:0
+msgid "Logistic unit"
+msgstr "Unité logistique"
+
+#. module: stock_tracking_child
+#: field:product.ul,capacity_index:0
+msgid "Capacity index"
+msgstr "Indice de capacité"
+
+#. module: stock_tracking_child
+#: model:ir.model,name:stock_tracking_child.model_stock_tracking
+msgid "Packs"
+msgstr "Colis"
+
+#. module: stock_tracking_child
+#: field:stock.tracking,child_serial_ids:0
+msgid "Child Serials"
+msgstr "Numéros de séries enfants"
+
+#. module: stock_tracking_child
+#: constraint:stock.tracking:0
+msgid "Bad parent type selection. Please try again."
+msgstr "Mauvais choix du type parent. Veuillez ressayez à nouveau."
+
+#. module: stock_tracking_child
+#: model:ir.model,name:stock_tracking_child.model_product_ul
+msgid "Shipping Unit"
+msgstr "Unité logistique"
+
+#. module: stock_tracking_child
+#: view:stock.tracking:0
+msgid "Child Packs"
+msgstr "Colis enfants"
+
+#. module: stock_tracking_child
+#: view:stock.tracking:0
+msgid "Serial Code"
+msgstr "Numéro de série"
+
+#. module: stock_tracking_child
+#: field:stock.tracking,parent_id:0
+msgid "Parent"
+msgstr "Parent"
+
+#. module: stock_tracking_child
+#: field:stock.tracking,child_product_ids:0
+msgid "Child Products"
+msgstr "Produits enfants"
+
+#. module: stock_tracking_child
+#: field:stock.tracking,child_ids:0
+msgid "Children"
+msgstr "Enfants"
+

=== added file 'stock_tracking_child/stock_tracking.py'
--- stock_tracking_child/stock_tracking.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_child/stock_tracking.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,151 @@
+ # -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+
+class stock_tracking(orm.Model):
+
+    _inherit = 'stock.tracking'
+    
+    def hierarchy_ids(self, tracking):
+        result_list = [tracking]
+        for child in tracking.child_ids:
+            result_list.extend(self.hierarchy_ids(child))
+        return result_list
+
+    def _get_child_products(self, cr, uid, ids, field_name, arg, context=None):
+        packs = self.browse(cr, uid, ids)
+        res = {}
+        for pack in packs:
+            res[pack.id] = []
+            childs = self.hierarchy_ids(pack)
+            for child in childs:
+                for prod in child.product_ids:
+                    res[pack.id].append(prod.id)
+        return res
+
+    def _get_child_serials(self, cr, uid, ids, field_name, arg, context=None):
+        packs = self.browse(cr, uid, ids)
+        res = {}
+        for pack in packs:
+            res[pack.id] = []
+            childs = self.hierarchy_ids(pack)
+            for child in childs:
+                for serial in child.serial_ids:
+                    res[pack.id].append(serial.id)
+        return res
+    
+    _columns = {
+        'parent_id': fields.many2one('stock.tracking', 'Parent'),
+        'child_ids': fields.one2many('stock.tracking', 'parent_id', 'Children', readonly=True),
+        'ul_id': fields.many2one('product.ul', 'Logistic unit'),
+        'child_product_ids': fields.function(_get_child_products, method=True, type='one2many', obj='product.stock.tracking', string='Child Products'),
+        'child_serial_ids': fields.function(_get_child_serials, method=True, type='one2many', obj='serial.stock.tracking', string='Child Serials'),
+    }
+    
+    def _create_data_product(self, cr, uid, child, product_list, context=None):
+        if context is None:
+            context = {}
+        stock_track = self.pool.get('product.stock.tracking')
+        for product in product_list.iterkeys():
+            stock_track.create(cr, uid, {
+                    'product_id': product,
+                    'quantity': product_list[product],
+                    'tracking_id': child.id
+                }, context=context)
+        return True
+    
+    def get_products(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        pack_ids = self.browse(cr, uid, ids, context=context)
+        stock_track = self.pool.get('product.stock.tracking')
+        for pack in pack_ids:
+            childs = self.hierarchy_ids(pack)
+            for child in childs:
+                product_ids = [x.id for x in child.product_ids]
+                stock_track.unlink(cr, uid, product_ids)
+                product_list = {}
+                for x in child.current_move_ids:
+                    if x.location_dest_id.id == child.location_id.id:
+                        product_list.setdefault(x.product_id.id, 0)
+                        product_list[x.product_id.id] += x.product_qty
+                self._create_data_product(cr, uid, child, product_list, context=context)
+        return True
+    
+    def _create_data_prodlot(self, cr, uid, child, serial_list, context=None):
+        if context is None:
+            context = {}
+        serial_track = self.pool.get('serial.stock.tracking')
+#        serial_obj = self.pool.get('stock.production.lot')
+        for serial in serial_list.iterkeys():
+            if serial:
+                serial_track.create(cr, uid, {
+                        'serial_id': serial,
+                        'quantity': serial_list[serial],
+                        'tracking_id': child.id
+                    }, context=context)
+#                serial_obj.write(cr, uid, [serial], {'tracking_id': child.id}, context=context)
+        return True
+
+    def get_serials(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        pack_ids = self.browse(cr, uid, ids, context=context)
+        serial_track = self.pool.get('serial.stock.tracking')
+        for pack in pack_ids:
+            childs = self.hierarchy_ids(pack)
+            for child in childs:
+                serial_ids = [x.id for x in child.serial_ids]
+                serial_track.unlink(cr, uid, serial_ids)
+                serial_list = {}
+                for x in child.current_move_ids:
+                    if x.location_dest_id.id == child.location_id.id:
+                        serial_list.setdefault(x.prodlot_id.id, 0)
+                        serial_list[x.prodlot_id.id] += x.product_qty
+                self._create_data_prodlot(cr, uid, child, serial_list, context=context)
+        return True
+    
+    def _check_parent_id(self, cr, uid, ids, context=None):
+        trackings = self.browse(cr, uid, ids, context=context)
+        for track in trackings:
+            if track.parent_id and track.parent_id.ul_id and track.ul_id and \
+                track.ul_id.capacity_index > track.parent_id.ul_id.capacity_index:
+                return False
+        return True
+
+    _constraints = [(_check_parent_id, 'Bad parent type selection. The UL is not well set.', ['parent_id']),]
+
+    _defaults = {
+#        'location_id': lambda x, y, z, c: c and c.get('location_id') or False,
+    }
+    
+class product_ul(orm.Model):
+    _inherit = "product.ul"
+    
+    _columns = {
+        'capacity_index': fields.integer('Capacity index'),
+    }
+    
+    _order = 'capacity_index'
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'stock_tracking_child/stock_tracking_view.xml'
--- stock_tracking_child/stock_tracking_view.xml	1970-01-01 00:00:00 +0000
+++ stock_tracking_child/stock_tracking_view.xml	2013-03-06 10:58:19 +0000
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_tracking_child_tree" model="ir.ui.view">
+            <field name="name">stock.tracking.child.tree</field>
+            <field name="model">stock.tracking</field>
+            <field name="inherit_id" ref="stock_tracking_extended.view_tracking_extended_tree"/>
+            <field name="arch" type="xml">
+                <field name="serial" position="after">
+                    <field name="parent_id"/>
+                    <field name="ul_id"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_tracking_child_form" model="ir.ui.view">
+            <field name="name">stock.tracking.child.form</field>
+            <field name="model">stock.tracking</field>
+            <field name="inherit_id" ref="stock_tracking_extended.view_tracking_extended_form"/>
+            <field name="arch" type="xml">
+                <field name="serial" position="after">
+                    <field name="parent_id"/>
+                    <field name="ul_id"/>
+                </field>
+                <field name="product_ids" position="replace">
+                    <field name="child_product_ids" nolabel="1" colspan="4" context="{'group_by':'product_id'}"/>
+                </field>
+                <field name="serial_ids" position="replace">
+                    <field name="child_serial_ids" nolabel="1" colspan="4"/>
+                </field>
+                <page string="Serial Code" position="after">
+                    <page string="Child Packs">
+                        <div name="children_packs">
+                            <div>
+                                <field name="child_ids" nolabel="1" colspan="4"/>
+                            </div>
+                            <div name="child_buttons"/>
+                        </div>
+                    </page>
+                </page>
+            </field>
+        </record>
+
+        <!--<record id="action_stock_tracking_tree" model="ir.actions.act_window">
+            <field name="name">Packs Structure</field>
+            <field name="res_model">stock.tracking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_stock_tracking_tree"/>
+            <field name="domain">[('parent_id','=',False)]</field>
+        </record>-->
+
+        <!--<menuitem
+            action="action_stock_tracking_tree"
+            id="menu_action_stock_tracking_tree"
+            parent="stock.menu_stock_inventory_control" />-->
+
+        <record id="product_ul_tree" model="ir.ui.view">
+            <field name="name">product.ul.tree.inherit</field>
+            <field name="model">product.ul</field>
+            <field name="inherit_id" ref="product.product_ul_tree"/>
+            <field name="arch" type="xml">
+                <field name="type" position="after">
+                    <field name="capacity_index"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="product_ul_form_view" model="ir.ui.view">
+            <field name="name">product.ul.form.inherit</field>
+            <field name="model">product.ul</field>
+            <field name="inherit_id" ref="product.product_ul_form_view"/>
+            <field name="arch" type="xml">
+                <field name="type" position="after">
+                    <field name="capacity_index"/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== modified file 'stock_tracking_extended/__openerp__.py'
--- stock_tracking_extended/__openerp__.py	2013-02-13 08:35:37 +0000
+++ stock_tracking_extended/__openerp__.py	2013-03-06 10:58:19 +0000
@@ -21,29 +21,29 @@
 
 {
     "name" : "Stock Tracking extended",
-    "version" : "1.0",
+    "version" : "1.1",
     "author" : "Julius Network Solutions",
     "description" : """
 
 Presentation:
 
-This module allows to define and identify package in parent or child
+This module adds some info into packs to get a better tracking of products and serial lots inside of these packs
 
 """,
     "website" : "http://www.julius.fr",
     "depends" : [
         "stock",
     ],
-    "category" : "Stock",
-    "init_xml" : [],
-    "demo_xml" : [],
-    "images" : ['images/Tracking extended.png'],
-    "update_xml" : [
+    "category" : "Warehouse Management",
+#    "images" : ['images/Tracking_extended.png'],
+    "demo" : [],
+    "data" : [
         'stock_tracking_view.xml',
-        'inventory_sequence.xml',
         "security/ir.model.access.csv",
     ],
     'test': [],
-    'installable': False,
+    'installable': True,
     'active': False,
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock_tracking_extended/i18n/fr.po'
--- stock_tracking_extended/i18n/fr.po	2012-03-21 18:22:58 +0000
+++ stock_tracking_extended/i18n/fr.po	2013-03-06 10:58:19 +0000
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.3\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-12-19 10:42+0000\n"
-"PO-Revision-Date: 2011-12-19 10:42+0000\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-15 11:56+0000\n"
+"PO-Revision-Date: 2013-02-15 11:56+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,76 +16,20 @@
 "Plural-Forms: \n"
 
 #. module: stock_tracking_extended
-#: model:ir.model,name:stock_tracking_extended.model_stock_production_lot
-msgid "Production lot"
-msgstr "Numéro de série"
-
-#. module: stock_tracking_extended
-#: model:ir.model,name:stock_tracking_extended.model_product_stock_tracking
-msgid "product.stock.tracking"
-msgstr "product.stock.tracking"
-
-#. module: stock_tracking_extended
-#: field:product.ul,capacity_index:0
-msgid "Capacity index"
-msgstr "Indice de capacité"
-
-#. module: stock_tracking_extended
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Vous devez affecter un numéro de série pour ce produit."
-
-#. module: stock_tracking_extended
-#: field:stock.tracking,state:0
-msgid "State"
-msgstr "Statut"
-
-#. module: stock_tracking_extended
-#: field:stock.production.lot,tracking_id:0
-msgid "pack"
-msgstr "Colis"
-
-#. module: stock_tracking_extended
-#: field:stock.tracking,location_id:0
-msgid "Location"
-msgstr "Stockage"
-
-#. module: stock_tracking_extended
-#: view:stock.tracking:0
-msgid "Serial Code"
-msgstr "Numéro de série"
-
-#. module: stock_tracking_extended
-#: sql_constraint:stock.production.lot:0
-msgid "The combination of serial number and internal reference must be unique !"
-msgstr "La combinaison du numéro de série et de la référence interne doit être unique !"
-
-#. module: stock_tracking_extended
-#: field:stock.tracking.history,type:0
-msgid "Type"
-msgstr "Type"
-
-#. module: stock_tracking_extended
-#: code:addons/stock_tracking_extended/stock_tracking.py:118
-#, python-format
-msgid "You can't re-open this pack because there is at least one not closed child"
-msgstr "Vous ne pouvez pas ré-ouvrir ce colis parce qu'il y a au moins un colis enfant non fermé"
-
-#. module: stock_tracking_extended
 #: field:product.stock.tracking,product_id:0
 #: field:serial.stock.tracking,product_id:0
 msgid "Product"
 msgstr "Produit"
 
 #. module: stock_tracking_extended
-#: model:ir.model,name:stock_tracking_extended.model_product_category
-msgid "Product Category"
-msgstr "Catégorie de produits"
+#: field:stock.move,pack_history_id:0
+msgid "Pack history"
+msgstr "Historique du Colis"
 
 #. module: stock_tracking_extended
-#: field:stock.tracking,parent_id:0
-msgid "Parent"
-msgstr "Parent"
+#: model:ir.model,name:stock_tracking_extended.model_product_stock_tracking
+msgid "Products in Packs"
+msgstr "Produits du colis"
 
 #. module: stock_tracking_extended
 #: model:ir.model,name:stock_tracking_extended.model_stock_tracking
@@ -93,19 +37,29 @@
 msgstr "Colis"
 
 #. module: stock_tracking_extended
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Vous essayez d'affecter un lot qui appartient à une autre référence."
-
-#. module: stock_tracking_extended
-#: constraint:stock.tracking:0
-msgid "Bad parent type selection. Please try again."
-msgstr "Mauvais choix du type parent. Veuillez ressayez à nouveau."
-
-#. module: stock_tracking_extended
-#: view:stock.tracking:0
-msgid "Reset Open"
-msgstr "Ré-ouvrir"
+#: model:ir.model,name:stock_tracking_extended.model_stock_tracking_history
+msgid "Packs history"
+msgstr "Historique du Colis"
+
+#. module: stock_tracking_extended
+#: view:stock.tracking:0
+msgid "Move"
+msgstr "Mouvements"
+
+#. module: stock_tracking_extended
+#: view:stock.tracking:0
+msgid "Update product list"
+msgstr "MàJ de la liste de produit"
+
+#. module: stock_tracking_extended
+#: model:ir.model,name:stock_tracking_extended.model_stock_move
+msgid "Stock Move"
+msgstr "Mouvement de stock"
+
+#. module: stock_tracking_extended
+#: view:stock.tracking:0
+msgid "Serial Code"
+msgstr "Numéro de série"
 
 #. module: stock_tracking_extended
 #: field:product.stock.tracking,quantity:0
@@ -114,84 +68,12 @@
 msgstr "Quantité"
 
 #. module: stock_tracking_extended
-#: code:addons/stock_tracking_extended/stock_tracking.py:113
-#: code:addons/stock_tracking_extended/stock_tracking.py:118
-#: code:addons/stock_tracking_extended/stock_tracking.py:131
-#, python-format
-msgid "Not allowed !"
-msgstr "Non autorisé !"
-
-#. module: stock_tracking_extended
-#: field:stock.tracking,current_move_ids:0
-msgid "Current moves"
-msgstr "Mouvements actuels"
-
-#. module: stock_tracking_extended
-#: view:stock.tracking:0
-#: field:stock.tracking,history_ids:0
-#: view:stock.tracking.history:0
-msgid "History"
-msgstr "Historique"
-
-#. module: stock_tracking_extended
-#: model:ir.module.module,description:stock_tracking_extended.module_meta_information
-msgid " This Module allows to have parent/child packaging "
-msgstr " Ce module permet d'avoir des colis parent/enfant "
-
-#. module: stock_tracking_extended
-#: field:product.category,tracked:0
-msgid "Need a serial code ?"
-msgstr "Suivre les numéros de série ?"
-
-#. module: stock_tracking_extended
 #: field:product.stock.tracking,tracking_id:0
 #: field:serial.stock.tracking,tracking_id:0
 msgid "Tracking"
 msgstr "Suivi"
 
 #. module: stock_tracking_extended
-#: view:stock.tracking:0
-msgid "Downstream traceability"
-msgstr "Traçabilité aval"
-
-#. module: stock_tracking_extended
-#: field:stock.tracking,ul_id:0
-msgid "Logistic unit"
-msgstr "Unité logistique"
-
-#. module: stock_tracking_extended
-#: model:ir.actions.act_window,name:stock_tracking_extended.action_stock_tracking_tree
-#: model:ir.ui.menu,name:stock_tracking_extended.menu_action_stock_tracking_tree
-msgid "Packs Structure"
-msgstr "Structure de colis"
-
-#. module: stock_tracking_extended
-#: field:stock.tracking,child_serial_ids:0
-msgid "Child Serials"
-msgstr "Numéros de séries enfants"
-
-#. module: stock_tracking_extended
-#: code:addons/stock_tracking_extended/stock_tracking.py:131
-#, python-format
-msgid "You can't close this pack because there is at least one not closed child"
-msgstr "Vous ne pouvez pas fermer ce colis parce qu'il y a au moins un enfant non fermé"
-
-#. module: stock_tracking_extended
-#: model:ir.model,name:stock_tracking_extended.model_stock_tracking_history
-msgid "stock.tracking.history"
-msgstr "stock.tracking.history"
-
-#. module: stock_tracking_extended
-#: view:stock.tracking:0
-msgid "Update product list"
-msgstr "MàJ de la liste de produit"
-
-#. module: stock_tracking_extended
-#: view:stock.tracking:0
-msgid "Child Packs"
-msgstr "Colis enfants"
-
-#. module: stock_tracking_extended
 #: view:product.stock.tracking:0
 #: view:serial.stock.tracking:0
 #: view:stock.tracking:0
@@ -201,79 +83,44 @@
 msgstr "Produits"
 
 #. module: stock_tracking_extended
+#: field:stock.tracking,location_id:0
+msgid "Location"
+msgstr "Stockage"
+
+#. module: stock_tracking_extended
+#: field:stock.tracking,current_move_ids:0
+msgid "Current moves"
+msgstr "Mouvements actuels"
+
+#. module: stock_tracking_extended
 #: view:stock.tracking:0
 msgid "Update Serial list"
 msgstr "MàJ de la liste des NS"
 
 #. module: stock_tracking_extended
-#: field:stock.tracking.history,tracking_id:0
-msgid "Pack"
-msgstr "Colis"
-
-#. module: stock_tracking_extended
-#: model:ir.module.module,shortdesc:stock_tracking_extended.module_meta_information
-msgid "Stock Packaging extended"
-msgstr "Gestion des colis étendu"
-
-#. module: stock_tracking_extended
-#: model:ir.model,name:stock_tracking_extended.model_stock_move
-msgid "Stock Move"
-msgstr "Mouvement de stock"
-
-#. module: stock_tracking_extended
-#: field:stock.tracking,child_product_ids:0
-msgid "Child Products"
-msgstr "Produits enfants"
-
-#. module: stock_tracking_extended
-#: constraint:product.category:0
-msgid "Error ! You can not create recursive categories."
-msgstr "Erreur ! Vous ne pouvez pas créer de catégories récursives"
-
-#. module: stock_tracking_extended
-#: model:ir.model,name:stock_tracking_extended.model_product_ul
-msgid "Shipping Unit"
-msgstr "Unité de livraison"
-
-#. module: stock_tracking_extended
-#: code:addons/stock_tracking_extended/stock_tracking.py:113
-#, python-format
-msgid "You can't re-open this pack because the parent pack is close"
-msgstr "Vous ne pouvez pas ré-ouvrir ce colis, car le colis parent est fermé"
-
-#. module: stock_tracking_extended
-#: model:ir.model,name:stock_tracking_extended.model_serial_stock_tracking
-msgid "serial.stock.tracking"
-msgstr "serial.stock.tracking"
-
-#. module: stock_tracking_extended
-#: view:stock.tracking:0
-#: selection:stock.tracking,state:0
-msgid "Close"
-msgstr "Fermer"
-
-#. module: stock_tracking_extended
 #: field:serial.stock.tracking,serial_id:0
 msgid "Serial"
 msgstr "Numéro de Série"
 
 #. module: stock_tracking_extended
 #: view:stock.tracking:0
-msgid "Stock Moves"
-msgstr "Mouvements de stocks"
-
-#. module: stock_tracking_extended
-#: selection:stock.tracking,state:0
-msgid "Open"
-msgstr "Ouvert"
-
-#. module: stock_tracking_extended
-#: field:stock.tracking,child_ids:0
-msgid "Children"
-msgstr "Enfant"
-
-#. module: stock_tracking_extended
-#: model:ir.model,name:stock_tracking_extended.model_stock_inventory
-msgid "Inventory"
-msgstr "Inventaire"
+#: field:stock.tracking,history_ids:0
+#: view:stock.tracking.history:0
+msgid "History"
+msgstr "Historique"
+
+#. module: stock_tracking_extended
+#: field:stock.tracking.history,type:0
+msgid "Type"
+msgstr "Type"
+
+#. module: stock_tracking_extended
+#: model:ir.model,name:stock_tracking_extended.model_serial_stock_tracking
+msgid "Serials in Packs"
+msgstr "Numéros de séries du colis"
+
+#. module: stock_tracking_extended
+#: field:stock.tracking.history,tracking_id:0
+msgid "Pack"
+msgstr "Colis"
 

=== removed file 'stock_tracking_extended/images/Tracking extended.png'
Binary files stock_tracking_extended/images/Tracking extended.png	2012-04-26 10:42:17 +0000 and stock_tracking_extended/images/Tracking extended.png	1970-01-01 00:00:00 +0000 differ
=== added file 'stock_tracking_extended/images/Tracking_extended.png'
Binary files stock_tracking_extended/images/Tracking_extended.png	1970-01-01 00:00:00 +0000 and stock_tracking_extended/images/Tracking_extended.png	2013-03-06 10:58:19 +0000 differ
=== removed file 'stock_tracking_extended/inventory_sequence.xml'
--- stock_tracking_extended/inventory_sequence.xml	2012-03-07 12:56:37 +0000
+++ stock_tracking_extended/inventory_sequence.xml	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-        <!-- Sequences for stock.inventory -->
-        <record id="seq_type_inventory_order" model="ir.sequence.type">
-            <field name="name">Inventory Order</field>
-            <field name="code">stock.inventory</field>
-        </record>
-
-        <record id="seq_sale_order" model="ir.sequence">
-            <field name="name">Inventory Order</field>
-            <field name="code">stock.inventory</field>
-            <field name="prefix">INV</field>
-            <field name="padding">3</field>
-        </record>
-
-    </data>
-</openerp>

=== modified file 'stock_tracking_extended/stock_tracking.py'
--- stock_tracking_extended/stock_tracking.py	2012-12-11 13:45:06 +0000
+++ stock_tracking_extended/stock_tracking.py	2013-03-06 10:58:19 +0000
@@ -1,4 +1,4 @@
- # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 #################################################################################
 #
 #    OpenERP, Open Source Management Solution
@@ -19,175 +19,125 @@
 #
 #################################################################################
 
-from datetime import datetime
-from osv import fields, osv
-from tools.translate import _
-import netsvc
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
 
 class one2many_special(fields.one2many):
     def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if not values:
+        if context is None:
+            context = {}
+        if self._context:
+            context = context.copy()
+        context.update(self._context)
+        if values is None:
             values = {}
+
         res = {}
         location_ids = []
         for id in ids:
             res[id] = []
-            location_id = obj.pool.get('stock.tracking').read(cr, user, id, ['location_id'])['location_id']
-            if location_id and location_id[0] and location_id[0] not in location_ids:
-                location_ids.append(location_id[0])
-        ids2 = obj.pool.get(self._obj).search(cr, user, self._domain + [(self._fields_id, 'in', ids), ('location_dest_id', 'in', location_ids)], limit=self._limit)
+            location_id = obj.read(cr, user, id, ['location_id'], context=context)['location_id']
+            if isinstance(location_id, (list,tuple)):
+                location_id = location_id and location_id[0] or False
+            if location_id and (location_id not in location_ids):
+                location_ids.append(location_id)
+        domain = self._domain(obj) if callable(self._domain) else self._domain
+        domain2 = [(self._fields_id, 'in', ids)]
+        if location_ids:
+            domain2 += [('location_dest_id', 'in', location_ids)]
+        ids2 = obj.pool.get(self._obj).search(cr, user, domain + domain2, limit=self._limit, context=context)
         for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
-            res[r[self._fields_id]].append( r['id'] )
+            if r[self._fields_id] in res:
+                res[r[self._fields_id]].append(r['id'])
         return res
 
-class stock_tracking(osv.osv):
-
+class stock_tracking(orm.Model):
     _inherit = 'stock.tracking'
-
-    def hierarchy_ids(self, tracking):
-        result_list = [tracking]
-        for child in tracking.child_ids:
-            result_list.extend(self.hierarchy_ids(child))
-        return result_list
-
-    def _get_child_products(self, cr, uid, ids, field_name, arg, context=None):
-        packs = self.browse(cr, uid, ids)
-        res = {}
-        for pack in packs:
-            res[pack.id] = []
-            childs = self.hierarchy_ids(pack)
-            for child in childs:
-                for prod in child.product_ids:
-                    res[pack.id].append(prod.id)
-        return res
-
-    def _get_child_serials(self, cr, uid, ids, field_name, arg, context=None):
-        packs = self.browse(cr, uid, ids)
-        res = {}
-        for pack in packs:
-            res[pack.id] = []
-            childs = self.hierarchy_ids(pack)
-            for child in childs:
-                for serial in child.serial_ids:
-                    res[pack.id].append(serial.id)
-        return res
+    
+    def _get_default_location(self, cr, uid, context=None):
+        """ By default we get the location defined on the main warehouse of the user's company """
+        # Initialization #
+        if context is None:
+            context = {}
+        if context.get('location_id'):
+            return context.get('location_id')
+        location_id = False
+        warehouse_obj = self.pool.get('stock.warehouse')
+        user_obj = self.pool.get('res.users')
+        # Process #
+        user_data = user_obj.browse(cr, uid, uid, context=context)
+        warehouse_ids = warehouse_obj.search(cr, uid, [
+                ('company_id', '=', user_data.company_id.id),
+            ], limit=1, context=context)
+        if warehouse_ids:
+            warehouse = warehouse_obj.browse(cr, uid, warehouse_ids[0], context=context)
+            location_id = warehouse.lot_stock_id and warehouse.lot_stock_id.id or False
+        return location_id 
 
     _columns = {
-        'parent_id': fields.many2one('stock.tracking', 'Parent'),
-        'child_ids': fields.one2many('stock.tracking', 'parent_id', 'Children', readonly=True),
-        'ul_id': fields.many2one('product.ul', 'Logistic unit', readonly=True, states={'open':[('readonly',False)]}),
-        'location_id': fields.many2one('stock.location', 'Location', required=True, readonly=True, states={'open':[('readonly',False)]}),
-        'state': fields.selection([('open','Open'),('close','Close')], 'State', readonly=True),
+        'location_id': fields.many2one('stock.location', 'Location', readonly=True),
         'product_ids': fields.one2many('product.stock.tracking', 'tracking_id', 'Products', readonly=True),
-        'child_product_ids': fields.function(_get_child_products, method=True, type='one2many', obj='product.stock.tracking', string='Child Products'),
-        'history_ids': fields.one2many('stock.tracking.history', 'tracking_id', 'History'),
+        'history_ids': fields.one2many('stock.tracking.history', 'tracking_id', 'History', readonly=True),
         'current_move_ids': one2many_special('stock.move', 'tracking_id', 'Current moves', domain=[('pack_history_id', '=', False)], readonly=True),
-        'name': fields.char('Pack Reference', size=64, required=True, readonly=True, states={'open':[('readonly',False)]}),
-        'date': fields.datetime('Creation Date', required=True, readonly=True, states={'open':[('readonly',False)]}),
+        'date': fields.datetime('Creation Date', required=True, readonly=True),
         'serial_ids': fields.one2many('serial.stock.tracking', 'tracking_id', 'Products', readonly=True),
-        'child_serial_ids': fields.function(_get_child_serials, method=True, type='one2many', obj='serial.stock.tracking', string='Child Serials'),
     }
-
-    def _check_parent_id(self, cr, uid, ids, context=None):
-        lines = self.browse(cr, uid, ids, context=context)
-
-        if lines[0].parent_id:
-            if lines[0].ul_id.capacity_index > lines[0].parent_id.ul_id.capacity_index:
-                return False
-        return True
-
-    _constraints = [(_check_parent_id, 'Bad parent type selection. Please try again.',['parent_id'] ),]
-
+    
     _defaults = {
-        'state': 'open',
-        'location_id': lambda x, y, z, c: c and c.get('location_id') or False,
+        'location_id': lambda self, cr, uid, context: self._get_default_location(cr, uid, context),
     }
-
-    def reset_open(self, cr, uid, ids, context=None):
-        pack_ids = self.browse(cr, uid, ids, context=context)
-        for pack in pack_ids:
-            allowed = True
-            if pack.parent_id:
-                if pack.parent_id and pack.parent_id != 'open':
-                    self.write(cr, uid, [pack.parent_id.id], {'state': 'open'}, context=context)
-            if allowed:
-                for child in pack.child_ids:
-                    if child.state == 'open':
-                        allowed = False
-                        raise osv.except_osv(_('Not allowed !'),_('You can\'t re-open this pack because there is at least one not closed child'))
-                        break
-            if allowed:
-                self.write(cr, uid, [pack.id], {'state': 'open'}, context=context)
-        return True
-
-    def set_close(self, cr, uid, ids, context=None):
-        pack_ids = self.browse(cr, uid, ids, context=context)
-        for pack in pack_ids:
-            allowed = True
-            for child in pack.child_ids:
-                if child.state == 'open':
-                    allowed = False
-                    raise osv.except_osv(_('Not allowed !'),_('You can\'t close this pack because there is at least one not closed child'))
-                    break
-            if allowed:
-                self.write(cr, uid, [pack.id], {'state': 'close'}, context=context)
-        return True
-
-    def get_products(self, cr, uid, ids, context=None):
-        pack_ids = self.browse(cr, uid, ids, context)
+    
+    def get_products_process(self, cr, uid, pack_ids, context=None):
         stock_track = self.pool.get('product.stock.tracking')
         for pack in pack_ids:
-            childs = self.hierarchy_ids(pack)
-            for child in childs:
-                product_ids = [x.id for x in child.product_ids]
-                stock_track.unlink(cr, uid, product_ids)
-                product_list = {}
-                for x in child.current_move_ids:
-                    if x.location_dest_id.id == child.location_id.id:
-                        if x.product_id.id not in product_list.keys():
-                            product_list.update({x.product_id.id:x.product_qty})
-                        else:
-                            product_list[x.product_id.id] += x.product_qty
-                for product in product_list.keys():
-                    stock_track.create(cr, uid, {'product_id': product, 'quantity': product_list[product], 'tracking_id': child.id})
+            product_ids = [x.id for x in pack.product_ids]
+            stock_track.unlink(cr, uid, product_ids, context=context)
+            product_list = {}
+            for x in pack.current_move_ids:
+                if x.location_dest_id.id == pack.location_id.id:
+                    product_list.setdefault(x.product_id.id, 0)
+                    product_list[x.product_id.id] += x.product_qty
+            for product in product_list.iterkeys():
+                stock_track.create(cr, uid, {
+                        'product_id': product,
+                        'quantity': product_list[product],
+                        'tracking_id': pack.id
+                    }, context=context)
         return True
 
-    def get_serials(self, cr, uid, ids, context=None):
-        pack_ids = self.browse(cr, uid, ids, context)
+    def get_serial_process(self, cr, uid, pack_ids, context=None):
         serial_track = self.pool.get('serial.stock.tracking')
         serial_obj = self.pool.get('stock.production.lot')
         for pack in pack_ids:
-            childs = self.hierarchy_ids(pack)
-            for child in childs:
-                serial_ids = [x.id for x in child.serial_ids]
-                serial_track.unlink(cr, uid, serial_ids)
-                serial_list = {}
-                for x in child.current_move_ids:
-                    if x.location_dest_id.id == child.location_id.id:
-                        if x.prodlot_id.id not in serial_list.keys():
-                            serial_list.update({x.prodlot_id.id:x.product_qty})
-                        else:
-                            serial_list[x.prodlot_id.id] += x.product_qty
-                for serial in serial_list.keys():
-                    if serial:
-                        serial_track.create(cr, uid, {'serial_id': serial, 'quantity': serial_list[serial], 'tracking_id': child.id}, context=context)
-                        serial_obj.write(cr, uid, [serial], {'tracking_id': child.id}, context=context)
+            serial_ids = [x.id for x in child.serial_ids]
+            serial_track.unlink(cr, uid, serial_ids)
+            serial_list = {}
+            for x in child.current_move_ids:
+                if x.location_dest_id.id == pack.location_id.id:
+                    serial_list.setdefault(x.prodlot_id.id, 0)
+                    serial_list[x.prodlot_id.id] += x.product_qty
+            for serial in serial_list.keys():
+                if serial:
+                    serial_track.create(cr, uid, {
+                            'serial_id': serial,
+                            'quantity': serial_list[serial],
+                            'tracking_id': pack.id
+                        }, context=context)
+                    serial_obj.write(cr, uid, [serial], {'tracking_id': pack.id}, context=context)
         return True
 
-stock_tracking()
-
-class product_ul(osv.osv):
-    _inherit = "product.ul"
-    _description = "Shipping Unit"
-    _columns = {
-         'capacity_index': fields.integer('Capacity index'),
-    }
-    _order = 'capacity_index'
-product_ul()
-
-class product_stock_tracking(osv.osv):
+    def get_products(self, cr, uid, ids, context=None):
+        pack_ids = self.browse(cr, uid, ids, context)
+        return self.get_products_process(cr, uid, pack_ids, context=context)
+
+    def get_serial(self, cr, uid, ids, context=None):
+        pack_ids = self.browse(cr, uid, ids, context)
+        return self.get_serial(cr, uid, pack_ids, context=context)
+
+class product_stock_tracking(orm.Model):
 
     _name = 'product.stock.tracking'
+    _description = 'Products in Packs'
 
     _columns = {
         'product_id': fields.many2one('product.product', 'Product'),
@@ -195,11 +145,10 @@
         'tracking_id': fields.many2one('stock.tracking', 'Tracking'),
     }
 
-product_stock_tracking()
-
-class serial_stock_tracking(osv.osv):
+class serial_stock_tracking(orm.Model):
 
     _name = 'serial.stock.tracking'
+    _description = 'Serials in Packs'
 
     _order = 'tracking_id,serial_id'
 
@@ -210,105 +159,27 @@
         'tracking_id': fields.many2one('stock.tracking', 'Tracking'),
     }
 
-serial_stock_tracking()
-
-class stock_tracking_history(osv.osv):
+class stock_tracking_history(orm.Model):
 
     _name = "stock.tracking.history"
+    _description = 'Packs history'
 
-    def _get_types(self, cr, uid, context={}):
+    def _get_types(self, cr, uid, context=None):
         res = []
         return res
 
-
     _columns = {
         'tracking_id': fields.many2one('stock.tracking', 'Pack', required=True),
         'type': fields.selection(_get_types, 'Type'),
+        'date': fields.datetime('Creation Date', readonly=True),
     }
 
     _rec_name = "tracking_id"
 
-stock_tracking_history()
-
-'''Add a field in order to store the current pack in a production lot'''
-class stock_production_lot(osv.osv):
-    _inherit = 'stock.production.lot'
-    _columns = {
-        'tracking_id': fields.many2one('stock.tracking', 'pack'),
-    }
-    def copy(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-        default.update({
-            'state': 'draft',
-            'shipped': False,
-            'tracking_id': False,
-            'move_ids': [],
-        })
-        return super(stock_production_lot, self).copy(cr, uid, id, default, context=context)
-    
-stock_production_lot()
-
-class product_category(osv.osv):
-    _inherit = 'product.category'
-    _columns = {
-        'tracked': fields.boolean('Need a serial code ?'),
-    }
-product_category()
-
-class stock_inventory(osv.osv):
-    _inherit = 'stock.inventory'
-    _defaults = {
-        'name': lambda x, y, z, c: x.pool.get('ir.sequence').get(y, z, 'stock.inventory') or '/'
-    }
-stock_inventory()
-
-class stock_move(osv.osv):
+class stock_move(orm.Model):
     _inherit = 'stock.move'
     _columns = {
-         'move_ori_id': fields.many2one('stock.move', 'Origin Move', select=True),
-    }
-
-    def write(self, cr, uid, ids, vals, context=None):
-        result = super(stock_move,self).write(cr, uid, ids, vals, context=context)
-        if not isinstance(ids, list):
-            ids = [ids]
-        for id in ids:
-            state = self.browse(cr, uid, id, context=context).state
-            move_ori_id = self.browse(cr, uid, id, context=context).move_ori_id
-            if state == 'done' and move_ori_id:
-                self.write(cr, uid, [move_ori_id.id], {'state':'done'}, context=context)
-        return result
-
-    def create(self, cr, uid, vals, context=None):
-        production_lot_obj = self.pool.get('stock.production.lot')
-        stock_tracking_obj = self.pool.get('stock.tracking')
-        if vals.get('prodlot_id',False):
-            production_lot_data = production_lot_obj.browse(cr, uid, vals['prodlot_id'], context=context)
-            last_production_lot_move_id = self.search(cr, uid, [('prodlot_id', '=', production_lot_data.id)], limit=1, order='date', context=context)
-            if last_production_lot_move_id:
-                last_production_lot_move = self.browse(cr,uid,last_production_lot_move_id[0])
-                if last_production_lot_move.tracking_id:
-                    ids = [last_production_lot_move.tracking_id.id]
-                    stock_tracking_obj.reset_open(cr, uid, ids, context=context)
-
-        return super(stock_move,self).create(cr, uid, vals, context=context)
-
-stock_move()
-
-class split_in_production_lot(osv.osv_memory):
-    _inherit = "stock.move.split"
-    _columns = {
-        'use_exist' : fields.boolean('Existing Lots', invisible=True),
-     }
-    _defaults = {
-        'use_exist': lambda *a: True,
-    }
-    def default_get(self, cr, uid, fields, context=None):
-        res = super(split_in_production_lot, self).default_get(cr, uid, fields, context=context)
-        res.update({'use_exist': True})
-        return res
-
-split_in_production_lot()
+        'pack_history_id': fields.many2one('stock.tracking.history', 'Pack history'),
+    }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock_tracking_extended/stock_tracking_view.xml'
--- stock_tracking_extended/stock_tracking_view.xml	2012-05-21 09:36:07 +0000
+++ stock_tracking_extended/stock_tracking_view.xml	2013-03-06 10:58:19 +0000
@@ -1,280 +1,106 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-                
-		<!--<record id="search_stock_packs_inherit" model="ir.ui.view">
-			<field name="name">Pack Search inherit</field>
-			<field name="model">stock.tracking</field>
-			<field name="type">search</field>
-			<field name="inherit_id" ref="stock.search_stock_packs"/>
-			<field name="arch" type="xml">
-				<filter name="available" position="after">
-					<filter icon="gtk-media-pause" name="on_hold" string="On Hold" domain="[('state','in',['on_hold','on_hold_billing','on_hold_paym'])]" help="On Hold Pickings"/>
-				</filter>
-			</field>
-		</record>-->
-		
-        <record id="product_category_tracked_form" model="ir.ui.view">
-            <field name="name">product.category.property.form.inherit</field>
-            <field name="model">product.category</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="product.product_category_form_view"/>
-			<field name="arch" type="xml">
-                <field name="parent_id" position="after">
-                        <field name="tracked"/>
-                </field>
-			</field>
-		</record>
-		
-		<record id="view_tracking_tree_inherit" model="ir.ui.view">
-			<field name="name">stock.tracking.tree.inherit</field>
-			<field name="model">stock.tracking</field>
-			<field name="type">tree</field>
-			<field name="inherit_id" ref="stock.view_tracking_tree"/>
-			<field name="arch" type="xml">
-				<field name="serial" position="after">
-					<field name="parent_id"/>
-					<field name="ul_id"/>
-					<field name="location_id"/>
-					<field name="state"/>
-				</field>
-			</field>
-		</record>
-        
-		<record id="lot_line_tree_inherit" model="ir.ui.view">
-			<field name="name">stock.tracking.tree.inherit</field>
-			<field name="model">stock.tracking</field>
-			<field name="type">tree</field>
-			<field name="inherit_id" ref="stock.lot_line_tree"/>
-			<field name="arch" type="xml">
-				<field name="serial" position="after">
-					<field name="parent_id"/>
-					<field name="ul_id"/>
-				</field>
-			</field>
-		</record>
-        
-		<record id="view_tracking_form_inherit" model="ir.ui.view">
-			<field name="name">stock.tracking.form.inherit</field>
-			<field name="model">stock.tracking</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="stock.view_tracking_form"/>
-			<field name="arch" type="xml">
-				<field name="serial" position="after">
-					<field name="parent_id"/>
-					<field name="ul_id"/>
-				</field>
-				<page string="Stock Moves" position="before">
-					<page string="Products">
-						<field name="child_product_ids" nolabel="1" colspan="4" context="{'group_by':'product_id'}"/>
-						<field name="product_ids" nolabel="1" colspan="4" invisible="True"/>
-						<button name="get_products" string="Update product list" colspan="2" type="object" icon="gtk-ok"/>
-					</page>
-					<page string="Serial Code">
-						<field name="child_serial_ids" nolabel="1" colspan="4"/>
-						<field name="serial_ids" nolabel="1" colspan="4" invisible="True"/>
-						<button name="get_serials" string="Update Serial list" colspan="2" type="object" icon="gtk-ok"/>
-						<!--
-						<field name="current_move_ids" nolabel="1" colspan="4">
-							<tree string="Stock Moves">
-								<field name="product_id"/>
-								<field name="prodlot_id" groups="base.group_extended"/>
-	                        </tree>
-						</field>
-						-->
-					</page>
-					<page string="Child Packs">
-						<field name="child_ids" nolabel="1" colspan="2"/>
-					</page>
-					<page string="History">
-						<field name="history_ids" nolabel="1" colspan="4"/>
-					</page>
-				</page>
-				<button name="action_traceability" string="Downstream traceability" position="after">
-					<field name="location_id"/>
-				</button>
-				<form position="inside">
-					<group colspan="4" col="12">
-						<field name="state" colspan="3"/>
-						<group colspan="9" col="10">
-							<button name="reset_open" states="close" string="Reset Open" colspan="2" type="object" icon="gtk-ok"/>
-							<button name="set_close" states="open" string="Close" colspan="2" type="object" icon="gtk-ok"/>
-						</group>
-					</group>
-				</form>
-				<!--
-					<field name="move_ids" position="before">
-						<separator string="Current moves" colspan="4"/>
-						<field name="current_move_ids" nolabel="1" colspan="4"/>
-						<separator string="All moves" colspan="4"/>
-					</field>
-				-->
-			</field>
-		</record>
-		
-		<record id="view_stock_tracking_tree" model="ir.ui.view">
-			<field name="name">stock.tracking.tree</field>
-			<field name="model">stock.tracking</field>
-			<field name="type">tree</field>
-			<field name="field_parent">child_ids</field>
-			<field name="arch" type="xml">
-				<tree toolbar="1">
-					<field name="name"/>
-					<field name="serial"/>
-					<field name="ul_id"/>
-				</tree>
-			</field>
-		</record>
-
-
-		<record id="action_stock_tracking_tree" model="ir.actions.act_window">
-			<field name="name">Packs Structure</field>
-			<field name="res_model">stock.tracking</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="view_type">tree</field>
-			<field name="view_id" ref="view_stock_tracking_tree"/>
-			<field name="domain">[('parent_id','=',False)]</field>
-		</record>
-		<menuitem
-			action="action_stock_tracking_tree"
-			id="menu_action_stock_tracking_tree"
-			parent="stock.menu_stock_inventory_control" />
-
-		<record id="view_picking_form" model="ir.ui.view">
-			<field name="name">stock.picking.form</field>
-			<field name="model">stock.picking</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="stock.view_picking_form"/>
-			<field name="arch" type="xml">
-				<xpath expr="/form/notebook/page/field[@name='move_lines']/form/group/field[@name='tracking_id']" position="replace">
-					<field name="tracking_id" domain="[('state', '=', 'open')]" colspan="3"/>
-				</xpath>
-			</field>
-		</record>
-
-		<record id="view_picking_out_form" model="ir.ui.view">
-			<field name="name">stock.picking.out.form</field>
-			<field name="model">stock.picking</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="stock.view_picking_out_form"/>
-			<field name="arch" type="xml">
-				<xpath expr="/form/notebook/page/field[@name='move_lines']/form/group/field[@name='tracking_id']" position="replace">
-					<field name="tracking_id" domain="[('state', '=', 'open')]" colspan="3"/>
-				</xpath>
-			</field>
-		</record>
-
-		<record id="view_picking_in_form" model="ir.ui.view">
-			<field name="name">stock.picking.in.form</field>
-			<field name="model">stock.picking</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="stock.view_picking_in_form"/>
-			<field name="arch" type="xml">
-				<xpath expr="/form/notebook/page/field[@name='move_lines']/form/group/field[@name='tracking_id']" position="replace">
-					<field name="tracking_id" domain="[('state', '=', 'open')]" colspan="3"/>
-				</xpath>
-			</field>
-		</record>
-		
-		<record id="view_product_stock_tracking_tree_inherit" model="ir.ui.view">
-			<field name="name">product.stock.tracking.tree</field>
-			<field name="model">product.stock.tracking</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Products">
-					<field name="product_id"/>
-					<field name="quantity"/>
-				</tree>
-			</field>
-		</record>
-		
-		
-		<record id="view_serial_stock_tracking_tree_inherit" model="ir.ui.view">
-			<field name="name">serial.stock.tracking.tree</field>
-			<field name="model">serial.stock.tracking</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Products">
-					<field name="tracking_id"/>
-					<field name="serial_id"/>
-					<field name="product_id"/>
-					<field name="quantity"/>
-				</tree>
-			</field>
-		</record>
-		
-	    
-		<!--<record id="view_tracking_form_inherit" model="ir.ui.view">
-			<field name="name">stock.tracking.form.inherit</field>
-			<field name="model">stock.tracking</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="stock_tracking_extended.view_tracking_form_inherit"/>
-			<field name="arch" type="xml">
-				<notebook position="inside">
-				</notebook>
-			</field>
-		</record>-->
-		
-		<record id="view_tracking_history_tree" model="ir.ui.view">
-			<field name="name">stock.tracking.history.tree</field>
-			<field name="model">stock.tracking.history</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="History">
-					<field name="type"/>
-				</tree>
-			</field>
-		</record>
-		
-		<record id="view_tracking_history_form" model="ir.ui.view">
-			<field name="name">stock.tracking.history.form</field>
-			<field name="model">stock.tracking.history</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="History">
-					<field name="type"/>
-					<!--<newline/>
-					<separator string="Products" colspan="4"/>
-					<field name="child_product_ids" nolabel="1" colspan="4"/>
-					<separator string="Child Packs" colspan="4"/>
-					<field name="child_pack_ids" nolabel="1" colspan="4"/>-->
-				</form>
-			</field>
-		</record>
-
-        <record id="product_ul_tree" model="ir.ui.view">
-            <field name="name">product.ul.tree.inherit</field>
-            <field name="model">product.ul</field>
-            <field name="inherit_id" ref="product.product_ul_tree"/>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <field name="type" position="after">
-                    <field name="capacity_index"/>
-                </field>
-            </field>
-        </record>
-        
-        <record id="product_ul_form_view" model="ir.ui.view">
-            <field name="name">product.ul.form.inherit</field>
-            <field name="model">product.ul</field>
-            <field name="inherit_id" ref="product.product_ul_form_view"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="type" position="after">
-                    <field name="capacity_index"/>
-                </field>
-            </field>
-        </record>
-        
-		<record id="view_stock_move_tree_inherit" model="ir.ui.view">
-			<field name="name">stock.move.tree</field>
-			<field name="model">stock.move</field>
-			<field name="type">tree</field>
-            <field name="inherit_id" ref="stock.view_move_tree_reception_picking_board"/>
-			<field name="arch" type="xml">
-            	<field name="date" position="after">
-            	    <field name="state"/>
-            	</field>
+
+        <record id="view_tracking_extended_tree" model="ir.ui.view">
+            <field name="name">stock.tracking.extended.tree</field>
+            <field name="model">stock.tracking</field>
+            <field name="inherit_id" ref="stock.view_tracking_tree"/>
+            <field name="arch" type="xml">
+                <field name="serial" position="after">
+                    <field name="location_id"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_tracking_extended_form" model="ir.ui.view">
+            <field name="name">stock.tracking.extended.form</field>
+            <field name="model">stock.tracking</field>
+            <field name="inherit_id" ref="stock.view_tracking_form"/>
+            <field name="arch" type="xml">
+                <field name="move_ids" position="replace">
+                    <notebook>
+                        <page string="Products">
+                            <group name="products">
+                                <div>
+                                    <div>
+                                        <field name="product_ids" nolabel="1" colspan="4"/>
+                                    </div>
+                                    <div name="product_buttons">
+                                        <button name="get_products" string="Update product list" colspan="2" type="object"/>
+                                    </div>
+                                </div>
+                            </group>
+                        </page>
+                        <page string="Serial Code">
+                            <group name="serials">
+                                <div>
+                                    <div>
+                                        <field name="serial_ids" nolabel="1" colspan="4"/>
+                                    </div>
+                                    <div name="prodlot_buttons">
+                                        <button name="get_serials" string="Update Serial list" colspan="2" type="object"/>
+                                    </div>
+                                </div>
+                            </group>
+                        </page>
+                        <page string="History">
+                            <field name="history_ids" nolabel="1" colspan="4"/>
+                        </page>
+                        <page string="Move">
+                            <field name="move_ids" nolabel="1" colspan="4"/>
+                        </page>
+                    </notebook>
+                </field>
+                <field name="serial" position="after">
+                    <field name="location_id"/>
+                </field>
+                </field>
+        </record>
+
+        <record id="view_product_stock_tracking_tree_inherit" model="ir.ui.view">
+            <field name="name">product.stock.tracking.tree</field>
+            <field name="model">product.stock.tracking</field>
+            <field name="arch" type="xml">
+                <tree string="Products">
+                    <field name="product_id"/>
+                    <field name="quantity"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_serial_stock_tracking_tree_inherit" model="ir.ui.view">
+            <field name="name">serial.stock.tracking.tree</field>
+            <field name="model">serial.stock.tracking</field>
+            <field name="arch" type="xml">
+                <tree string="Products">
+                    <field name="tracking_id"/>
+                    <field name="serial_id"/>
+                    <field name="product_id"/>
+                    <field name="quantity"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_tracking_history_tree" model="ir.ui.view">
+            <field name="name">stock.tracking.history.tree</field>
+            <field name="model">stock.tracking.history</field>
+            <field name="arch" type="xml">
+                <tree string="History">
+                    <field name="date"/>
+                    <field name="type"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_tracking_history_form" model="ir.ui.view">
+            <field name="name">stock.tracking.history.form</field>
+            <field name="model">stock.tracking.history</field>
+            <field name="arch" type="xml">
+                <form string="History">
+                    <field name="date"/>
+                    <field name="type"/>
+                </form>
             </field>
         </record>
 

=== added directory 'stock_tracking_prodlot'
=== added file 'stock_tracking_prodlot/__init__.py'
--- stock_tracking_prodlot/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_prodlot/__init__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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 stock_tracking
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'stock_tracking_prodlot/__openerp__.py'
--- stock_tracking_prodlot/__openerp__.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_prodlot/__openerp__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+{
+    "name" : "Stock Tracking Prodlot",
+    "version" : "1.0",
+    "author" : "Julius Network Solutions",
+    "description" : """
+
+Presentation:
+
+This module adds the packaging into the production lot
+
+""",
+    "website" : "http://www.julius.fr",
+    "depends" : [
+        "stock",
+    ],
+    "category" : "Warehouse Management",
+    "demo" : [],
+    "data" : [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'stock_tracking_prodlot/stock_tracking.py'
--- stock_tracking_prodlot/stock_tracking.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_prodlot/stock_tracking.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,42 @@
+ # -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+
+'''Add a field in order to store the current pack in a production lot'''
+class stock_production_lot(orm.Model):
+    _inherit = 'stock.production.lot'
+    _columns = {
+        'tracking_id': fields.many2one('stock.tracking', 'pack'),
+    }
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default.update({
+#            'state': 'draft',
+#            'shipped': False,
+            'tracking_id': False,
+#            'move_ids': [],
+        })
+        return super(stock_production_lot, self).copy(cr, uid, id, default, context=context)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock_tracking_reopen/__openerp__.py'
--- stock_tracking_reopen/__openerp__.py	2013-02-13 08:35:37 +0000
+++ stock_tracking_reopen/__openerp__.py	2013-03-06 10:58:19 +0000
@@ -34,16 +34,16 @@
     "depends" : [
          "stock",
          "stock_tracking_extended",
-         "tr_barcode",
-     ],
-    "category" : "Customs/Stock",
-    "init_xml" : [],
-    "demo_xml" : [],
-    "images" : ['images/Tracking reopen.png'],
-    "update_xml" : [
+         "stock_tracking_state",
+    ],
+    "category" : "Warehouse Management",
+    "demo" : [],
+    "data" : [
         'stock_view.xml',
     ],
     'test': [],
     'installable': False,
     'active': False,
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock_tracking_reopen/stock.py'
--- stock_tracking_reopen/stock.py	2012-11-02 10:27:23 +0000
+++ stock_tracking_reopen/stock.py	2013-03-06 10:58:19 +0000
@@ -19,11 +19,11 @@
 #
 #################################################################################
 
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
 import time
 
-class stock_tracking(osv.osv):
+class stock_tracking(orm.Model):
     
     _inherit = 'stock.tracking'
 
@@ -32,94 +32,101 @@
         'modified': fields.boolean('Modified'),
     }
     
-    _default = {
-            'modified': False,
+    _defaults = {
+        'modified': False,
     }   
     '''Function for pack creation'''    
-    def create_pack(self, cr, uid, ids, context=None):        
+    def _create_pack(self, cr, uid, pack_id, context=None):        
         '''Init'''
         if context == None:
             context = {}            
         '''Location determination'''
-        stock_tracking_data = self.browse(cr, uid, ids[0])
+        stock_tracking_data = self.browse(cr, uid, pack_id, context=context)
         '''Pack Creation'''
-        tracking_id = self.create(cr, uid, {'ul_id': stock_tracking_data.ul_id.id, 'location_id': stock_tracking_data.location_id.id})        
+        tracking_id = self.create(cr, uid, {
+            'ul_id': stock_tracking_data.ul_id.id,
+            'location_id': stock_tracking_data.location_id.id
+        }, context=context)        
         '''Pack name is returned'''
         return tracking_id
     
     def reset_open(self, cr, uid, ids, context=None):
-        res = super(stock_tracking, self).reset_open(cr, uid, ids, context)
-        pack_ids = self.browse(cr, uid, ids, context)
+        res = super(stock_tracking, self).reset_open(cr, uid, ids, context=context)
+        history_obj = self.pool.get('stock.tracking.history')
+        pack_ids = self.browse(cr, uid, ids, context=context)
         for pack in pack_ids:                        
             if pack.state == 'open':
-                self.pool.get('stock.tracking.history').create(cr, uid, {
-                                'type': 'reopen',
-                                'previous_ref': pack.name,
-                                'tracking_id': pack.id
-                                }, context)
+                history_obj.create(cr, uid, {
+                        'type': 'reopen',
+                        'previous_ref': pack.name,
+                        'tracking_id': pack.id
+                    }, context=context)
         return True
 
+    #TODO: check this method !!
     def set_close(self, cr, uid, ids, context=None):
         
-        barcode_obj = self.pool.get('tr.barcode')
         stock_move_obj = self.pool.get('stock.move')
         history_obj = self.pool.get('stock.tracking.history')
-        res = super(stock_tracking, self).set_close(cr, uid, ids, context)
+        res = super(stock_tracking, self).set_close(cr, uid, ids, context=context)
         if res:
-            pack_ids = self.browse(cr, uid, ids, context)
+            pack_ids = self.browse(cr, uid, ids, context=context)
             for pack in pack_ids:
                 if pack.state == 'open':                
-                    if self.pool.get('stock.tracking.history').search(cr,uid,[('type','=','reopen'),('tracking_id','=',pack.id)]) and pack.modified == True:           
-                        new_pack_id = self.create_pack(cr, uid, ids, context)
-                        new_pack_data = self.browse(cr, uid, new_pack_id, context)
+                    if history_obj.search(cr, uid, [
+                            ('type', '=', 'reopen'),
+                            ('tracking_id', '=', pack.id)
+                        ], context=context) and pack.modified == True:           
+                        new_pack_id = self._create_pack(cr, uid, pack.id, context=context)
+                        new_pack_data = self.browse(cr, uid, new_pack_id, context=context)
                         '''loop on each move form the old pack to the new pack'''
                         for pack_move in pack.current_move_ids:
                             '''stock move creation'''
-                            barcode_name = pack_move.prodlot_id.name
-                            barcode_data = barcode_obj.search(cr, uid,[('code', '=', barcode_name)], limit=1)
                             move_id = stock_move_obj.create(cr, uid, {
-                                                                      'name': pack_move.name,
-                                                                      'state': pack_move.state,
-                                                                      'product_id': pack_move.product_id.id,
-                                                                      'product_uom': pack_move.product_uom.id,
-                                                                      'prodlot_id': pack_move.prodlot_id.id,
-                                                                      'location_id': pack.location_id.id,
-                                                                      'location_dest_id': new_pack_data.location_id.id,
-                                                                      'tracking_id': new_pack_data.id,
-                                                                    })                            
+                                      'name': pack_move.name,
+                                      'state': pack_move.state,
+                                      'product_id': pack_move.product_id.id,
+                                      'product_uom': pack_move.product_uom.id,
+                                      'prodlot_id': pack_move.prodlot_id.id,
+                                      'location_id': pack.location_id.id,
+                                      'location_dest_id': new_pack_data.location_id.id,
+                                      'tracking_id': new_pack_data.id,
+                                  }, context=context)                            
                         '''end of loop''' 
                         if pack.child_ids:
                             for child_pack_data in pack.child_ids:
                                 if child_pack_data.state == 'close':   
-                                    self.write(cr, uid, child_pack_data.id, {'active': False})                                                          
-                                    self.write(cr, uid, [new_child_pack_id], {'parent_id': new_pack_data.id,})
-                                    history_obj.create(cr, uid, {'type': 'pack_in',
-                                                                 'tracking_id': child_pack_data.id,
-                                                                 'parent_id': new_pack_data.id,
-                                                                })
-                                    self.write(cr, uid, new_pack_data.id, {'location_id': child_pack_data.location_id and child_pack_data.location_id.id or False,})
+                                    self.write(cr, uid, child_pack_data.id, {'active': False}, context=context)                                                          
+                                    self.write(cr, uid, [new_child_pack_id], {'parent_id': new_pack_data.id,}, context=context)
+                                    history_obj.create(cr, uid, {
+                                            'type': 'pack_in',
+                                            'tracking_id': child_pack_data.id,
+                                            'parent_id': new_pack_data.id,
+                                        }, context=context)
+                                    self.write(cr, uid, new_pack_data.id, {
+                                            'location_id': child_pack_data.location_id and child_pack_data.location_id.id or False,
+                                        }, context=context)
                         
-                        self.write(cr, uid, [pack.id], {'state': 'close',
-                                                        'active': False,
-                                                        'modified': False})
+                        self.write(cr, uid, [pack.id], {
+                                'state': 'close',
+                                'active': False,
+                                'modified': False,
+                            }, context=context)
                         '''Call for a function who will display serial code list and product list in the pack layout'''                                                
-                        self.get_products(cr, uid, [new_pack_data.id], context=None)
-                        self.get_serials(cr, uid, [new_pack_data.id], context=None)
-                        
-                    self.write(cr, uid, [pack.id], {'state': 'close'})
+                        self.get_products(cr, uid, [new_pack_data.id], context=context)
+                        self.get_serials(cr, uid, [new_pack_data.id], context=context)
+                    self.write(cr, uid, [pack.id], {'state': 'close'}, context=context)
         return res
 
-stock_tracking()
-
-class stock_tracking_history(osv.osv):
+class stock_tracking_history(orm.Model):
     
     _inherit = "stock.tracking.history"
     
     def _get_types(self, cr, uid, context={}):
-        res = super(stock_tracking_history, self)._get_types(cr, uid, context)
+        res = super(stock_tracking_history, self)._get_types(cr, uid, context=context)
         if not res:
             res = []
-        res = res + [('reopen','Re Open')]
+        res = res + [('reopen',_('Re Open'))]
         return res
     
     _columns = {
@@ -127,7 +134,5 @@
         'previous_ref': fields.char('Previous reference', size=128),        
 #        'previous_id': fields.many2one('stock.tracking', 'Previous pack'),
     }
-    
-stock_tracking_history()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock_tracking_reopen/stock_view.xml'
--- stock_tracking_reopen/stock_view.xml	2012-03-07 12:56:37 +0000
+++ stock_tracking_reopen/stock_view.xml	2013-03-06 10:58:19 +0000
@@ -2,29 +2,27 @@
 <openerp>
     <data>
 
-		<record id="view_tracking_history_tree" model="ir.ui.view">
-			<field name="name">stock.tracking.history.tree.reopen</field>
-			<field name="model">stock.tracking.history</field>
-			<field name="type">tree</field>
-			<field name="inherit_id" ref="stock_tracking_extended.view_tracking_history_tree"/>
-			<field name="arch" type="xml">
-				<field name="type" position="after">
-					<field name="previous_ref"/>
-				</field>
-			</field>
-		</record>
-		
-		<record id="view_tracking_history_form" model="ir.ui.view">
-			<field name="name">stock.tracking.history.form.reopen</field>
-			<field name="model">stock.tracking.history</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="stock_tracking_extended.view_tracking_history_form"/>
-			<field name="arch" type="xml">
-				<field name="type" position="after">
-					<field name="previous_ref"/>
-				</field>
-			</field>
-		</record>
+        <record id="view_tracking_history_tree" model="ir.ui.view">
+            <field name="name">stock.tracking.history.tree.reopen</field>
+            <field name="model">stock.tracking.history</field>
+            <field name="inherit_id" ref="stock_tracking_extended.view_tracking_history_tree"/>
+            <field name="arch" type="xml">
+                <field name="type" position="after">
+                    <field name="previous_ref"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_tracking_history_form" model="ir.ui.view">
+            <field name="name">stock.tracking.history.form.reopen</field>
+            <field name="model">stock.tracking.history</field>
+            <field name="inherit_id" ref="stock_tracking_extended.view_tracking_history_form"/>
+            <field name="arch" type="xml">
+                <field name="type" position="after">
+                    <field name="previous_ref"/>
+                </field>
+            </field>
+        </record>
 
     </data>
 </openerp>

=== added directory 'stock_tracking_state'
=== added file 'stock_tracking_state/__init__.py'
--- stock_tracking_state/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_state/__init__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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 stock_tracking
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'stock_tracking_state/__openerp__.py'
--- stock_tracking_state/__openerp__.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_state/__openerp__.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+{
+    "name" : "Stock Tracking State",
+    "version" : "1.0",
+    "author" : "Julius Network Solutions",
+    "description" : """
+
+Presentation:
+
+This module will add the state field to make changes of closed packed
+
+""",
+    "website" : "http://www.julius.fr",
+    "depends" : [
+        "stock",
+        "stock_tracking_extended",
+    ],
+    "category" : "Warehouse Management",
+    "demo" : [],
+    "data" : [
+        'stock_tracking_view.xml',
+    ],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'stock_tracking_state/i18n'
=== added file 'stock_tracking_state/i18n/fr.po'
--- stock_tracking_state/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ stock_tracking_state/i18n/fr.po	2013-03-06 10:58:19 +0000
@@ -0,0 +1,76 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* stock_tracking_state
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-15 14:17+0000\n"
+"PO-Revision-Date: 2013-02-15 14:17+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: stock_tracking_state
+#: view:stock.tracking:0
+msgid "Close Pack"
+msgstr "Fermer Colis"
+
+#. module: stock_tracking_state
+#: model:ir.model,name:stock_tracking_state.model_stock_tracking
+msgid "Packs"
+msgstr "Colis"
+
+#. module: stock_tracking_state
+#: code:addons/stock_tracking_state/stock_tracking.py:63
+#, python-format
+msgid "You can't close this pack because there is at least one not closed child"
+msgstr "Vous ne pouvez pas fermer ce colis car il y a au moins un colis enfant non fermé"
+
+#. module: stock_tracking_state
+#: model:ir.model,name:stock_tracking_state.model_stock_move
+msgid "Stock Move"
+msgstr "Mouvement de stock"
+
+#. module: stock_tracking_state
+#: code:addons/stock_tracking_state/stock_tracking.py:50
+#, python-format
+msgid "You can't re-open this pack because there is at least one not closed child"
+msgstr "Vous ne pouvez pas ré-ouvrir ce colis car il y a au moins un colis enfant non fermé"
+
+#. module: stock_tracking_state
+#: view:stock.tracking:0
+msgid "Reset Open"
+msgstr "Ré-ouvrir"
+
+#. module: stock_tracking_state
+#: field:stock.tracking,state:0
+msgid "State"
+msgstr "Statut"
+
+#. module: stock_tracking_state
+#: code:addons/stock_tracking_state/stock_tracking.py:50
+#: code:addons/stock_tracking_state/stock_tracking.py:63
+#, python-format
+msgid "Not allowed !"
+msgstr "Non autorisé !"
+
+#. module: stock_tracking_state
+#: selection:stock.tracking,state:0
+msgid "Close"
+msgstr "Fermé"
+
+#. module: stock_tracking_state
+#: selection:stock.tracking,state:0
+msgid "Open"
+msgstr "Ouvert"
+
+#. module: stock_tracking_state
+#: constraint:stock.move:0
+msgid "You cannot choose this pack because it's closed."
+msgstr "Vous ne pouvez pas choisir ce colis car il est fermé."
+

=== added file 'stock_tracking_state/stock_tracking.py'
--- stock_tracking_state/stock_tracking.py	1970-01-01 00:00:00 +0000
+++ stock_tracking_state/stock_tracking.py	2013-03-06 10:58:19 +0000
@@ -0,0 +1,83 @@
+ # -*- coding: utf-8 -*-
+#################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Julius Network Solutions SARL <[e-mail]>
+#
+#    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/>.
+#
+#################################################################################
+
+from openerp.osv import fields, osv, orm
+from openerp.tools.translate import _
+
+class stock_tracking(orm.Model):
+
+    _inherit = 'stock.tracking'
+    
+    _columns = { 
+        'state': fields.selection([('open','Open'),('close','Close')], 'State', required=True, readonly=True),
+        'parent_id': fields.many2one('stock.tracking', 'Parent'),
+        'child_ids': fields.one2many('stock.tracking', 'parent_id', 'Children', readonly=True),
+    }
+
+    _defaults = {
+        'state': 'open',
+    }
+    
+    def reset_open(self, cr, uid, ids, context=None):
+        pack_ids = self.browse(cr, uid, ids, context=context)
+        for pack in pack_ids:
+            allowed = True
+            if pack.parent_id:
+                if pack.parent_id and pack.parent_id != 'open':
+                    self.write(cr, uid, [pack.parent_id.id], {'state': 'open'}, context=context)
+            if allowed:
+                for child in pack.child_ids:
+                    if child.state == 'open':
+                        allowed = False
+                        raise osv.except_osv(_('Not allowed !'),_('You can\'t re-open this pack because there is at least one not closed child'))
+                        break
+            if allowed:
+                self.write(cr, uid, [pack.id], {'state': 'open'}, context=context)
+        return True
+
+    def set_close(self, cr, uid, ids, context=None):
+        pack_ids = self.browse(cr, uid, ids, context=context)
+        for pack in pack_ids:
+            allowed = True
+            for child in pack.child_ids:
+                if child.state == 'open':
+                    allowed = False
+                    raise osv.except_osv(_('Not allowed !'),_('You can\'t close this pack because there is at least one not closed child'))
+                    break
+            if allowed:
+                self.write(cr, uid, [pack.id], {'state': 'close'}, context=context)
+        return True
+
+class stock_move(orm.Model):
+    _inherit = 'stock.move'
+    
+    def _check_tracking_state(self, cr, uid, ids, context=None):
+        lines = self.browse(cr, uid, ids, context=context)
+        for l in lines:
+            if l.tracking_id.state == 'close':
+                return False
+        return True
+    
+    _constraints = [
+        (_check_tracking_state, 'You cannot choose this pack because it\'s closed.', ['tracking_id']),
+    ]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'stock_tracking_state/stock_tracking_view.xml'
--- stock_tracking_state/stock_tracking_view.xml	1970-01-01 00:00:00 +0000
+++ stock_tracking_state/stock_tracking_view.xml	2013-03-06 10:58:19 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_tracking_state_tree" model="ir.ui.view">
+            <field name="name">stock.tracking.state.tree</field>
+            <field name="model">stock.tracking</field>
+            <field name="inherit_id" ref="stock_tracking_extended.view_tracking_extended_tree"/>
+            <field name="arch" type="xml">
+                <field name="location_id" position="after">
+                    <field name="state"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_tracking_state_form" model="ir.ui.view">
+            <field name="name">stock.tracking.state.form</field>
+            <field name="model">stock.tracking</field>
+            <field name="inherit_id" ref="stock.view_tracking_form"/>
+            <field name="arch" type="xml">
+                <group position="before">
+                    <header> 
+                        <button name="reset_open" states="close" string="Reset Open"  type="object" class="oe_highlight"/>
+                        <button name="set_close" states="open" string="Close Pack"  type="object" class="oe_highlight"/>
+                        <field name="state" widget="statusbar" statusbar_visible="open,close" />
+                    </header>
+                </group>
+            </field>
+        </record>
+
+        <record id="view_tracking_state_extended_form" model="ir.ui.view">
+            <field name="name">stock.tracking.state.extended.form</field>
+            <field name="model">stock.tracking</field>
+            <field name="inherit_id" ref="stock_tracking_extended.view_tracking_extended_form"/>
+            <field name="arch" type="xml">
+                <div name="product_buttons" position="attributes">
+                    <attribute name="attrs">{'invisible':[('state', '=', 'close')]}</attribute>
+                </div>
+                <div name="prodlot_buttons" position="attributes">
+                    <attribute name="attrs">{'invisible':[('state', '=', 'close')]}</attribute>
+                </div>