X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Ffleet%2Ffleet_view.xml;h=4d0e62981299b02886751f1154d841cd79e2862f;hb=ee844c0ac678153015b1dc7854b0acfc0b8f9bcd;hp=b6406e77fb295f41d547c123249c28562eb7e3a5;hpb=befdb18c74d6df26ffdae7436821628fc67c7c7c;p=odoo%2Fodoo.git

diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index b6406e7..4d0e629 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -8,17 +8,35 @@
                 <form string="Model" version="7.0">
                     <sheet>
                         <field name="image_medium" widget='image' class="oe_left oe_avatar"/>
-                        <group col="2">
-                            <group>
-                                <field name="brand" on_change="on_change_brand(brand)"/>
-                            </group>
-                            <group>
-                                <field name="modelname" />   
-                            </group>
-                        </group>
+                        <div class="oe_title">
+                            <label for="modelname" class="oe_edit_only"/>
+                            <h1>
+                                <field name="modelname" />
+                            </h1>
+                            <label for="brand" class="oe_edit_only"/>
+                            <h2>
+                                <field name="brand_id" on_change="on_change_brand(brand_id)"/>
+                            </h2>
+                        </div>
                         <notebook>
                             <page string="Vendors">
-                                <field name="vendors" widget="many2many_kanban"/>
+                                <field name="vendors" widget="many2many_kanban">
+                                    <kanban quick_create="false" create="true">
+                                        <field name="name"/>
+                                        <templates>
+                                            <t t-name="kanban-box">
+                                                <div style="position: relative">
+                                                    <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
+                                                    <div class="oe_module_vignette">
+                                                        <div class="oe_module_desc">
+                                                            <field name="name"/>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </t>
+                                        </templates>
+                                    </kanban>
+                                </field>
                             </page>
                         </notebook>
                     </sheet>
@@ -30,18 +48,38 @@
             <field name="model">fleet.vehicle.model</field>
             <field name="arch" type="xml">
                 <tree string="Models" version="7.0">
-                    <field name="brand" />
+                    <field name="brand_id" />
                     <field name="modelname" />
-                    <field name="vendors" />
                 </tree>
             </field>
         </record>
 
+        <record model='ir.ui.view' id='fleet_vehicle_model_search'>
+            <field name="name">fleet.vehicle.model.search</field>
+            <field name="model">fleet.vehicle.model</field>
+            <field name="arch" type="xml">
+                <search string="Vehicles costs" >
+                    <field name="brand_id" />
+                    <group expand="1" string="Group By...">
+                        <filter name="groupby_brand" context="{'group_by' : 'brand_id'}" string="Brand"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record model='ir.actions.act_window' id='fleet_vehicle_model_act'>
             <field name="name">Vehicle Model</field>
             <field name="res_model">fleet.vehicle.model</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{"search_default_groupby_brand" : True,}</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new model.
+              </p><p>
+                You can define several models (e.g. A3, A4) for each brand (Audi).
+              </p>
+            </field>
         </record>
  
         <record model='ir.ui.view' id='fleet_vehicle_model_brand_tree'>
@@ -109,6 +147,11 @@
             <field name="res_model">fleet.vehicle.model.brand</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new brand.
+              </p>
+            </field>
         </record>
 
         <record model='ir.ui.view' id='fleet_vehicle_state_tree'>
@@ -124,18 +167,25 @@
         </record>
 
         <record model='ir.actions.act_window' id='fleet_vehicle_state_act'>
-            <field name="name">States of Vehicle</field>
+            <field name="name">Vehicle Status</field>
             <field name="res_model">fleet.vehicle.state</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a vehicule status.
+              </p><p>
+                You can customize available status to track the evolution of
+                each vehicule. Example: Active, Being Repaired, Sold.
+              </p>
+            </field>
         </record>
 
