[MERGE] Merged with addons/trunk.

[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 a654198..34fc8dc 100644 (file)
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -4,7 +4,6 @@
 
     <record model="ir.ui.view" id="purchase_order_form_inherit">
         <field name="name">purchase.order.form.inherit</field>
-        <field name="type">form</field>
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.purchase_order_form"/>
         <field name="arch" type="xml">
@@ -16,7 +15,6 @@
 
     <record model="ir.ui.view" id="purchase_order_search_inherit">
         <field name="name">purchase.order.list.select.inherit</field>
-        <field name="type">form</field>
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
         <field name="arch" type="xml">
@@ -28,7 +26,6 @@
 
     <record model="ir.ui.view" id="view_purchase_requisition_form">
         <field name="name">purchase.requisition.form</field>
-        <field name="type">form</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
             <form string="Purchase Requisition" version="7.0">
@@ -47,7 +44,7 @@
                 <h1>
                     <field name="name" class="oe_inline"/>
                     <label string="," attrs="{'invisible':[('origin','=',False)]}"/>
-                    <field name="origin" class="oe_inline" placeholder="PO0025"/>
+                    <field name="origin" class="oe_inline" placeholder="e.g. PO0025"/>
                 </h1>
                 <group>
                     <group>
@@ -106,17 +103,17 @@
             </sheet>
             <div class="oe_chatter">
                   <field name="message_ids" widget="mail_thread"/>
+                  <field name="message_follower_ids" widget="mail_followers"/>
             </div> 
             </form>
         </field>
     </record>
     <record model="ir.ui.view" id="view_purchase_requisition_tree">
         <field name="name">purchase.requisition.tree</field>
-        <field name="type">tree</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <tree fonts="bold:needaction_pending==True" colors="grey:state == 'cancel';red:date_end and date_end&lt;current_date;black:date_end&gt;current_date;" string="Purchase Requisition">
-                <field name="needaction_pending" invisible="1"/>
+            <tree fonts="bold:message_unread==True" colors="grey:state == 'cancel';red:date_end and date_end&lt;current_date;black:date_end&gt;current_date;" string="Purchase Requisition">
+                <field name="message_unread" invisible="1"/>
                 <field name="name"/>
                 <field name="date_start"/>
                 <field name="user_id"/>
@@ -131,7 +128,6 @@
     <record id="view_purchase_requisition_filter" model="ir.ui.view">
             <field name="name">purchase.requisition.list.select</field>
             <field name="model">purchase.requisition</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
                     <field name="name" string="Purchase Requisition"/>
@@ -162,8 +158,8 @@
         <field name="view_mode">tree,form</field>
         <field name="context">{"search_default_create_uid":uid}</field>
         <field name="search_view_id" ref="view_purchase_requisition_filter"/>
-        <field name="help" type="xml">
-          <p>
+        <field name="help" type="html">
+          <p class="oe_view_nocontent_create">
             Click to start a new purchase requisition process. 
           </p><p>
             A purchase requisition is the step before a request for quotation.
@@ -183,7 +179,6 @@
 
     <record model="ir.ui.view" id="product_normal_form_view_inherit">
         <field name="name">product.form.inherit</field>
-        <field name="type">form</field>
         <field name="model">product.product</field>
         <field name="inherit_id" ref="product.product_normal_form_view"/>
         <field name="arch" type="xml">
@@ -197,7 +192,6 @@
 
     <record model="ir.ui.view" id="procurement_normal_form_view_inherit">
         <field name="name">procurement.form.inherit</field>
-        <field name="type">form</field>
         <field name="model">procurement.order</field>
         <field name="inherit_id" ref="procurement.procurement_form_view"/>
         <field name="arch" type="xml">