diff options
| author | Christophe Simonis <chs@openerp.com> | 2013-11-25 16:00:54 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2013-11-25 16:00:54 +0100 |
| commit | bb1e256f5b24bb4fc4b64e1fa973f86a30e4bace (patch) | |
| tree | 95f1de1c67b507b0d10786d04aa0f98bcd22243a /addons/fleet | |
| parent | f148061b9455e39d3b3e6f316a5c7d586e1aad88 (diff) | |
| parent | 7baee2822180db919e6754f04c0fa9bc8aaafe92 (diff) | |
[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
Diffstat (limited to 'addons/fleet')
| -rw-r--r-- | addons/fleet/fleet_demo.xml | 3 | ||||
| -rw-r--r-- | addons/fleet/fleet_view.xml | 26 |
2 files changed, 25 insertions, 4 deletions
diff --git a/addons/fleet/fleet_demo.xml b/addons/fleet/fleet_demo.xml index a550ae78da5..2f9b71b3bb5 100644 --- a/addons/fleet/fleet_demo.xml +++ b/addons/fleet/fleet_demo.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> + <!--Users--> <record id="base.user_demo" model="res.users"> - <field name="groups_id" eval="[(4, ref('fleet.group_fleet_user'))]" /> + <field name="groups_id" eval="[(4, ref('fleet.group_fleet_manager'))]" /> </record> <record id="vehicle_state_inshop" model="fleet.vehicle.state"> diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 1258e49aa2d..a0ced74a509 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -43,6 +43,7 @@ </form> </field> </record> + <record model='ir.ui.view' id='fleet_vehicle_model_tree'> <field name="name">fleet.vehicle.model.tree</field> <field name="model">fleet.vehicle.model</field> @@ -565,7 +566,7 @@ </tree> </field> </record> - <!-- + <record model='ir.ui.view' id='fleet_vehicle_odometer_search'> <field name="name">fleet.vehicle.odometer.search</field> <field name="model">fleet.vehicle.odometer</field> @@ -575,11 +576,12 @@ <field name="value"/> <field name="unit"/> <field name="date"/> - <filter name="groupby_vehicle" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/> + <group expand="0" string="Group By..."> + <filter name="groupby_vehicle" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/> + </group> </search> </field> </record> - --> <record model="ir.ui.view" id="fleet_vehicle_odometer_graph"> <field name="name">fleet.vehicle.odometer.graph</field> @@ -671,6 +673,23 @@ </tree> </field> </record> + + <record model='ir.ui.view' id='fleet_vehicle_log_fuel_search'> + <field name="name">fleet.vehicle.log.fuel.search</field> + <field name="model">fleet.vehicle.log.fuel</field> + <field name="arch" type="xml"> + <search string="Vehicles Fuel Logs" > + <field name="vehicle_id" /> + <field name="date"/> + <field name="purchaser_id" /> + <field name="liter" /> + <field name="amount" sum="Price"/> + <group expand="0" string="Group By..."> + <filter name="groupby_vehicle" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/> + </group> + </search> + </field> + </record> <record model="ir.ui.view" id="fleet_vehicle_log_fuel_graph"> <field name="name">fleet.vehicle.log.fuel.graph</field> @@ -690,6 +709,7 @@ <field name="res_model">fleet.vehicle.log.fuel</field> <field name="view_type">form</field> <field name="view_mode">tree,form,graph</field> + <field name="context">{"search_default_groupby_vehicle" : True}</field> <field name="help" type="html"> <p class="oe_view_nocontent_create"> Click to create a new fuel log. |