-        <menuitem name="Fleet" id="menu_root" />
-        <menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" />
-        <menuitem name="Configuration" parent="menu_root" id="fleet_configuration" />
-        <menuitem action="fleet_vehicle_model_act" parent="fleet_configuration" id="fleet_vehicle_model_menu" />
-        <menuitem action="fleet_vehicle_model_brand_act" parent="fleet_configuration" id="fleet_vehicle_model_brand_menu" />
-        <menuitem action="fleet_vehicle_state_act" parent="fleet_configuration" id="fleet_vehicle_state_menu" />
+        <menuitem name="Fleet" id="menu_root" sequence="110" groups="group_fleet_user"/>
+        <menuitem name="Configuration" parent="menu_root" id="fleet_configuration" sequence="3" groups="group_fleet_manager"/>
+        <menuitem action="fleet_vehicle_model_act" parent="fleet_configuration" id="fleet_vehicle_model_menu" groups="base.group_no_one"/>
+        <menuitem action="fleet_vehicle_model_brand_act" parent="fleet_configuration" id="fleet_vehicle_model_brand_menu" groups="base.group_no_one"/>
+        <menuitem action="fleet_vehicle_state_act" parent="fleet_configuration" id="fleet_vehicle_state_menu" groups="group_fleet_manager"/>
 
         <record model='ir.ui.view' id='fleet_vehicle_form'>
             <field name="name">fleet.vehicle.form</field>
@@ -143,7 +193,7 @@
             <field name="arch" type="xml">
                 <form string="Vehicle" version="7.0">
                     <header>
-                        <field name="state"  widget="statusbar" clickable="True" />
+                        <field name="state_id"  widget="statusbar" clickable="True" />
                     </header>
                     <sheet> 
                         <field name="image_medium" widget='image' class="oe_left oe_avatar"/> 
@@ -160,18 +210,20 @@
                             <field name="tag_ids" widget="many2many_tags" />
                         </div>
                         <div class="oe_right oe_button_box">
-                            <button name="act_show_log_contract" type="object" string="Contracts" help="show the contract for this vehicle" />
-                            <button name="act_show_log_fuel" type="object" string="Fuel Logs" help="show the fuel logs for this vehicle" /> 
-                            <button name="act_show_log_services" type="object" string="Services Logs" help="show the services logs for this vehicle" />
+                            <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_contract_act'}" string="Contracts" help="show the contract for this vehicle" />
+                            <button name="act_show_log_cost" type="object" string="Costs" help="show all the costs for this vehicle" groups="fleet.group_fleet_manager"/>
+                            <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_services_act'}" string="Services" help="show the services logs for this vehicle" />
+                            <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_fuel_act'}" string="Fuel Logs" help="show the fuel logs for this vehicle" />
+                            <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_odometer_act'}" string="Odometer Logs" help="show the odometer logs for this vehicle" />
                         </div> 
-                        <group col ="2">
-                            <group string="General Properties">
-                                <field name="driver" />
+                        <group col="2" string="General Properties">
+                            <group >
+                                <field name="driver_id" />
                                 <field name="location" />
                                 <field name="vin_sn" />
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </group>
-                            <group string="Additional Properties">
+                            <group >
                                 <label for="odometer" />
                                 <div>
                                     <field name="odometer" class="oe_inline"/>
@@ -179,11 +231,11 @@
                                 </div>
                                 <field name="acquisition_date" />
                                 <field name="car_value" />
-                                <field name="leasing_value" />
                             </group>
                         </group>
                         <group col="2">
-                            <group string="External Options">
+                            <group string="Additional Properties">
+                                <field name="seats" />
                                 <field name="doors" />
                                 <field name="color" />
                             </group>
@@ -208,17 +260,18 @@
             <field name="name">fleet.vehicle.tree</field>
             <field name="model">fleet.vehicle</field>
             <field name="arch" type="xml">
-                <tree string="Vehicle" version="7.0" colors="orange:contract_renewal_due_soon>0 and contract_renewal_overdue==0;red:contract_renewal_overdue>0">
+                <tree string="Vehicle" version="7.0" colors="orange:contract_renewal_due_soon and not contract_renewal_overdue;red:contract_renewal_overdue">
                     <field name="license_plate" />
                     <field name="model_id" />
-                    <field name="driver" />
+                    <field name="driver_id" />
                     <field name="vin_sn" />
                     <field name="acquisition_date" />
-                    <field name="state"/>
+                    <field name="state_id"/>
                     <field name="odometer" />
+                    <field name="odometer_unit" />
                     <field name="contract_renewal_due_soon" invisible="1"/>
-                    <field name="contract_renewal_overdue" invisible="1"/>
-                    <field name="next_service_date" invisible="1"/>
+                    <field name="contract_renewal_overdue" invisible="1" />
+                    <field name="contract_renewal_total" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -229,8 +282,11 @@
             <field name="arch" type="xml">
                 <search string="All vehicles">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('license_plate','ilike',self)]" string="Vehicle"/>
-                    <field name="driver"/>
+                    <field name="driver_id"/>
                     <field name="tag_ids"/>
