diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 0f83cefa852..711c41f1960 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -496,12 +496,12 @@ class pos_order(osv.osv):
                     if line.product_id and line.product_id.type=='service':
                         continue
                     prop_ids = self.pool.get("ir.property").search(cr, uid, [('name', '=', 'property_stock_customer')])
-                    val = self.pool.get("ir.property").browse(cr, uid, prop_ids[0]).value
+                    val = self.pool.get("ir.property").browse(cr, uid, prop_ids[0]).value_reference
                     cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order.shop_id.warehouse_id.id))
                     res=cr.fetchone()
                     location_id=res and res[0] or None
 #                    location_id = order and order.shop_id and order.shop_id.warehouse_id and order.shop_id.warehouse_id.lot_stock_id.id or None
-                    stock_dest_id = int(val.split(',')[1])
+                    stock_dest_id = val.id
                     if line.qty < 0:
                         location_id, stock_dest_id = stock_dest_id, location_id
 
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 637d37fa0b8..4958afc82fd 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -175,7 +175,9 @@
         <menuitem name="Point of Sale" id="menu_point_root" sequence="10"/>
         <menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
         <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
-        <menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale" sequence="2" name="Products"/>
+        <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="2" />
+        
+        <menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale_product" sequence="2" name="Products"/>
 
         <!--  POS Order view (date_payment)  -->
          <record model="ir.actions.act_window" id="action_pos_pos_form_user">
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index b85fe0b8e4c..57e909ae913 100644
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -25,23 +25,18 @@
             <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
             <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
         </record>
-		<record id="ir_rule_group_posline0" model="ir.rule.group">
-			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
-			<field eval="&quot;&quot;&quot;POS line&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="global"/>
-		</record>
 		<record id="ir_rule_0" model="ir.rule">
-			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
-			<field name="rule_group" ref="ir_rule_group_posline0"/>
+			<field name="name">POS line</field>
+	        <field name="model_id" ref="model_pos_order_line"/>
+	        <field name="global" eval="True"/>
+	        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
 		</record>
 	</data>
 
 	<data>
 		<record id="res_groups_posuserposline0" model="res.groups">
 			<field eval="[(6,0,[ref('point_of_sale.menu_action_pos_order_line'),ref('point_of_sale.menu_action_pos_order_line_day')])]" name="menu_access"/>
-			<field eval="[(6,0,[ref('ir_rule_group_posline0')])]" name="rule_groups"/>
+			<field eval="[(6,0,[ref('ir_rule_0')])]" name="rule_groups"/>
 			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
 			<field eval="&quot;&quot;&quot;POS_user_pos_line&quot;&quot;&quot;" name="name"/>
 		</record>
@@ -66,42 +61,21 @@
 	</data>
 
 	<data>
-		<record id="ir_rule_group_point0" model="ir.rule.group">
-			<field name="model_id" ref="point_of_sale.model_pos_order"/>
-			<field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="global"/>
-		</record>
-		<record id="ir_rule_0" model="ir.rule">
-			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_pos_order_company_id"/>
-			<field name="rule_group" ref="ir_rule_group_point0"/>
-		</record>
-
-
-		 <record id="ir_rule_group_poslinecompany0" model="ir.rule.group">
-			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
-			<field eval="&quot;&quot;&quot;POS line company&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="global"/>
-		</record>
-		<record id="ir_rule_4" model="ir.rule">
-			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
-			<field name="rule_group" ref="ir_rule_group_poslinecompany0"/>
-		</record>
-
-		<record id="ir_rule_group_posreporting0" model="ir.rule.group">
+	<record id="ir_rule_0" model="ir.rule">		
+    	<field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
+		<field name="model_id" ref="model_pos_order"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+	</record>     
+		<record id="ir_rule_group_posreporting0" model="ir.rule">
 			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>
 			<field eval="&quot;&quot;&quot;POS Reporting&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="global"/>
+	  		<field name="global" eval="True"/>
 		</record>
 
 		<record id="ir_rule_5" model="ir.rule">
-			<field eval="&quot;&quot;&quot;=&quot;&quot;&quot;" name="operator"/>
-			<field eval="&quot;&quot;&quot;user.id&quot;&quot;&quot;" name="operand"/>
-			<field name="field_id" ref="point_of_sale.field_report_transaction_pos_user_id"/>
-			<field name="rule_group" ref="ir_rule_group_posreporting0"/>
+			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>		
+			<field name="domain_force">['|',('user_id','=',False),('user_id','=',[user.id])]</field>			
 		</record>
 
 	</data>
diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
index 947348a990d..098f4cb2b00 100644
--- a/addons/point_of_sale/statement_data.xml
+++ b/addons/point_of_sale/statement_data.xml
@@ -21,13 +21,13 @@
 			<field eval="1" name="perm_create"/>
 			<field name="group_id" ref="point_of_sale.res_groups_posuser0"/>
 		</record>
-		<record id="ir_rule_group_bankstatementcompany0" model="ir.rule.group">
+		<record id="ir_rule_group_bankstatementcompany0" model="ir.rule">
 			<field name="model_id" ref="account.model_account_bank_statement"/>
 			<field eval="&quot;&quot;&quot;Bank Statement company&quot;&quot;&quot;" name="name"/>
 			<field eval="1" name="global"/>
 		</record>
 
-		<record id="ir_rule_group_bankstatementlinecompany0" model="ir.rule.group">
+		<record id="ir_rule_group_bankstatementlinecompany0" model="ir.rule">
 			<field name="model_id" ref="account.model_account_bank_statement_line"/>
 			<field eval="&quot;&quot;&quot;Bank Statement line Company&quot;&quot;&quot;" name="name"/>
 			<field eval="1" name="global"/>
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index f0a63eeb00f..592ce3db56b 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -147,11 +147,11 @@ class pos_return(osv.osv_memory):
 
             for order_id in order_obj.browse(cr, uid, [record_id], context=context):
                 prop_ids = property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
-                val = property_obj.browse(cr, uid,prop_ids[0]).value
+                val = property_obj.browse(cr, uid,prop_ids[0]).value_reference
                 cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
                 res=cr.fetchone()
                 location_id=res and res[0] or None
-                stock_dest_id = int(val.split(',')[1])
+                stock_dest_id = val.id
                                     
                 new_picking=picking_obj.copy(cr, uid, order_id.last_out_picking.id, {'name':'%s (return)' % order_id.name,
                                                                                     'move_lines':[], 'state':'draft', 'type':'in',
@@ -232,11 +232,11 @@ class add_product(osv.osv_memory):
                 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
+                val = property_obj.browse(cr, uid,prop_ids[0]).value_reference
                 cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
                 res=cr.fetchone()
                 location_id=res and res[0] or None
-                stock_dest_id = int(val.split(',')[1])
+                stock_dest_id = val.id
         
                 prod_id=prod_obj.browse(cr,uid,prod)
                 new_picking=picking_obj.create(cr,uid,{
@@ -295,11 +295,11 @@ class add_product(osv.osv_memory):
         wf_service = netsvc.LocalService("workflow")
         for order_id in order_obj.browse(cr, uid, [record_id], context=context):
             prop_ids =property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
-            val = property_obj.browse(cr, uid,prop_ids[0]).value
+            val = property_obj.browse(cr, uid,prop_ids[0]).value_reference
             cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
             res=cr.fetchone()
             location_id=res and res[0] or None
-            stock_dest_id = int(val.split(',')[1])
+            stock_dest_id = val.id
     
             order_obj.write(cr,uid,[order_id.id],{'type_rec':'Exchange'})
             if order_id.invoice_id: