odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REF]change some fields type from integer to boolean since we only use them as boolean 

bzr revid: csn@openerp.com-20121108091021-q990e9d9o6i0ff0u
This commit is contained in:
Cedric Snauwaert 2012-11-08 10:10:21 +01:00
parent 6b84c61e50
commit def5bca1aa
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
addons/fleet/fleet.py
View File

@ -274,8 +274,8 @@ class fleet_vehicle(osv.Model):
def _get_contract_reminder_fnc(self, cr, uid, ids, field_names, unknow_none, context=None):
res= {}
for record in self.browse(cr, uid, ids, context=context):
overdue = 0
due_soon = 0
overdue = False
due_soon = False
name = ''
for element in record.log_contracts:
if element.state in ('open', 'toclose') and element.expiration_date:
@ -285,14 +285,14 @@ class fleet_vehicle(osv.Model):
due_time = str_to_date(due_time_str)
diff_time = (due_time-current_date).days
if diff_time < 0:
overdue += 1
if diff_time < 15 and diff_time >= 0:
due_soon = due_soon + 1;
if overdue + due_soon > 0:
overdue = True
if diff_time<15 and diff_time>=0:
due_soon = True;
if overdue or due_soon:
ids = self.pool.get('fleet.vehicle.log.contract').search(cr,uid,[('vehicle_id', '=', record.id), ('state', 'in', ('open', 'toclose'))], limit=1, order='expiration_date asc')
if ids:
if len(ids) > 0:
#we display only the name of the oldest overdue/due soon contract
name = self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, ids[0], context=context).cost_subtype.name
name=(self.pool.get('fleet.vehicle.log.contract').browse(cr,uid,ids[0],context=context).cost_subtype.name)
res[record.id] = {
'contract_renewal_overdue': overdue,
@ -356,8 +356,8 @@ class fleet_vehicle(osv.Model):
'image': fields.related('model_id', 'image', type="binary", string="Logo"),
'image_medium': fields.related('model_id', 'image_medium', type="binary", string="Logo"),
'image_small': fields.related('model_id', 'image_small', type="binary", string="Logo"),
'contract_renewal_due_soon': fields.function(_get_contract_reminder_fnc, fnct_search=_search_contract_renewal_due_soon, type="integer", string='Contracts to renew', multi='contract_info'),
'contract_renewal_overdue': fields.function(_get_contract_reminder_fnc, fnct_search=_search_get_overdue_contract_reminder, type="integer", string='Contracts Overdued', multi='contract_info'),
'contract_renewal_due_soon': fields.function(_get_contract_reminder_fnc, fnct_search=_search_contract_renewal_due_soon, type="boolean", string='Contracts to renew', multi='contract_info'),
'contract_renewal_overdue': fields.function(_get_contract_reminder_fnc, fnct_search=_search_get_overdue_contract_reminder, type="boolean", string='Contracts Overdued', multi='contract_info'),
'contract_renewal_name': fields.function(_get_contract_reminder_fnc, type="text", string='Name of contract to renew soon', multi='contract_info'),
'contract_renewal_total': fields.function(_get_contract_reminder_fnc, type="integer", string='Total of contracts due or overdue minus one', multi='contract_info'),
'car_value': fields.float('Car Value', help='Value of the bought vehicle'),
@ -499,11 +499,11 @@ class fleet_vehicle_log_fuel(osv.Model):
def on_change_amount(self, cr, uid, ids, liter, price_per_liter, amount, context=None):
if amount > 0 and liter > 0:
return {'value': {'price_per_liter': amount / liter}}
return {'value': {'price_per_liter': amount / liter,}}
elif amount > 0 and price_per_liter > 0:
return {'value': {'liter': amount / price_per_liter}}
return {'value': {'liter': amount / price_per_liter,}}
elif liter > 0 and price_per_liter > 0:
return {'value': {'amount': liter * price_per_liter}}
return {'value': {'amount': liter * price_per_liter,}}
return {}
def _get_default_service_type(self, cr, uid, context):

6
addons/fleet/fleet_view.xml
View File

@ -229,7 +229,7 @@
<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>0 and contract_renewal_overdue==0;red:contract_renewal_overdue>0">
<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" />
<field name="model_id" />
<field name="driver" />
@ -293,7 +293,7 @@
<field name="model_id" />
</a>
</h4>
<t t-if="record.contract_renewal_due_soon.raw_value > 0 and record.contract_renewal_overdue.raw_value lte 0">
<t t-if="record.contract_renewal_due_soon.raw_value and !record.contract_renewal_overdue.raw_value">
<a data-type="object" data-name="return_action_to_open" href="#" class="oe_kanban_action oe_kanban_action_a" data-context='{"xml_id":"fleet_vehicle_log_contract_act"}'>
<span class="oe_tag oe_kanban_color_3"><field name="contract_renewal_name" />
<t t-if="record.contract_renewal_total.raw_value > 0"> and <field name="contract_renewal_total" /> other(s) </t>
@ -301,7 +301,7 @@
</a>
</t>
<t t-if="record.contract_renewal_overdue.raw_value > 0">
<t t-if="record.contract_renewal_overdue.raw_value">
<a data-type="object" data-name="return_action_to_open" href="#" class="oe_kanban_action oe_kanban_action_a" data-context='{"xml_id":"fleet_vehicle_log_contract_act"}'>
<span class="oe_tag oe_kanban_color_2"><field name="contract_renewal_name" />
<t t-if="record.contract_renewal_total.raw_value > 0"> and <field name="contract_renewal_total" /> other(s) </t>