[FIX]Change insurance to contract

bzr revid: dle@openerp.com-20121002143637-aoul3tazs67oghtx

addons/fleet/demo.xml

@@ -1846,23 +1846,23 @@ gg==
         <field name="sequence">4</field>
       </record>
 
-      <record id="vehicle_insurance_pending" model="fleet.insurance.state">
+      <record id="vehicle_contract_pending" model="fleet.contract.state">
         <field name="name">In Progress</field>
       </record>
 
-      <record id="vehicle_insurance_over" model="fleet.insurance.state">
+      <record id="vehicle_contract_over" model="fleet.contract.state">
         <field name="name">Terminated</field>
       </record>
 
-      <record id="vehicle_insurance_type_bigrisks" model="fleet.insurance.type">
+      <record id="vehicle_contract_type_bigrisks" model="fleet.contract.type">
         <field name="name">Big risks</field>
       </record>
 
-      <record id="vehicle_insurance_type_smallrisks" model="fleet.insurance.type">
+      <record id="vehicle_contract_type_smallrisks" model="fleet.contract.type">
         <field name="name">Small risks</field>
       </record>
 
-      <record id="vehicle_insurance_type_omium" model="fleet.insurance.type">
+      <record id="vehicle_contract_type_omium" model="fleet.contract.type">
         <field name="name">Omium</field>
       </record>
 

addons/fleet/fleet.py

@@ -146,11 +146,11 @@ class fleet_vehicle(osv.Model):
         res['domain']=[('vehicle_id','=', ids[0])]
         return res
 
-    def act_show_log_insurance(self, cr, uid, ids, context=None):
+    def act_show_log_contract(self, cr, uid, ids, context=None):
         """ This opens log view to view and add new log for this vehicle
-            @return: the insurance log view
+            @return: the contract log view
         """
-        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log_insurance', context)
+        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log_contract', context)
         res['context'] = {
             'default_vehicle_id': ids[0]
         }
@@ -190,7 +190,7 @@ class fleet_vehicle(osv.Model):
     def str_to_date(self,strdate):
         return datetime.datetime(int(strdate[:4]),int(strdate[5:7]),int(strdate[8:]))
 
-    def get_overdue_insurance_reminder(self,cr,uid,ids,prop,unknow_none,context=None):
+    def get_overdue_contract_reminder(self,cr,uid,ids,prop,unknow_none,context=None):
         if context is None:
             context={}
         if not ids:
@@ -198,12 +198,12 @@ class fleet_vehicle(osv.Model):
         reads = self.browse(cr,uid,ids,context=context)
         res=[]
         for record in reads:
-            insurances = self.pool.get('fleet.vehicle.log.insurance').search(cr,uid,[('vehicle_id','=',record.id),('state','=','In Progress')],order='expiration_date')
+            contracts = self.pool.get('fleet.vehicle.log.contract').search(cr,uid,[('vehicle_id','=',record.id),('state','=','In Progress')],order='expiration_date')
             overdue=0
-            if (len(insurances) > 0):
-                for element in insurances:
+            if (len(contracts) > 0):
+                for element in contracts:
                     current_date_str=time.strftime('%Y-%m-%d')
-                    due_time_str=self.pool.get('fleet.vehicle.log.insurance').browse(cr,uid,element,context=context).expiration_date
+                    due_time_str=self.pool.get('fleet.vehicle.log.contract').browse(cr,uid,element,context=context).expiration_date
                     
                     current_date=self.str_to_date(current_date_str)
                     due_time=self.str_to_date(due_time_str)
@@ -218,7 +218,7 @@ class fleet_vehicle(osv.Model):
                 res.append((record.id,0))
         return dict(res)
 
-    def get_next_insurance_reminder(self,cr,uid,ids,prop,unknow_none,context=None):
+    def get_next_contract_reminder(self,cr,uid,ids,prop,unknow_none,context=None):
         if context is None:
             context={}
         if not ids:
@@ -226,12 +226,12 @@ class fleet_vehicle(osv.Model):
         reads = self.browse(cr,uid,ids,context=context)
         res=[]
         for record in reads:
-            insurances = self.pool.get('fleet.vehicle.log.insurance').search(cr,uid,[('vehicle_id','=',record.id),('state','=','In Progress')],order='expiration_date')
+            contracts = self.pool.get('fleet.vehicle.log.contract').search(cr,uid,[('vehicle_id','=',record.id),('state','=','In Progress')],order='expiration_date')
             due_soon=0
-            if (len(insurances) > 0):
-                for element in insurances:
+            if (len(contracts) > 0):
+                for element in contracts:
                     current_date_str=time.strftime('%Y-%m-%d')
-                    due_time_str=self.pool.get('fleet.vehicle.log.insurance').browse(cr,uid,element,context=context).expiration_date
+                    due_time_str=self.pool.get('fleet.vehicle.log.contract').browse(cr,uid,element,context=context).expiration_date
                     
                     current_date=self.str_to_date(current_date_str)
                     due_time=self.str_to_date(due_time_str)
@@ -264,7 +264,7 @@ class fleet_vehicle(osv.Model):
 
     _name = 'fleet.vehicle'
     _description = 'Fleet Vehicle'
-    #_order = 'insurance_renewal_overdue desc, insurance_renewal_due_soon desc'
+    #_order = 'contract_renewal_overdue desc, contract_renewal_due_soon desc'
     _order= 'name asc'
     _columns = {
         'name' : fields.function(_vehicle_name_get_fnc, type="char", string='Name', store=True),
@@ -276,7 +276,7 @@ class fleet_vehicle(osv.Model):
         'log_ids' : fields.one2many('fleet.vehicle.log', 'vehicle_id', 'Other Logs'),
         '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_contracts' : fields.one2many('fleet.vehicle.log.contract','vehicle_id', 'Contracts'),
         'acquisition_date' : fields.date('Acquisition Date', required=False, help='Date when the vehicle has been bought'),
         'color' : fields.char('Color',size=32, help='Color of the vehicle'),
         'state': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle', ),
@@ -298,8 +298,8 @@ class fleet_vehicle(osv.Model):
         'image_medium': fields.related('model_id','image_medium',type="binary",string="Logo",store=False),
         'image_small': fields.related('model_id','image_small',type="binary",string="Logo",store=False),
 
-        'insurance_renewal_due_soon' : fields.function(get_next_insurance_reminder,type="integer",string='Insurance Renewal Due Soon',store=False),
-        'insurance_renewal_overdue' : fields.function(get_overdue_insurance_reminder,type="integer",string='Insurance Renewal Overdue',store=False),
+        'contract_renewal_due_soon' : fields.function(get_next_contract_reminder,type="integer",string='Contract Renewal Due Soon',store=False),
+        'contract_renewal_overdue' : fields.function(get_overdue_contract_reminder,type="integer",string='Contract Renewal Overdue',store=False),
         'next_service_date' : fields.function(get_next_service_reminder,type="date",string='Next Service Due Date',store=False),
 
         'car_value': fields.float('Car value', help='Value of the bought vehicle'),
@@ -396,7 +396,7 @@ class fleet_vehicle_odometer(osv.Model):
     _columns = {
         'name' : fields.function(_vehicle_log_name_get_fnc, type="char", string='Name', store=True),
 
-        'date' : fields.date('Execution Date'),
+        'date' : fields.date('Purchase Date'),
         'value' : fields.float('Odometer Value',group_operator="max"),
         'unit': fields.related('vehicle_id','odometer_unit',type="char",string="Unit",store=False, readonly=True),
         'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True),
@@ -510,19 +510,19 @@ class fleet_vehicle_log_services(osv.Model):
         'date' : time.strftime('%Y-%m-%d'),
     }
 
-class fleet_insurance_type(osv.Model):
-    _name = 'fleet.insurance.type'
+class fleet_contract_type(osv.Model):
+    _name = 'fleet.contract.type'
     _columns = {
         'name': fields.char('Name', required=True, translate=True),
     }
 
-class fleet_insurance_state(osv.Model):
-    _name = 'fleet.insurance.state'
+class fleet_contract_state(osv.Model):
+    _name = 'fleet.contract.state'
     _columns = {
-        'name':fields.char('Insurance Status',size=32),
+        'name':fields.char('Contract Status',size=32),
     }
 
-class fleet_vehicle_log_insurance(osv.Model):
+class fleet_vehicle_log_contract(osv.Model):
     _inherits = {'fleet.vehicle.odometer': 'odometer_id'}
 
     def on_change_vehicle(self, cr, uid, ids, vehicle_id, context=None):
@@ -549,20 +549,20 @@ class fleet_vehicle_log_insurance(osv.Model):
         else:
             return {}
 
-    _name = 'fleet.vehicle.log.insurance'
+    _name = 'fleet.vehicle.log.contract'
     _order='state,expiration_date'
     _columns = {
 
         #'name' : fields.char('Name',size=64),
 
-        'insurance_type' : fields.many2one('fleet.insurance.type', 'Type', required=False, help='Type of the insurance'),
-        'start_date' : fields.date('Start Date', required=False, help='Date when the coverage of the insurance begins'),
-        'expiration_date' : fields.date('Expiration Date', required=False, help='Date when the coverage of the insurance expirates (by default, one year after begin date)'),
-        'price' : fields.float('Price', help="Cost of the insurance for the specified period"),
+        'contract_type' : fields.many2one('fleet.contract.type', 'Type', required=False, help='Type of the contract'),
+        'start_date' : fields.date('Start Date', required=False, help='Date when the coverage of the contract begins'),
+        'expiration_date' : fields.date('Expiration Date', required=False, help='Date when the coverage of the contract expirates (by default, one year after begin date)'),
+        'price' : fields.float('Price', help="Cost of the contract for the specified period"),
         'insurer_id' :fields.many2one('res.partner', 'Insurer', domain="[('supplier','=',True)]"),
         'purchaser_id' : fields.many2one('res.partner', 'Purchaser',domain="['|',('customer','=',True),('employee','=',True)]"),
-        'ins_ref' : fields.char('Insurance Reference', size=64),
-        'state' : fields.many2one('fleet.insurance.state', 'Insurance Status', help='Choose wheter the insurance is still valid or not'),
+        'ins_ref' : fields.char('Contract Reference', size=64),
+        'state' : fields.many2one('fleet.contract.state', 'Contract Status', help='Choose wheter the contract is still valid or not'),
         'notes' : fields.text('Terms and Conditions'),
     }
     _defaults = {

addons/fleet/fleet_view.xml

@@ -159,7 +159,7 @@
                             <field name="tag_ids" widget="many2many_tags" />
                         </div>
                         <div class="oe_right oe_button_box">
-                            <button name="act_show_log_insurance" type="object" string="Insurances" help="show the insurance for this vehicle" />
+                            <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" />
                         </div> 
@@ -207,7 +207,7 @@
             <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:insurance_renewal_due_soon>0 and insurance_renewal_overdue==0;red:insurance_renewal_overdue>0">
+                <tree string="Vehicle" version="7.0" colors="orange:contract_renewal_due_soon>0 and contract_renewal_overdue==0;red:contract_renewal_overdue>0">
                     <field name="license_plate" />
                     <field name="model_id" />
                     <field name="driver" />
@@ -215,8 +215,8 @@
                     <field name="acquisition_date" />
                     <field name="state"/>
                     <field name="odometer" />
-                    <field name="insurance_renewal_due_soon" invisible="1"/>
-                    <field name="insurance_renewal_overdue" invisible="1"/>
+                    <field name="contract_renewal_due_soon" invisible="1"/>
+                    <field name="contract_renewal_overdue" invisible="1"/>
                     <field name="next_service_date" invisible="1"/>
                 </tree>
             </field>
@@ -249,8 +249,8 @@
                     <field name="odometer_unit" />
                     <field name="image" />
                     <field name="tag_ids" />
-                    <field name="insurance_renewal_due_soon" />
-                    <field name="insurance_renewal_overdue" />
+                    <field name="contract_renewal_due_soon" />
+                    <field name="contract_renewal_overdue" />
                     <templates>
                         <t t-name="kanban-box">
                             <div class="oe_kanban_vignette oe_semantic_html_override">
@@ -277,15 +277,15 @@
                                             <t t-if="record.location.raw_value"><field name="location"/></t>
                                         </li>
                                         <li>
-                                            <t t-if="record.insurance_renewal_due_soon.raw_value > 0 and record.insurance_renewal_overdue.raw_value lte 0">
-                                                 <a data-type="object" data-name="act_show_log_insurance" href="#" class="oe_kanban_action oe_kanban_action_a" Style="color:orange">
-                                                        Alert Insurance Renewal
+                                            <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.insurance_renewal_overdue.raw_value > 0">
-                                                <a data-type="object" data-name="act_show_log_insurance" href="#" class="oe_kanban_action oe_kanban_action_a" Style="color:red">
-                                                        Alert Insurance Renewal
+                                            <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>
                                             
@@ -323,9 +323,9 @@
 
         <act_window
             context="{'default_vehicle_id': active_id}"
-            id="act_show_log_insurance"
-            name="Insurance"
-            res_model="fleet.vehicle.log.insurance"
+            id="act_show_log_contract"
+            name="Contract"
+            res_model="fleet.vehicle.log.contract"
             src_model="fleet.vehicle"
             view_mode="tree,form"
             view_type="form"/>
@@ -341,22 +341,27 @@
         <menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" />
         <menuitem action="fleet_vehicle_act" parent="fleet_vehicles" id="fleet_vehicle_menu" />
 
-        <record model='ir.ui.view' id='fleet_vehicle_log_insurance_form'>
-            <field name="name">fleet.vehicle.log_insurance.form</field>
-            <field name="model">fleet.vehicle.log.insurance</field>
+        <record model='ir.ui.view' id='fleet_vehicle_log_contract_form'>
+            <field name="name">fleet.vehicle.log_contract.form</field>
+            <field name="model">fleet.vehicle.log.contract</field>
             <field name="arch" type="xml">
-                <form string="Insurance logs" version="7.0">
+                <form string="Contract logs" version="7.0">
                     <header>
                         <field name="state" widget="statusbar" clickable="True" />
                     </header>
                     <sheet>
-                        <group col="2">
-                            <group string="Insurance details">
-                                    <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
-                                    <field name="insurance_type" />
-                                    <field name="start_date" on_change="on_change_start_date(start_date)"/>
-                                    <field name="expiration_date" />
-                                    <field name="price" />
+                        <group string="Contract details" col="2">
+                            <group >
+                                <field name="contract_type" />
+                                <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
+                                <field name="price" />
+                                <field name="insurer_id" />
+                            </group>
+                            <group>
+                                <field name="date" />
+                                <field name="start_date" on_change="on_change_start_date(start_date)"/>
+                                <field name="expiration_date" />
+                                <field name="ins_ref" />
                             </group>
                         </group>
                         <group col="2">
@@ -366,11 +371,7 @@
                                     <field name="unit" class="oe_inline"/>
                                 </div>
                             </group>
-                            <group string="Additional details">
-                                <field name="date" />
-                                <field name="insurer_id" />
-                                <field name="ins_ref" />
-                            </group>
+                            <group></group>
                         </group>
                         <group string="Terms and Conditions"></group>
                         <field name="notes" />
@@ -379,13 +380,13 @@
             </field>
         </record>
 
-        <record model='ir.ui.view' id='fleet_vehicle_log_insurance_tree'>
-            <field name="name">fleet.vehicle.log.insurance.tree</field>
-            <field name="model">fleet.vehicle.log.insurance</field>
+        <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="Insurance logs" version="7.0">
+                <tree string="Contract logs" version="7.0">
                     <field name="vehicle_id" />
-                    <field name="insurance_type" />
+                    <field name="contract_type" />
                     <field name="state" />
                     <field name="start_date" />
                     <field name="expiration_date" />
@@ -398,14 +399,14 @@
             </field>
         </record>
 
-        <record model='ir.actions.act_window' id='fleet_vehicle_log_insurance_act'>
-            <field name="name">Vehicles Insurances</field>
-            <field name="res_model">fleet.vehicle.log.insurance</field>
+        <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>
         </record>
 
-        <menuitem action="fleet_vehicle_log_insurance_act" parent="fleet_vehicles" id="fleet_vehicle_log_insurance_menu" />
+        <menuitem action="fleet_vehicle_log_contract_act" parent="fleet_vehicles" id="fleet_vehicle_log_contract_menu" />
 
        <record model='ir.ui.view' id='fleet_vehicle_odometer_form'>
             <field name="name">fleet.vehicle.odometer.form</field>