+                    <field name="location"/>
+                    <field name="state_id" />
+                    <filter name="alert_true" domain="['|',('contract_renewal_due_soon','=',True),('contract_renewal_overdue','=',True)]" string="Has Alert(s)"/>
                </search>
             </field>
         </record>
@@ -243,15 +299,17 @@
                 <kanban>
                     <field name="license_plate" />
                     <field name="model_id" />
-                    <field name="driver" />
+                    <field name="driver_id" />
                     <field name="location" />
-                    <field name="state" />
-                    <field name="odometer" />
-                    <field name="odometer_unit" />
+                    <field name="state_id" />
+
                     <field name="image" />
                     <field name="tag_ids" />
                     <field name="contract_renewal_due_soon" />
                     <field name="contract_renewal_overdue" />
+                    <field name="contract_renewal_name" />
+                    <field name="contract_renewal_total" />
+                    
                     <templates>
                         <t t-name="kanban-box">
                             <div class="oe_kanban_vignette oe_semantic_html_override">
@@ -265,71 +323,40 @@
                                             <field name="model_id" />
                                         </a>
                                     </h4>
-                                    <div class="oe_kanban_partner_categories">
-                                        <span class="oe_kanban_list_many2many">
-                                            <div modifiers="{}" name="tag_ids" class="oe_form_field oe_tags" model="fleet.vehicle.tag" t-att-data="record.tag_ids.raw_value" />
-                                        </span>
-                                    </div>
+                                    <t t-if="record.contract_renewal_due_soon.raw_value and !record.contract_renewal_overdue.raw_value">
+                                        <a data-type="object" data-name="return_action_to_open" href="#" class="oe_kanban_action oe_kanban_action_a" data-context='{"xml_id":"fleet_vehicle_log_contract_act"}'>
+                                            <span class="oe_tag oe_kanban_color_3"><field name="contract_renewal_name" />
+                                               <t t-if="record.contract_renewal_total.raw_value > 0"> and <field name="contract_renewal_total" /> other(s) </t>
+                                            </span>
+                                        </a>
+                                    </t>
+
+                                    <t t-if="record.contract_renewal_overdue.raw_value">
+                                        <a data-type="object" data-name="return_action_to_open" href="#" class="oe_kanban_action oe_kanban_action_a" data-context='{"xml_id":"fleet_vehicle_log_contract_act"}'>
+                                            <span class="oe_tag oe_kanban_color_2"><field name="contract_renewal_name" />
+                                                <t t-if="record.contract_renewal_total.raw_value > 0"> and <field name="contract_renewal_total" /> other(s) </t>
+                                            </span>
+                                        </a>
+                                    </t>
+                                    
                                     <ul>
                                         <li>
-                                            <t t-if="record.driver.raw_value"><field name="driver"/></t>
+                                            <t t-if="record.driver_id.raw_value"><field name="driver_id"/></t>
                                         </li>
                                         <li>
                                             <t t-if="record.location.raw_value"><field name="location"/></t>
                                         </li>
-                                        <li>
-                                            <t t-if="record.contract_renewal_due_soon.raw_value > 0 and record.contract_renewal_overdue.raw_value lte 0">
-                                                 <a data-type="object" data-name="act_show_log_contract" href="#" class="oe_kanban_action oe_kanban_action_a" Style="color:orange">
-                                                        Alert Contract Renewal
-                                                </a>
-                                            </t>
-
-                                            <t t-if="record.contract_renewal_overdue.raw_value > 0">
-                                                <a data-type="object" data-name="act_show_log_contract" href="#" class="oe_kanban_action oe_kanban_action_a" Style="color:red">
-                                                        Alert Contract Renewal
-                                                </a>
-                                            </t>
-                                            
-                                        </li>
+                                        
                                     </ul>
 
-                                    
+                                    <field name="tag_ids"/>
                                 </div>
-                                
                             </div>
-                            
                         </t>
                     </templates>
                 </kanban>
             </field>
         </record>
