odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] misc fixes 

bzr revid: fp@tinyerp.com-20131123105650-ucwfuqf7o6qtpszc
This commit is contained in:
Fabien Pinckaers 2013-11-23 11:56:50 +01:00
parent 677bb87a6c
commit 66b721e848
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/event/event.py
View File

@ -178,7 +178,7 @@ class event_event(osv.osv):
_visibility_selection = lambda self, *args, **kwargs: self._get_visibility_selection(*args, **kwargs)
_columns = {
'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
'name': fields.char('Event Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}),
'type': fields.many2one('event.type', 'Type of Event', readonly=False, states={'done': [('readonly', True)]}),
'register_max': fields.integer('Maximum Registrations', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),

2
addons/website_event/models/event.py
View File

@ -44,7 +44,7 @@ class event(osv.osv):
_columns = {
'twitter_hashtag': fields.char('Twitter Hashtag'),
'website_published': fields.boolean('Available in the website'),
'website_published': fields.boolean('Visible in Website'),
# TDE TODO FIXME: when website_mail/mail_thread.py inheritance work -> this field won't be necessary
'website_message_ids': fields.one2many(
'mail.message', 'res_id',

4
addons/website_event_track/data/event_view.xml
View File

@ -97,10 +97,10 @@
<field name="inherit_id" ref="event.view_event_form"/>
<field name="model">event.event</field>
<field name="arch" type="xml">
<xpath expr="div[@class='oe_title']" position="inside">
<xpath expr="//div[@class='oe_title']" position="inside">
<field name="tag_ids"/>
</xpath>
<xpath expr="div[@class='oe_button_box']" position="inside">
<xpath expr="//div[@class='oe_right oe_button_box']" position="inside">
<button name="%(website_event_track.act_event_list_tracks)d" type="action" string="Tracks"/>
<button name="%(website_event_track.act_event_list_tracks)d" type="action" string="Activate Blog"/>
<button name="%(website_event_track.act_event_list_tracks)d" type="action" string="Desactivate Blog"/>