From 68d6dfefe3499e66265e0a855f60257a8df802f4 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Tue, 2 Oct 2012 13:07:36 +0200 Subject: [PATCH] [ADD]some changes on vehicle kanban view bzr revid: csn@openerp.com-20121002110736-ohud00icy1lsibu3 --- addons/fleet/fleet.py | 9 +++++---- addons/fleet/fleet_view.xml | 14 +++++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index ff975408180..06ae81e93f2 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -241,6 +241,7 @@ class fleet_vehicle(osv.Model): due_soon = due_soon +1; if diff_time>15: break + res.append((record.id,due_soon)) else: res.append((record.id,0)) @@ -263,7 +264,7 @@ class fleet_vehicle(osv.Model): _name = 'fleet.vehicle' _description = 'Fleet Vehicle' - + _order = 'insurance_renewal_overdue desc, insurance_renewal_due_soon desc' _columns = { 'name' : fields.function(_vehicle_name_get_fnc, type="char", string='Name', store=True), 'company_id': fields.many2one('res.company', 'Company'), @@ -297,15 +298,15 @@ 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), + 'insurance_renewal_due_soon' : fields.function(get_next_insurance_reminder,type="integer",string='Insurance Renewal Due Soon',store=True), + 'insurance_renewal_overdue' : fields.function(get_overdue_insurance_reminder,type="integer",string='Insurance Renewal Overdue',store=True), 'next_service_date' : fields.function(get_next_service_reminder,type="date",string='Next Service Due Date',store=False), } _defaults = { 'doors' : 5, - 'odometer_unit' : 'Kilometers', + 'odometer_unit' : 'kilometers', } diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index d3109a5eb14..6fb7a12e734 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -261,7 +261,7 @@
- +

@@ -290,7 +290,13 @@
  • - Insurance renewal
    - due soon
    + Insurance renewal
    - due soon
    +
  • +
  • + - overdue +
  • +
  • + Service Alert
    - due soon
  • - overdue @@ -301,9 +307,7 @@
  • - +