From 4b36b0cd494df3d463bc35b40e3f43cb903fd51e Mon Sep 17 00:00:00 2001
From: Jacques-Etienne Baudoux <je@bcim.be>
Date: Tue, 4 Jun 2013 14:59:27 +0200
Subject: [PATCH] [IMP]purchase: improve form view tabs

bzr revid: je@bcim.be-20130604125927-0ylgwlr0i2cil7at
---
 addons/purchase/purchase_view.xml              | 18 +++++++++---------
 .../purchase_requisition_view.xml              |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 72238173b19..b05e547b0de 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -203,7 +203,7 @@
                         </group>
                     </group>
                     <notebook>
-                        <page string="Purchase Order">
+                        <page string="Products">
                             <field name="order_line">
                                 <tree string="Purchase Order Lines" editable="bottom">
                                     <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,0,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,product_lead_time,context)"/>
@@ -232,7 +232,14 @@
                             <div class="oe_clear"/>
                             <field name="notes" class="oe_inline" placeholder="Terms and conditions..."/>
                         </page>
-                        <page string="Incoming Shipments &amp; Invoices">
+                        <page string="RFQ &amp; Bid">
+                            <group>
+                                <field name="payment_term_id" widget="selection"/>
+                                <field name="bid_date"/>
+                                <field name="bid_validity"/>
+                            </group>
+                        </page>
+                        <page string="Deliveries &amp; Invoices">
                             <group>
                                 <group>
                                     <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)" groups="stock.group_locations"/>
@@ -243,7 +250,6 @@
                                 <group>
                                     <field name="invoice_method"/>
                                     <field name="invoiced"/>
-                                    <field name="payment_term_id" widget="selection"/>
                                     <field name="fiscal_position" attrs="{'readonly': [('invoiced','=', True)]}" />
                                     <!-- We do not need these fields anymore, the information is in open chatter -->
                                     <field name="validator" groups="base.group_no_one"/>
@@ -251,12 +257,6 @@
                                 </group>
                             </group>
                         </page>
-                        <page string="Bid information">
-                            <group>
-                                <field name="bid_date"/>
-                                <field name="bid_validity"/>
-                            </group>
-                        </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 77ea48e938f..6ee454dde0e 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -7,7 +7,7 @@
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.purchase_order_form"/>
         <field name="arch" type="xml">
-            <field name="validator" position="before">
+            <field name="bid_date" position="before">
                 <field name="requisition_id"/>
             </field>
         </field>