[MERGE] merge with addons

[odoo/odoo.git] / addons / purchase_requisition / purchase_requisition_view.xml

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 13ea40d..c4c2702 100644 (file)
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -102,11 +102,8 @@
                 </notebook>
             </sheet>
             <div class="oe_chatter">
-                  <field name="message_ids" widget="mail_thread"/>
-                  <!-- Invisible fields used in chatter widgets -->
-                  <field name="message_subtype_data" invisible="True"/>
-                  <field name="message_is_follower" invisible="True"/>
-                  <field name="message_follower_ids" widget="mail_followers"/>
+              <field name="message_ids" widget="mail_thread"/>
+              <field name="message_follower_ids" widget="mail_followers"/>
             </div> 
             </form>
         </field>
@@ -183,7 +180,7 @@
     <record model="ir.ui.view" id="product_normal_form_view_inherit">
         <field name="name">product.form.inherit</field>
         <field name="model">product.product</field>
-        <field name="inherit_id" ref="product.product_normal_form_view"/>
+        <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
         <field name="arch" type="xml">
             <field name="procure_method" position="before">
                 <field name="purchase_requisition"/>