diff options
| author | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-02-02 14:56:02 +0100 |
|---|---|---|
| committer | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-02-02 14:56:02 +0100 |
| commit | 7f0c30580b567bb5e2e2d9d2c4e7d65112da72a5 (patch) | |
| tree | 4ac6be94f1094e629a54c2ce8ac203dfc5cdbbd8 /addons/fleet | |
| parent | 308a3def95458d5a3ff8037a01449666b1a69711 (diff) | |
| parent | c5da05715cdbe8fb5b066baa92ef0abb88d75b41 (diff) | |
[MERGE] Sync with trunk-website-al
bzr revid: rim@openerp.com-20140131154544-tfcci0uo0q6652jh
bzr revid: rim@openerp.com-20140202135602-82pcqeqqtdp6h9fr
Diffstat (limited to 'addons/fleet')
| -rw-r--r-- | addons/fleet/fleet_board_view.xml | 12 | ||||
| -rw-r--r-- | addons/fleet/fleet_view.xml | 20 |
2 files changed, 15 insertions, 17 deletions
diff --git a/addons/fleet/fleet_board_view.xml b/addons/fleet/fleet_board_view.xml index 41093d2c283..c4732d9a0f4 100644 --- a/addons/fleet/fleet_board_view.xml +++ b/addons/fleet/fleet_board_view.xml @@ -54,10 +54,10 @@ <record model="ir.actions.act_window" id="action_fleet_reporting_costs"> <field name="name">Costs Analysis</field> <field name="res_model">fleet.vehicle.cost</field> - <field name="view_id" ref="fleet_vehicle_costs_tree"></field> + <field name="view_id" ref="fleet_vehicle_costs_report"></field> <field name="view_type">form</field> - <field name="view_mode">tree</field> - <field name="context">{"search_default_parent_false" : True,"search_default_groupby_year" : True,"search_default_groupby_cost_type" : True,"search_default_groupby_cost_subtype" : True, "search_default_groupby_vehicle_id" : True,}</field> + <field name="view_mode">graph</field> + <field name="context">{"search_default_parent_false" : True,"search_default_groupby_year" : True, "search_default_groupby_cost_subtype" : True,"search_default_groupby_vehicle_id" : True}</field> <field name="help" type="html"> <p> OpenERP helps you managing the costs for your different vehicles @@ -73,10 +73,10 @@ <record model="ir.actions.act_window" id="action_fleet_reporting_costs_non_effective"> <field name="name">Indicative Costs Analysis</field> <field name="res_model">fleet.vehicle.cost</field> - <field name="view_id" ref="fleet_vehicle_costs_tree"></field> + <field name="view_id" ref="fleet_vehicle_costs_report"></field> <field name="view_type">form</field> - <field name="view_mode">tree</field> - <field name="context">{"search_default_parent_true" : True,"search_default_groupby_cost_subtype" : True,"search_default_groupby_cost_type" : True,"search_default_groupby_parent_id" : True,}</field> + <field name="view_mode">graph</field> + <field name="context">{"search_default_parent_true" : True,"search_default_groupby_cost_subtype" : True,"search_default_groupby_parent_id" : True,}</field> <field name="help" type="html"> <p> OpenERP helps you managing the costs for your different vehicles diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index db38821b56e..c8929d2b492 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -849,19 +849,17 @@ <menuitem action="fleet_vehicle_service_types_act" parent="fleet_configuration" id="fleet_vehicle_service_types_menu" groups="base.group_no_one"/> - <record model='ir.ui.view' id='fleet_vehicle_costs_tree'> - <field name="name">fleet.vehicle.cost.tree</field> + <record model='ir.ui.view' id='fleet_vehicle_costs_report'> + <field name="name">fleet.vehicle.cost.graph</field> <field name="model">fleet.vehicle.cost</field> <field name="arch" type="xml"> - <tree string="Vehicles costs" > - <field name="date"/> - <field name="vehicle_id" /> - <field name="cost_type"/> - <field name="cost_subtype_id"/> - <field name="amount" sum="Total Cost"/> - <field name="parent_id" invisible="1" /> - <field name="year" invisible="1"/> - </tree> + <graph string="Vehicles costs" type="pivot"> + <field name="date" interval="year" type="row"/> + <field name="vehicle_id" type="row"/> + <field name="cost_type" type="col"/> + <!-- <field name="cost_subtype_id"/> --> + <field name="amount" type="measure"/> + </graph> </field> </record> |