-
-        <act_window
-            context="{'default_vehicle_id': active_id}"
-            id="act_show_log_services"
-            name="Services Logs"
-            res_model="fleet.vehicle.log.services"
-            src_model="fleet.vehicle"
-            view_mode="tree,form"
-            view_type="form"/>
-
-        <act_window
-            context="{'default_vehicle_id': active_id}"
-            id="act_show_log_fuel"
-            name="Fuel Logs"
-            res_model="fleet.vehicle.log.fuel"
-            src_model="fleet.vehicle"
-            view_mode="tree,form"
-            view_type="form"/>
-
-        <act_window
-            context="{'default_vehicle_id': active_id}"
-            id="act_show_log_contract"
-            name="Contract"
-            res_model="fleet.vehicle.log.contract"
-            src_model="fleet.vehicle"
-            view_mode="tree,form"
-            view_type="form"/>
         
 
         <record model='ir.actions.act_window' id='fleet_vehicle_act'>
@@ -337,10 +364,24 @@
             <field name="res_model">fleet.vehicle</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new vehicle. 
+              </p><p>
+                You will be able to manage your fleet by keeping track of the
+                contracts, services, fixed and recurring costs, odometers and
+                fuel logs associated to each vehicle.
+            </p><p>
+                OpenERP will warn you when services or contract have to be
+                renewed.
+              </p>
+            </field>
         </record>
 
-        <menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" />
-        <menuitem action="fleet_vehicle_act" parent="fleet_vehicles" id="fleet_vehicle_menu" />
+        <menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" sequence="2" groups="group_fleet_user"/>
+        <menuitem action="fleet_vehicle_act" parent="fleet_vehicles" id="fleet_vehicle_menu" groups="group_fleet_user"/>
+
+
 
         <record model='ir.ui.view' id='fleet_vehicle_log_contract_form'>
             <field name="name">fleet.vehicle.log_contract.form</field>
@@ -348,82 +389,140 @@
             <field name="arch" type="xml">
                 <form string="Contract logs" version="7.0">
                     <header>
-                        <field name="state" widget="statusbar" clickable="True" />
+                        <button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="open" type="object" class="oe_highlight" string="Terminate Contract" groups="fleet.group_fleet_manager"/>
+                        <button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="toclose" type="object" class="oe_highlight" string="Terminate Contract" groups="fleet.group_fleet_manager"/>
+                        <button modifiers="{'invisible': [['state', 'not in', ['closed']]]}" name="contract_open" states="closed" type="object" class="oe_highlight" string="Set Contract In Progress" groups="fleet.group_fleet_manager"/>
+                        <button class="oe_highlight" name="act_renew_contract" type="object" string="Renew Contract" help="Create a new contract automatically with all the same informations except for the date that will start at the end of current contract" groups="fleet.group_fleet_manager"/>
+                        <field name="state" widget="statusbar" />
                     </header>
                     <sheet>
-                        <group string="Contract details" col="2">
-                            <group >
-                                <field name="contract_type" />
+                        <group col="2">
+                            <group string="Contract details">
                                 <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
-                                <field name="price" />
-                                <field name="insurer_id" />
+                                <field name="cost_subtype_id" required="1" domain="['|',('category','=','contract'),('category','=','both')]"/>
+                                <field name="amount" string="Activation Cost"/>
+                                <label for="cost_generated"/>
+                                <div>
+                                    <field name="cost_generated" class="oe_inline" attrs="{'invisible': [('cost_frequency','=','no')]}" />
+                                    <field name="cost_frequency" class="oe_inline"  />
+                                </div>
                             </group>
+                            <group string="Odometer details">
+                                <label for="odometer"/>
+                                <div>
+                                    <field name="odometer" class="oe_inline"/>
+                                    <field name="odometer_unit" class="oe_inline"/>
+                                </div>
+                            </group>
+                        </group>
+                        <group col="2">
                             <group>
-                                <field name="date" />
-                                <field name="start_date" on_change="on_change_start_date(start_date)"/>
+                                <field name="date" string="Invoice Date"/>
+                                <field name="start_date"/>
                                 <field name="expiration_date" />
+                            </group>
+                            <group>
+                                <field name="insurer_id" />
+                                <field name="purchaser_id" />
                                 <field name="ins_ref" />
                             </group>
                         </group>
