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

[ADD]working color reminder for contract and also change header status bar for contract 

bzr revid: csn@openerp.com-20121003095404-lgh3k0wrnttx59pu
This commit is contained in:
Cedric Snauwaert 2012-10-03 11:54:04 +02:00
parent 2d5fb35250
commit 7a8a5abeff
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
addons/fleet/fleet.py
View File

@ -235,7 +235,7 @@ class fleet_vehicle(osv.Model):
reads = self.browse(cr,uid,ids,context=context)
res=[]
for record in reads:
contracts = self.pool.get('fleet.vehicle.log.contract').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'),('reminder','=',True)],order='expiration_date')
due_soon=0
if (len(contracts) > 0):
for element in contracts:
@ -569,16 +569,19 @@ class fleet_vehicle_log_contract(osv.Model):
reads = self.browse(cr,uid,ids,context=context)
res=[]
for record in reads:
if (record.state):
if (record.reminder==True):
if (record.expiration_date and record.state.name=='In Progress'):
today=self.str_to_date(time.strftime('%Y-%m-%d'))
renew_date = self.str_to_date(record.expiration_date)
diff_time=int((renew_date-today).days)
res.append((record.id,diff_time))
if (diff_time<=0):
res.append((record.id,0))
else:
res.append((record.id,diff_time))
else:
res.append((record.id,0))
res.append((record.id,-1))
else:
res.append((record.id,0))
res.append((record.id,-1))
return dict(res)
_name = 'fleet.vehicle.log.contract'
@ -595,17 +598,28 @@ class fleet_vehicle_log_contract(osv.Model):
'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('Contract Reference', size=64),
'state' : fields.many2one('fleet.contract.state', 'Contract Status', help='Choose wheter the contract is still valid or not'),
'state' : fields.selection([('open', 'In Progress'), ('closed', 'Terminated')], 'Status', readonly=True, help='Choose wheter the contract is still valid or not'),
#'state' : fields.many2one('fleet.contract.state', 'Contract Status', help='Choose wheter the contract is still valid or not'),
'reminder' : fields.boolean('Renewal Reminder', help="Warn the user when this contract needs to be renewed"),
'notes' : fields.text('Terms and Conditions'),
'costs' : fields.one2many('fleet.vehicle.cost', 'vehicle_id', 'Costs covered'),
}
_defaults = {
'purchaser_id': lambda self, cr, uid, ctx: uid,
'start_date' : time.strftime('%Y-%m-%d'),
'state':'open',
#'expiration_date' : self.compute_next_year_date(time.strftime('%Y-%m-%d')),
}
def contract_close(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {'state': 'closed'})
return True
def contract_open(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {'state': 'open'})
return True
class fleet_service_type(osv.Model):
_name = 'fleet.service.type'
_columns = {

9
addons/fleet/fleet_view.xml
View File

@ -348,13 +348,15 @@
<field name="arch" type="xml">
<form string="Contract logs" version="7.0">
<header>
<field name="state" widget="statusbar" clickable="True" />
<button modifiers="{'invisible': [['state', 'not in', ['open']]]}" name="contract_close" states="open" type="object" class="oe_highlight" string="Terminate Contract"/>
<button modifiers="{'invisible': [['state', 'not in', ['closed']]]}" name="contract_open" states="closed" type="object" class="oe_highlight" string="Set Contract In Progress"/>
<field name="state" widget="statusbar" />
</header>
<sheet>
<group string="Contract details" col="2">
<group >
<field name="contract_type" />
<field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
<field name="contract_type" />
<field name="price" />
<field name="insurer_id" />
</group>
@ -363,6 +365,7 @@
<field name="start_date" on_change="on_change_start_date(start_date)"/>
<field name="expiration_date" />
<field name="ins_ref" />
<field name="reminder" />
</group>
</group>
<group>
@ -401,7 +404,7 @@
<field name="name">fleet.vehicle.log.contract.tree</field>
<field name="model">fleet.vehicle.log.contract</field>
<field name="arch" type="xml">
<tree string="Contract logs" version="7.0" colors="orange:warning_date>0 and warning_date&lt;15;red:warning_date&lt;0">
<tree string="Contract logs" version="7.0" colors="orange:warning_date>0 and warning_date&lt;15;red:warning_date==0">
<field name="vehicle_id" />
<field name="contract_type" />
<field name="state" />