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

[ADD]on change on creation date in services, add a field notes in insurances 

bzr revid: csn@openerp.com-20120928101040-iru11mllx5arkjyc
This commit is contained in:
Cedric Snauwaert 2012-09-28 12:10:40 +02:00
parent c09ab5e7d9
commit 0be6d1532f
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addons/fleet/fleet.py
View File

@ -304,7 +304,7 @@ class fleet_vehicle_log_fuel(osv.Model):
'amount': fields.float('Total price'),
'purchaser_id' : fields.many2one('res.partner', 'Purchaser'),
'inv_ref' : fields.char('Invoice Reference', size=64),
'vendor_id' : fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"),
'vendor_id' : fields.many2one('res.partner', 'Supplier', domain="[('supplier','=',True)]"),
'notes' : fields.text('Notes'),
}
_defaults = {
@ -319,16 +319,17 @@ class fleet_vehicle_log_services(osv.Model):
_columns = {
#'name' : fields.char('Name',size=64),
'date' :fields.date('Service Date',help='Date when the service will be/has been performed'),
'amount' :fields.float('Cost', help="Total cost of the service"),
'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'),
'purchaser_id' : fields.many2one('res.partner', 'Purchaser'),
'purchaser_id' : fields.many2one('res.partner', 'Purchaser',domain="[('supplier','=',False)]"),
'inv_ref' : fields.char('Invoice Reference', size=64),
'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"),
'vendor_id' :fields.many2one('res.partner', 'Supplier', domain="[('supplier','=',True)]"),
'notes' : fields.text('Notes'),
}
_defaults = {
'purchaser_id': lambda self, cr, uid, ctx: uid,
'date' : time.strftime('%Y-%m-%d'),
}
class fleet_insurance_type(osv.Model):
@ -340,10 +341,17 @@ class fleet_insurance_type(osv.Model):
class fleet_vehicle_log_insurance(osv.Model):
_inherits = {'fleet.vehicle.odometer': 'odometer_id'}
def compute_next_year_date(strdate):
def compute_next_year_date(self, strdate):
nextyear=int(strdate[:4])+1
return str(nextyear)+strdate[4:]
def on_change_start_date(self, cr, uid, ids, strdate, context=None):
if (strdate):
return {'value' : {'expiration_date' : self.compute_next_year_date(strdate),}}
else:
return {}
_name = 'fleet.vehicle.log.insurance'
_columns = {
@ -356,12 +364,12 @@ class fleet_vehicle_log_insurance(osv.Model):
'insurer_id' :fields.many2one('res.partner', 'Insurer', domain="[('supplier','=',True)]"),
'purchaser_id' : fields.many2one('res.partner', 'Purchaser'),
'ins_ref' : fields.char('Insurance Reference', size=64),
'notes' : fields.text('Notes'),
'notes' : fields.text('Terms and Conditions'),
}
_defaults = {
'purchaser_id': lambda self, cr, uid, ctx: uid,
'start_date' : time.strftime('%Y-%m-%d'),
'expiration_date' : compute_next_year_date(time.strftime('%Y-%m-%d')),
#'expiration_date' : self.compute_next_year_date(time.strftime('%Y-%m-%d')),
}

9
addons/fleet/fleet_view.xml
View File

@ -238,12 +238,14 @@
<sheet>
<group col="2">
<group string="Insurance details">
<field name="vehicle_id" />
<field name="insurance_type" />
<field name="start_date" />
<field name="start_date" on_change="on_change_start_date(start_date)"/>
<field name="expiration_date" />
<field name="price" />
</group>
<group></group>
</group>
<group col="2">
<group string="Odometer details">
@ -256,6 +258,8 @@
<field name="ins_ref" />
</group>
</group>
<group string="Terms and Conditions"></group>
<field name="notes" />
</sheet>
</form>
</field>
@ -274,6 +278,7 @@
<field name="price" />
<field name="value" />
<field name="unit" />
<field name="notes" />
</tree>
</field>
</record>