diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5e011b9fb5b..ef9810196fe 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -632,7 +632,7 @@
                                     <button
                                         name="%(stock.track_line)d"
                                         string="Split in production lots"
-                                           type="action" icon="gtk-justify-fill"
+                                           type="action" icon="terp-stock_effects-object-colorize"
                                            states="draft,waiting,confirmed,assigned" />
 
                                     <button name="%(stock.move_scrap)d"
@@ -664,7 +664,7 @@
                                             <field groups="base.group_extended" name="tracking_id"/>
                                             <newline/>
                                             <label/>
-                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
                                             <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
@@ -785,7 +785,7 @@
                                     <button
                                            name="%(stock.track_line)d"
                                            string="Split in production lots"
-                                           type="action" icon="gtk-justify-fill"
+                                           type="action" icon="terp-stock_effects-object-colorize"
                                            groups="base.group_extended"
                                            states="draft,waiting,confirmed,assigned" />
                                        <button name="%(stock.move_scrap)d"
@@ -966,7 +966,7 @@
                                     <button
                                            name="%(stock.track_line)d"
                                            string="Split in production lots"
-                                           type="action" icon="gtk-justify-fill"
+                                           type="action" icon="terp-stock_effects-object-colorize"
                                            states="draft,waiting,confirmed,assigned" />
                                        <button
                                            name="%(stock.move_scrap)d"
@@ -996,7 +996,7 @@
                                                 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="gtk-justify-fill"/>
+                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
                                             <group colspan="2">
@@ -1065,7 +1065,7 @@
         </record>
 
         <record id="action_picking_tree" model="ir.actions.act_window">
-            <field name="name">Outgoing Products</field>
+            <field name="name">Outgoing Packings</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1143,7 +1143,7 @@
                                     <button
                                            name="%(stock.track_line)d"
                                            string="Split in production lots"
-                                           type="action" icon="gtk-justify-fill"
+                                           type="action" icon="terp-stock_effects-object-colorize"
                                            states="draft,waiting,confirmed,assigned" />
                                        <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
@@ -1175,7 +1175,7 @@
                                             <field groups="base.group_extended" name="tracking_id"/>
                                             <newline/>
                                             <label/>
-                                            <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                            <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
                                             <group colspan="2">
@@ -1374,7 +1374,7 @@
                                     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)"/>
-                                <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill" colspan="2" />
+                                <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
                             </group>
                         </page>
                         <page string="Return Picking History">
@@ -1460,7 +1460,9 @@
                     <field name="date_expected"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="state"/>
+                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" states="draft,waiting,confirmed,assigned"/>
                     <button name="%(action_partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
+                    <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                     <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
                     <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
                 </tree>
@@ -1501,7 +1503,7 @@
                             <newline/>
                             <group col="2" colspan="2">
                                 <label/>
-                                <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                <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"/>
@@ -1554,7 +1556,7 @@
         </record>
 
         <record id="action_reception_picking_move" model="ir.actions.act_window">
-            <field name="name">Incoming Packings</field>
+            <field name="name">Incoming Products</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1766,7 +1768,7 @@
         </record>
 
         <record id="action_out_picking_move" model="ir.actions.act_window">
-            <field name="name">Outcoming Packings</field>
+            <field name="name">Outgoing Products</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 0f538748a98..8f283ebee62 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -31,8 +31,9 @@ class stock_partial_move(osv.osv_memory):
     _description = "Partial Move"    
     _columns = {
         'date': fields.datetime('Date', required=True),
-        'partner_id': fields.many2one('res.partner',string="Partner", required=True),
-        'address_id': fields.many2one('res.partner.address', 'Delivery Address', help="Address where goods are to be delivered", required=True),
+        'partner_id': fields.many2one('res.partner',string="Partner"),
+        'type': fields.char("Type", size=3),
+        'address_id': fields.many2one('res.partner.address', 'Delivery Address', help="Address where goods are to be delivered"),
      }
 
     def view_init(self, cr, uid, fields_list, context=None):
