diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 499700a8777..d2a543a0a3e 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po
index 565dd1e0f4d..3c18c0ec32e 100644
--- a/addons/base_module_quality/i18n/it.po
+++ b/addons/base_module_quality/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/board/i18n/nl_BE.po b/addons/board/i18n/nl_BE.po
index 2754b34b4bd..b36d1a918a6 100644
--- a/addons/board/i18n/nl_BE.po
+++ b/addons/board/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index c4f6acceef1..04619e44885 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/mrp_operations/i18n/hi.po b/addons/mrp_operations/i18n/hi.po
index fa9b4ac9ef8..657860cae37 100644
--- a/addons/mrp_operations/i18n/hi.po
+++ b/addons/mrp_operations/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/hi.po b/addons/mrp_repair/i18n/hi.po
index 902b7bbf5bd..6136b1e992a 100644
--- a/addons/mrp_repair/i18n/hi.po
+++ b/addons/mrp_repair/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/multi_company/i18n/it.po b/addons/multi_company/i18n/it.po
index aa820150b5a..1899d197277 100644
--- a/addons/multi_company/i18n/it.po
+++ b/addons/multi_company/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 35d5e643150..93bb2e12631 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index c6a09d5d728..d1ccce7b15f 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -24,3 +24,5 @@
 "access_account_sequence_fiscalyear_purchase_user","account.sequence.fiscalyear purchase","account.model_account_sequence_fiscalyear","group_purchase_user",1,1,1,1
 "access_res_partner_purchase_user","res.partner purchase","base.model_res_partner","group_purchase_user",1,0,0,0
 "access_res_partner_address_purchase_user","res.partner.address purchase","base.model_res_partner_address","group_purchase_user",1,0,0,0
+"access_account_journal","account.journal","account.model_account_journal","purchase.group_purchase_user",1,1,1,0
+"access_account_journal_manager","account.journal","account.model_account_journal","purchase.group_purchase_manager",1,1,1,1
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 528ad7fd1cd..e7ad2972dbc 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="sale.group_sale_user"/> 
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 25a0c9e5358..bc826ef796d 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index aade911d099..95d22fcaa6c 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index f7bbc7ea3b9..7ecb0b833e9 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -50,4 +50,6 @@
 "access_stock_replacement_result","stock.replacement.result","model_stock_replacement_result","stock.group_stock_user",1,1,1,1
 "access_stock_ups","stock.ups","model_stock_ups","stock.group_stock_user",1,1,1,1
 "access_stock_ups_final","stock.ups.final","model_stock_ups_final","stock.group_stock_user",1,1,1,1
-"access_stock_ups_upload","stock.ups.upload","model_stock_ups_upload","stock.group_stock_user",1,1,1,1
\ No newline at end of file
+"access_stock_ups_upload","stock.ups.upload","model_stock_ups_upload","stock.group_stock_user",1,1,1,1
+"access_stock_split_into","stock.split.into","model_stock_split_into","stock.group_stock_user",1,1,1,0
+"access_stock_split_into_manager","stock.split.into","model_stock_split_into","stock.group_stock_manager",1,1,1,1
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3fdfda9e057..d824cefe2c7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -631,15 +631,18 @@
                                     <button
                                         name="%(stock.track_line)d"
                                         string="Split in production lots"
-                                           type="action" icon="terp-stock_effects-object-colorize"
-                                           states="draft,waiting,confirmed,assigned" />
+                                        groups="base.group_extended" 
+                                        type="action" icon="terp-stock_effects-object-colorize"
+                                        states="draft,waiting,confirmed,assigned" />
                                     <field groups="base.group_extended" name="tracking_id"/>
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                            groups="base.group_extended" 
                                             icon="terp-stock_effects-object-colorize" 
                                             states="draft,assigned,confirmed,done"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
                                         icon="terp-stock_effects-object-colorize" 
+                                        groups="base.group_extended" 
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
@@ -677,9 +680,11 @@
 
                                             <newline/>
                                             <label/>
