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 bf07fe15058..d824cefe2c7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1192,8 +1192,8 @@
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                       <button
                                            name="%(stock.track_line)d"
-                                           string="Split in production lots"
-                                            groups="base.group_extended" 
+                                           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"/>
@@ -1385,8 +1385,8 @@
                         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"/>
@@ -1595,27 +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" 
-                              groups="base.group_extended" 
-                              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_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index ff4cd588c47..d0f46e45658 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -69,13 +69,13 @@ class stock_split_into(osv.osv_memory):
             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['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)