[IMP]Deleting generic logs and inherits from odometer part 2 + Fix demos values
bzr revid: dle@openerp.com-20120926145603-m7dkh9mf320i31uj
This commit is contained in:
Denis Ledoux dle@openerp.com
parent
971f1a66ce
commit
49bae040aa
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data noupdate="1">
|
||||
<data>
|
||||
|
||||
<record id="brand_opel" model="fleet.vehicle.model.brand">
|
||||
<field name="name">Opel</field>
|
||||
|
|
@ -56,17 +56,26 @@
|
|||
</record>
|
||||
|
||||
<record id="log_service_1" model="fleet.vehicle.log.services">
|
||||
<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">Services</field>
|
||||
<field name="purchaser_id" ref="hr.employee_fp" />
|
||||
<field name="vendor_id">5</field>
|
||||
<field name="date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
|
||||
<field name="amount">500.0</field>
|
||||
<field name="service_ids" eval="[(6,0,[ref('type_service_oil')])]" />
|
||||
<field name="inv_ref">4574.2321</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
|
||||
<record id="log_fuel_1" model="fleet.vehicle.log.fuel">
|
||||
<field name="purchaser_id" ref="hr.employee_fp" />
|
||||
<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')" />
|
||||
<field name="liter">20</field>
|
||||
<field name="price_per_liter">1.4</field>
|
||||
<field name="amount">28</field>
|
||||
<field name="service_ids" eval="[(6,0,[ref('type_service_oil')])]" />
|
||||
<field name="inv_ref">67458</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ class fleet_vehicle_log(osv.Model):
|
|||
|
||||
class fleet_vehicle_log_fuel(osv.Model):
|
||||
|
||||
_inherits = {'fleet.vehicle.odometer': 'request_id'}
|
||||
_inherits = {'fleet.vehicle.odometer': 'odometer_id'}
|
||||
|
||||
def on_change_liter(self, cr, uid, ids, liter, price_per_liter, amount, context=None):
|
||||
|
||||
|
|
@ -249,7 +249,6 @@ class fleet_vehicle_log_fuel(osv.Model):
|
|||
liter = float(liter);
|
||||
price_per_liter = float(price_per_liter);
|
||||
if price_per_liter > 0 and liter > 0:
|
||||
print 'Debug :' + str(liter) + ' | ' + str(price_per_liter) + ' | ' + str(amount)
|
||||
return {'value' : {'amount' : float(liter) * float(price_per_liter),}}
|
||||
elif price_per_liter > 0 and amount > 0:
|
||||
return {'value' : {'liter' : float(amount) / float(price_per_liter),}}
|
||||
|
|
@ -274,13 +273,30 @@ class fleet_vehicle_log_fuel(osv.Model):
|
|||
|
||||
_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),
|
||||
'inv_ref' : fields.char('Invoice Reference', size=64),
|
||||
'vendor_id' : fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"),
|
||||
#'odometer_id': fields.many2one('fleet.vehicle.odometer','Odometer', ondelete='cascade', required=False),
|
||||
}
|
||||
|
||||
class fleet_vehicle_log_services(osv.Model):
|
||||
|
||||
_inherits = {'fleet.vehicle.odometer': 'odometer_id'}
|
||||
|
||||
_name = 'fleet.vehicle.log.services'
|
||||
_columns = {
|
||||
|
||||
'name' : fields.char('Name',size=64),
|
||||
|
||||
'amount' :fields.float('Cost', help="Total cost of the service"),
|
||||
|
||||
'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'),
|
||||
'purchaser_id' : fields.many2one('res.partner', 'Purchaser'),
|
||||
'inv_ref' : fields.char('Invoice Reference', size=64),
|
||||
'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"),
|
||||
}
|
||||
|
||||
class fleet_insurance_type(osv.Model):
|
||||
|
|
@ -310,21 +326,6 @@ class fleet_service_type(osv.Model):
|
|||
'name': fields.char('Name', required=True, translate=True),
|
||||
}
|
||||
|
||||
class fleet_vehicle_log_services(osv.Model):
|
||||
_inherit = ['fleet.vehicle.log']
|
||||
|
||||
_name = 'fleet.vehicle.log.services'
|
||||
_columns = {
|
||||
'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"),
|
||||
'amount' :fields.float('Cost', help="Total cost of the service"),
|
||||
'reference' :fields.char('Reference',size=128),
|
||||
'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'),
|
||||
'odometer_log' : fields.one2many('fleet.vehicle.log.odometer','fuel_log', 'Odometer',type="char"),
|
||||
}
|
||||
_defaults = {
|
||||
# 'name': 'Service log',
|
||||
'type': 'Services'}
|
||||
|
||||
class fleet_vehicle_log_odometer(osv.Model):
|
||||
_inherit = ['fleet.vehicle.log']
|
||||
|
||||
|
|
|
|||
|
|
@ -154,41 +154,22 @@
|
|||
<group>
|
||||
<field name="log_services">
|
||||
<tree string="Completed services">
|
||||
<field name="employee_id" />
|
||||
<field name="vendor_id" />
|
||||
<field name="service_ids" widget="many2many_tags"/>
|
||||
<field name="amount" />
|
||||
<field name="reference" />
|
||||
<field name="service_ids"/>
|
||||
<field name="date_creation" />
|
||||
<field name="date" />
|
||||
<field name="purchaser_id" />
|
||||
<field name="vendor_id" />
|
||||
<field name="inv_ref" />
|
||||
</tree>
|
||||
<form string="Services Logs" version="7.0">
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="date_creation" />
|
||||
<field name="employee_id" />
|
||||
<field name="vendor_id" />
|
||||
<field name="amount" />
|
||||
<field name="reference" />
|
||||
<field name="service_ids" widget="many2many_tags"/>
|
||||
<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="service_ids" widget="many2many_tags"/>
|
||||
<field name="amount" />
|
||||
<field name="date" />
|
||||
<field name="purchaser_id" />
|
||||
<field name="vendor_id" />
|
||||
<field name="inv_ref" />
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
|
|
@ -394,6 +375,7 @@
|
|||
<field name="value" />
|
||||
<field name="unit" />
|
||||
<field name="inv_ref" />
|
||||
<field name="vendor_id" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -460,33 +442,18 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Services Logs" version="7.0">
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="date_creation" />
|
||||
<field name="vehicle_id" />
|
||||
<field name="employee_id" />
|
||||
<field name="vendor_id" />
|
||||
<field name="amount" />
|
||||
<field name="reference" />
|
||||
<field name="service_ids" widget="many2many_tags"/>
|
||||
<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>
|
||||
<group col="2">
|
||||
<group string="Services details">
|
||||
<field name="vehicle_id" />
|
||||
<field name="service_ids" widget="many2many_tags"/>
|
||||
<field name="amount" />
|
||||
</group>
|
||||
<group string="Additional details">
|
||||
<field name="date" />
|
||||
<field name="purchaser_id" />
|
||||
<field name="vendor_id" />
|
||||
<field name="inv_ref" />
|
||||
</group>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
|
|
@ -499,13 +466,13 @@
|
|||
<field name="model">fleet.vehicle.log.services</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Services Logs">
|
||||
<field name="date_creation" />
|
||||
<field name="vehicle_id" />
|
||||
<field name="employee_id" />
|
||||
<field name="service_ids" widget="many2many_tags"/>
|
||||
<field name="amount" />
|
||||
<field name="reference" />
|
||||
<field name="service_ids"/>
|
||||
<field name="odometer_log" />
|
||||
<field name="date" />
|
||||
<field name="purchaser_id" />
|
||||
<field name="vendor_id" />
|
||||
<field name="inv_ref" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
|||
Loading…
Reference in New Issue