From 87673678ada0b4fd86ac1e1bda2a19e54f2f5467 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 24 Sep 2012 11:14:26 +0200
Subject: [PATCH] [RESOLVED]solved conflicts in log object and removed log type
 object

bzr revid: csn@openerp.com-20120924091426-i57amm2p6t1fskc1
---
 addons/fleet/fleet.py       | 20 ++++++--------------
 addons/fleet/fleet_view.xml |  2 ++
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index c2e233b12f7..e5e84550797 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -117,13 +117,6 @@ class fleet_vehicle(osv.Model):
             }
         }
 
-class fleet_vehicle_log_type(osv.Model):
-    _name = 'fleet.vehicle.log.type'
-
-    _columns = {
-        'name' : fields.char('Name', size=32, required=True),
-    }
-
 class fleet_vehicle_log(osv.Model):
     _name = 'fleet.vehicle.log'
 
@@ -131,11 +124,12 @@ class fleet_vehicle_log(osv.Model):
         'employee_id' : fields.many2one('hr.employee', 'Employee', required=True),
         'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True),
 
-        'create_date' : fields.datetime('Creation Date'),
+        'create_date' : fields.date('Creation Date'),
 
         'description' : fields.text('Description'),
-        'type' : fields.char('Type', size=32, required=False),
-    }
+        'type' : fields.char('Type',size=32),
+        }
+        
     _defaults = {
             'type' : 'Log',
     }
@@ -147,11 +141,9 @@ class fleet_vehicle_log_fuel(osv.Model):
         'description' : fields.text('Description'),
         'liter' : fields.integer('Liter'),
         'price_per_liter' : fields.float('Price per liter'),
-        'type' : fields.char('Type', size=32, required=False),
-    }
-    _defaults = {
-            'type' : 'Fuel',
+        'type' : fields.char('Type',size=32),
     }
+    _defaults = {'type': 'Refueling',}
 
 class fleet_vehicle_log_insurance(osv.Model):
     _inherit = 'fleet.vehicle.log'
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index c19d9760197..9c611c9cea8 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -97,6 +97,8 @@
                                     <tree string="Fuel Logs">
                                         <field name="create_date" />
                                         <field name="employee_id" />
+                                        <field name="liter" />
+                                        <field name="price_per_liter" />
                                         <field name="description" />
                                     </tree>
                                     <form string="Fuel Logs" version="7.0">