-                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"
+                                              groups="base.group_extended" />
                                             <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
                                             <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                                groups="base.group_extended" 
                                                 icon="terp-stock_effects-object-colorize" />
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
@@ -792,9 +797,11 @@
                                     <field groups="base.group_extended" name="tracking_id"/>
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                        groups="base.group_extended" 
                                         states="draft,assigned,confirmed,done"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
+                                        groups="base.group_extended" 
                                         icon="terp-stock_effects-object-colorize" 
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
@@ -837,9 +844,12 @@
                                             <field groups="base.group_extended" name="tracking_id"/>
 
                                             <label/>
-                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            <button name="%(track_line)d" string="Split in production lots" 
+                                            groups="base.group_extended" 
+                                            type="action" icon="terp-stock_effects-object-colorize"/>
                                             <label/>
                                             <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                              groups="base.group_extended" 
                                                 icon="terp-stock_effects-object-colorize"
                                                 states="draft,assigned,confirmed,done"/>
                                             <separator colspan="4" string="Move State"/>
@@ -993,9 +1003,11 @@
                                     <field name="tracking_id" groups="base.group_extended"/>
                                   <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                       icon="terp-stock_effects-object-colorize"
+                                      groups="base.group_extended" 
                                       states="draft,assigned,confirmed,done"/>
                                 <button name="setlast_tracking" string="Set Last Tracking" type="object"
                                     attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
+                                    groups="base.group_extended" 
                                     icon="terp-stock_effects-object-colorize" 
                                     states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
@@ -1027,9 +1039,12 @@
                                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
                                             <label/>
-                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"
+                                                groups="base.group_extended" 
+                                             />
                                             <label/>
                                             <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                                groups="base.group_extended" 
                                                 icon="terp-stock_effects-object-colorize" 
                                                 states="draft,assigned,confirmed,done"/>
                                             <label/>
@@ -1177,14 +1192,17 @@
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                       <button
                                            name="%(stock.track_line)d"
-                                           string="Split in production lots"
+                                           string="Split in production ii lots"
+                                            groups="base.group_extended"
                                            type="action" icon="terp-stock_effects-object-colorize"
                                            states="draft,waiting,confirmed,assigned" />
                                     <field name="tracking_id" groups="base.group_extended"/>
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                        groups="base.group_extended" 
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                                        groups="base.group_extended" 
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="state"/>
@@ -1216,7 +1234,9 @@
                                             <label/>
                                           	<button groups="base.group_extended" name="267" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
                                             <label/>
-                                            <button name="275" string="Split Stock Moves" type="action" icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" states="draft,assigned,confirmed,done"/>
+                                            <button name="275" string="Split Stock Moves" type="action"
+                                              groups="base.group_extended" 
+                                              icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" states="draft,assigned,confirmed,done"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
                                             <group colspan="2">
@@ -1365,17 +1385,18 @@
                         icon="gtk-convert" context="{'scrap': True}"
                         states="draft,waiting,confirmed,assigned" />
                     <field name="prodlot_id" groups="base.group_extended"/>
-                    <button name="%(track_line)d" string="Split" type="action"
-                        icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
+                    <button name="%(track_line)d" string="Split in Production Lots" type="action"
+                        icon="gtk-justify-fill" 
                         states="assigned,confirmed"
                         groups="base.group_extended"/>
                     <field groups="base.group_extended" name="tracking_id"/>
                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                        groups="base.group_extended" 
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
-                        icon="terp-stock_effects-object-colorize" 
-                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
+                        groups="base.group_extended" 
+                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
@@ -1435,9 +1456,12 @@
                                 <newline/>
                                 <group colspan="4" col="4">
                                   <label/>
-                                	<button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
+                                	<button name="%(track_line)d"
+                                    groups="base.group_extended" 
+                                   string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
                                   <label/>
-                                	<button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                    <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                        groups="base.group_extended" 
                                 		icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                 		states="draft,assigned,confirmed,done"/>
                                 </group>
