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

[ADD]add name function for logs 

bzr revid: csn@openerp.com-20120927150524-qcghcjs3cknrdvfs
This commit is contained in:
Cedric Snauwaert 2012-09-27 17:05:24 +02:00
parent 3ebb1caaae
commit d99934d1b8
2 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
addons/fleet/fleet.py
View File

@ -195,8 +195,28 @@ class fleet_vehicle_odometer(osv.Model):
_name='fleet.vehicle.odometer'
_description='Odometer log for a vehicle'
def name_get(self, cr, uid, ids, context=None):
if context is None:
context = {}
if not ids:
return []
reads = self.browse(cr, uid, ids, context=context)
res = []
for record in reads:
if record.vehicle_id.name:
name = str(record.vehicle_id.name)
if record.date:
name = name+ ' / '+ str(record.date)
print record.date
res.append((record.id, name))
return res
def _vehicle_log_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
res = self.name_get(cr, uid, ids, context=context)
return dict(res)
_columns = {
'name' : fields.char('Name',size=64),
'name' : fields.function(_vehicle_log_name_get_fnc, type="char", string='Name', store=True),
'date' : fields.date('Date'),
'value' : fields.float('Odometer Value'),
@ -250,7 +270,7 @@ class fleet_vehicle_log_fuel(osv.Model):
_name = 'fleet.vehicle.log.fuel'
_columns = {
'name' : fields.char('Name',size=64),
#'name' : fields.char('Name',size=64),
'liter' : fields.float('Liter'),
'price_per_liter' : fields.float('Price per liter'),
@ -271,7 +291,7 @@ class fleet_vehicle_log_services(osv.Model):
_name = 'fleet.vehicle.log.services'
_columns = {
'name' : fields.char('Name',size=64),
#'name' : fields.char('Name',size=64),
'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'),
@ -296,7 +316,7 @@ class fleet_vehicle_log_insurance(osv.Model):
_name = 'fleet.vehicle.log.insurance'
_columns = {
'name' : fields.char('Name',size=64),
#'name' : fields.char('Name',size=64),
'insurance_type' : fields.many2one('fleet.insurance.type', 'Type', required=False, help='Type of the insurance'),
'start_date' : fields.date('Start date', required=False, help='Date when the coverage of the insurance begins'),

40
addons/fleet/fleet_view.xml
View File

@ -97,8 +97,8 @@
</header>
<sheet>
<div class="oe_right oe_button_box">
<button name="act_show_log_services" type="object" string="show services logs" help="show the services logs for this vehicle" />
<button name="act_show_log_fuel" type="object" string="show fuel logs" help="show the fuel logs for this vehicle" />
<button name="act_show_log_services" type="object" string="services logs" help="show the services logs for this vehicle" />
<button name="act_show_log_fuel" type="object" string="fuel logs" help="show the fuel logs for this vehicle" />
</div>
<field name="image" widget='image'/>
<group col ="2">
@ -191,6 +191,40 @@
</field>
</record>
<record model='ir.ui.view' id='fleet_vehicle_kanban'>
<field name="name">fleet.vehicle.kanban</field>
<field name="model">fleet.vehicle</field>
<field name="arch" type="xml">
<kanban>
<field name="license_plate" />
<field name="model_id" />
<field name="driver" />
<field name="location" />
<field name="image" />
<templates>
<t t-name="kanban-box">
<div class="oe_vehicle_vignette">
<a type="open" class="oe_vehicle_icon">
<img t-att-src="kanban_image('fleet.vehicle', 'image', record.id.value)" class="oe_vehicle_picture"/>
</a>
<div class="oe_vehicle_desc">
<h4><a type="open"><field name="license_plate"/></a></h4>
<p>
<field name="model_id"/><br/>
<t t-if="record.driver.raw_value"><field name="driver"/><br/></t>
<t t-if="record.location.raw_value"><field name="location"/><br/></t>
</p>
</div>
</div>
<script>
$('.oe_vehicle_picture').load(function() { if($(this).width() > $(this).height()) { $(this).addClass('oe_vehicle_picture_wide') } });
</script>
</t>
</templates>
</kanban>
</field>
</record>
<act_window
context="{'default_vehicle_id': active_id}"
id="act_show_log_services"
@ -214,7 +248,7 @@
<field name="name">Vehicles</field>
<field name="res_model">fleet.vehicle</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">tree,form,kanban</field>
</record>
<menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" />