summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Ledoux dle@openerp.com <>2012-09-24 15:08:43 +0200
committerDenis Ledoux dle@openerp.com <>2012-09-24 15:08:43 +0200
commit0efec5d0047773bbdf3be92cf5ef63a4f2ae50c3 (patch)
tree2ffea8bec7af4b5b6d691a12d5e69739c3c3f7a2
parenta9d4bf30bb55acf889538ab715dba1c682d2d38a (diff)
[REM]Complete services fields
bzr revid: dle@openerp.com-20120924130843-tpnhes50q7rryg5l
-rw-r--r--addons/fleet/fleet.py6
-rw-r--r--addons/fleet/fleet_view.xml4
2 files changed, 1 insertions, 9 deletions
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index da3ecec63a7..425c1d4db00 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -185,11 +185,6 @@ class service_type(osv.Model):
}
class fleet_vehicle_log_services(osv.Model):
- def _compute_complete_service(self, cr, uid, ids, field, arg, context=None):
- return dict(
- (record.id, " ".join(service.name for service in record.service_ids))
- for record in self.browse(cr, uid, ids, context=context)
- )
_inherit = 'fleet.vehicle.log'
_name = 'fleet.vehicle.log.services'
_columns = {
@@ -198,7 +193,6 @@ class fleet_vehicle_log_services(osv.Model):
'amount' :fields.float('Amount', 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'),
- 'complete_service': fields.function(_compute_complete_service, type="char", string='Services completed'),
}
class hr_employee(osv.Model):
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index f758ce680b6..c82e326587d 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -97,8 +97,7 @@
<field name="vendor_id" />
<field name="amount" />
<field name="reference" />
- <field name="service_ids" />
- <field name="complete_service" />
+ <field name="service_ids" widget="many2many_tags"/>
</tree>
<form string="Fuel Logs" version="7.0">
<sheet>
@@ -109,7 +108,6 @@
<field name="amount" />
<field name="reference" />
<field name="service_ids" />
- <field name="complete_service" />
</group>
</sheet>
</form>