From a71ed635f3d9a3fb85f7f52a7235a87fd3cdc895 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 18 Mar 2013 16:12:28 +0530
Subject: [IMP]:Fleet Management

bzr revid: aja@tinyerp.com-20130318104228-yti1y8hri248ppy3
---
 addons/fleet/fleet_view.xml | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

(limited to 'addons/fleet/fleet_view.xml')

diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 4d0e6298129..820858ef146 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -242,11 +242,17 @@
                             <group string="Engine Options">
                                 <field name="transmission" />
                                 <field name="fuel_type" />
-                                <field name="co2" />
+                                <label for="co2"/>
+                                <div>
+                                    <field name="co2" class="oe_inline"/> Unit
+                                </div>
                                 <field name="horsepower" />
                                 <field name="horsepower_tax" />
-                                <field name="power" />
-                            </group>  
+                                <label for="power"/>
+                                <div>
+                                    <field name="power" class="oe_inline"/> kW
+                                </div>
+                            </group>
                         </group>
                     </sheet>
                     <div class="oe_chatter">
@@ -287,6 +293,10 @@
                     <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)"/>
+                    <group expand="1" string="Group By...">
+                        <filter name="groupby_status" context="{'group_by' : 'state_id'}" string="Status"/>
+                        <filter name="groupby_model" context="{'group_by' : 'model_id'}" string="Model"/>
+                    </group>
                </search>
             </field>
         </record>
@@ -591,7 +601,9 @@
             <field name="view_mode">tree,graph</field>
             <field name="context">{"search_default_groupby_vehicle" : True}</field>
             <field name="help" type="html">
-              <p>
+              <p class="oe_view_nocontent_create">
+                Click to create a new odometer entry.
+              </p><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.
@@ -764,6 +776,19 @@
             </field>
         </record>
 
+        <record model='ir.ui.view' id='fleet_vehicle_log_services_search'>
+            <field name="name">fleet.vehicle.log.services.search</field>
+            <field name="model">fleet.vehicle.log.services</field>
+            <field name="arch" type="xml">
+                <search string="Services Logs" >
+                    <group expand="1" string="Group By...">
+                        <filter name="groupby_vehicle" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
+                        <filter name="groupby_service_type" context="{'group_by' : 'cost_subtype_id'}" string="Service Type"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record model='ir.actions.act_window' id='fleet_vehicle_log_services_act'>
             <field name="name">Vehicles Services Logs</field>
             <field name="res_model">fleet.vehicle.log.services</field>
@@ -786,7 +811,7 @@
             <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">
+                <tree string="Service types" editable="top">
                     <field name="name" />
                     <field name="category"/>
                 </tree>
-- 
cgit v1.2.3


From 8f35cb9132aa9b4008f3a12279a9995b18f57110 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 19 Mar 2013 14:23:10 +0530
Subject: [IMP]: Service log search view

bzr revid: aja@tinyerp.com-20130319085310-cft0yxltgkivz53i
---
 addons/fleet/fleet_view.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'addons/fleet/fleet_view.xml')

diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 820858ef146..627c1c63549 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -781,10 +781,8 @@
             <field name="model">fleet.vehicle.log.services</field>
             <field name="arch" type="xml">
                 <search string="Services Logs" >
-                    <group expand="1" string="Group By...">
-                        <filter name="groupby_vehicle" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
-                        <filter name="groupby_service_type" context="{'group_by' : 'cost_subtype_id'}" string="Service Type"/>
-                    </group>
+                    <field name="vehicle_id"/>
+                    <field name="cost_subtype_id"/>
                 </search>
             </field>
         </record>
-- 
cgit v1.2.3


From b16ef2e1f865328c7f4349b3447a8cac05dd8d7b Mon Sep 17 00:00:00 2001
From: "Ravish (Open ERP)" <rmu@tinyerp.com>
Date: Fri, 22 Mar 2013 14:46:25 +0530
Subject: [IMP]put arrow for all forms

