[IMP] project_budget: add new fields in views

avanzosc · Oct 29, 2018 · 83e64fd · 83e64fd
1 parent d1feb37
commit 83e64fd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/project_budget/__manifest__.py b/project_budget/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Project Bugdet",
-    "version": "11.0.3.1.0",
+    "version": "11.0.3.2.0",
     "category": "Custom Module",
     "license": "AGPL-3",
     "author": "AvanzOSC",

diff --git a/project_budget/views/crossovered_budget_line_view.xml b/project_budget/views/crossovered_budget_line_view.xml
@@ -105,8 +105,8 @@
             <pivot string="Budget Lines">
                 <field name="project_id" type="row"/>
                 <field name="general_budget_id" type="col" />
-                <field name="planned_amount" type="measure"/>
                 <field name="initial_planned_amount" type="measure" />
+                <field name="planned_amount" type="measure"/>
                 <field name="practical_amount" type="measure" />
                 <field name="sum_amount" type="measure" />
             </pivot>

diff --git a/project_budget/views/crossovered_budget_view.xml b/project_budget/views/crossovered_budget_view.xml
@@ -3,6 +3,9 @@
     <record id="account_budget.act_crossovered_budget_view" model="ir.actions.act_window">
         <field name="context">{'active_test': False}</field>
     </record>
+    <record id="account_budget.act_crossovered_budget_lines_view" model="ir.actions.act_window">
+        <field name="domain">[('budget_active','=',True)]</field>
+    </record>
 
     <record id="crossovered_budget_form_view" model="ir.ui.view">
         <field name="name">crossovered.budget.form</field>
@@ -37,6 +40,10 @@
                 <field name="initial_planned_amount" widget="monetary"
                        sum="Initial Planned Amount"/>
             </xpath>
+            <xpath expr="//field[@name='crossovered_budget_line']/tree//field[@name='practical_amount']" position="after">
+                <field name="sum_amount" widget="monetary"
+                       sum="Sum Amount Total" />
+            </xpath>
             <xpath expr="//field[@name='crossovered_budget_line']/tree//field[@name='paid_date']" position="attributes">
                 <attribute name="invisible">True</attribute>
             </xpath>
@@ -46,6 +53,9 @@
             <xpath expr="//field[@name='crossovered_budget_line']/tree//field[@name='percentage']" position="attributes">
                 <attribute name="invisible">True</attribute>
             </xpath>
+            <xpath expr="//field[@name='crossovered_budget_line']/tree//field[@name='percentage']" position="after">
+                <field name="notes" />
+            </xpath>
         </field>
     </record>
 

diff --git a/project_budget/views/project_project_view.xml b/project_budget/views/project_project_view.xml
@@ -58,6 +58,8 @@
                 <separator />
                 <filter name="unbudgeted" string="Unbudgeted"
                         domain="[('has_current_budget', '!=', True)]" />
+                <filter name="budgeted" string="Budgeted"
+                        domain="[('has_current_budget', '=', True)]" />
             </filter>
         </field>
     </record>