[MERGE] sync with parent branch

bzr revid: dizzy.zala@gmail.com-20140404061805-88pi5l8lg63pd5xh
This commit is contained in:
Dharmraj Jhala (OpenERP)
2014-04-04 11:48:05 +05:30
@@ -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')
}