diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index c458044365f..e45e6984a9a 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -124,14 +124,12 @@ class pos_return(osv.osv_memory):
             date_cur = time.strftime('%Y-%m-%d %H:%M:%S')
 
             for order_id in order_obj.browse(cr, uid, [active_id], context=context):
-                prop_ids = property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
-                val = property_obj.browse(cr, uid, prop_ids[0], context=context).value_reference
+                stock_dest_id = property_obj.get(cr, uid, 'property_stock_customer', 'res.partner', context=context).id
                 cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w "
                             "WHERE w.lot_stock_id=s.id AND w.id=%s ", 
                             (order_id.shop_id.warehouse_id.id,))
                 res = cr.fetchone()
                 location_id = res and res[0] or None
-                stock_dest_id = val.id
                 new_picking = picking_obj.copy(cr, uid, order_id.picking_id.id, {'name':'%s (return)' % order_id.name,
                                                                                'move_lines': [],
                                                                                'state':'draft',
@@ -221,15 +219,12 @@ class add_product(osv.osv_memory):
             for order_id in order_obj.browse(cr, uid, [active_id], context=context):
                 prod=data['product_id']
                 qty=data['quantity']
-                prop_ids = property_obj.search(cr, uid, [('name', '=', 'property_stock_customer')])
-                val = property_obj.browse(cr, uid, prop_ids[0]).value_reference
+                stock_dest_id = property_obj.get(cr, uid, 'property_stock_customer', 'res.partner', context=context).id
                 cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w "
                             "WHERE w.lot_stock_id=s.id AND w.id=%s ",
                             (order_id.shop_id.warehouse_id.id,))
                 res=cr.fetchone()
                 location_id=res and res[0] or None
-                stock_dest_id = val.id
-
                 prod_id=prod_obj.browse(cr, uid, prod, context=context)
                 new_picking=picking_obj.create(cr, uid, {
                                 'name':'%s (Added)' %order_id.name,
@@ -288,14 +283,12 @@ class add_product(osv.osv_memory):
         order_obj.add_product(cr, uid, active_ids[0], self_data['product_id'], self_data['quantity'], context=context)
         
         for order_id in order_obj.browse(cr, uid, active_ids, context=context):
-            prop_ids =property_obj.search(cr, uid, [('name', '=', 'property_stock_customer')])
-            val = property_obj.browse(cr, uid, prop_ids[0]).value_reference
+            stock_dest_id = property_obj.get(cr, uid, 'property_stock_customer', 'res.partner', context=context).id
             cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w "
                         " WHERE w.lot_stock_id=s.id AND w.id=%s ",
                         (order_id.shop_id.warehouse_id.id,))
             res=cr.fetchone()
             location_id=res and res[0] or None
-            stock_dest_id = val.id
 
             order_obj.write(cr,uid,[order_id.id],{'type_rec':'Exchange'})
             if order_id.invoice_id:
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index b5248e93654..7509b55b5d8 100644
--- a/addons/point_of_sale/wizard/pos_return_view.xml
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Return lines">
-                    <label string="Quantities you enter, match to products that will return to the stock" colspan="4"/>
+                    <label string=" Enter the quantities which you want to return." colspan="4"/>
                     <separator colspan="4"/>
                     <field name="pos_moves_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200" >
                     </field>
                     <newline/>
                     <separator colspan="4"/>
                     <button icon='gtk-cancel' special="cancel" string="Cancel" />
-                    <button icon='gtk-ok' name= "create_returns" string="Return with Exchange" type="object"/>
+                    <button icon='gtk-ok' name= "create_returns" string="Return With Exchange" type="object"/>
                     <button icon='gtk-ok' name="create_returns2" string="Refund Without Exchange" type="object"/>
                  </form>
             </field>