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

[ADD]access rights and group for fleet

Browse Source 
bzr revid: csn@openerp.com-20121206145215-1os0ynymj6vsjv6d
This commit is contained in:
Cedric Snauwaert
2012-12-06 15:52:15 +01:00
parent 68a5aba106 d37bd882a8
commit 89c112c08c
7 changed files with 287 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/fleet/__openerp__.py
+1 -1
View File
@@ -52,7 +52,7 @@ Main Features
'fleet_data.xml',
'fleet_board_view.xml',
],
'update_xml' : ['security/ir.model.access.csv'],
'update_xml' : ['security/fleet_security.xml','security/ir.model.access.csv'],
'demo': ['fleet_cars.xml','fleet_demo.xml'],
addons/fleet/fleet.py
+29 -29
View File
@@ -66,8 +66,8 @@ class fleet_vehicle_cost(osv.Model):
res = {}
for record in self.browse(cr, uid, ids, context=context):
name = record.vehicle_id.name
if record.cost_subtype.name:
name += ' / '+ record.cost_subtype.name
if record.cost_subtype_id.name:
name += ' / '+ record.cost_subtype_id.name
if record.date:
name += ' / '+ record.date
res[record.id] = name
@@ -76,7 +76,7 @@ class fleet_vehicle_cost(osv.Model):
_columns = {
'name': fields.function(_cost_name_get_fnc, type="char", string='Name', store=True),
'vehicle_id': fields.many2one('fleet.vehicle', 'Vehicle', required=True, help='Vehicle concerned by this log'),
'cost_subtype': fields.many2one('fleet.service.type', 'Type', help='Cost type purchased with this cost'),
'cost_subtype_id': fields.many2one('fleet.service.type', 'Type', help='Cost type purchased with this cost'),
'amount': fields.float('Total Price'),
'cost_type': fields.selection([('contract', 'Contract'), ('services','Services'), ('fuel','Fuel'), ('other','Other')], 'Category of the cost', help='For internal purpose only', required=True),
'parent_id': fields.many2one('fleet.vehicle.cost', 'Parent', help='Parent cost to this current cost'),
@@ -104,7 +104,7 @@ class fleet_vehicle_cost(osv.Model):
if 'contract_id' in data and data['contract_id']:
contract = self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, data['contract_id'], context=context)
data['vehicle_id'] = contract.vehicle_id.id
data['cost_subtype'] = contract.cost_subtype.id
data['cost_subtype_id'] = contract.cost_subtype_id.id
data['cost_type'] = contract.cost_type
if 'odometer' in data and not data['odometer']:
#if received value for odometer is 0, then remove it from the data as it would result to the creation of a
@@ -135,8 +135,8 @@ class fleet_vehicle_model(osv.Model):
res = {}
for record in self.browse(cr, uid, ids, context=context):
name = record.modelname
if record.brand.name:
name = record.brand.name + ' / ' + name
if record.brand_id.name:
name = record.brand_id.name + ' / ' + name
res[record.id] = name
return res
@@ -157,11 +157,11 @@ class fleet_vehicle_model(osv.Model):
_columns = {
'name': fields.function(_model_name_get_fnc, type="char", string='Name', store=True),
'modelname': fields.char('Model name', size=32, required=True),
'brand': fields.many2one('fleet.vehicle.model.brand', 'Model Brand', required=True, help='Brand of the vehicle'),
'brand_id': fields.many2one('fleet.vehicle.model.brand', 'Model Brand', required=True, help='Brand of the vehicle'),
'vendors': fields.many2many('res.partner', 'fleet_vehicle_model_vendors', 'model_id', 'partner_id', string='Vendors'),
'image': fields.related('brand', 'image', type="binary", string="Logo"),
'image_medium': fields.related('brand', 'image_medium', type="binary", string="Logo"),
'image_small': fields.related('brand', 'image_small', type="binary", string="Logo"),
'image': fields.related('brand_id', 'image', type="binary", string="Logo"),
'image_medium': fields.related('brand_id', 'image_medium', type="binary", string="Logo"),
'image_small': fields.related('brand_id', 'image_small', type="binary", string="Logo"),
}
@@ -210,7 +210,7 @@ class fleet_vehicle(osv.Model):
def _vehicle_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
res = {}
for record in self.browse(cr, uid, ids, context=context):
res[record.id] = record.model_id.brand.name + '/' + record.model_id.modelname + ' / ' + record.license_plate
res[record.id] = record.model_id.brand_id.name + '/' + record.model_id.modelname + ' / ' + record.license_plate
return res
def return_action_to_open(self, cr, uid, ids, context=None):
@@ -308,7 +308,7 @@ class fleet_vehicle(osv.Model):
ids = self.pool.get('fleet.vehicle.log.contract').search(cr,uid,[('vehicle_id', '=', record.id), ('state', 'in', ('open', 'toclose'))], limit=1, order='expiration_date asc')
if len(ids) > 0:
#we display only the name of the oldest overdue/due soon contract
name=(self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, ids[0], context=context).cost_subtype.name)
name=(self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, ids[0], context=context).cost_subtype_id.name)
res[record.id] = {
'contract_renewal_overdue': overdue,
@@ -333,14 +333,14 @@ class fleet_vehicle(osv.Model):
'company_id': fields.many2one('res.company', 'Company'),
'license_plate': fields.char('License Plate', size=32, required=True, help='License plate number of the vehicle (ie: plate number for a car)'),
'vin_sn': fields.char('Chassis Number', size=32, help='Unique number written on the vehicle motor (VIN/SN number)'),
'driver': fields.many2one('res.partner', 'Driver', help='Driver of the vehicle'),
'model_id': fields.many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle'),
'log_fuel': fields.one2many('fleet.vehicle.log.fuel', 'vehicle_id', 'Fuel Logs'),
'driver_id': fields.many2one('res.partner', 'Driver', _idhelp='Driver of the vehicle'),
'model_id': fields.many2one('fleet.vehicle.model', 'Model', requ_idired=True, help='Model of the vehicle'),
'log_fuel': fields.one2many('fleet.vehicle.log.f_iduel', 'vehicle_id', 'Fuel Logs'),
'log_services': fields.one2many('fleet.vehicle.log.services', 'vehicle_id', 'Services Logs'),
'log_contracts': fields.one2many('fleet.vehicle.log.contract', 'vehicle_id', 'Contracts'),
'acquisition_date': fields.date('Acquisition Date', required=False, help='Date when the vehicle has been bought'),
'color': fields.char('Color', size=32, help='Color of the vehicle'),
'state': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle', ondelete="set null"),
'state_id': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle', ondelete="set null"),
'location': fields.char('Location', size=128, help='Location of the vehicle (garage, ...)'),
'seats': fields.integer('Seats Number', help='Number of seats of the vehicle'),
'doors': fields.integer('Doors Number', help='Number of doors of the vehicle'),
@@ -366,7 +366,7 @@ class fleet_vehicle(osv.Model):
_defaults = {
'doors': 5,
'odometer_unit': 'kilometers',
'state': _get_default_state,
'state_id': _get_default_state,
}
def copy(self, cr, uid, id, default=None, context=None):
@@ -408,13 +408,13 @@ class fleet_vehicle(osv.Model):
value = self.pool.get('fleet.vehicle.model').browse(cr,uid,vals['model_id'],context=context).name
oldmodel = vehicle.model_id.name or _('None')
changes.append(_("Model: from '%s' to '%s'") %(oldmodel, value))
if 'driver' in vals and vehicle.driver.id != vals['driver']:
value = self.pool.get('res.partner').browse(cr,uid,vals['driver'],context=context).name
olddriver = (vehicle.driver.name) or _('None')
if 'driver_id' in vals and vehicle.driver_id.id != vals['driver_id']:
value = self.pool.get('res.partner').browse(cr,uid,vals['driver_id'],context=context).name
olddriver = (vehicle.driver_id.name) or _('None')
changes.append(_("Driver: from '%s' to '%s'") %(olddriver, value))
if 'state' in vals and vehicle.state.id != vals['state']:
value = self.pool.get('fleet.vehicle.state').browse(cr,uid,vals['state'],context=context).name
oldstate = vehicle.state.name or _('None')
if 'state_id' in vals and vehicle.state_id.id != vals['state_id']:
value = self.pool.get('fleet.vehicle.state').browse(cr,uid,vals['state_id'],context=context).name
oldstate = vehicle.state_id.name or _('None')
changes.append(_("State: from '%s' to '%s'") %(oldstate, value))
if 'license_plate' in vals and vehicle.license_plate != vals['license_plate']:
old_license_plate = vehicle.license_plate or _('None')
@@ -548,7 +548,7 @@ class fleet_vehicle_log_fuel(osv.Model):
_defaults = {
'purchaser_id': lambda self, cr, uid, ctx: uid,
'date': fields.date.context_today,
'cost_subtype': _get_default_service_type,
'cost_subtype_id': _get_default_service_type,
'cost_type': 'fuel',
}
@@ -585,7 +585,7 @@ class fleet_vehicle_log_services(osv.Model):
_defaults = {
'purchaser_id': lambda self, cr, uid, ctx: uid,
'date': fields.date.context_today,
'cost_subtype': _get_default_service_type,
'cost_subtype_id': _get_default_service_type,
'cost_type': 'services'
}
@@ -630,7 +630,7 @@ class fleet_vehicle_log_contract(osv.Model):
'amount': contract.cost_generated,
'date': startdate.strftime(tools.DEFAULT_SERVER_DATE_FORMAT),
'vehicle_id': contract.vehicle_id.id,
'cost_subtype': contract.cost_subtype.id,
'cost_subtype_id': contract.cost_subtype_id.id,
'contract_id': contract.id,
'auto_generated': True
}
@@ -664,8 +664,8 @@ class fleet_vehicle_log_contract(osv.Model):
res = {}
for record in self.browse(cr, uid, ids, context=context):
name = record.vehicle_id.name
if record.cost_subtype.name:
name += ' / '+ record.cost_subtype.name
if record.cost_subtype_id.name:
name += ' / '+ record.cost_subtype_id.name
if record.date:
name += ' / '+ record.date
res[record.id] = name
@@ -789,7 +789,7 @@ class fleet_vehicle_log_contract(osv.Model):
'state':'open',
'expiration_date': lambda self, cr, uid, ctx: self.compute_next_year_date(fields.date.context_today(self, cr, uid, context=ctx)),
'cost_frequency': 'no',
'cost_subtype': _get_default_contract_type,
'cost_subtype_id': _get_default_contract_type,
'cost_type': 'contract',
}
addons/fleet/fleet_board_view.xml
+7 -4
View File
@@ -135,17 +135,20 @@
<menuitem id="menu_fleet_dashboard"
parent="base.menu_reporting_dashboard"
action="open_board_fleet"
sequence="50"/>
sequence="50"
groups="group_fleet_user"/>
<menuitem name="Fleet" parent="base.menu_reporting" id="menu_fleet_reporting" sequence="50" />
<menuitem name="Fleet" parent="base.menu_reporting" id="menu_fleet_reporting" sequence="50" groups="group_fleet_manager"/>
<menuitem id="menu_fleet_reporting_costs"
parent="menu_fleet_reporting"
action="action_fleet_reporting_costs"
sequence="1"/>
sequence="1"
groups="group_fleet_manager"/>
<menuitem id="menu_fleet_reporting_indicative_costs"
parent="menu_fleet_reporting"
action="action_fleet_reporting_costs_non_effective"
sequence="2"/>
sequence="2"
groups="group_fleet_manager"/>
</data>
</openerp>
addons/fleet/fleet_demo.xml
+82 -82
View File
@@ -3,227 +3,227 @@
<data>
<record id="model_corsa" model="fleet.vehicle.model">
<field name="modelname">Corsa</field>
<field name="brand" ref="brand_opel" />
<field name="brand_id" ref="brand_opel" />
</record>
<record id="model_astra" model="fleet.vehicle.model">
<field name="modelname">Astra</field>
<field name="brand" ref="brand_opel" />
<field name="brand_id" ref="brand_opel" />
</record>
<record id="model_agila" model="fleet.vehicle.model">
<field name="modelname">Agila</field>
<field name="brand" ref="brand_opel" />
<field name="brand_id" ref="brand_opel" />
</record>
<record id="model_combotour" model="fleet.vehicle.model">
<field name="modelname">Combo Tour</field>
<field name="brand" ref="brand_opel" />
<field name="brand_id" ref="brand_opel" />
</record>
<record id="model_meriva" model="fleet.vehicle.model">
<field name="modelname">Meriva</field>
<field name="brand" ref="brand_opel" />
<field name="brand_id" ref="brand_opel" />
</record>
<record id="model_astragtc" model="fleet.vehicle.model">
<field name="modelname">AstraGTC</field>
<field name="brand" ref="brand_opel" />
<field name="brand_id" ref="brand_opel" />
</record>
<record id="model_zafira" model="fleet.vehicle.model">
<field name="modelname">Zafira</field>
<field name="brand" ref="brand_opel" />
<field name="brand_id" ref="brand_opel" />
</record>
<record id="model_zafiratourer" model="fleet.vehicle.model">
<field name="modelname">Zafira Tourer</field>
<field name="brand" ref="brand_opel" />
<field name="brand_id" ref="brand_opel" />
</record>
<record id="model_insignia" model="fleet.vehicle.model">
<field name="modelname">Insignia</field>
<field name="brand" ref="brand_opel" />
<field name="brand_id" ref="brand_opel" />
</record>
<record id="model_mokka" model="fleet.vehicle.model">
<field name="modelname">Mokka</field>
<field name="brand" ref="brand_opel" />
<field name="brand_id" ref="brand_opel" />
</record>
<record id="model_antara" model="fleet.vehicle.model">
<field name="modelname">Antara</field>
<field name="brand" ref="brand_opel" />
<field name="brand_id" ref="brand_opel" />
</record>
<record id="model_ampera" model="fleet.vehicle.model">
<field name="modelname">Ampera</field>
<field name="brand" ref="brand_opel" />
<field name="brand_id" ref="brand_opel" />
</record>
<record id="model_a1" model="fleet.vehicle.model">
<field name="modelname">A1</field>
<field name="brand" ref="brand_audi" />
<field name="brand_id" ref="brand_audi" />
</record>
<record id="model_a3" model="fleet.vehicle.model">
<field name="modelname">A3</field>
<field name="brand" ref="brand_audi" />
<field name="brand_id" ref="brand_audi" />
</record>
<record id="model_a4" model="fleet.vehicle.model">
<field name="modelname">A4</field>
<field name="brand" ref="brand_audi" />
<field name="brand_id" ref="brand_audi" />
</record>
<record id="model_a5" model="fleet.vehicle.model">
<field name="modelname">A5</field>
<field name="brand" ref="brand_audi" />
<field name="brand_id" ref="brand_audi" />
</record>
<record id="model_a6" model="fleet.vehicle.model">
<field name="modelname">A6</field>
<field name="brand" ref="brand_audi" />
<field name="brand_id" ref="brand_audi" />
</record>
<record id="model_a7" model="fleet.vehicle.model">
<field name="modelname">A7</field>
<field name="brand" ref="brand_audi" />
<field name="brand_id" ref="brand_audi" />
</record>
<record id="model_a8" model="fleet.vehicle.model">
<field name="modelname">A8</field>
<field name="brand" ref="brand_audi" />
<field name="brand_id" ref="brand_audi" />
</record>
<record id="model_q3" model="fleet.vehicle.model">
<field name="modelname">Q3</field>
<field name="brand" ref="brand_audi" />
<field name="brand_id" ref="brand_audi" />
</record>
<record id="model_q5" model="fleet.vehicle.model">
<field name="modelname">Q5</field>
<field name="brand" ref="brand_audi" />
<field name="brand_id" ref="brand_audi" />
</record>
<record id="model_q7" model="fleet.vehicle.model">
<field name="modelname">Q7</field>
<field name="brand" ref="brand_audi" />
<field name="brand_id" ref="brand_audi" />
</record>
<record id="model_tt" model="fleet.vehicle.model">
<field name="modelname">TT</field>
<field name="brand" ref="brand_audi" />
<field name="brand_id" ref="brand_audi" />
</record>
<record id="model_serie1" model="fleet.vehicle.model">
<field name="modelname">Serie 1</field>
<field name="brand" ref="brand_bmw" />
<field name="brand_id" ref="brand_bmw" />
</record>
<record id="model_serie3" model="fleet.vehicle.model">
<field name="modelname">Serie 3</field>
<field name="brand" ref="brand_bmw" />
<field name="brand_id" ref="brand_bmw" />
</record>
<record id="model_serie5" model="fleet.vehicle.model">
<field name="modelname">Serie 5</field>
<field name="brand" ref="brand_bmw" />
<field name="brand_id" ref="brand_bmw" />
</record>
<record id="model_serie6" model="fleet.vehicle.model">
<field name="modelname">Serie 6</field>
<field name="brand" ref="brand_bmw" />
<field name="brand_id" ref="brand_bmw" />
</record>
<record id="model_serie7" model="fleet.vehicle.model">
<field name="modelname">Serie 7</field>
<field name="brand" ref="brand_bmw" />
<field name="brand_id" ref="brand_bmw" />
</record>
<record id="model_seriex" model="fleet.vehicle.model">
<field name="modelname">Serie X</field>
<field name="brand" ref="brand_bmw" />
<field name="brand_id" ref="brand_bmw" />
</record>
<record id="model_seriez4" model="fleet.vehicle.model">
<field name="modelname">Serie Z4</field>
<field name="brand" ref="brand_bmw" />
<field name="brand_id" ref="brand_bmw" />
</record>
<record id="model_seriem" model="fleet.vehicle.model">
<field name="modelname">Serie M</field>
<field name="brand" ref="brand_bmw" />
<field name="brand_id" ref="brand_bmw" />
</record>
<record id="model_seriehybrid" model="fleet.vehicle.model">
<field name="modelname">Serie Hybrid</field>
<field name="brand" ref="brand_bmw" />
<field name="brand_id" ref="brand_bmw" />
</record>
<record id="model_classa" model="fleet.vehicle.model">
<field name="modelname">Class A</field>
<field name="brand" ref="brand_mercedes" />
<field name="brand_id" ref="brand_mercedes" />
</record>
<record id="model_classb" model="fleet.vehicle.model">
<field name="modelname">Class B</field>
<field name="brand" ref="brand_mercedes" />
<field name="brand_id" ref="brand_mercedes" />
</record>
<record id="model_classc" model="fleet.vehicle.model">
<field name="modelname">Class C</field>
<field name="brand" ref="brand_mercedes" />
<field name="brand_id" ref="brand_mercedes" />
</record>
<record id="model_classcl" model="fleet.vehicle.model">
<field name="modelname">Class CL</field>
<field name="brand" ref="brand_mercedes" />
<field name="brand_id" ref="brand_mercedes" />
</record>
<record id="model_classcls" model="fleet.vehicle.model">
<field name="modelname">Class CLS</field>
<field name="brand" ref="brand_mercedes" />
<field name="brand_id" ref="brand_mercedes" />
</record>
<record id="model_classe" model="fleet.vehicle.model">
<field name="modelname">Class E</field>
<field name="brand" ref="brand_mercedes" />
<field name="brand_id" ref="brand_mercedes" />
</record>
<record id="model_classm" model="fleet.vehicle.model">
<field name="modelname">Class M</field>
<field name="brand" ref="brand_mercedes" />
<field name="brand_id" ref="brand_mercedes" />
</record>
<record id="model_classgl" model="fleet.vehicle.model">
<field name="modelname">Class GL</field>
<field name="brand" ref="brand_mercedes" />
<field name="brand_id" ref="brand_mercedes" />
</record>
<record id="model_classglk" model="fleet.vehicle.model">
<field name="modelname">Class GLK</field>
<field name="brand" ref="brand_mercedes" />
<field name="brand_id" ref="brand_mercedes" />
</record>
<record id="model_classr" model="fleet.vehicle.model">
<field name="modelname">Class R</field>
<field name="brand" ref="brand_mercedes" />
<field name="brand_id" ref="brand_mercedes" />
</record>
<record id="model_classs" model="fleet.vehicle.model">
<field name="modelname">Class S</field>
<field name="brand" ref="brand_mercedes" />
<field name="brand_id" ref="brand_mercedes" />
</record>
<record id="model_classslk" model="fleet.vehicle.model">
<field name="modelname">Class SLK</field>
<field name="brand" ref="brand_mercedes" />
<field name="brand_id" ref="brand_mercedes" />
</record>
<record id="model_classsls" model="fleet.vehicle.model">
<field name="modelname">SLS</field>
<field name="brand" ref="brand_mercedes" />
<field name="brand_id" ref="brand_mercedes" />
</record>
<record id="vehicle_state_inshop" model="fleet.vehicle.state">
@@ -253,7 +253,7 @@
<field name="color">Black</field>
<field name="location">Grand-Rosiere</field>
<field name="doors">5</field>
<field name="driver" ref="base.res_partner_address_18" />
<field name="driver_id" ref="base.res_partner_address_18" />
<field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
<field name="state" ref="vehicle_state_active"/>
<field name="odometer_unit">kilometers</field>
@@ -268,7 +268,7 @@
<field name="color">Red</field>
<field name="location">Grand-Rosiere</field>
<field name="doors">5</field>
<field name="driver" ref="base.res_partner_address_19" />
<field name="driver_id" ref="base.res_partner_address_19" />
<field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
<field name="state" ref="vehicle_state_inactive"/>
<field name="odometer_unit">kilometers</field>
@@ -283,7 +283,7 @@
<field name="color">Titanium Grey</field>
<field name="location">Grand-Rosiere</field>
<field name="doors">3</field>
<field name="driver" ref="base.res_partner_address_17" />
<field name="driver_id" ref="base.res_partner_address_17" />
<field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
<field name="state" ref="vehicle_state_active"/>
<field name="odometer_unit">kilometers</field>
@@ -298,7 +298,7 @@
<field name="color">White</field>
<field name="location">Grand-Rosiere</field>
<field name="doors">3</field>
<field name="driver" ref="base.res_partner_address_16" />
<field name="driver_id" ref="base.res_partner_address_16" />
<field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
<field name="state" ref="vehicle_state_active"/>
<field name="odometer_unit">kilometers</field>
@@ -313,7 +313,7 @@
<field name="color">Brown</field>
<field name="location">Grand-Rosiere</field>
<field name="doors">5</field>
<field name="driver" ref="base.res_partner_address_15" />
<field name="driver_id" ref="base.res_partner_address_15" />
<field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
<field name="state" ref="vehicle_state_active"/>
<field name="odometer_unit">kilometers</field>
@@ -862,7 +862,7 @@
<record id="log_service_1" model="fleet.vehicle.log.services" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">650</field>
<field name="cost_subtype" ref="type_service_service_8"/>
<field name="cost_subtype_id" ref="type_service_service_8"/>
<field name="date">2012-09-02</field>
<field name="purchaser_id" ref="base.res_partner_address_18" />
<field name="inv_ref">4586</field>
@@ -873,7 +873,7 @@
<record id="services_cost_11" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">50</field>
<field name="cost_subtype" ref="type_service_7"/>
<field name="cost_subtype_id" ref="type_service_7"/>
<field name="date">2012-09-02</field>
<field name="parent_id" ref="log_service_1_fleet_vehicle_cost" />
</record>
@@ -881,7 +881,7 @@
<record id="services_cost_12" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">25</field>
<field name="cost_subtype" ref="type_service_8"/>
<field name="cost_subtype_id" ref="type_service_8"/>
<field name="date">2012-09-02</field>
<field name="parent_id" ref="log_service_1_fleet_vehicle_cost" />
</record>
@@ -889,7 +889,7 @@
<record id="services_cost_13" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_service_9"/>
<field name="cost_subtype_id" ref="type_service_9"/>
<field name="date">2012-09-02</field>
<field name="parent_id" ref="log_service_1_fleet_vehicle_cost" />
</record>
@@ -897,7 +897,7 @@
<record id="log_service_2" model="fleet.vehicle.log.services" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">350</field>
<field name="cost_subtype" ref="type_service_service_8"/>
<field name="cost_subtype_id" ref="type_service_service_8"/>
<field name="date">2012-11-02</field>
<field name="purchaser_id" ref="base.res_partner_address_18" />
<field name="inv_ref">4814</field>
@@ -908,7 +908,7 @@
<record id="services_cost_21" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_service_10"/>
<field name="cost_subtype_id" ref="type_service_10"/>
<field name="date">2012-11-02</field>
<field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
</record>
@@ -916,7 +916,7 @@
<record id="services_cost_22" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">150</field>
<field name="cost_subtype" ref="type_service_11"/>
<field name="cost_subtype_id" ref="type_service_11"/>
<field name="date">2012-11-02</field>
<field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
</record>
@@ -924,7 +924,7 @@
<record id="services_cost_23" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_service_12"/>
<field name="cost_subtype_id" ref="type_service_12"/>
<field name="date">2012-11-02</field>
<field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
</record>
@@ -932,7 +932,7 @@
<record id="log_service_3" model="fleet.vehicle.log.services" >
<field name="vehicle_id" ref="vehicle_1" />
<field name="amount">513</field>
<field name="cost_subtype" ref="type_service_service_8"/>
<field name="cost_subtype_id" ref="type_service_service_8"/>
<field name="date">2012-10-15</field>
<field name="purchaser_id" ref="base.res_partner_address_18" />
<field name="inv_ref">124</field>
@@ -943,7 +943,7 @@
<record id="log_service_4" model="fleet.vehicle.log.services" >
<field name="vehicle_id" ref="vehicle_3" />
<field name="amount">412</field>
<field name="cost_subtype" ref="type_service_service_8"/>
<field name="cost_subtype_id" ref="type_service_service_8"/>
<field name="date">2012-10-08</field>
<field name="purchaser_id" ref="base.res_partner_address_18" />
<field name="inv_ref">20984</field>
@@ -954,7 +954,7 @@
<record id="log_service_5" model="fleet.vehicle.log.services" >
<field name="vehicle_id" ref="vehicle_4" />
<field name="amount">275</field>
<field name="cost_subtype" ref="type_service_service_8"/>
<field name="cost_subtype_id" ref="type_service_service_8"/>
<field name="date">2012-09-25</field>
<field name="purchaser_id" ref="base.res_partner_address_18" />
<field name="inv_ref">241</field>
@@ -965,7 +965,7 @@
<record id="log_service_6" model="fleet.vehicle.log.services" >
<field name="vehicle_id" ref="vehicle_5" />
<field name="amount">302</field>
<field name="cost_subtype" ref="type_service_service_8"/>
<field name="cost_subtype_id" ref="type_service_service_8"/>
<field name="date">2012-09-15</field>
<field name="purchaser_id" ref="base.res_partner_address_18" />
<field name="inv_ref">22513</field>
@@ -978,7 +978,7 @@
<field name="amount">0</field>
<field name="cost_generated">20</field>
<field name="cost_frequency">daily</field>
<field name="cost_subtype" ref="type_contract_leasing"/>
<field name="cost_subtype_id" ref="type_contract_leasing"/>
<field name="date" eval="time.strftime('%Y-01-01')" />
<field name="start_date" eval="time.strftime('%Y-01-01')" />
<field name="expiration_date" eval="(DateTime.now() + timedelta(5)).strftime('%Y-%m-%d')" />
@@ -990,7 +990,7 @@
<record id="contract_cost_11" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">50</field>
<field name="cost_subtype" ref="type_service_service_2"/>
<field name="cost_subtype_id" ref="type_service_service_2"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_1_fleet_vehicle_cost" />
</record>
@@ -998,7 +998,7 @@
<record id="contract_cost_12" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">25</field>
<field name="cost_subtype" ref="type_service_service_3"/>
<field name="cost_subtype_id" ref="type_service_service_3"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_1_fleet_vehicle_cost" />
</record>
@@ -1006,7 +1006,7 @@
<record id="contract_cost_13" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_contract_omnium"/>
<field name="cost_subtype_id" ref="type_contract_omnium"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_1_fleet_vehicle_cost" />
</record>
@@ -1016,7 +1016,7 @@
<field name="amount">0</field>
<field name="cost_generated">150</field>
<field name="cost_frequency">weekly</field>
<field name="cost_subtype" ref="type_contract_leasing"/>
<field name="cost_subtype_id" ref="type_contract_leasing"/>
<field name="date" eval="time.strftime('%Y-01-01')" />
<field name="start_date" eval="time.strftime('%Y-01-01')" />
<field name="expiration_date" eval="(DateTime.now() + timedelta(-1)).strftime('%Y-%m-%d')" />
@@ -1028,7 +1028,7 @@
<record id="contract_cost_21" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_1" />
<field name="amount">50</field>
<field name="cost_subtype" ref="type_service_service_2"/>
<field name="cost_subtype_id" ref="type_service_service_2"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_2_fleet_vehicle_cost" />
</record>
@@ -1036,7 +1036,7 @@
<record id="contract_cost_22" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_1" />
<field name="amount">25</field>
<field name="cost_subtype" ref="type_service_service_3"/>
<field name="cost_subtype_id" ref="type_service_service_3"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_2_fleet_vehicle_cost" />
</record>
@@ -1044,7 +1044,7 @@
<record id="contract_cost_23" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_1" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_contract_omnium"/>
<field name="cost_subtype_id" ref="type_contract_omnium"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_2_fleet_vehicle_cost" />
</record>
@@ -1054,7 +1054,7 @@
<field name="amount">0</field>
<field name="cost_generated">400</field>
<field name="cost_frequency">monthly</field>
<field name="cost_subtype" ref="type_contract_leasing"/>
<field name="cost_subtype_id" ref="type_contract_leasing"/>
<field name="date" eval="time.strftime('%Y-01-01')"/>
<field name="start_date" eval="time.strftime('%Y-01-01')" />
<field name="expiration_date" eval="time.strftime('%Y-12-31')" />
@@ -1066,7 +1066,7 @@
<record id="contract_cost_31" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_3" />
<field name="amount">50</field>
<field name="cost_subtype" ref="type_service_service_2"/>
<field name="cost_subtype_id" ref="type_service_service_2"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_3_fleet_vehicle_cost" />
</record>
@@ -1074,7 +1074,7 @@
<record id="contract_cost_32" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_3" />
<field name="amount">25</field>
<field name="cost_subtype" ref="type_service_service_3"/>
<field name="cost_subtype_id" ref="type_service_service_3"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_3_fleet_vehicle_cost" />
</record>
@@ -1082,7 +1082,7 @@
<record id="contract_cost_33" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_3" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_contract_omnium"/>
<field name="cost_subtype_id" ref="type_contract_omnium"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_3_fleet_vehicle_cost" />
</record>
@@ -1092,7 +1092,7 @@
<field name="amount">0</field>
<field name="cost_generated">4000</field>
<field name="cost_frequency">yearly</field>
<field name="cost_subtype" ref="type_contract_leasing"/>
<field name="cost_subtype_id" ref="type_contract_leasing"/>
<field name="date" eval="time.strftime('%Y-01-01')" />
<field name="start_date" eval="time.strftime('%Y-01-01')" />
<field name="expiration_date" eval="time.strftime('%Y-12-31')" />
@@ -1104,7 +1104,7 @@
<record id="contract_cost_41" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_4" />
<field name="amount">50</field>
<field name="cost_subtype" ref="type_service_service_2"/>
<field name="cost_subtype_id" ref="type_service_service_2"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_4_fleet_vehicle_cost" />
</record>
@@ -1112,7 +1112,7 @@
<record id="contract_cost_42" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_4" />
<field name="amount">25</field>
<field name="cost_subtype" ref="type_service_service_3"/>
<field name="cost_subtype_id" ref="type_service_service_3"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_4_fleet_vehicle_cost" />
</record>
@@ -1120,7 +1120,7 @@
<record id="contract_cost_43" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_4" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_contract_omnium"/>
<field name="cost_subtype_id" ref="type_contract_omnium"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_4_fleet_vehicle_cost" />
</record>
@@ -1130,7 +1130,7 @@
<field name="amount">17000</field>
<field name="cost_generated">0</field>
<field name="cost_frequency">no</field>
<field name="cost_subtype" ref="type_contract_leasing"/>
<field name="cost_subtype_id" ref="type_contract_leasing"/>
<field name="date" eval="time.strftime('2012-01-01')" />
<field name="start_date" eval="time.strftime('2012-01-01')" />
<field name="expiration_date" eval="time.strftime('2016-12-31')" />
@@ -1142,7 +1142,7 @@
<record id="contract_cost_51" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_5" />
<field name="amount">50</field>
<field name="cost_subtype" ref="type_service_service_2"/>
<field name="cost_subtype_id" ref="type_service_service_2"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_5_fleet_vehicle_cost" />
</record>
@@ -1150,7 +1150,7 @@
<record id="contract_cost_52" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_5" />
<field name="amount">25</field>
<field name="cost_subtype" ref="type_service_service_3"/>
<field name="cost_subtype_id" ref="type_service_service_3"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_5_fleet_vehicle_cost" />
</record>
@@ -1158,7 +1158,7 @@
<record id="contract_cost_53" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_5" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_contract_omnium"/>
<field name="cost_subtype_id" ref="type_contract_omnium"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_5_fleet_vehicle_cost" />
</record>
addons/fleet/fleet_view.xml
+37 -38
View File
@@ -10,7 +10,7 @@
<field name="image_medium" widget='image' class="oe_left oe_avatar"/>
<group col="2">
<group>
<field name="brand" on_change="on_change_brand(brand)"/>
<field name="brand_id" on_change="on_change_brand(brand_id)"/>
</group>
<group>
<field name="modelname" />
@@ -30,7 +30,7 @@
<field name="model">fleet.vehicle.model</field>
<field name="arch" type="xml">
<tree string="Models" version="7.0">
<field name="brand" />
<field name="brand_id" />
<field name="modelname" />
</tree>
</field>
@@ -135,7 +135,7 @@
</record>
<record model='ir.actions.act_window' id='fleet_vehicle_state_act'>
<field name="name">States of Vehicle</field>
<field name="name">Vehicle Status</field>
<field name="res_model">fleet.vehicle.state</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@@ -149,11 +149,11 @@
</field>
</record>
<menuitem name="Fleet" id="menu_root" sequence="110" />
<menuitem name="Configuration" parent="menu_root" id="fleet_configuration" sequence="3" />
<menuitem name="Fleet" id="menu_root" sequence="110" groups="group_fleet_user"/>
<menuitem name="Configuration" parent="menu_root" id="fleet_configuration" sequence="3" groups="group_fleet_manager"/>
<menuitem action="fleet_vehicle_model_act" parent="fleet_configuration" id="fleet_vehicle_model_menu" groups="base.group_no_one"/>
<menuitem action="fleet_vehicle_model_brand_act" parent="fleet_configuration" id="fleet_vehicle_model_brand_menu" groups="base.group_no_one"/>
<menuitem action="fleet_vehicle_state_act" parent="fleet_configuration" id="fleet_vehicle_state_menu" />
<menuitem action="fleet_vehicle_state_act" parent="fleet_configuration" id="fleet_vehicle_state_menu" groups="group_fleet_manager"/>
<record model='ir.ui.view' id='fleet_vehicle_form'>
<field name="name">fleet.vehicle.form</field>
@@ -161,7 +161,7 @@
<field name="arch" type="xml">
<form string="Vehicle" version="7.0">
<header>
<field name="state" widget="statusbar" clickable="True" />
<field name="state_id" widget="statusbar" clickable="True" />
</header>
<sheet>
<field name="image_medium" widget='image' class="oe_left oe_avatar"/>
@@ -179,14 +179,14 @@
</div>
<div class="oe_right oe_button_box">
<button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_contract_act'}" string="Contracts" help="show the contract for this vehicle" />
<button name="act_show_log_cost" type="object" string="Costs" help="show all the costs for this vehicle" />
<button name="act_show_log_cost" type="object" string="Costs" help="show all the costs for this vehicle" groups="fleet.group_fleet_manager"/>
<button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_services_act'}" string="Services" help="show the services logs for this vehicle" />
<button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_fuel_act'}" string="Fuel Logs" help="show the fuel logs for this vehicle" />
<button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_odometer_act'}" string="Odometer Logs" help="show the odometer logs for this vehicle" />
</div>
<group col="2" string="General Properties">
<group >
<field name="driver" />
<field name="driver_id" />
<field name="location" />
<field name="vin_sn" />
<field name="company_id" groups="base.group_multi_company"/>
@@ -231,10 +231,10 @@
<tree string="Vehicle" version="7.0" colors="orange:contract_renewal_due_soon and not contract_renewal_overdue;red:contract_renewal_overdue">
<field name="license_plate" />
<field name="model_id" />
<field name="driver" />
<field name="driver_id" />
<field name="vin_sn" />
<field name="acquisition_date" />
<field name="state"/>
<field name="state_id"/>
<field name="odometer" />
<field name="odometer_unit" />
<field name="contract_renewal_due_soon" invisible="1"/>
@@ -250,11 +250,10 @@
<field name="arch" type="xml">
<search string="All vehicles">
<field name="name" filter_domain="['|', ('name','ilike',self), ('license_plate','ilike',self)]" string="Vehicle"/>
<field name="driver"/>
<field name="driver_id"/>
<field name="tag_ids"/>
<field name="location"/>
<field name="state" />
<field name="state" />
<field name="state_id" />
<filter name="alert_true" domain="['|',('contract_renewal_due_soon','=',True),('contract_renewal_overdue','=',True)]" string="Has Alert(s)"/>
</search>
</field>
@@ -268,9 +267,9 @@
<kanban>
<field name="license_plate" />
<field name="model_id" />
<field name="driver" />
<field name="driver_id" />
<field name="location" />
<field name="state" />
<field name="state_id" />
<field name="image" />
<field name="tag_ids" />
@@ -310,7 +309,7 @@
<ul>
<li>
<t t-if="record.driver.raw_value"><field name="driver"/></t>
<t t-if="record.driver_id.raw_value"><field name="driver_id"/></t>
</li>
<li>
<t t-if="record.location.raw_value"><field name="location"/></t>
@@ -347,8 +346,8 @@
</field>
</record>
<menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" sequence="2" />
<menuitem action="fleet_vehicle_act" parent="fleet_vehicles" id="fleet_vehicle_menu" />
<menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" sequence="2" groups="group_fleet_user"/>
<menuitem action="fleet_vehicle_act" parent="fleet_vehicles" id="fleet_vehicle_menu" groups="group_fleet_user"/>
@@ -358,17 +357,17 @@
<field name="arch" type="xml">
<form string="Contract logs" version="7.0">
<header>
<button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="open" type="object" class="oe_highlight" string="Terminate Contract"/>
<button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="toclose" 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"/>
<button class="oe_highlight" name="act_renew_contract" type="object" string="Renew Contract" help="Create a new contract automatically with all the same informations except for the date that will start at the end of current contract" />
<button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="open" type="object" class="oe_highlight" string="Terminate Contract" groups="fleet.group_fleet_manager"/>
<button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="toclose" type="object" class="oe_highlight" string="Terminate Contract" groups="fleet.group_fleet_manager"/>
<button modifiers="{'invisible': [['state', 'not in', ['closed']]]}" name="contract_open" states="closed" type="object" class="oe_highlight" string="Set Contract In Progress" groups="fleet.group_fleet_manager"/>
<button class="oe_highlight" name="act_renew_contract" type="object" string="Renew Contract" help="Create a new contract automatically with all the same informations except for the date that will start at the end of current contract" groups="fleet.group_fleet_manager"/>
<field name="state" widget="statusbar" />
</header>
<sheet>
<group col="2">
<group string="Contract details">
<field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
<field name="cost_subtype" required="1" domain="['|',('category','=','contract'),('category','=','both')]"/>
<field name="cost_subtype_id" required="1" domain="['|',('category','=','contract'),('category','=','both')]"/>
<field name="amount" string="Activation Cost"/>
<label for="cost_generated"/>
<div>
@@ -401,7 +400,7 @@
<group>
<field name="cost_ids" context="{'vehicle_id': vehicle_id}" nolabel="1" on_change="on_change_indic_cost(cost_ids)">
<tree version="7.0" editable="bottom">
<field name="cost_subtype" string="Service" domain="[('category','=','service')]"/>
<field name="cost_subtype_id" string="Service" domain="[('category','=','service')]"/>
<field name="amount" sum="Price" string="Indicative Cost" />
</tree>
</field>
@@ -449,7 +448,7 @@
<field name="expiration_date" />
<field name="days_left" invisible="1"/>
<field name="vehicle_id" />
<field name="cost_subtype"/>
<field name="cost_subtype_id"/>
<field name="insurer_id" />
<field name="amount" string="Activation Cost"/>
<field name="cost_generated"/>
@@ -491,7 +490,7 @@
</field>
</record>
<menuitem action="fleet_vehicle_log_contract_act" parent="fleet_vehicles" id="fleet_vehicle_log_contract_menu" />
<menuitem action="fleet_vehicle_log_contract_act" parent="fleet_vehicles" id="fleet_vehicle_log_contract_menu" groups="group_fleet_user"/>
<record model='ir.ui.view' id='fleet_vehicle_odometer_form'>
<field name="name">fleet.vehicle.odometer.form</field>
@@ -568,7 +567,7 @@
</field>
</record>
<menuitem action="fleet_vehicle_odometer_act" parent="fleet_vehicles" id="fleet_vehicle_odometer_menu" />
<menuitem action="fleet_vehicle_odometer_act" parent="fleet_vehicles" id="fleet_vehicle_odometer_menu" groups="group_fleet_user"/>
<record model='ir.ui.view' id='fleet_vehicle_log_fuel_form'>
<field name="name">fleet.vehicle.log.fuel.form</field>
@@ -657,7 +656,7 @@
</field>
</record>
<menuitem action="fleet_vehicle_log_fuel_act" parent="fleet_vehicles" id="fleet_vehicle_log_fuel_menu" />
<menuitem action="fleet_vehicle_log_fuel_act" parent="fleet_vehicles" id="fleet_vehicle_log_fuel_menu" groups="group_fleet_user"/>
<record model='ir.ui.view' id='fleet_vehicle_log_services_form'>
@@ -669,7 +668,7 @@
<group col="2">
<group string="Services Details">
<field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
<field name="cost_subtype" string="Service Type" domain="['|',('category','=','service'),('category','=','both')]" required="1"/>
<field name="cost_subtype_id" string="Service Type" domain="['|',('category','=','service'),('category','=','both')]" required="1"/>
<field name="amount" string="Price"/>
</group>
<group string="Odometer Details">
@@ -691,7 +690,7 @@
<group string="Included Services">
<field name="cost_ids" nolabel="1">
<tree string="Included Services" version="7.0" editable="bottom">
<field name="cost_subtype" string="Service" domain="[('category','=','service')]"/>
<field name="cost_subtype_id" string="Service" domain="[('category','=','service')]"/>
<field name="amount" sum="Price" string="Cost"/>
</tree>
</field>
@@ -711,7 +710,7 @@
<tree string="Services Logs">
<field name="date" />
<field name="vehicle_id" />
<field name="cost_subtype"/>
<field name="cost_subtype_id"/>
<field name="purchaser_id"/>
<field name="vendor_id" />
<field name="inv_ref" />
@@ -749,7 +748,7 @@
</field>
</record>
<menuitem action="fleet_vehicle_log_services_act" parent="fleet_vehicles" id="fleet_vehicle_log_services_menu" />
<menuitem action="fleet_vehicle_log_services_act" parent="fleet_vehicles" id="fleet_vehicle_log_services_menu" groups="group_fleet_user"/>
<record model='ir.ui.view' id='fleet_vehicle_service_types_tree'>
<field name="name">fleet.service.type.tree</field>
@@ -787,7 +786,7 @@
<field name="date"/>
<field name="vehicle_id" />
<field name="cost_type"/>
<field name="cost_subtype"/>
<field name="cost_subtype_id"/>
<field name="amount" sum="Total Cost"/>
<field name="parent_id" invisible="1" />
<field name="year" invisible="1"/>
@@ -801,7 +800,7 @@
<field name="arch" type="xml">
<search string="Vehicles costs" >
<field name="vehicle_id" />
<field name="cost_subtype"/>
<field name="cost_subtype_id"/>
<field name="year"/>
<field name="date"/>
<field name="parent_id"/>
@@ -811,7 +810,7 @@
<filter name="groupby_year" context="{'group_by' : 'year'}" string="Year"/>
<filter name="groupby_date" context="{'group_by' : 'date'}" string="Date"/>
<filter name="groupby_cost_type" context="{'group_by' : 'cost_type'}" string="Cost Type"/>
<filter name="groupby_cost_subtype" context="{'group_by' : 'cost_subtype'}" string="Cost Subtype"/>
<filter name="groupby_cost_subtype_id" context="{'group_by' : 'cost_subtype_id'}" string="Cost Subtype"/>
<filter name="groupby_vehicle_id" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
<filter name="groupby_parent_id" context="{'group_by' : 'parent_id'}" string="Parent"/>
</group>
@@ -828,7 +827,7 @@
<group col="2" string="Cost Details">
<group>
<field name="vehicle_id" />
<field name="cost_subtype"/>
<field name="cost_subtype_id"/>
<field name="amount"/>
</group>
<group>
@@ -870,7 +869,7 @@
</field>
</record>
<menuitem action="fleet_vehicle_costs_act" parent="fleet_vehicles" id="fleet_vehicle_costs_menu" />
<menuitem action="fleet_vehicle_costs_act" parent="fleet_vehicles" id="fleet_vehicle_costs_menu" groups="group_fleet_manager"/>
<!--
<record model='ir.ui.view' id='fleet_hr_employee_form'>
<field name="name">fleet.hr.employee.form</field>
addons/fleet/security/fleet_security.xml
+109
View File
@@ -0,0 +1,109 @@
<?xml version="1.0" ?>
<openerp>
<data>
<record model="ir.module.category" id="module_fleet_category">
<field name="name">Fleet</field>
<field name="sequence">17</field>
</record>
<record id="group_fleet_user" model="res.groups">
<field name="name">User</field>
<field name="category_id" ref="module_fleet_category"/>
</record>
<record id="group_fleet_manager" model="res.groups">
<field name="name">Manager</field>
<field name="implied_ids" eval="[(4, ref('group_fleet_user'))]"/>
<field name="category_id" ref="module_fleet_category"/>
</record>
<record id="fleet_user_contract_visibility" model="ir.rule">
<field name="name">User can only see his/her contracts</field>
<field name="model_id" ref="model_fleet_vehicle_log_contract"/>
<field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="domain_force">[('cost_id.vehicle_id.driver_id','=',user.partner_id.id)]</field>
</record>
<record id="fleet_user_cost_visibility" model="ir.rule">
<field name="name">User can only see his/her costs</field>
<field name="model_id" ref="model_fleet_vehicle_cost"/>
<field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="False"/>
<field name="domain_force">[('vehicle_id.driver_id','=',user.partner_id.id)]</field>
</record>
<record id="fleet_user_service_visibility" model="ir.rule">
<field name="name">User can only see his/her vehicle's services</field>
<field name="model_id" ref="model_fleet_vehicle_log_services"/>
<field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="domain_force">[('cost_id.vehicle_id.driver_id','=',user.partner_id.id)]</field>
</record>
<record id="fleet_user_odometer_visibility" model="ir.rule">
<field name="name">User can only see his/her vehicle's odometer</field>
<field name="model_id" ref="model_fleet_vehicle_odometer"/>
<field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="True"/>
<field name="domain_force">[('vehicle_id.driver_id','=',user.partner_id.id)]</field>
</record>
<record id="fleet_user_fuel_log_visibility" model="ir.rule">
<field name="name">User can only see his/her vehicle's fuel log</field>
<field name="model_id" ref="model_fleet_vehicle_log_fuel"/>
<field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="True"/>
<field name="domain_force">[('cost_id.vehicle_id.driver_id','=',user.partner_id.id)]</field>
</record>
<record id="fleet_user_vehicle_visibility" model="ir.rule">
<field name="name">User can only see his/her vehicle</field>
<field name="model_id" ref="model_fleet_vehicle"/>
<field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="domain_force">[('driver_id','=',user.partner_id.id)]</field>
</record>
<record id="fleet_user_contract_visibility_manager" model="ir.rule">
<field name="name">Manager has all rights on vehicle's contracts</field>
<field name="model_id" ref="model_fleet_vehicle_log_contract"/>
<field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
</record>
<record id="fleet_user_cost_visibility_manager" model="ir.rule">
<field name="name">Manager has all rights on vehicle's costs</field>
<field name="model_id" ref="model_fleet_vehicle_cost"/>
<field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
</record>
<record id="fleet_user_service_visibility_manager" model="ir.rule">
<field name="name">Manager has all rights on vehicle's services</field>
<field name="model_id" ref="model_fleet_vehicle_log_services"/>
<field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
</record>
<record id="fleet_user_odometer_visibility_manager" model="ir.rule">
<field name="name">Manager has all rights on vehicle's vehicle's odometer</field>
<field name="model_id" ref="model_fleet_vehicle_odometer"/>
<field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
</record>
<record id="fleet_user_fuel_log_visibility_manager" model="ir.rule">
<field name="name">Manager has all rights on vehicle's fuel log</field>
<field name="model_id" ref="model_fleet_vehicle_log_fuel"/>
<field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
</record>
<record id="fleet_user_vehicle_visibility_manager" model="ir.rule">
<field name="name">Manager has all rights on vehicle</field>
<field name="model_id" ref="model_fleet_vehicle"/>
<field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
</record>
</data>
</openerp>
addons/fleet/security/ir.model.access.csv
+22 -12
View File
@@ -1,13 +1,23 @@
id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
fleet_vehicle_model_access_right,fleet_vehicle_model_access_right,model_fleet_vehicle_model,,1,1,1,1
fleet_vehicle_tag_access_right,fleet_vehicle_tag_access_right,model_fleet_vehicle_tag,,1,1,1,1
fleet_vehicle_state_access_right,fleet_vehicle_state_access_right,model_fleet_vehicle_state,,1,1,1,1
fleet_vehicle_odometer_access_right,fleet_vehicle_odometer_access_right,model_fleet_vehicle_odometer,,1,1,1,1
fleet_vehicle_model_brand_access_right,fleet_vehicle_model_brand_access_right,model_fleet_vehicle_model_brand,,1,1,1,1
fleet_vehicle_access_right,fleet_vehicle_access_right,model_fleet_vehicle,,1,1,1,1
fleet_vehicle_log_fuel_access_right,fleet_vehicle_log_fuel_access_right,model_fleet_vehicle_log_fuel,,1,1,1,1
fleet_vehicle_log_services_access_right,fleet_vehicle_log_services_access_right,model_fleet_vehicle_log_services,,1,1,1,1
fleet_vehicle_log_contract_access_right,fleet_vehicle_log_contract_access_right,model_fleet_vehicle_log_contract,,1,1,1,1
fleet_service_type_access_right,fleet_service_type_access_right,model_fleet_service_type,,1,1,1,1
access_fleet_vehicle_cost,access_fleet_vehicle_cost,model_fleet_vehicle_cost,,1,1,1,1
access_fleet_contract_state,access_fleet_contract_state,model_fleet_contract_state,,1,1,1,1
fleet_vehicle_model_access_right_user,fleet_vehicle_model_access_right,model_fleet_vehicle_model,group_fleet_user,1,0,0,0
fleet_vehicle_tag_access_right_user,fleet_vehicle_tag_access_right,model_fleet_vehicle_tag,group_fleet_user,1,0,0,0
fleet_vehicle_state_access_right_user,fleet_vehicle_state_access_right,model_fleet_vehicle_state,group_fleet_user,1,0,0,0
fleet_vehicle_model_brand_access_right_user,fleet_vehicle_model_brand_access_right,model_fleet_vehicle_model_brand,group_fleet_user,1,0,0,0
fleet_vehicle_access_right_user,fleet_vehicle_access_right",model_fleet_vehicle,group_fleet_user,1,1,0,0
fleet_vehicle_log_services_access_right_user,fleet_vehicle_log_services_access_right,model_fleet_vehicle_log_services,group_fleet_user,1,0,0,0
fleet_vehicle_log_contract_access_right_user,fleet_vehicle_log_contract_access_right,model_fleet_vehicle_log_contract,group_fleet_user,1,0,0,0
fleet_service_type_access_right_user,fleet_service_type_access_right,model_fleet_service_type,group_fleet_user,1,0,0,0
access_fleet_vehicle_cost_user,access_fleet_vehicle_cost,model_fleet_vehicle_cost,group_fleet_user,1,1,1,0
access_fleet_contract_state_user,access_fleet_contract_state,model_fleet_contract_state,group_fleet_user,1,0,0,0
fleet_vehicle_model_access_right,fleet_vehicle_model_access_right,model_fleet_vehicle_model,group_fleet_manager,1,1,1,1
fleet_vehicle_tag_access_right,fleet_vehicle_tag_access_right,model_fleet_vehicle_tag,group_fleet_manager,1,1,1,1
fleet_vehicle_state_access_right,fleet_vehicle_state_access_right,model_fleet_vehicle_state,group_fleet_manager,1,1,1,1
fleet_vehicle_odometer_access_right,fleet_vehicle_odometer_access_right,model_fleet_vehicle_odometer,group_fleet_user,1,1,1,1
fleet_vehicle_model_brand_access_right,fleet_vehicle_model_brand_access_right,model_fleet_vehicle_model_brand,group_fleet_manager,1,1,1,1
fleet_vehicle_access_right,fleet_vehicle_access_right,model_fleet_vehicle,group_fleet_manager,1,1,1,1
fleet_vehicle_log_fuel_access_right,fleet_vehicle_log_fuel_access_right,model_fleet_vehicle_log_fuel,group_fleet_user,1,1,1,1
fleet_vehicle_log_services_access_right,fleet_vehicle_log_services_access_right,model_fleet_vehicle_log_services,group_fleet_manager,1,1,1,1
fleet_vehicle_log_contract_access_right,fleet_vehicle_log_contract_access_right,model_fleet_vehicle_log_contract,group_fleet_manager,1,1,1,1
fleet_service_type_access_right,fleet_service_type_access_right,model_fleet_service_type,group_fleet_manager,1,1,1,1
access_fleet_vehicle_cost,access_fleet_vehicle_cost,model_fleet_vehicle_cost,group_fleet_manager,1,1,1,1
access_fleet_contract_state,access_fleet_contract_state,model_fleet_contract_state,group_fleet_manager,1,1,1,1
Can't render this file because it contains an unexpected character in line 6 and column 59.