X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fpurchase_requisition%2Fpurchase_requisition_view.xml;h=fdd7cdc9333a736b3ee256e36585e5c41a66b6c9;hb=ff612f9d02012ecf37d56349999168304f167363;hp=79cee2870b75f4ebf83e8fed7ed278cd655fe7d8;hpb=178fec5c6410db05dd7b49f362454a49a4dd8b21;p=odoo%2Fodoo.git

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 79cee28..fdd7cdc 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -2,15 +2,14 @@
 <openerp>
     <data>
 
-
     <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">
-            <field name="shipped" position="after">
-                <field name="requisition_id" groups="base.group_extended"/>
+            <field name="validator" position="before">
+                <field name="requisition_id"/>
             </field>
         </field>
     </record>
@@ -21,79 +20,93 @@
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
         <field name="arch" type="xml">
-            <xpath expr="/search/group/filter[@string='Not Invoiced']" position="after">
-             <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]" separator="1" help="Purchase Orders with requisition"/>
+            <xpath expr="//filter[@name='approved']" position="after">
+                <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]"  help="Purchase Orders with requisition"/>
             </xpath>
         </field>
     </record>
+
     <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">
-                <group colspan="4" col="6">
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="exclusive"/>
-                    <field name="date_start"/>
-                    <field name="date_end"/>
-                    <field name="origin"/>
-                    <field name="warehouse_id" groups="base.group_extended" widget="selection"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+            <form string="Purchase Requisition" version="7.0">
+            <header>
+                <button name="tender_in_progress" states="draft" string="Send to Suppliers" type="object" class="oe_highlight"/>
+                <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
+                <button name="tender_done" states="in_progress" string="Purchase Done" type="object" class="oe_highlight"/>
+                <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" />
+                <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
+            </header>
+            <sheet>
+                <div class="oe_edit_only">
+                    <label for="name" class="oe_inline"/>
+                    <label for="origin" class="oe_inline"/>
+                </div>
+                <h1>
+                    <field name="name" class="oe_inline"/>
+                    <label string="," attrs="{'invisible':[('origin','=',False)]}"/>
+                    <field name="origin" class="oe_inline" placeholder="e.g. PO0025"/>
+                </h1>
+                <group>
+                    <group>
+                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="exclusive"/>
+                    </group>
+                    <group>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <field name="warehouse_id" widget="selection" groups="stock.group_locations"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
                 </group>
-                <notebook colspan="4">
+                <notebook>
                     <page string="Products">
-                        <field name="line_ids" colspan="4" nolabel="1">
+                        <field name="line_ids">
                             <tree string="Products" editable="bottom">
                                 <field name="product_id" on_change="onchange_product_id(product_id,product_uom_id)"/>
                                 <field name="product_qty"/>
-                                <field name="product_uom_id"/>
+                                <field name="product_uom_id" groups="product.group_uom"/>
                             </tree>
-                            <form string="Products">
-                                <field name="product_id" />
-                                <field name="product_qty"/>
-                                <field name="product_uom_id" />
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <form string="Products" version="7.0">
+                                <group>
+                                    <field name="product_id" />
+                                    <field name="product_qty"/>
+                                    <field name="product_uom_id" />
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                </group>
                             </form>
-
                         </field>
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
-                        <field name="state" select="1" readonly ="1"/>
-                        <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
-                        <button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
-                        <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
-                        <button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
-                    </group>
-                    </page>
-                    <page string="Quotations">
-                        <field colspan="4" name="purchase_ids" nolabel="1" mode="tree,form">
+                        <div class="oe_right oe_button_box" style="margin-top: 10px">
+                            <button name="%(action_purchase_requisition_partner)d" type="action"
+                                string="Request a Quotation" icon="gtk-execute"
+                                attrs="{'invisible': [('line_ids','=',False),('state', 'not in', ('in_progress'))]}"/>
+                        </div>
+                        <separator string="Quotations"/>
+                        <field name="purchase_ids" readonly="1">
                             <tree string="Purchase Order">
                                 <field name="name" string="Reference"/>
                                 <field name="date_order" string="Order Date"/>
                                 <field name="partner_id"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="location_id"/>