-                        <group>
-                            <field name="costs" >
-                                <tree string="Costs" version="7.0">
-                                    <field name="type" />
-                                    <field name="price" />
-                                </tree>
-                                <form string="Costs" version="7.0">
-                                    <sheet>
-                                        <group>
-                                            <field name="type" />
-                                            <field name="price" />
-                                        </group>
-                                    </sheet>
-                                </form>
-                            </field>
-                        </group>
-                        <group col="2">
-                            <group string="Odometer details">
-                                <div>
-                                    <field name="value" class="oe_inline"/>
-                                    <field name="unit" class="oe_inline"/>
-                                </div>
-                            </group>
-                            <group></group>
+                        <notebook>
+                            <page string="Included Services">
+                                <group>
+                                    <field name="cost_ids" context="{'vehicle_id': vehicle_id}" nolabel="1" on_change="on_change_indic_cost(cost_ids)">
+                                        <tree version="7.0" editable="bottom">
+                                            <field name="cost_subtype_id" string="Service" domain="[('category','=','service')]"/>
+                                            <field name="amount" sum="Price" string="Indicative Cost" />
+                                        </tree>
+                                    </field>
+
+                                </group>
+                                <div class="oe_right"><group><field name="sum_cost" string="Indicative Costs Total"/></group></div>
+                            </page>
+                            <page string="Generated Costs">
+                                <group>
+                                    <field name="generated_cost_ids" context="{'vehicle_id': vehicle_id}" nolabel="1" sum="amount">
+                                        <tree version="7.0" editable="bottom" >
+                                            <field name="date" />
+                                            <field name="amount" sum="amount"/>
+                                        </tree>
+
+                                    </field>
+                                </group>
+                            </page>
+                        </notebook>
+                        <group string="Terms and Conditions">
+                            <field name="notes" nolabel="1" placeholder="Write here all other information relative to this contract" />
                         </group>
-                        <group string="Terms and Conditions"></group>
-                        <field name="notes" />
                     </sheet>
                 </form>
             </field>
         </record>
 
+        <act_window
+            
+            id="act_renew_contract"
+            name="Renew Contract"
+            res_model="fleet.vehicle.log.contract"
+            src_model="fleet.vehicle.log.contract"
+            view_mode="form"
+            view_type="form"
+            />
+
+
         <record model='ir.ui.view' id='fleet_vehicle_log_contract_tree'>
             <field name="name">fleet.vehicle.log.contract.tree</field>
             <field name="model">fleet.vehicle.log.contract</field>
             <field name="arch" type="xml">
-                <tree string="Contract logs" version="7.0">
-                    <field name="vehicle_id" />
-                    <field name="contract_type" />
-                    <field name="state" />
+                <tree string="Contract logs" version="7.0" colors="orange:days_left>0 and days_left&lt;15;red:days_left==0;grey:state=='closed'">
                     <field name="start_date" />
                     <field name="expiration_date" />
+                    <field name="days_left" invisible="1"/>
+                    <field name="vehicle_id" />
+                    <field name="cost_subtype_id"/>
                     <field name="insurer_id" />
-                    <field name="price" />
-                    <field name="value" />
-                    <field name="unit" />
-                    <field name="notes" />
+                    <field name="amount" string="Activation Cost"/>
+                    <field name="cost_generated"/>
+                    <field name="cost_frequency"/>
+                    <field name="state" />
                 </tree>
             </field>
         </record>
 
+        <record model="ir.ui.view" id="fleet_vehicle_log_contract_graph">
+           <field name="name">fleet.vehicle.log.contract.graph</field>
+           <field name="model">fleet.vehicle.log.contract</field>
+           <!--<field name="type">graph</field>-->
+           <field name="arch" type="xml">
+                <graph string="Contract Costs Per Month">
+                    <field name="date" />
+                    <field name="cost_amount" operator="+"/>
+                    <field name="vehicle_id" group="True"/>
+                </graph>
+            </field>
+        </record>
+
         <record model='ir.actions.act_window' id='fleet_vehicle_log_contract_act'>
             <field name="name">Vehicles Contracts</field>
             <field name="res_model">fleet.vehicle.log.contract</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new contract. 
+              </p><p>
+                Manage all your contracts (leasing, insurances, etc.) with
+                their related services, costs. OpenERP will automatically warn
+                you when some contracts have to be renewed.
+              </p><p>
+                Each contract (e.g.: leasing) may include several services
+                (reparation, insurances, periodic maintenance).
+              </p>
+            </field>
         </record>
 
-        <menuitem action="fleet_vehicle_log_contract_act" parent="fleet_vehicles" id="fleet_vehicle_log_contract_menu" />
+        <menuitem action="fleet_vehicle_log_contract_act" parent="fleet_vehicles" id="fleet_vehicle_log_contract_menu" groups="group_fleet_user"/>
 
        <record model='ir.ui.view' id='fleet_vehicle_odometer_form'>
             <field name="name">fleet.vehicle.odometer.form</field>
@@ -433,10 +532,10 @@
                     <sheet>
                         <group>
                             <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
