[IMP]Deleting generic logs and inherits from odometer part 1
bzr revid: dle@openerp.com-20120926141352-nfsrwmibms0xg0dg
This commit is contained in:
Denis Ledoux dle@openerp.com
parent
f7372cc5ea
commit
971f1a66ce
|
|
@ -64,24 +64,9 @@
|
|||
<field name="service_ids" eval="[(6,0,[ref('type_service_oil')])]" />
|
||||
</record>
|
||||
|
||||
<record id="log_fuel_1" model="fleet.vehicle.log.fuel">
|
||||
<field name="employee_id" ref="hr.employee_fp" />
|
||||
<field name="vehicle_id" ref="vehicle_1" />
|
||||
<field name="date_creation" eval="time.strftime('%Y-%m-%d 2:00:00')" />
|
||||
<field name="type">Fuel</field>
|
||||
<field name="liter">40.0</field>
|
||||
<field name="price_per_liter">1.45</field>
|
||||
<field name="amount">58</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
<record id="log_odo_1" model="fleet.vehicle.log.odometer">
|
||||
<field name="employee_id" ref="hr.employee_fp" />
|
||||
<field name="vehicle_id" ref="vehicle_1" />
|
||||
<field name="date_creation" eval="time.strftime('%Y-%m-%d 2:00:00')" />
|
||||
<field name="type">Odometer</field>
|
||||
<field name="value">1579.5</field>
|
||||
<field name="description">Odometer value when vehicle retrieved from partner</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
from itertools import chain
|
||||
from osv import osv, fields
|
||||
import time
|
||||
|
||||
|
||||
class fleet_vehicle_model_type(osv.Model):
|
||||
_name = 'fleet.vehicle.type'
|
||||
|
|
@ -172,6 +174,23 @@ class fleet_vehicle(osv.Model):
|
|||
pass
|
||||
return vehicle_id
|
||||
|
||||
class fleet_vehicle_odometer(osv.Model):
|
||||
_name='fleet.vehicle.odometer'
|
||||
_description='Odometer log for a vehicle'
|
||||
|
||||
_columns = {
|
||||
'name' : fields.char('Name',size=64),
|
||||
|
||||
'date' : fields.date('Date'),
|
||||
'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),
|
||||
'notes' : fields.text('Notes'),
|
||||
}
|
||||
_defaults = {
|
||||
'date' : time.strftime('%Y-%m-%d')
|
||||
}
|
||||
|
||||
class fleet_vehicle_log(osv.Model):
|
||||
_name = 'fleet.vehicle.log'
|
||||
|
||||
|
|
@ -212,8 +231,7 @@ class fleet_vehicle_log(osv.Model):
|
|||
|
||||
class fleet_vehicle_log_fuel(osv.Model):
|
||||
|
||||
|
||||
_inherit = ['fleet.vehicle.log','mail.thread']
|
||||
_inherits = {'fleet.vehicle.odometer': 'request_id'}
|
||||
|
||||
def on_change_liter(self, cr, uid, ids, liter, price_per_liter, amount, context=None):
|
||||
|
||||
|
|
@ -253,18 +271,17 @@ class fleet_vehicle_log_fuel(osv.Model):
|
|||
|
||||
|
||||
_name = 'fleet.vehicle.log.fuel'
|
||||
|
||||
_columns = {
|
||||
'name' : fields.char('Name',size=64),
|
||||
'liter' : fields.float('Liter'),
|
||||
'price_per_liter' : fields.float('Price per liter'),
|
||||
'amount': fields.float('Total price'),
|
||||
'purchaser_id' : fields.many2one('res.partner', 'Purchaser'),
|
||||
'inv_ref' : fields.char('Invoice Ref.', size=32),
|
||||
'vendor_id' : fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"),
|
||||
'odometer_log' : fields.one2many('fleet.vehicle.log.odometer','fuel_log', 'Odometer',type="char"),
|
||||
#'odometer_id': fields.many2one('fleet.vehicle.odometer','Odometer', ondelete='cascade', required=False),
|
||||
}
|
||||
_defaults = {
|
||||
# 'name': 'Fuel log',
|
||||
'type': 'Refueling',
|
||||
}
|
||||
|
||||
class fleet_insurance_type(osv.Model):
|
||||
_name = 'fleet.insurance.type'
|
||||
|
|
|
|||
|
|
@ -200,47 +200,34 @@
|
|||
<field name="liter" />
|
||||
<field name="price_per_liter" />
|
||||
<field name="amount" />
|
||||
<field name="employee_id" />
|
||||
<field name="purchaser_id" />
|
||||
<field name="vendor_id" />
|
||||
<field name="inv_ref" />
|
||||
<field name="date_creation" />
|
||||
<field name="date" />
|
||||
</tree>
|
||||
<form string="Fuel Logs" version="7.0">
|
||||
<sheet>
|
||||
<group col = "2">
|
||||
<group>
|
||||
<group col="2">
|
||||
<group string="Transaction details">
|
||||
<field name="liter" on_change="on_change_liter(liter,price_per_liter,amount)"/>
|
||||
<field name="price_per_liter" on_change="on_change_price_per_liter(liter,price_per_liter,amount)" />
|
||||
<field name="amount" on_change="on_change_amount(liter,price_per_liter,amount)"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="date_creation" />
|
||||
<field name="employee_id" />
|
||||
</group>
|
||||
<group col="2">
|
||||
<group string="Odometer details">
|
||||
<field name="value" />
|
||||
<field name="unit" />
|
||||
</group>
|
||||
<group string="Additional details">
|
||||
<field name="date" />
|
||||
<field name="purchaser_id" />
|
||||
<field name="inv_ref" />
|
||||
<field name="vendor_id" />
|
||||
</group>
|
||||
</group>
|
||||
<group>
|
||||
<field name="description" />
|
||||
<field name="odometer_log" >
|
||||
<tree string="Odometer">
|
||||
<field name="date_creation" />
|
||||
<field name="value" />
|
||||
<field name="description" />
|
||||
</tree>
|
||||
<form string="Odometer" version="7.0" >
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="date_creation" />
|
||||
<field name="value" />
|
||||
<field name="vehicle_id"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="description" />
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
<field name="notes" />
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
|
|
@ -363,41 +350,30 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Fuel Logs" version="7.0">
|
||||
<sheet>
|
||||
<group col = "2">
|
||||
<group>
|
||||
<group col="2">
|
||||
<group string="Vehicle details">
|
||||
<field name="vehicle_id"/>
|
||||
</group>
|
||||
<group string="Transaction details">
|
||||
<field name="liter" on_change="on_change_liter(liter,price_per_liter,amount)"/>
|
||||
<field name="price_per_liter" on_change="on_change_price_per_liter(liter,price_per_liter,amount)" />
|
||||
<field name="amount" on_change="on_change_amount(liter,price_per_liter,amount)"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="date_creation" />
|
||||
<field name="employee_id" />
|
||||
</group>
|
||||
<group col="2">
|
||||
<group string="Odometer details">
|
||||
<field name="value" />
|
||||
<field name="unit" />
|
||||
</group>
|
||||
<group string="Additional details">
|
||||
<field name="date" />
|
||||
<field name="purchaser_id" />
|
||||
<field name="inv_ref" />
|
||||
<field name="vendor_id" />
|
||||
</group>
|
||||
</group>
|
||||
<group>
|
||||
<field name="description" />
|
||||
<field name="odometer_log">
|
||||
<tree string="Odometer">
|
||||
<field name="date_creation" />
|
||||
<field name="value" />
|
||||
<field name="description" />
|
||||
</tree>
|
||||
<form string="Odometer" version="7.0" >
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="date_creation" />
|
||||
<field name="value" />
|
||||
<field name="vehicle_id"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="description" />
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
<field name="notes" />
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
|
|
@ -413,10 +389,11 @@
|
|||
<field name="liter" />
|
||||
<field name="price_per_liter" />
|
||||
<field name="amount" />
|
||||
<field name="employee_id" />
|
||||
<field name="date_creation" />
|
||||
<field name="purchaser_id" />
|
||||
<field name="date" />
|
||||
<field name="value" />
|
||||
<field name="unit" />
|
||||
<field name="inv_ref" />
|
||||
<field name="odometer_log" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
|||
Loading…
Reference in New Issue