[UPDATE]changes create_date fields in log by creation_date to remove a warning - create_date is a reserved fields
bzr revid: csn@openerp.com-20120925083500-lihupfbu5y9ycq7b
This commit is contained in:
Cedric Snauwaert
@@ -57,7 +57,7 @@
|
||||
<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="create_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
|
||||
<field name="date_creation" eval="time.strftime('%Y-%m-%d 2:00:00')" />
|
||||
<field name="type">Services</field>
|
||||
<field name="amount">500.0</field>
|
||||
<field name="service_ids" eval="[(6,0,[ref('type_service_oil')])]" />
|
||||
@@ -66,7 +66,7 @@
|
||||
<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="create_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
|
||||
<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>
|
||||
|
||||
+13
-4
@@ -131,16 +131,18 @@ class fleet_vehicle_log(osv.Model):
|
||||
_name = 'fleet.vehicle.log'
|
||||
|
||||
_columns = {
|
||||
'name' : fields.char('Log',size=32),
|
||||
'employee_id' : fields.many2one('hr.employee', 'Employee', required=True),
|
||||
'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True),
|
||||
|
||||
'create_date' : fields.date('Creation Date'),
|
||||
'date_creation' : fields.date('Creation Date'),
|
||||
|
||||
'description' : fields.text('Description'),
|
||||
'type' : fields.char('Type',size=32),
|
||||
}
|
||||
|
||||
_defaults = {
|
||||
'name' : 'Log',
|
||||
'type' : 'Log',
|
||||
}
|
||||
|
||||
@@ -178,7 +180,10 @@ class fleet_vehicle_log_fuel(osv.Model):
|
||||
'amount': fields.function(_get_price, type='float', multi='fuel', string='Total Price'),
|
||||
'inv_ref' : fields.char('Invoice Ref.', size=32),
|
||||
}
|
||||
_defaults = {'type': 'Refueling',}
|
||||
_defaults = {
|
||||
'name': 'Fuel log',
|
||||
'type': 'Refueling',
|
||||
}
|
||||
|
||||
class fleet_insurance_type(osv.Model):
|
||||
_name = 'fleet.insurance.type'
|
||||
@@ -197,7 +202,9 @@ class fleet_vehicle_log_insurance(osv.Model):
|
||||
'insurer_id' :fields.many2one('res.partner', 'Insurer', domain="[('supplier','=',True)]"),
|
||||
'description' : fields.text('Description'),
|
||||
}
|
||||
_defaults = {'type': 'Insurance',}
|
||||
_defaults = {
|
||||
'name': 'Insurance log',
|
||||
'type': 'Insurance',}
|
||||
|
||||
class service_type(osv.Model):
|
||||
_name = 'fleet.service.type'
|
||||
@@ -215,7 +222,9 @@ class fleet_vehicle_log_services(osv.Model):
|
||||
'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'),
|
||||
}
|
||||
_defaults = {'type': 'Services'}
|
||||
_defaults = {
|
||||
'name': 'Service log',
|
||||
'type': 'Services'}
|
||||
|
||||
class hr_employee(osv.Model):
|
||||
_inherit = 'hr.employee'
|
||||
|
||||
+13
-13
@@ -109,7 +109,7 @@
|
||||
<field name="price" />
|
||||
</group>
|
||||
<group>
|
||||
<field name="create_date" />
|
||||
<field name="date_creation" />
|
||||
<field name="start_date" />
|
||||
<field name="expiration_date" />
|
||||
</group>
|
||||
@@ -127,12 +127,12 @@
|
||||
<field name="amount" />
|
||||
<field name="reference" />
|
||||
<field name="service_ids"/>
|
||||
<field name="create_date" />
|
||||
<field name="date_creation" />
|
||||
</tree>
|
||||
<form string="Services Logs" version="7.0">
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="create_date" />
|
||||
<field name="date_creation" />
|
||||
<field name="employee_id" />
|
||||
<field name="vendor_id" />
|
||||
<field name="amount" />
|
||||
@@ -151,12 +151,12 @@
|
||||
<field name="amount" />
|
||||
<field name="employee_id" />
|
||||
<field name="inv_ref" />
|
||||
<field name="create_date" />
|
||||
<field name="date_creation" />
|
||||
</tree>
|
||||
<form string="Fuel Logs" version="7.0">
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="create_date" />
|
||||
<field name="date_creation" />
|
||||
<field name="employee_id" />
|
||||
<field name="liter" on_change="on_change_fuel(liter,price_per_liter)"/>
|
||||
<field name="price_per_liter" on_change="on_change_fuel(liter,price_per_liter)" />
|
||||
@@ -174,13 +174,13 @@
|
||||
<field name="type" />
|
||||
<field name="employee_id" />
|
||||
<field name="description" />
|
||||
<field name="create_date" />
|
||||
<field name="date_creation" />
|
||||
</tree>
|
||||
<form string="Other logs" version="7.0">
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="type" />
|
||||
<field name="create_date" />
|
||||
<field name="date_creation" />
|
||||
<field name="employee_id" />
|
||||
<field name="description" />
|
||||
</group>
|
||||
@@ -245,7 +245,7 @@
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="type" />
|
||||
<field name="create_date" />
|
||||
<field name="date_creation" />
|
||||
<field name="vehicle_id" />
|
||||
<field name="employee_id" />
|
||||
<field name="description" />
|
||||
@@ -263,7 +263,7 @@
|
||||
<tree string="Logs">
|
||||
|
||||
<field name="type" />
|
||||
<field name="create_date" />
|
||||
<field name="date_creation" />
|
||||
<field name="vehicle_id" />
|
||||
<field name="employee_id" />
|
||||
<field name="description" />
|
||||
@@ -288,7 +288,7 @@
|
||||
<form string="Fuel Logs" version="7.0">
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="create_date" />
|
||||
<field name="date_creation" />
|
||||
<field name="vehicle_id" />
|
||||
<field name="employee_id" />
|
||||
<field name="liter" />
|
||||
@@ -307,7 +307,7 @@
|
||||
<field name="model">fleet.vehicle.log.fuel</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Fuel Logs">
|
||||
<field name="create_date" />
|
||||
<field name="date_creation" />
|
||||
<field name="vehicle_id" />
|
||||
<field name="employee_id" />
|
||||
<field name="liter" />
|
||||
@@ -334,7 +334,7 @@
|
||||
<form string="Services Logs" version="7.0">
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="create_date" />
|
||||
<field name="date_creation" />
|
||||
<field name="vehicle_id" />
|
||||
<field name="employee_id" />
|
||||
<field name="vendor_id" />
|
||||
@@ -353,7 +353,7 @@
|
||||
<field name="model">fleet.vehicle.log.services</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Services Logs">
|
||||
<field name="create_date" />
|
||||
<field name="date_creation" />
|
||||
<field name="vehicle_id" />
|
||||
<field name="employee_id" />
|
||||
<field name="amount" />
|
||||
|
||||
Reference in New Issue
Block a user