From acc87133f4a78686694dbe4344d8a5b1fe9fb595 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 19 Sep 2012 13:22:55 +0200 Subject: [PATCH] [FIX]XML Syntax Error bzr revid: dle@openerp.com-20120919112255-uyel7xe66ghj294k --- addons/hr_fleet_management/__init__.py | 2 ++ addons/hr_fleet_management/__openerp__.py | 2 +- .../hr_fleet_management.py | 18 ++++++++--- .../view/hr_fleet_management_view.xml | 32 +++++++++++++++---- 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/addons/hr_fleet_management/__init__.py b/addons/hr_fleet_management/__init__.py index 4fe53db08ca..4da53d5adab 100644 --- a/addons/hr_fleet_management/__init__.py +++ b/addons/hr_fleet_management/__init__.py @@ -1 +1,3 @@ +# -*- coding: utf-8 -*- + import hr_fleet_management diff --git a/addons/hr_fleet_management/__openerp__.py b/addons/hr_fleet_management/__openerp__.py index 1a3acb9b742..7823e967699 100644 --- a/addons/hr_fleet_management/__openerp__.py +++ b/addons/hr_fleet_management/__openerp__.py @@ -31,7 +31,7 @@ - managing cars insurance - remind insurance renewing """, - 'data': ['hr_fleet_management_view.xml'], + 'data': ['view/hr_fleet_management_view.xml'], 'demo': [], 'installable': True, 'auto_install': False, diff --git a/addons/hr_fleet_management/hr_fleet_management.py b/addons/hr_fleet_management/hr_fleet_management.py index fb6cda1da39..46efcdfd46e 100644 --- a/addons/hr_fleet_management/hr_fleet_management.py +++ b/addons/hr_fleet_management/hr_fleet_management.py @@ -1,10 +1,20 @@ +# -*- coding: utf-8 -*- from osv import osv, fields -class Car (osv.Model): +class fleet_vehicle_model (osv.Model): - _name = ’hr_fleet_management.car’ + _name = 'fleet.vehicle.model' + _description = '...' _columns = { - ’name’ : fields.char(’Car name’, 128, required = True), - ’description’ : fields.text(’Description’), + 'name' : fields.char('Car name', 128, required = True), + } + +class fleet_vehicle(osv.Model): + _name = 'fleet.vehicle' + _description = 'Fleet Vehicle' + + _columns = { + 'name' : fields.char('Name', size=32, required=True), + 'model_id' : fields.many2one('fleet.vehicle.model','Model', required=True), } diff --git a/addons/hr_fleet_management/view/hr_fleet_management_view.xml b/addons/hr_fleet_management/view/hr_fleet_management_view.xml index 963c339a1bb..9deb8786382 100644 --- a/addons/hr_fleet_management/view/hr_fleet_management_view.xml +++ b/addons/hr_fleet_management/view/hr_fleet_management_view.xml @@ -1,14 +1,34 @@ - - - - Cars - car_fleet_management.car + + + fleet.vehicle.model.form + fleet.vehicle.model + +
+ + +
+
+ + + fleet.vehicle.model.tree + fleet.vehicle.model + + + + + + + + Vehicle Model + fleet.vehicle.model form tree,form - + + +