Merge pull request #44 from lepistone/lrs-ui

source: add buttons and always show budget
OCA · Nov 19, 2014 · 7f7fc0c · 7f7fc0c
2 parents 2593905 + 5c64096
commit 7f7fc0c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/framework_agreement_sourcing/__openerp__.py b/framework_agreement_sourcing/__openerp__.py
@@ -53,8 +53,8 @@
 """,
  'website': 'http://www.camptocamp.com',
  'data': [
-     'view/requisition_view.xml',
      'wizard/logistic_requisition_source_create_po_view.xml',
+     'view/requisition_view.xml',
      'security/ir.model.access.csv'
  ],
  'demo': [],

diff --git a/framework_agreement_sourcing/view/requisition_view.xml b/framework_agreement_sourcing/view/requisition_view.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-    <record id="add_supplier_and_agreement_on_source_line" model="ir.ui.view">
-      <field name="name">add supplier and agrement on source line</field>
+    <record model="ir.ui.view" id="view_logistic_requisition_source_form">
+      <field name="name">view_logistic_requisition_source_form</field>
       <field name="model">logistic.requisition.source</field>
       <field name="inherit_id" ref="logistic_requisition.view_logistic_requisition_source_form"/>
       <field name="arch" type="xml">
+        <xpath expr="//header/group" position="after">
+          <group attrs="{'invisible': [('procurement_method', '!=', 'fw_agreement')]}">
+            <button name="%(action_view_create_agr_po_from_source)d"
+              states="assigned"
+              string="Create Agreement Purchase Order"
+              class="oe_highlight"
+              type="action"/>
+          </group>
+        </xpath>
         <field name="unit_cost"
                position="before">
           <field name="framework_agreement_id"
@@ -24,14 +33,6 @@
                position="attributes">
           <attribute name="attrs">{'invisible': [('procurement_method', '=', 'fw_agreement')]}</attribute>
         </field>
-        <field name="unit_cost"
-               position="attributes">
-          <attribute name="attrs">{'invisible': [('procurement_method', '=', 'fw_agreement')]}</attribute>
-        </field>
-        <field name="total_cost"
-               position="attributes">
-          <attribute name="attrs">{'invisible': [('procurement_method', '=', 'fw_agreement')]}</attribute>
-        </field>
         <field name="price_is"
                position="attributes">
           <attribute name="attrs">{'invisible': [('procurement_method', '=', 'fw_agreement')]}</attribute>

diff --git a/logistic_requisition/view/logistic_requisition.xml b/logistic_requisition/view/logistic_requisition.xml
@@ -593,6 +593,15 @@
         <field name="model">logistic.requisition.source</field>
         <field name="arch" type="xml">
             <form string="Logistics Requisition Sourcing Lines" create="false">
+              <header>
+                <group attrs="{'invisible': [('procurement_method', '!=', 'procurement')]}">
+                  <button name="%(action_view_create_requisition_from_source)d"
+                    states="assigned"
+                    string="Create Call for Bids"
+                    class="oe_highlight"
+                    type="action"/>
+                </group>
+              </header>
                 <sheet>
                     <div class="oe_title">
                         <h1>