-                            <div>
-                                <field name="value" class="oe_inline"/>
-                                <field name="unit" class="oe_inline"/>
-                            </div>
+                                <div>
+                                    <field name="value" class="oe_inline"/>
+                                    <field name="unit" class="oe_inline"/>
+                                </div>
                             <field name="date" />
                         </group>
                     </sheet>
@@ -448,24 +547,39 @@
             <field name="name">fleet.vehicle.odometer.tree</field>
             <field name="model">fleet.vehicle.odometer</field>
             <field name="arch" type="xml">
-                <tree string="Odometer Logs" version="7.0" editable="bottom">
+                <tree string="Odometer Logs" version="7.0" editable="top">
+                    <field name="date" />
                     <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
                     <field name="value" />
                     <field name="unit" />
-                    <field name="date" />
                 </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>
+            <field name="arch" type="xml">
+                <search string="Vehicles odometers" >
+                    <field name="vehicle_id" />
+                    <field name="value"/>
+                    <field name="unit"/>
+                    <field name="date"/>
+                    <filter name="groupby_vehicle" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
+                </search>
+            </field>
+        </record>
+        -->
 
         <record model="ir.ui.view" id="fleet_vehicle_odometer_graph">
            <field name="name">fleet.vehicle.odometer.graph</field>
            <field name="model">fleet.vehicle.odometer</field>
            <!--<field name="type">graph</field>-->
            <field name="arch" type="xml">
-                <graph string="Odometer value per month">
+                <graph string="Odometer Values Per Month">
                     <field name="date" />
-                    <field name="value" />
-                    <field name="vehicle_id" group="True" /> 
+                    <field name="value" operator="+"/>
+                    <field name="vehicle_id" group="True"/> 
                 </graph>
             </field>
         </record>
@@ -474,10 +588,18 @@
             <field name="name">Vehicles Odometer</field>
             <field name="res_model">fleet.vehicle.odometer</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="context">{"search_default_groupby_vehicle" : True}</field>
+            <field name="help" type="html">
+              <p>
+                Here you can add various odometer entries for all vehicles.
+                You can also show odometer value for a particular vehicle using
+                the search field.
+              </p>
+            </field>
         </record>
 
-        <menuitem action="fleet_vehicle_odometer_act" parent="fleet_vehicles" id="fleet_vehicle_odometer_menu" />
+        <menuitem action="fleet_vehicle_odometer_act" parent="fleet_vehicles" id="fleet_vehicle_odometer_menu" groups="group_fleet_user"/>
 
         <record model='ir.ui.view' id='fleet_vehicle_log_fuel_form'>
             <field name="name">fleet.vehicle.log.fuel.form</field>
@@ -497,9 +619,10 @@
                         </group>
                         <group col="2">
                             <group string="Odometer Details">
+                                <label for="odometer"/>
                                 <div>
-                                    <field name="value" class="oe_inline"/>
-                                    <field name="unit" class="oe_inline"/>
+                                    <field name="odometer" class="oe_inline"/>
+                                    <field name="odometer_unit" class="oe_inline"/>
                                 </div>
                             </group>
                             <group string="Additional Details">
@@ -510,7 +633,7 @@
                             </group>
                         </group>
                         <group string="Notes">
-                            <field nolabel="1" name="notes" />
+                            <field nolabel="1" name="notes" placeholder="Write here any other information"/>
                         </group>
                     </sheet>
                 </form>
@@ -522,16 +645,16 @@
             <field name="model">fleet.vehicle.log.fuel</field>
             <field name="arch" type="xml">
                 <tree string="Fuel Logs">
+                    <field name="date" /> 
                     <field name="vehicle_id" />
+                    <field name="odometer" invisible="1"/>
+                    <field name="odometer_unit" invisible="1"/>
+                    <field name="purchaser_id" />             
+                    <field name="inv_ref" invisible="1"/>
+                    <field name="vendor_id" invisible="1"/>
                     <field name="liter" />
-                    <field name="price_per_liter" />
-                    <field name="amount" />
-                    <field name="purchaser_id" />   
-                    <field name="date" />   
-                    <field name="value" />
-                    <field name="unit" />         
-                    <field name="inv_ref" />
-                    <field name="vendor_id" />
+                    <field name="price_per_liter" invisible="1"/>
+                    <field name="amount" sum="Price"/>
                 </tree>
             </field>
         </record>
