Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMP] project_budget: add new fields in views #67

Merged
merged 1 commit into from
Oct 30, 2018
Merged

[IMP] project_budget: add new fields in views #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project_budget/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion project_budget/views/crossovered_budget_line_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 10 additions & 0 deletions project_budget/views/crossovered_budget_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>

Expand Down
2 changes: 2 additions & 0 deletions project_budget/views/project_project_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down