pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ADD]Graph view for services, refueling and odometer

Browse Source 
bzr revid: dle@openerp.com-20120928085622-56kgy7styi6untl2
This commit is contained in:
Denis Ledoux dle@openerp.com
2012-09-28 10:56:22 +02:00
parent 8ac58a65c3
commit e9c67a0a4a
3 changed files with 62 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/fleet/demo.xml
+2 -3
View File
@@ -84,7 +84,7 @@
<record id="log_service_1" model="fleet.vehicle.log.services">
<field name="vehicle_id" ref="vehicle_1" />
<field name="purchaser_id" ref="hr.employee_fp" />
<field name="purchaser_id" ref="base.res_partner_2" />
<field name="vendor_id">5</field>
<field name="date" eval="time.strftime('%Y-%m-%d 16:00:00')" />
<field name="amount">500.0</field>
@@ -96,7 +96,7 @@
</record>
<record id="log_fuel_1" model="fleet.vehicle.log.fuel">
<field name="purchaser_id" ref="hr.employee_fp" />
<field name="purchaser_id" ref="base.res_partner_2" />
<field name="vehicle_id" ref="vehicle_1" />
<field name="vendor_id">6</field>
<field name="date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
@@ -109,6 +109,5 @@
<field name="unit">kilometers</field>
<field name="notes">Trip to Paris</field>
</record>
</data>
</openerp>
addons/fleet/fleet.py
+17 -1
View File
@@ -218,7 +218,6 @@ class fleet_vehicle_odometer(osv.Model):
name = str(record.vehicle_id.name)
if record.date:
name = name+ ' / '+ str(record.date)
print record.date
res.append((record.id, name))
return res
@@ -226,6 +225,22 @@ class fleet_vehicle_odometer(osv.Model):
res = self.name_get(cr, uid, ids, context=context)
return dict(res)
def get_month(self, cr, uid, ids, context=None):
if context is None:
context = {}
if not ids:
return []
months = ['January','February','March','April','May','June','July','August','September','October','November','December']
reads = self.browse(cr, uid, ids, context=context)
res = []
for record in reads:
res.append((record.id,months[int(record.date.split('-')[1])-1]))
return res
def _vehicle_log_month_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
res = self.get_month(cr, uid, ids, context=context)
return dict(res)
_columns = {
'name' : fields.function(_vehicle_log_name_get_fnc, type="char", string='Name', store=True),
@@ -233,6 +248,7 @@ class fleet_vehicle_odometer(osv.Model):
'value' : fields.float('Odometer Value'),
'unit' : fields.selection([('kilometers', 'Kilometers'),('miles','Miles')], 'Odometer Unit', help='Unit of the measurement',required=False),
'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True),
'month' : fields.function(_vehicle_log_month_get_fnc,string="Month", type="char",size=32, store=True)
}
_defaults = {
'date' : time.strftime('%Y-%m-%d')
addons/fleet/fleet_view.xml
+43 -3
View File
@@ -315,15 +315,29 @@
<field name="unit" />
<field name="inv_ref" />
<field name="vendor_id" />
<field name="month" invisible="1"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="fleet_vehicle_log_fuel_graph">
<field name="name">fleet.vehicle.log.fuel.graph</field>
<field name="model">fleet.vehicle.log.fuel</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Odometer value per month">
<field name="month" />
<field name="vehicle_id" group="True" />
<field name="amount" operator="+"/>
</graph>
</field>
</record>
<record model='ir.actions.act_window' id='fleet_vehicle_log_fuel_act'>
<field name="name">Vehicles Fuel Logs</field>
<field name="res_model">fleet.vehicle.log.fuel</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">tree,form,graph</field>
</record>
<menuitem action="fleet_vehicle_log_fuel_act" parent="fleet_vehicles" id="fleet_vehicle_log_fuel_menu" />
@@ -430,11 +444,24 @@
</field>
</record>
<record model="ir.ui.view" id="fleet_vehicle_log_services_graph">
<field name="name">fleet.vehicle.log.services.graph</field>
<field name="model">fleet.vehicle.log.services</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Odometer value per month">
<field name="month" />
<field name="vehicle_id" group="True" />
<field name="amount" operator="+"/>
</graph>
</field>
</record>
<record model='ir.actions.act_window' id='fleet_vehicle_log_services_act'>
<field name="name">Vehicles Services Logs</field>
<field name="res_model">fleet.vehicle.log.services</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">tree,form,graph</field>
</record>
<menuitem action="fleet_vehicle_log_services_act" parent="fleet_vehicles" id="fleet_vehicle_log_services_menu" />
@@ -469,11 +496,24 @@
</field>
</record>
<record model="ir.ui.view" id="fleet_vehicle_odometer_graph">
<field name="name">fleet.vehicle.odometer.graph</field>
<field name="model">fleet.vehicle.odometer</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Odometer value per month">
<field name="month" />
<field name="vehicle_id" group="True" />
<field name="value" operator="+"/>
</graph>
</field>
</record>
<record model='ir.actions.act_window' id='fleet_vehicle_odometer_act'>
<field name="name">Vehicles Odometer</field>
<field name="res_model">fleet.vehicle.odometer</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">tree,form,graph</field>
</record>
<menuitem action="fleet_vehicle_odometer_act" parent="fleet_vehicles" id="fleet_vehicle_odometer_menu" />