[FIX]fleet : go to fleet menu after installation, change demo data, correct some bugs
bzr revid: csn@openerp.com-20121211103734-mtt0lbqiebp0e4v5
This commit is contained in:
commit
54a4b12103
|
@ -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',
|
||||
|
|
|
@ -333,9 +333,9 @@ 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_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'),
|
||||
'driver_id': 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'),
|
||||
'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'),
|
||||
|
@ -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'
|
||||
|
|
|
@ -16,6 +16,17 @@
|
|||
</record>
|
||||
-->
|
||||
|
||||
<!-- After installation of the module, open the related menu -->
|
||||
<record id="action_fleet_menu" model="ir.actions.client">
|
||||
<field name="name">Open Fleet Menu</field>
|
||||
<field name="tag">reload</field>
|
||||
<field name="params" eval="{'menu_id': ref('fleet.menu_root')}"/>
|
||||
</record>
|
||||
<record id="base.open_menu" model="ir.actions.todo">
|
||||
<field name="action_id" ref="action_fleet_menu"/>
|
||||
<field name="state">open</field>
|
||||
</record>
|
||||
|
||||
<record forcecreate="True" id="ir_cron_contract_costs_generator" model="ir.cron">
|
||||
<field name="name">Generation of contracts costs based on the costs frequency</field>
|
||||
<field eval="True" name="active" />
|
||||
|
|
|
@ -28,9 +28,9 @@
|
|||
<field name="color">Black</field>
|
||||
<field name="location">Grand-Rosiere</field>
|
||||
<field name="doors">5</field>
|
||||
<field name="driver_id" ref="base.res_partner_address_18" />
|
||||
<field name="driver_id" ref="base.user_demo" />
|
||||
<field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
|
||||
<field name="state" ref="vehicle_state_active"/>
|
||||
<field name="state_id" ref="vehicle_state_active"/>
|
||||
<field name="odometer_unit">kilometers</field>
|
||||
<field name="car_value">20000</field>
|
||||
<field eval="[(6,0,[ref('vehicle_tag_leasing'),ref('fleet.vehicle_tag_break'),ref('fleet.vehicle_tag_senior')])]" name="tag_ids"/>
|
||||
|
@ -45,7 +45,7 @@
|
|||
<field name="doors">5</field>
|
||||
<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="state_id" ref="vehicle_state_inactive"/>
|
||||
<field name="odometer_unit">kilometers</field>
|
||||
<field name="car_value">16000</field>
|
||||
<field eval="[(6,0,[ref('vehicle_tag_leasing'),ref('fleet.vehicle_tag_compact'),ref('fleet.vehicle_tag_junior')])]" name="tag_ids"/>
|
||||
|
@ -60,7 +60,7 @@
|
|||
<field name="doors">3</field>
|
||||
<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="state_id" ref="vehicle_state_active"/>
|
||||
<field name="odometer_unit">kilometers</field>
|
||||
<field name="car_value">20000</field>
|
||||
<field eval="[(6,0,[ref('vehicle_tag_leasing'),ref('fleet.vehicle_tag_compact'),ref('fleet.vehicle_tag_senior')])]" name="tag_ids"/>
|
||||
|
@ -75,7 +75,7 @@
|
|||
<field name="doors">3</field>
|
||||
<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="state_id" ref="vehicle_state_active"/>
|
||||
<field name="odometer_unit">kilometers</field>
|
||||
<field name="car_value">20000</field>
|
||||
<field eval="[(6,0,[ref('vehicle_tag_leasing'),ref('fleet.vehicle_tag_compact'),ref('fleet.vehicle_tag_senior')])]" name="tag_ids"/>
|
||||
|
@ -90,7 +90,7 @@
|
|||
<field name="doors">5</field>
|
||||
<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="state_id" ref="vehicle_state_active"/>
|
||||
<field name="odometer_unit">kilometers</field>
|
||||
<field name="car_value">18000</field>
|
||||
<field eval="[(6,0,[ref('vehicle_tag_leasing'),ref('fleet.vehicle_tag_compact'),ref('fleet.vehicle_tag_senior')])]" name="tag_ids"/>
|
||||
|
|
|
@ -20,7 +20,23 @@
|
|||
</div>
|
||||
<notebook>
|
||||
<page string="Vendors">
|
||||
<field name="vendors" widget="many2many_kanban"/>
|
||||
<field name="vendors" widget="many2many_kanban">
|
||||
<kanban quick_create="false" create="true">
|
||||
<field name="name"/>
|
||||
<templates>
|
||||
<t t-name="kanban-box">
|
||||
<div style="position: relative">
|
||||
<a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
|
||||
<div class="oe_module_vignette">
|
||||
<div class="oe_module_desc">
|
||||
<field name="name"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
</templates>
|
||||
</kanban>
|
||||
</field>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
|
@ -38,11 +54,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.
|
||||
|
|
|
@ -8,11 +8,13 @@
|
|||
<record id="group_fleet_user" model="res.groups">
|
||||
<field name="name">User</field>
|
||||
<field name="category_id" ref="module_fleet_category"/>
|
||||
<field name="users" eval="[(4, ref('base.user_demo'))]"/>
|
||||
</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"/>
|
||||
<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