Merge pull request #185 from lepistone/requisition_ui

Purchase Requisition ui improvements

ngo_purchase_requisition/view/purchase_order.xml

@@ -2,32 +2,6 @@
 <openerp>
   <data>
 
-    <record model="ir.ui.view" id="view_purchase_order_line_tree">
-      <field name="name">purchase_order_line_tree</field>
-      <field name="model">purchase.order.line</field>
-      <field name="inherit_id" ref="purchase_requisition_bid_selection.view_purchase_order_line_tree"/>
-      <field name="arch" type="xml">
-
-        <field name="name" position="after">
-          <field name="country_of_origin" invisible="not context.get('selection_view')"/>
-        </field>
-
-        <field name="partner_id" position="after">
-          <field name="meets_specifications" invisible="not context.get('selection_view')"/>
-          <field name="bid_eligible" invisible="not context.get('selection_view')"/>
-          <field name="incoterm_id" invisible="not context.get('selection_view')"/>
-          <field name="incoterm_address" invisible="not context.get('selection_view')"/>
-          <field name="date_planned" invisible="not context.get('selection_view')"/>
-        </field>
-
-        <field name="product_qty" position="before">
-          <field name="terms_of_payment" invisible="not context.get('selection_view')"/>
-          <field name="payment_term_id" invisible="not context.get('selection_view')"/>
-        </field>
-
-      </field>
-    </record>
-
     <record model="ir.ui.view" id="view_purchase_order_line_search">
       <field name="name">purchase_order_line_search</field>
       <field name="model">purchase.order.line</field>

ngo_purchase_requisition/view/purchase_requisition.xml

@@ -12,9 +12,11 @@
             <button type="object" name="ask_confirmation_to_close_selection" states="selected" string="Accept selection" class="oe_highlight"/>
             <button name="open_bid" states="in_progress" string="Close Call for Bids" class="oe_highlight"/>
             <!-- added by purchase_requisition_bid_selection -->
-            <button name="reopen_bid" states="selected" string="Re-Open Bids Selection"/>
+            <button name="reopen_bid" states="selected" string="Re-Open Bids Selection" groups="purchase_requisition.group_purchase_requisition_manager"/>
             <button name="tender_reset" states="cancel" string="Reset to Draft" type="object" />
             <button name="open_product_line" states="open" string="Choose product lines" type="object" class="oe_highlight" groups="purchase.group_advance_bidding" />
+            <button name="back_to_sent" states="open" string="Back to Confirmed" groups="purchase_requisition.group_purchase_requisition_manager"/>
+            <button name="back_to_selected" states="closed" string="Back to Selected" groups="purchase_requisition.group_purchase_requisition_manager"/>
             <!-- extended by purchase_requisition_bid_selection -->
             <button name="generate_po" states="closed" string="Generate PO" type="object" class="oe_highlight"/>
             <button name="cancel_requisition" states="draft,in_progress" string="Cancel Call"/>
@@ -53,7 +55,13 @@
               <group>
                 <field name="ordering_date" attrs="{'readonly': [('state','!=','draft')]}"/>
                 <field name="schedule_date" attrs="{'readonly': [('state','!=','draft')]}"/>
-                <field name="req_validity" attrs="{'readonly': [('state','!=','draft')]}"/>
+
+                <label for="req_validity" />
+                <div>
+                  <field name="req_validity" class="oe_inline" attrs="{'readonly': [('state','!=','draft')]}"/>
+                  <button name="ask_validity" class="oe_inline oe_link" type="object" string="(extend)" attrs="{'invisible': [('state', '=', 'draft')]}"/>
+                </div>
+
                 <field name="date_end" attrs="{'readonly': [('state','!=','draft')]}"/>
               </group>
               <group>