bzr revid: rmu@tinyerp.com-20130322091625-mnk0437uegjddnws
---
 addons/fleet/fleet_view.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/fleet/fleet_view.xml')

diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 4d0e6298129..a8f6a321daf 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -591,6 +591,9 @@
             <field name="view_mode">tree,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 odometer log. 
+              </p>
               <p>
                 Here you can add various odometer entries for all vehicles.
                 You can also show odometer value for a particular vehicle using
-- 
cgit v1.2.3


From ade9603f7248af2b0f450f26b82d30b7c72c9618 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 22 Mar 2013 14:53:21 +0530
Subject: [IMP] correct field name

bzr revid: tpa@tinyerp.com-20130322092321-al9vso65agqbpq94
---
 addons/fleet/fleet_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/fleet/fleet_view.xml')

diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 627c1c63549..076bf9c74b2 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -13,7 +13,7 @@
                             <h1>
                                 <field name="modelname" />
                             </h1>
-                            <label for="brand" class="oe_edit_only"/>
+                            <label for="brand_id" class="oe_edit_only"/>
                             <h2>
                                 <field name="brand_id" on_change="on_change_brand(brand_id)"/>
                             </h2>
-- 
cgit v1.2.3


From b981abbe5dc65066d41924f0783befaca999da0b Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 22 Mar 2013 18:47:47 +0530
Subject: [IMP] improved strings in view

bzr revid: tpa@tinyerp.com-20130322131747-g6wp65x98njjt1t4
---
 addons/fleet/fleet_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/fleet/fleet_view.xml')

diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 076bf9c74b2..25bc62fe798 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -450,7 +450,7 @@
                                 </group>
                                 <div class="oe_right"><group><field name="sum_cost" string="Indicative Costs Total"/></group></div>
                             </page>
-                            <page string="Generated Costs">
+                            <page string="Generated Recurring Costs">
                                 <group>
                                     <field name="generated_cost_ids" context="{'vehicle_id': vehicle_id}" nolabel="1" sum="amount">
                                         <tree version="7.0" editable="bottom" >
@@ -713,7 +713,7 @@
                             <group string="Services Details">
                                 <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"/>
+                                <field name="amount"/>
                             </group>
                             <group string="Odometer Details">
                                 <label for="odometer"/>
@@ -735,7 +735,7 @@
                             <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"/>
+                                    <field name="amount" sum="Price" string="Indicative Cost"/>
                                 </tree>
                             </field>
                         </group>
-- 
cgit v1.2.3


From 3a8272359acc8928bd6825890fcdbf4b0468e932 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 25 Mar 2013 11:55:07 +0530
Subject: [IMP] improved code

bzr revid: tpa@tinyerp.com-20130325062507-6gjq4pjyfllqydbs
---
 addons/fleet/fleet_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/fleet/fleet_view.xml')

diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 25bc62fe798..f3f101ba9bf 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -244,7 +244,7 @@
                                 <field name="fuel_type" />
                                 <label for="co2"/>
                                 <div>
-                                    <field name="co2" class="oe_inline"/> Unit
+                                    <field name="co2" class="oe_inline"/> g/km
                                 </div>
                                 <field name="horsepower" />
                                 <field name="horsepower_tax" />
@@ -410,7 +410,7 @@
                             <group string="Contract details">
                                 <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
                                 <field name="cost_subtype_id" required="1" domain="['|',('category','=','contract'),('category','=','both')]"/>
-                                <field name="amount" string="Activation Cost"/>
+                                <field name="amount" string="Activation Cost" help="Cost that is paid only once at the creation of the contract"/>
                                 <label for="cost_generated"/>
                                 <div>
                                     <field name="cost_generated" class="oe_inline" attrs="{'invisible': [('cost_frequency','=','no')]}" />
-- 
cgit v1.2.3