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

[IMP]Logs views improvement, various logs concatened in one view. Add demo data for fuel logs

Browse Source 
bzr revid: dle@openerp.com-20120924155824-v78fhhjfwm07oa27
This commit is contained in:
Denis Ledoux dle@openerp.com
2012-09-24 17:58:24 +02:00
parent abc6903431
commit a4d644cd33
3 changed files with 80 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/fleet/demo.xml
+9
View File
@@ -63,5 +63,14 @@
<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="create_date" 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>
</record>
</data>
</openerp>
addons/fleet/fleet.py
+2 -3
View File
@@ -82,7 +82,7 @@ class fleet_vehicle(osv.Model):
'vin_sn' : fields.char('Chassis Number', size=32, required=False, help='Unique number written on the vehicle motor (VIN/SN number)'),
'driver' : fields.many2one('hr.employee', 'Driver',required=False, help='Driver of the vehicle'),
'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle'),
'log_ids' : fields.one2many('fleet.vehicle.log', 'vehicle_id', 'Logs'),
'log_ids' : fields.one2many('fleet.vehicle.log', 'vehicle_id', 'Other Logs'),
'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_insurances' : fields.one2many('fleet.vehicle.log.insurance','vehicle_id', 'Insurances'),
@@ -171,10 +171,9 @@ class fleet_vehicle_log_fuel(osv.Model):
_name = 'fleet.vehicle.log.fuel'
_columns = {
'liter' : fields.integer('Liter'),
'liter' : fields.float('Liter'),
'price_per_liter' : fields.float('Price per liter'),
'amount': fields.function(_get_price, type='float', multi='fuel', string='Total Price'),
'type' : fields.char('Type', size=32),
'inv_ref' : fields.char('Invoice Ref.', size=32),
}
_defaults = {'type': 'Refueling',}
addons/fleet/fleet_view.xml
+69 -68
View File
@@ -118,75 +118,76 @@
</form>
</field>
</page>
<page string="Services">
<field name="log_services">
<tree string="Services Logs">
<field name="create_date" />
<field name="employee_id" />
<field name="vendor_id" />
<field name="amount" />
<field name="reference" />
<field name="service_ids"/>
</tree>
<form string="Services Logs" version="7.0">
<sheet>
<group>
<field name="create_date" />
<field name="employee_id" />
<field name="vendor_id" />
<field name="amount" />
<field name="reference" />
<field name="service_ids" widget="many2many_tags"/>
</group>
</sheet>
</form>
</field>
</page>
<page string="Fuel Logs">
<field name="log_fuel">
<tree string="Fuel Logs">
<field name="create_date" />
<field name="employee_id" />
<field name="liter" />
<field name="price_per_liter" />
<field name="amount" />
<field name="description" />
<field name="inv_ref" />
</tree>
<form string="Fuel Logs" version="7.0">
<sheet>
<group>
<field name="create_date" />
<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)" />
<field name="amount" />
<field name="description" />
<field name="inv_ref" />
</group>
</sheet>
</form>
</field>
</page>
<page string="Logs">
<field name="log_ids">
<tree string="Logs">
<field name="create_date" />
<field name="type" />
<field name="employee_id" />
<field name="description" />
</tree>
<form string="Logs" version="7.0">
<sheet>
<group>
<field name="type" />
<field name="create_date" />
<field name="employee_id" />
<field name="description" />
</group>
</sheet>
</form>
</field>
<group>
<field name="log_services">
<tree string="Completed services">
<field name="employee_id" />
<field name="vendor_id" />
<field name="amount" />
<field name="reference" />
<field name="service_ids"/>
<field name="create_date" />
</tree>
<form string="Services Logs" version="7.0">
<sheet>
<group>
<field name="create_date" />
<field name="employee_id" />
<field name="vendor_id" />
<field name="amount" />
<field name="reference" />
<field name="service_ids" widget="many2many_tags"/>
</group>
</sheet>
</form>
</field>
</group>
<group>
<field name="log_fuel">
<tree string="Fuel Logs">
<field name="liter" />
<field name="price_per_liter" />
<field name="amount" />
<field name="employee_id" />
<field name="inv_ref" />
<field name="create_date" />
</tree>
<form string="Fuel Logs" version="7.0">
<sheet>
<group>
<field name="create_date" />
<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)" />
<field name="amount" />
<field name="description" />
<field name="inv_ref" />
</group>
</sheet>
</form>
</field>
</group>
<group>
<field name="log_ids">
<tree string="Other Logs">
<field name="type" />
<field name="employee_id" />
<field name="description" />
<field name="create_date" />
</tree>
<form string="Other logs" version="7.0">
<sheet>
<group>
<field name="type" />
<field name="create_date" />
<field name="employee_id" />
<field name="description" />
</group>
</sheet>
</form>
</field>
</group>
</page>
<page string="Engine">
<group col="2">