+                                <field name="location_id" groups="stock.group_locations"/>
                                 <field name="minimum_planned_date"/>
                                 <field name="origin"/>
                                 <field name="state"/>
-                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>								
-								<button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/>
+                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>
+                                <button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/>
                                 <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-ok"/>
                             </tree>
-                         </field>
-                        <separator colspan="4" string=""/>
-                         <group col="8" colspan="4">
-                          <label colspan="6"  string=""/>
-                        <button name="%(action_purchase_requisition_partner)d" string="Request a Quotation" type="action" icon="gtk-execute"
-                           attrs="{'readonly': [('state', '=', 'done')]}" />
-                        </group>
-                   </page>
-                    <page string="Notes">
-                        <field name="description" colspan="4" nolabel="1"/>
+                        </field>
+                        <separator string="Terms and Conditions"/>
+                        <field name="description"/>
                     </page>
                 </notebook>
+            </sheet>
+            <div class="oe_chatter">
+                  <field name="message_ids" widget="mail_thread"/>
+            </div> 
             </form>
         </field>
     </record>
@@ -102,15 +115,17 @@
         <field name="type">tree</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <tree colors="grey:state == 'done';red:date_end&lt;current_date and state not in ('done','cancel');black:date_end&gt;=current_date;" string="Purchase Requisition">
+            <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"/>
                 <field name="name"/>
-                <field name="user_id"/>
                 <field name="date_start"/>
+                <field name="user_id"/>
+                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 <field name="date_end"/>
                 <field name="origin"/>
                 <field name="state"/>
             </tree>
-        </field>
+      </field>
     </record>
 
     <record id="view_purchase_requisition_filter" model="ir.ui.view">
@@ -119,27 +134,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
-                 <group col='10' colspan='4'>
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Purchase Requisition"/>
-                    <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
-                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
-                    <separator orientation="vertical"/>
+                    <field name="name" string="Purchase Requisition"/>
+                    <field name="exclusive" />
+                    <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Purchase Requisition"/>
+                    <filter icon="terp-camera_test" string="Sent to Suppliers" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
+                    <filter icon="terp-dialog-close" string="Purchase Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
+                    <separator/>
                     <filter icon="terp-personal-" string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
-                    <field name="name"/>
                     <field name="user_id" />
-                    <field name="exclusive" />
-                </group>
-                <newline/>
-                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
-                  	<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-					<separator orientation="vertical"/>
-                    <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
-                    <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
-                </group>
-              </search>
+                    <group expand="0" string="Group By...">
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -150,15 +160,24 @@
         <field name="res_model">purchase.requisition</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="context">{"search_default_create_uid":uid,'search_default_draft': 1}</field>
+        <field name="context">{"search_default_create_uid":uid}</field>
         <field name="search_view_id" ref="view_purchase_requisition_filter"/>
-        <field name="help">A purchase requisition is the step before a request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to suppliers. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others.</field>
+        <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.
+            In a purchase requisition (or purchase tender), you can record the
+            products you need to buy and trigger the creation of RfQs to
+            suppliers. After the negotiation, once you have reviewed all the
+            supplier's offers, you can validate some and cancel others.
+          </p>
+        </field>
     </record>
 
     <menuitem
         id="menu_purchase_requisition_pro_mgt"
-        sequence="0"
-        groups="base.group_extended"
+        sequence="10"
         parent="purchase.menu_procurement_management"
         action="action_purchase_requisition"/>
 
@@ -182,17 +201,18 @@
         <field name="model">procurement.order</field>
         <field name="inherit_id" ref="procurement.procurement_form_view"/>
         <field name="arch" type="xml">
-             <xpath expr="/form/notebook/page/field[@name='close_move']" position="after">
+            <xpath expr="//field[@name='close_move']" position="after">
                 <field name="requisition_id"/>
             </xpath>
         </field>
     </record>
-	<act_window
+    <act_window
             domain="[('requisition_id', '=', active_id)]"
+            context="{'default_requisition_id': active_id}"
             id="act_res_partner_2_purchase_order"
             name="Purchase orders"
             res_model="purchase.order"
             src_model="purchase.requisition"/>
-    
+
     </data>
 </openerp>