[ADD]Data.xml data files and Refueling service type, default value of fuel log

bzr revid: dle@openerp.com-20121004143253-dhh44g6gwtb9gfdw

diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py
index 44a04f6..db9be6b 100644 (file)
--- a/addons/fleet/__openerp__.py
+++ b/addons/fleet/__openerp__.py
@@ -24,6 +24,7 @@ Add insurance and services reminder that will help you by sending you a mail whe
     ],
     'data' : [
         'fleet_view.xml',
+        'data.xml',
     ],
     'update_xml' : ['security/ir.model.access.csv'],
     'demo': ['demo.xml'],

diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml
index 0ef71e1..553c7e5 100644 (file)
--- a/addons/fleet/demo.xml
+++ b/addons/fleet/demo.xml
@@ -2199,7 +2199,12 @@ gg==
       <record id="type_service_56" model="fleet.service.type">
           <field name="name">Small risks</field>
           <field name="category">contract</field>
-      </record>    
+      </record>   
+
+      <record id="type_service_refueling" model="fleet.service.type">
+          <field name="name">Refueling</field>
+          <field name="category">service</field>
+      </record> 
 
       <record id="log_odometer_1" model="fleet.vehicle.odometer">
           <field name="vehicle_id" ref="vehicle_1" />

diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index 1feea5d..b998b54 100644 (file)
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -5,6 +5,7 @@ import tools
 import datetime
 from osv.orm import except_orm
 from tools.translate import _
+from import_base.mapper import *
 ############################
 ############################
 #Vehicle.cost class
@@ -550,6 +551,9 @@ class fleet_vehicle_log_fuel(osv.Model):
         self.write(cr, uid, id, {'odometer_id': ''})
         return False
 
+    def _get_default_service_type(self, cr, uid, context):
+        model, model_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'fleet', 'type_service_refueling')
+        return model_id
 
     _name = 'fleet.vehicle.log.fuel'
 
@@ -569,7 +573,7 @@ class fleet_vehicle_log_fuel(osv.Model):
     _defaults = {
         'purchaser_id': lambda self, cr, uid, ctx: uid,
         'date' : time.strftime('%Y-%m-%d'),
-
+        'cost_type': _get_default_service_type,
     }
 
 ############################

diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index b2d1ce3..e718ee8 100644 (file)
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -665,7 +665,7 @@
             <field name="name">fleet.service.type.tree</field>
             <field name="model">fleet.service.type</field>
             <field name="arch" type="xml">
-                <tree string="Services Logs">
+                <tree string="Service types">
                     <field name="name" />
                     <field name="category"/>
                 </tree>
@@ -680,6 +680,29 @@
         </record>
 
         <menuitem action="fleet_vehicle_service_types_act" parent="fleet_configuration" id="fleet_vehicle_service_types_menu" />
+
+
+        <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="vehicle_id" />
+                    <field name="cost_type"/>
+                    <field name="amount"/>
+                    <field name="parent_id"/>
+                </tree>
+            </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</field>
+        </record>
+
+        <menuitem action="fleet_vehicle_costs_act" parent="fleet_vehicles" id="fleet_vehicle_costs_menu" />
 <!--    
         <record model='ir.ui.view' id='fleet_hr_employee_form'>
             <field name="name">fleet.hr.employee.form</field>