@@ -66,11 +67,14 @@ class stock_partial_move(osv.osv_memory):
         _moves_arch_lst = """<form string="Deliver Products">
                         <separator colspan="4" string="Delivery Information"/>
                     	<field name="date" colspan="4" />
-                    	<field name="partner_id"/>
-                    	<field name="address_id"/>
+                     <group colspan="4" attrs="{'invisible':[('type','=','in')]}">
+                    	<field name="partner_id"  attrs="{'required':[('type','!=','in')]}" />
+                    	<field name="address_id"  attrs="{'required':[('type','!=','in')]}"/>
+                    	<field name="type" invisible="1"/>
                     	<newline/>
+                        </group>
                         <separator colspan="4" string="Move Detail"/>
-                    	"""
+                    	""" 
         _moves_fields = result['fields']
         if move_ids and view_type in ['form']:            
             for m in move_obj.browse(cr, uid, move_ids, context):                
@@ -152,7 +156,7 @@ class stock_partial_move(osv.osv_memory):
         move_obj = self.pool.get('stock.move')        
         if not context:
             context={}
-        moveids = []
+        moveids = address_delivery = address_default = []
         if 'date' in fields:
             res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         move_ids = context.get('active_ids', [])
@@ -160,14 +164,23 @@ class stock_partial_move(osv.osv_memory):
         for m in move_obj.browse(cr, uid, context.get('active_ids', [])):            
             if m.state in ('done', 'cancel'):
                 continue
+            res['type'] = m.picking_id and m.picking_id.type or ''
             address_ids = list(set([(pick.address_id and pick.address_id.id, pick.address_id and pick.address_id.partner_id and  pick.address_id.partner_id.id) for pick in move_obj.browse(cr, uid, move_ids)]))
-            if len(address_ids) == 1:
-                address_id = address_ids[0][0]
-                partner_id = address_ids[0][1]
-                res['address_id'] = address_ids[0][0]
-                res['partner_id'] = address_ids[0][1]
-            else:
-                address_id = partner_id = False
+            address_ids1 = list(set([(pick.address_id and pick.address_id.id, pick.address_id and pick.address_id.partner_id and  pick.address_id.partner_id.id) for pick in move_obj.browse(cr, uid, move_ids) if pick.address_id]))
+            if len(address_ids1) == 1:
+                if m.picking_id and m.picking_id.type=='out':
+                    res['address_id'] = address_ids[0][0] or False
+                    res['partner_id'] = address_ids[0][1] or False  
+            if  m.picking_id and m.picking_id.type=='in':
+                    res['partner_id'] = m.company_id.partner_id.id or False
+                    if  m.company_id.partner_id:
+                        address_default = [add.id for add in  m.company_id.partner_id.address if add.type=='default']
+                        address_delivery = [add.id for add in  m.company_id.partner_id.address if add.type=='delivery']
+                    if len(address_delivery):
+                        res['address_id'] =  address_delivery and address_delivery[0] or False
+                    else:
+                        res['address_id'] =  address_default and address_default[0] or False
+
             if 'move%s_product_id'%(m.id) in fields:
                 res['move%s_product_id'%(m.id)] = m.product_id.id
             if 'move%s_product_qty'%(m.id) in fields:
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 0feac97010b..1326050dd7d 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -32,6 +32,7 @@ class stock_partial_picking(osv.osv_memory):
             'date': fields.datetime('Date', required=True),
             'partner_id': fields.many2one('res.partner',string="Partner", required=True),
             'address_id': fields.many2one('res.partner.address', 'Delivery Address', help="Address where goods are to be delivered", required=True),
+            'type': fields.char("Type", size=3),
      }
 
     def view_init(self, cr, uid, fields_list, context=None):
@@ -65,9 +66,12 @@ class stock_partial_picking(osv.osv_memory):
         _moves_arch_lst = """<form string="Deliver Products">
                         <separator colspan="4" string="Delivery Information"/>
                     	<field name="date" colspan="4" />
-                    	<field name="partner_id"/>
-                    	<field name="address_id"/>
+                         <group colspan="4" attrs="{'invisible':[('type','=','in')]}">
+                    	<field name="partner_id"  attrs="{'required':[('type','!=','in')]}" />
+                    	<field name="address_id"  attrs="{'required':[('type','!=','in')]}"/>
+                    	<field name="type" invisible="1"/>
                     	<newline/>
+                        </group>
                         <separator colspan="4" string="Move Detail"/>
                     	"""
         _moves_fields = result['fields']
@@ -163,6 +167,23 @@ class stock_partial_picking(osv.osv_memory):
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
                     continue
+                res['type'] = m.picking_id and m.picking_id.type or ''
+                address_ids = list(set([(pick.address_id and pick.address_id.id, pick.address_id and pick.address_id.partner_id and  pick.address_id.partner_id.id) for pick in pick_obj.browse(cr, uid, context.get('active_ids', []))]))
+                address_ids1 = list(set([(pick.address_id and pick.address_id.id, pick.address_id and pick.address_id.partner_id and  pick.address_id.partner_id.id) for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])) if pick.address_id]))
+                if len(address_ids1) == 1:
+                    if m.picking_id and m.picking_id.type=='out':
+                        res['address_id'] = address_ids[0] and address_ids[0][0] or False
+                        res['partner_id'] = address_ids[0][1] or False  
+                if  m.picking_id and m.picking_id.type=='in':
+                        res['partner_id'] = m.company_id.partner_id.id or False
+                        partner_company = m.company_id.partner_id and m.company_id.partner_id 
+                        if partner_company:
+                            address_default = [add.id for add in  m.company_id.partner_id.address if add.type=='default']
+                            address_delivery = [add.id for add in  m.company_id.partner_id.address if add.type=='delivery']
+                        if len(address_delivery):
+                            res['address_id'] =  address_delivery and address_delivery[0] or False
+                        else:
+                            res['address_id'] =  address_default and address_default[0] or False
                 if 'move%s_product_id'%(m.id) in fields:
                     res['move%s_product_id'%(m.id)] = m.product_id.id
                 if 'move%s_product_qty'%(m.id) in fields: