diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 95db4d76d5b..b5b68aaf13c 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -56,7 +56,6 @@ Main Features
         'mail_thread_view.xml',
         'mail_group_view.xml',
         'res_config_view.xml',
-        'res_partner_view.xml',
         'data/mail_data.xml',
         'data/mail_group_data.xml',
         'security/mail_security.xml',
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
deleted file mode 100644
index 6b36a62005f..00000000000
--- a/addons/mail/res_partner_view.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <record id="view_emails_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.emails.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='container_row_2']" position="after">
-                    <group name="container_row_communication">
-                        <group string="Mailing" name="mailing">
-                            <field name='notify_email' widget="radio"/>
-                        </group>
-                    </group>
-                </xpath>
-                <xpath expr="//sheet" position="after">
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers"/>
-                        <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}'/>
-                    </div>
-                </xpath>
-            </field>
-        </record>
-
-   </data>
-</openerp>
diff --git a/addons/mail/views/res_partner_view.xml b/addons/mail/views/res_partner_view.xml
index b163f28b8fb..97942b5561a 100644
--- a/addons/mail/views/res_partner_view.xml
+++ b/addons/mail/views/res_partner_view.xml
@@ -1,13 +1,25 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-        <record model="ir.ui.view" id="res_partner_opt_out_form">
-            <field name="name">res.partner.opt_out.form</field>
+
+        <record id="view_emails_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.emails.info.inherit</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='active']" position="after">
-                    <field name="opt_out"/>
+                <xpath expr="//group[@name='container_row_2']" position="after">
+                    <group name="container_row_communication">
+                        <group string="Mailing" name="mailing">
+                            <field name='notify_email' widget="radio"/>
+                            <field name="opt_out"/>
+                        </group>
+                    </group>
+                </xpath>
+                <xpath expr="//sheet" position="after">
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}'/>
+                    </div>
                 </xpath>
             </field>
         </record>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 2402dffbe0c..40e8a5ea723 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -147,7 +147,7 @@
           parent="base.menu_purchase_root" sequence="8"/>
 
       <menuitem name="Products by Category" id="menu_product_by_category_purchase_form" action="product.product_category_action"
-           parent="menu_procurement_management_product" sequence="2"/>
+           parent="menu_procurement_management_product" sequence="2" groups="base.group_no_one"/>
 
       <menuitem name="Products" id="menu_procurement_partner_contact_form" action="product_normal_action_puchased"
           parent="menu_procurement_management_product" sequence="1"/>
@@ -228,7 +228,6 @@
                             <field name="date_order"/>
                             <field name="origin" attrs="{'invisible': [('origin','=',False)]}"/>
                             <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
-                            <field name="picking_type_id" on_change="onchange_picking_type_id(picking_type_id, context)" domain="[('code','=','incoming')]" options="{'no_create': True}" context="{'special_shortened_wh_name': True}" groups="stock.group_locations"/>
                             <field name="related_usage" invisible="1"/>
                             <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id, context)"
                                 attrs="{'invisible':[('related_usage','!=','customer')],
@@ -283,7 +282,8 @@
                             <group>
                                 <group>
                                     <field name="minimum_planned_date"/>
-                                    <field name="location_id" groups="stock.group_locations"/>
+                                    <field name="picking_type_id" on_change="onchange_picking_type_id(picking_type_id, context)" domain="[('code','=','incoming')]" options="{'no_create': True}" context="{'special_shortened_wh_name': True}" groups="stock.group_locations"/>
+                                    <field name="location_id" groups="stock.group_locations" string="Location"/>
                                     <field name="shipped" groups="base.group_no_one"/>
                                     <field name="incoterm_id"/>
                                 </group>