[FIX]Odometer logs

bzr revid: dle@openerp.com-20120925104057-ztuns0n60pycg64z

2 files changed, 67 insertions, 15 deletions

diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index 087efc67002..6bc74d40191 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -88,6 +88,7 @@ class fleet_vehicle(osv.Model):
         'log_fuel' : fields.one2many('fleet.vehicle.log.fuel','vehicle_id', 'Fuel Logs'),
         'log_services' : fields.one2many('fleet.vehicle.log.services','vehicle_id', 'Services Logs'),
         'log_insurances' : fields.one2many('fleet.vehicle.log.insurance','vehicle_id', 'Insurances'),
+        'log_odometer' : fields.one2many('fleet.vehicle.log.odometer','vehicle_id', 'Odometer'),
         'acquisition_date' : fields.date('Acquisition date', required=False, help='Date when the vehicle has been bought'),
         'acquisition_price' : fields.integer('Price', help='Price of the bought vehicle'),
         'color' : fields.char('Color',size=32, help='Color of the vehicle'),
@@ -195,6 +196,7 @@ class fleet_vehicle_log_fuel(osv.Model):
         'amount': fields.float('Total price'),
         'inv_ref' : fields.char('Invoice Ref.', size=32),
         'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"),
+        'log_odometer_id' :fields.many2one('fleet.vehicle.log.odometer', 'Odometer Log'),
     }
     _defaults = {
         'name': 'Fuel log',
@@ -222,7 +224,7 @@ class fleet_vehicle_log_insurance(osv.Model):
         'name': 'Insurance log',
         'type': 'Insurance',}
 
-class service_type(osv.Model):
+class fleet_service_type(osv.Model):
     _name = 'fleet.service.type'
     _columns = {
         'name': fields.char('Name', required=True, translate=True),
@@ -242,6 +244,31 @@ class fleet_vehicle_log_services(osv.Model):
         'name': 'Service log',
         'type': 'Services'}
 
+class fleet_vehicle_log_services(osv.Model):
+    _inherit = ['fleet.vehicle.log']
+
+    _name = 'fleet.vehicle.log.services'
+    _columns = {
+        'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"),
+        'amount' :fields.float('Cost', help="Total cost of the service"),
+        'reference' :fields.char('Reference',size=128),
+        'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'),
+    }
+    _defaults = {
+        'name': 'Service log',
+        'type': 'Services'}
+
+class fleet_vehicle_log_odometer(osv.Model):
+    _inherit = ['fleet.vehicle.log']
+
+    _name = 'fleet.vehicle.log.odometer'
+    _columns = {
+        'value' : fields.float('Value', required=True, help="Meter reading at service, fuel up and others"),
+    }
+    _defaults = {
+        'name': 'Odometer Log',
+        'type': 'Odometer'}
+
 class hr_employee(osv.Model):
     _inherit = 'hr.employee'
 
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 7d0c6f737f7..9ea77645379 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -120,6 +120,30 @@
                             </page>
                             <page string="Logs">
                                 <group>
+                                    <field name="log_odometer">
+                                        <tree string="Odometer Logs">
+                                            <field name="value" />
+                                            <field name="date_creation" />
+                                            <field name="employee_id" />
+                                            <field name="description" />
+                                        </tree>
+                                        <form string="Odometer Logs" version="7.0">
+                                            <sheet>
+                                                <group col = "2">
+                                                    <group>
+                                                        <field name="value" />
+                                                        <field name="date_creation" />
+                                                        <field name="employee_id" />
+                                                    </group>
+                                                    <group>
+                                                        <field name="description" />
+                                                    </group>
+                                                </group>
+                                            </sheet>
+                                        </form>
+                                    </field>
+                                </group>
+                                <group>
                                     <field name="log_services">
                                         <tree string="Completed services">
                                             <field name="employee_id" />
@@ -153,6 +177,7 @@
                                             <field name="vendor_id" />
                                             <field name="inv_ref" />
                                             <field name="date_creation" />
+                                            <field name="log_odometer_id" />
                                         </tree>
                                         <form string="Fuel Logs" version="7.0">
                                             <sheet>
@@ -161,6 +186,7 @@
                                                         <field name="liter" on_change="on_change_liter(liter,price_per_liter,amount)"/>
                                                         <field name="price_per_liter" on_change="on_change_price_per_liter(liter,price_per_liter,amount)" />
                                                         <field name="amount" on_change="on_change_amount(liter,price_per_liter,amount)"/>
+                                                        <field name="log_odometer_id" />
                                                     </group>
                                                     <group>
                                                         <field name="date_creation" />
@@ -315,13 +341,12 @@
                     <field name="model">fleet.vehicle.log.fuel</field>
                     <field name="arch" type="xml">
                         <tree string="Fuel Logs">
-                                        <field name="date_creation" />
-                                        <field name="vehicle_id" />
-                                        <field name="employee_id" />
-                                        <field name="liter" />
-                                        <field name="amount" />
-                                        <field name="inv_ref" />
-                           
+                            <field name="date_creation" />
+                            <field name="vehicle_id" />
+                            <field name="employee_id" />
+                            <field name="liter" />
+                            <field name="amount" />
+                            <field name="inv_ref" />
                         </tree>
                     </field>
         </record>
@@ -342,13 +367,13 @@
                 <form string="Services Logs" version="7.0">
                     <sheet>
                         <group>
-                                        <field name="date_creation" />
-                                        <field name="vehicle_id" />
-                                        <field name="employee_id" />
-                                        <field name="vendor_id" />
-                                        <field name="amount" />
-                                        <field name="reference" />
-                                        <field name="service_ids" widget="many2many_tags"/>
+                            <field name="date_creation" />
+                            <field name="vehicle_id" />
+                            <field name="employee_id" />
+                            <field name="vendor_id" />
+                            <field name="amount" />
+                            <field name="reference" />
+                            <field name="service_ids" widget="many2many_tags"/>
                         </group>
                     </sheet>
                 </form>