@@ -1530,10 +1554,12 @@
                         groups="base.group_extended"/>
                     <field name="tracking_id" groups="base.group_extended"/>
                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                        groups="base.group_extended" 
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
+                        groups="base.group_extended" 
                         icon="terp-stock_effects-object-colorize" 
                         states="draft,assigned,confirmed,done"/>
                     <field name="date_planned"/>
@@ -1569,24 +1595,23 @@
                             <field name="date_expected"/>
                             <field name="priority"/>
                             <field name="address_id" context="{'contact_display':'partner'}"/>
-                            <newline/>
+                            <field name="picking_id"/>
                             <newline/>
                             <field name="prodlot_id" groups="base.group_extended"
                                 context="{'location_id':location_id, 'product_id':product_id}"
                                 domain="[('product_id','=?',product_id)]"
                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                             <field groups="base.group_extended" name="tracking_id"/>
-
                             <newline/>
-                            <field name="picking_id"/>
-                            <group col="2" colspan="2">
+                              <label/>
+	                            <button name="%(track_line)d" string="Split in production lots" 
+                              groups="base.group_extended" 
+                              type="action" icon="terp-stock_effects-object-colorize"/>
                               <label/>
 	                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                groups="base.group_extended" 
 	                            	icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
 	                            	states="draft,assigned,confirmed,done"/>
-                              <label/>
-	                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
-                        	</group>
                             <separator colspan="4" string="Move State"/>
                             <field name="state"/>
                             <group col="5" colspan="2">
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 05c35d5a830..71626e7d161 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -120,7 +120,7 @@
 
                   <group colspan="4" attrs="{'invisible':[('use_exist','=',True)]}">
 	                	<field name="line_ids" colspan="4" nolabel="1">
-	                		<tree string="Lots Number" editable="top">
+	                		<tree string="Lots Number" editable="bottom">
 	                			<field name="name" string="Lots"/>
 	                			<field name="quantity" />
 	                		</tree>
@@ -132,7 +132,7 @@
                     </group>
                   <group colspan="4" attrs="{'invisible':[('use_exist','!=',True)]}">
 	                	<field name="line_exist_ids" colspan="4" nolabel="1">
-	                		<tree string="Lots Number" editable="top">
+	                		<tree string="Lots Number" editable="bottom">
 	                			<field name="prodlot_id" string="Lots" domain="[('product_id','=',parent.product_id)]"/>
 	                			<field name="quantity" />
 	                		</tree>
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index dcc97d6379d..d0f46e45658 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -57,26 +57,26 @@ class stock_split_into(osv.osv_memory):
         value_to_split = self.browse(cr, uid, data[0], context)
         quantity =  value_to_split.quantity or 0.0
         ir_sequence_obj = self.pool.get('ir.sequence')
-        prodlot_obj = self.pool.get('stock.production.lot')
+        track_obj = self.pool.get('stock.tracking')
         for move in move_obj.browse(cr, uid, rec_id):
             move_qty = move.product_qty
             uos_qty_rest = move.product_uos_qty
             quantity_rest = move_qty - quantity
             if quantity_rest == 0:
                 continue
-            sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
-            prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence}, {'product_id': move.product_id.id})
+            sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.tracking')
+            tracking_id = track_obj.create(cr, uid, {'name': sequence}, {'product_id': move.product_id.id})
             uos_qty = quantity / move_qty * move.product_uos_qty
             uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
             default_val = {
-                'product_qty': quantity,
+                'product_qty': quantity_rest,
                 'product_uos_qty': uos_qty,
                 'state': move.state
             }
             current_move = move_obj.copy(cr, uid, move.id, default_val)
             new_move.append(current_move)
-            update_val['product_qty'] = quantity_rest
-            update_val['prodlot_id'] = prodlot_id
+            update_val['product_qty'] = quantity
+            update_val['tracking_id'] = tracking_id
             update_val['product_uos_qty'] = uos_qty_rest
             move_obj.write(cr, uid, [move.id], update_val)
         return {}