[ADD]search field and some changes to fuel and service log: purchaser should be driver by default
bzr revid: csn@openerp.com-20121210140317-kg03hsk46rpzgcyx
This commit is contained in:
parent
b3cc67fabd
commit
789ede3ea8
|
@ -22,6 +22,7 @@
|
|||
'name' : 'Fleet Management',
|
||||
'version' : '0.1',
|
||||
'author' : 'OpenERP S.A.',
|
||||
'sequence': 110,
|
||||
'category': 'Managing vehicles and contracts',
|
||||
'website' : 'http://www.openerp.com',
|
||||
'summary' : 'Vehicle, leasing, insurances, costs',
|
||||
|
|
|
@ -468,10 +468,13 @@ class fleet_vehicle_log_fuel(osv.Model):
|
|||
def on_change_vehicle(self, cr, uid, ids, vehicle_id, context=None):
|
||||
if not vehicle_id:
|
||||
return {}
|
||||
odometer_unit = self.pool.get('fleet.vehicle').browse(cr, uid, vehicle_id, context=context).odometer_unit
|
||||
vehicle = self.pool.get('fleet.vehicle').browse(cr, uid, vehicle_id, context=context)
|
||||
odometer_unit = vehicle.odometer_unit
|
||||
driver = vehicle.driver_id.id
|
||||
return {
|
||||
'value': {
|
||||
'odometer_unit': odometer_unit,
|
||||
'purchaser_id': driver,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -546,7 +549,6 @@ class fleet_vehicle_log_fuel(osv.Model):
|
|||
'cost_amount': fields.related('cost_id', 'amount', string='Amount', type='float', store=True), #we need to keep this field as a related with store=True because the graph view doesn't support (1) to address fields from inherited table and (2) fields that aren't stored in database
|
||||
}
|
||||
_defaults = {
|
||||
'purchaser_id': lambda self, cr, uid, ctx: uid,
|
||||
'date': fields.date.context_today,
|
||||
'cost_subtype_id': _get_default_service_type,
|
||||
'cost_type': 'fuel',
|
||||
|
@ -558,10 +560,13 @@ class fleet_vehicle_log_services(osv.Model):
|
|||
def on_change_vehicle(self, cr, uid, ids, vehicle_id, context=None):
|
||||
if not vehicle_id:
|
||||
return {}
|
||||
odometer_unit = self.pool.get('fleet.vehicle').browse(cr, uid, vehicle_id, context=context).odometer_unit
|
||||
vehicle = self.pool.get('fleet.vehicle').browse(cr, uid, vehicle_id, context=context)
|
||||
odometer_unit = vehicle.odometer_unit
|
||||
driver = vehicle.driver_id.id
|
||||
return {
|
||||
'value': {
|
||||
'odometer_unit': odometer_unit,
|
||||
'purchaser_id': driver,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -583,7 +588,6 @@ class fleet_vehicle_log_services(osv.Model):
|
|||
'notes': fields.text('Notes'),
|
||||
}
|
||||
_defaults = {
|
||||
'purchaser_id': lambda self, cr, uid, ctx: uid,
|
||||
'date': fields.date.context_today,
|
||||
'cost_subtype_id': _get_default_service_type,
|
||||
'cost_type': 'services'
|
||||
|
|
|
@ -38,11 +38,25 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<record model='ir.ui.view' id='fleet_vehicle_model_search'>
|
||||
<field name="name">fleet.vehicle.model.search</field>
|
||||
<field name="model">fleet.vehicle.model</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Vehicles costs" >
|
||||
<field name="brand_id" />
|
||||
<group expand="1" string="Group By...">
|
||||
<filter name="groupby_brand" context="{'group_by' : 'brand_id'}" string="Brand"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model='ir.actions.act_window' id='fleet_vehicle_model_act'>
|
||||
<field name="name">Vehicle Model</field>
|
||||
<field name="res_model">fleet.vehicle.model</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="context">{"search_default_groupby_brand" : True,}</field>
|
||||
<field name="help" type="html">
|
||||
<p class="oe_view_nocontent_create">
|
||||
Click to create a new model.
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
<field name="name">Manager</field>
|
||||
<field name="implied_ids" eval="[(4, ref('group_fleet_user'))]"/>
|
||||
<field name="category_id" ref="module_fleet_category"/>
|
||||
<field name="users" eval="[(4, ref('base.user_root'))]"/>
|
||||
</record>
|
||||
<record id="fleet_user_contract_visibility" model="ir.rule">
|
||||
<field name="name">User can only see his/her contracts</field>
|
||||
|
|
Loading…
Reference in New Issue