@@ -541,10 +664,10 @@
            <field name="model">fleet.vehicle.log.fuel</field>
            <!--<field name="type">graph</field>-->
            <field name="arch" type="xml">
-                <graph string="Total Fuel amount per month">
-                    <field name="date" />
-                    <field name="vehicle_id" group="True" /> 
-                    <field name="amount" operator="+"/>
+                <graph string="Fuel Costs Per Month">
+                    <field name="date" /> 
+                    <field name="cost_amount" operator="+"/>
+                    <field name="vehicle_id" group="True"/>
                 </graph>
             </field>
         </record>
@@ -554,9 +677,18 @@
             <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="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new fuel log. 
+              </p><p>
+                Here you can add refuelling entries for all vehicles.  You can
+                also filter logs of a particular vehicle using the search
+                field.
+              </p>
+            </field>
         </record>
 
-        <menuitem action="fleet_vehicle_log_fuel_act" parent="fleet_vehicles" id="fleet_vehicle_log_fuel_menu" />
+        <menuitem action="fleet_vehicle_log_fuel_act" parent="fleet_vehicles" id="fleet_vehicle_log_fuel_menu" groups="group_fleet_user"/>
 
 
         <record model='ir.ui.view' id='fleet_vehicle_log_services_form'>
@@ -566,21 +698,20 @@
                 <form string="Services Logs" version="7.0">
                     <sheet>
                         <group col="2">
-                            <group string="Vehicle Details">
-                                <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
-                            </group>
                             <group string="Services Details">
-                                <field name="service_ids" widget="many2many_tags"/>
-                                <field name="amount" />
+                                <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
+                                <field name="cost_subtype_id" string="Service Type" domain="['|',('category','=','service'),('category','=','both')]" required="1"/>
+                                <field name="amount" string="Price"/>
                             </group>
-                        </group>
-                        <group col="2">
                             <group string="Odometer Details">
+                                <label for="odometer"/>
                                 <div>
-                                    <field name="value" class="oe_inline"/>
-                                    <field name="unit" class="oe_inline"/>
+                                    <field name="odometer" class="oe_inline"/>
+                                    <field name="odometer_unit" class="oe_inline"/>
                                 </div>
                             </group>
+                        </group>
+                        <group col="2">
                             <group string="Additional Details">
                                 <field name="date" />
                                 <field name="purchaser_id" />
@@ -588,8 +719,16 @@
                                 <field name="inv_ref" />
                             </group>
                         </group>
+                        <group string="Included Services">
+                            <field name="cost_ids" nolabel="1">
+                                <tree string="Included Services" version="7.0" editable="bottom">
+                                    <field name="cost_subtype_id" string="Service" domain="[('category','=','service')]"/>
+                                    <field name="amount" sum="Price" string="Cost"/>
+                                </tree>
+                            </field>
+                        </group>
                         <group string="Notes">
-                            <field nolabel="1" name="notes" />
+                            <field nolabel="1" name="notes" placeholder="Write here any other information related to the service completed."/>
                         </group>
                     </sheet>
                 </form>
@@ -601,15 +740,14 @@
             <field name="model">fleet.vehicle.log.services</field>
             <field name="arch" type="xml">
                 <tree string="Services Logs">
-                    <field name="vehicle_id" />
-                    <field name="service_ids" widget="many2many_tags"/>
-                    <field name="amount" />
                     <field name="date" />
-                    <field name="purchaser_id" />
+                    <field name="vehicle_id" />
+                    <field name="cost_subtype_id"/>
+                    <field name="purchaser_id"/>
                     <field name="vendor_id" />
                     <field name="inv_ref" />
-                    <field name="value" />
-                    <field name="unit" /> 
+                    <field name="notes" />
+                    <field name="amount" sum="Total"/>
                 </tree>
             </field>
         </record>
@@ -618,10 +756,10 @@
            <field name="name">fleet.vehicle.log.services.graph</field>
            <field name="model">fleet.vehicle.log.services</field>
            <field name="arch" type="xml">
-                <graph string="Services total amount per month">
+                <graph string="Services Costs Per Month">
                     <field name="date" />
-                    <field name="vehicle_id" group="True" /> 
-                    <field name="amount" operator="+"/>
+                    <field name="cost_amount" operator="+"/>
+                    <field name="vehicle_id" group="True"/> 
                 </graph>
             </field>
         </record>
@@ -631,9 +769,139 @@
             <field name="res_model">fleet.vehicle.log.services</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new service entry. 
