[MERGE]merge with trunk

bzr revid: rma@tinyerp.com-20121119110824-rj4y32rfbszqln7g

5 files changed, 15 insertions, 12 deletions

diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index d531b00bc43..be0e8b34351 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -56,7 +56,10 @@ class fleet_vehicle_cost(osv.Model):
     def _year_get_fnc(self, cr, uid, ids, name, unknow_none, context=None):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
-            res[record.id] = str(time.strptime(record.date, tools.DEFAULT_SERVER_DATE_FORMAT).tm_year)
+            if (record.date):
+                res[record.id] = str(time.strptime(record.date, tools.DEFAULT_SERVER_DATE_FORMAT).tm_year)
+            else:
+                res[record.id] = _('Unknown')
         return res
 
     def _cost_name_get_fnc(self, cr, uid, ids, name, unknow_none, context=None):
@@ -253,7 +256,6 @@ class fleet_vehicle(osv.Model):
 
     def _search_get_overdue_contract_reminder(self, cr, uid, obj, name, args, context):
         res = []
-        today = fields.date.today(self, cr, uid, context=context)
         for field, operator, value in args:
             assert operator in ('=', '!=', '<>') and value in (True, False), 'Operation not supported'
             if (operator == '=' and value == True) or (operator in ('<>', '!=') and value == False):
@@ -343,7 +345,7 @@ class fleet_vehicle(osv.Model):
         'seats': fields.integer('Seats Number', help='Number of seats of the vehicle'),
         'doors': fields.integer('Doors Number', help='Number of doors of the vehicle'),
         'tag_ids' :fields.many2many('fleet.vehicle.tag', 'fleet_vehicle_vehicle_tag_rel', 'vehicle_tag_id','tag_id', 'Tags'),
