[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140403075941-19dv64zzkvxdigpq
This commit is contained in:
Thibault Delavallée 2014-04-03 09:59:41 +02:00
commit eccbb272ee
1 changed files with 2 additions and 0 deletions

View File

@ -25,12 +25,14 @@ from openerp.addons.website.models.website import slug
class event_track_tag(osv.osv):
_name = "event.track.tag"
_order = 'name'
_columns = {
'name': fields.char('Event Track Tag')
}
class event_tag(osv.osv):
_name = "event.tag"
_order = 'name'
_columns = {
'name': fields.char('Event Tag')
}