+              </p><p>
+                OpenERP helps you keeping track of all the services done
+                on your vehicle. Services can be of many type: occasional
+                repair, fixed maintenance, etc.
+              </p>
+            </field>
         </record>
 
-        <menuitem action="fleet_vehicle_log_services_act" parent="fleet_vehicles" id="fleet_vehicle_log_services_menu" />
+        <menuitem action="fleet_vehicle_log_services_act" parent="fleet_vehicles" id="fleet_vehicle_log_services_menu" groups="group_fleet_user"/>
+
+        <record model='ir.ui.view' id='fleet_vehicle_service_types_tree'>
+            <field name="name">fleet.service.type.tree</field>
+            <field name="model">fleet.service.type</field>
+            <field name="arch" type="xml">
+                <tree string="Service types" editable="bottom">
+                    <field name="name" />
+                    <field name="category"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model='ir.actions.act_window' id='fleet_vehicle_service_types_act'>
+            <field name="name">Service Types</field>
+            <field name="res_model">fleet.service.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new type of service.
+              </p><p>
+                Each service can used in contracts, as a standalone service or both.
+              </p>
+            </field>
+        </record>
+
+        <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>
+            <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>
+            </field>
+        </record>
+
+        <record model='ir.ui.view' id='fleet_vehicle_costs_search'>
+            <field name="name">fleet.vehicle.cost.search</field>
+            <field name="model">fleet.vehicle.cost</field>
+            <field name="arch" type="xml">
+                <search string="Vehicles costs" >
+                    <field name="vehicle_id" />
+                    <field name="cost_subtype_id"/>
+                    <field name="year"/>
+                    <field name="date"/>
+                    <field name="parent_id"/>
+                    <filter name="parent_false" domain="[('parent_id','=',False)]" string="Effective Costs"/>
+                    <filter name="parent_true" domain="[('parent_id','!=',False)]" string="Indicative Costs"/>
+                    <group expand="1" string="Group By...">
+                        <filter name="groupby_year" context="{'group_by' : 'year'}" string="Year"/>
+                        <filter name="groupby_date" context="{'group_by' : 'date'}" string="Date"/>
+                        <filter name="groupby_cost_type" context="{'group_by' : 'cost_type'}" string="Cost Type"/>
+                        <filter name="groupby_cost_subtype_id" context="{'group_by' : 'cost_subtype_id'}" string="Cost Subtype"/>
+                        <filter name="groupby_vehicle_id" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
+                        <filter name="groupby_parent_id" context="{'group_by' : 'parent_id'}" string="Parent"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record model='ir.ui.view' id='fleet_vehicle_costs_form'>
+            <field name="name">fleet.vehicle.cost.form</field>
+            <field name="model">fleet.vehicle.cost</field>
+            <field name="arch" type="xml">
+                <form string="Vehicle costs" version="7.0">
+                    <sheet>
+                        <group col="2" string="Cost Details">
+                            <group>
+                                <field name="vehicle_id" />
+                                <field name="cost_subtype_id"/>
+                                <field name="amount"/>
+                            </group>
+                            <group>
+                                <field name="date"/>
+                                <field name="parent_id"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="fleet_vehicle_costs_graph">
+           <field name="name">fleet.vehicle.cost.graph</field>
+           <field name="model">fleet.vehicle.cost</field>
+           <field name="arch" type="xml">
+                <graph string="Costs Per Month">
+                    <field name="date" />
+                    <field name="amount"/>
+                    <field name="vehicle_id" group="True"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model='ir.actions.act_window' id='fleet_vehicle_costs_act'>
+            <field name="name">Vehicle Costs</field>
+            <field name="res_model">fleet.vehicle.cost</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="context">{"search_default_parent_false" : True, "search_default_groupby_vehicle_id" : True,}</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new cost.
+              </p><p>
+                OpenERP helps you managing the costs for your different
+                vehicles. Costs are created automatically from services,
+                contracts (fixed or recurring) and fuel logs.
+              </p>
+            </field>
+        </record>
+
+        <menuitem action="fleet_vehicle_costs_act" parent="fleet_vehicles" id="fleet_vehicle_costs_menu" groups="group_fleet_manager"/>
 <!--    
         <record model='ir.ui.view' id='fleet_hr_employee_form'>
             <field name="name">fleet.hr.employee.form</field>
@@ -660,6 +928,5 @@
             <field name="model_id" ref="citroen" />
         </record>
  -->
- 
     </data>
 </openerp>