-        'odometer': fields.function(_get_odometer, fnct_inv=_set_odometer, type='float', string='Odometer Value', help='Odometer measure of the vehicle at the moment of this log'),
+        'odometer': fields.function(_get_odometer, fnct_inv=_set_odometer, type='float', string='Last Odometer', help='Odometer measure of the vehicle at the moment of this log'),
         'odometer_unit': fields.selection([('kilometers', 'Kilometers'),('miles','Miles')], 'Odometer Unit', help='Unit of the odometer ',required=True),
         'transmission': fields.selection([('manual', 'Manual'), ('automatic', 'Automatic')], 'Transmission', help='Transmission Used by the vehicle'),
         'fuel_type': fields.selection([('gasoline', 'Gasoline'), ('diesel', 'Diesel'), ('electric', 'Electric'), ('hybrid', 'Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle'),
@@ -718,7 +720,7 @@ class fleet_vehicle_log_contract(osv.Model):
                 'start_date': datetime.datetime.strftime(str_to_datetime(element.expiration_date) + datetime.timedelta(days=1), tools.DEFAULT_SERVER_DATE_FORMAT),
                 'expiration_date': datetime.datetime.strftime(enddate + diffdate, tools.DEFAULT_SERVER_DATE_FORMAT),
             }
-            newid = super(fleet_vehicle_log_contract, self).copy(cr, uid, [element.id], default, context=context)
+            newid = super(fleet_vehicle_log_contract, self).copy(cr, uid, element.id, default, context=context)
         mod, modid = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'fleet', 'fleet_vehicle_log_contract_form')
         return {
             'name':_("Renew Contract"),
@@ -769,8 +771,8 @@ class fleet_vehicle_log_contract(osv.Model):
         'start_date': fields.date('Contract Start Date', help='Date when the coverage of the contract begins'),
         'expiration_date': fields.date('Contract Expiration Date', help='Date when the coverage of the contract expirates (by default, one year after begin date)'),
         'days_left': fields.function(get_days_left, type='integer', string='Warning Date'),
-        'insurer_id' :fields.many2one('res.partner', 'Supplier', domain="[('supplier','=',True)]"),
-        'purchaser_id': fields.many2one('res.partner', 'Contractor', domain="['|', ('customer','=',True), ('employee','=',True)]",help='Person to which the contract is signed for'),
+        'insurer_id' :fields.many2one('res.partner', 'Supplier'),
+        'purchaser_id': fields.many2one('res.partner', 'Contractor', help='Person to which the contract is signed for'),
         'ins_ref': fields.char('Contract Reference', size=64),
         'state': fields.selection([('open', 'In Progress'), ('toclose','To Close'), ('closed', 'Terminated')], 'Status', readonly=True, help='Choose wheter the contract is still valid or not'),
         'notes': fields.text('Terms and Conditions', help='Write here all supplementary informations relative to this contract'),
diff --git a/addons/fleet/fleet_board_view.xml b/addons/fleet/fleet_board_view.xml
index 425d5c5b8eb..760fc1cf583 100644
--- a/addons/fleet/fleet_board_view.xml
+++ b/addons/fleet/fleet_board_view.xml
@@ -43,7 +43,7 @@
       <field name="view_id" ref="fleet_vehicle_kanban"></field>
       <field name="view_type">form</field>
       <field name="view_mode">tree</field>
-      <field name="domain">['|',('contract_renewal_due_soon','>',0),('contract_renewal_overdue','>',0)]</field>
+      <field name="domain">['|',('contract_renewal_due_soon','=',True),('contract_renewal_overdue','=',True)]</field>
       <field name="help" type="html">
         <p>
           Here are displayed vehicles for which one or more contracts need to be renewed. If you see this message, then there is no contracts to renew.
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index bb15440ba37..bed4cd872fa 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -227,7 +227,6 @@
         <record model='ir.ui.view' id='fleet_vehicle_tree'>
             <field name="name">fleet.vehicle.tree</field>
             <field name="model">fleet.vehicle</field>
-            <field name="sequence">1</field>
             <field name="arch" type="xml">
                 <tree string="Vehicle" version="7.0" colors="orange:contract_renewal_due_soon and not contract_renewal_overdue;red:contract_renewal_overdue">
                     <field name="license_plate" />
@@ -256,7 +255,7 @@
                     <field name="location"/>
                     <field name="state" />
                     <field name="state" />
-                    <filter name="alert_true" domain="['|',('contract_renewal_due_soon','>',0),('contract_renewal_overdue','>',0)]" string="Has Alert(s)"/>
+                    <filter name="alert_true" domain="['|',('contract_renewal_due_soon','=',True),('contract_renewal_overdue','=',True)]" string="Has Alert(s)"/>
                </search>
             </field>
         </record>
@@ -522,7 +521,7 @@
             <field name="name">fleet.vehicle.odometer.tree</field>
             <field name="model">fleet.vehicle.odometer</field>
             <field name="arch" type="xml">
-                <tree string="Odometer Logs" version="7.0" editable="bottom">
+                <tree string="Odometer Logs" version="7.0" editable="top">
                     <field name="date" />
                     <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
                     <field name="value" />
@@ -563,7 +562,7 @@
             <field name="name">Vehicles Odometer</field>
             <field name="res_model">fleet.vehicle.odometer</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
+            <field name="view_mode">tree,graph</field>
             <field name="context">{"search_default_groupby_vehicle" : True}</field>
             <field name="help" type="html">
               <p>
diff --git a/addons/fleet/security/ir.model.access.csv b/addons/fleet/security/ir.model.access.csv
index 0c50a6fbee3..823b3cb2945 100644
--- a/addons/fleet/security/ir.model.access.csv
+++ b/addons/fleet/security/ir.model.access.csv
@@ -8,4 +8,6 @@ fleet_vehicle_access_right,fleet_vehicle_access_right,model_fleet_vehicle,,1,1,1
 fleet_vehicle_log_fuel_access_right,fleet_vehicle_log_fuel_access_right,model_fleet_vehicle_log_fuel,,1,1,1,1
 fleet_vehicle_log_services_access_right,fleet_vehicle_log_services_access_right,model_fleet_vehicle_log_services,,1,1,1,1
 fleet_vehicle_log_contract_access_right,fleet_vehicle_log_contract_access_right,model_fleet_vehicle_log_contract,,1,1,1,1
-fleet_service_type_access_right,fleet_service_type_access_right,model_fleet_service_type,,1,1,1,1
\ No newline at end of file
+fleet_service_type_access_right,fleet_service_type_access_right,model_fleet_service_type,,1,1,1,1
+access_fleet_vehicle_cost,access_fleet_vehicle_cost,model_fleet_vehicle_cost,,1,1,1,1
+access_fleet_contract_state,access_fleet_contract_state,model_fleet_contract_state,,1,1,1,1
diff --git a/addons/fleet/static/src/img/icon.png b/addons/fleet/static/src/img/icon.png
index 3db7ae9fa49..5b41e43c5bd 100644
--- a/addons/fleet/static/src/img/icon.png
+++ b/addons/fleet/static/src/img/icon.png