pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] misc fixes

Browse Source 
bzr revid: fp@tinyerp.com-20131123104607-ndbx420pq35fsvud
This commit is contained in:
Fabien Pinckaers
2013-11-23 11:46:07 +01:00
parent 57585307fa
commit 95c0865283
9 changed files with 34 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/event/__openerp__.py
+1 -1
View File
@@ -39,7 +39,7 @@ Key Features
* Use emails to automatically confirm and send acknowledgements for any event registration
""",
'author': 'OpenERP SA',
'depends': ['base_setup', 'board', 'email_template'],
'depends': ['base_setup', 'board', 'email_template', 'marketing'],
'data': [
'security/event_security.xml',
'security/ir.model.access.csv',
addons/event/event_view.xml
+3 -9
View File
@@ -9,13 +9,7 @@
<field name="view_mode">tree,form,calendar,graph</field>
<field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id}</field>
</record>
<!-- Top menu item -->
<menuitem name="Events"
id="event_main_menu"
groups="base.group_user"
sequence="115"/>
<menuitem name="Events Organization" id="base.menu_event_main" parent="event_main_menu"/>
<menuitem name="Events" parent="base.marketing_menu" id="event_main_menu"/>
<!-- EVENTS -->
@@ -318,7 +312,7 @@
context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
view_type="form"/>
<menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
<menuitem name="Events" id="menu_event_event" action="action_event_view" parent="event.event_main_menu" />
<!-- EVENTS/REGISTRATIONS/EVENTS -->
@@ -455,7 +449,7 @@
</record>
<menuitem name="Registrations"
id="menu_action_registration" parent="base.menu_event_main"
id="menu_action_registration" parent="event.event_main_menu"
action="action_registration" groups="event.group_event_manager,event.group_event_user"/>
<menuitem name="Reporting" id="base.menu_report_association" parent="event_main_menu" sequence="20"/>
addons/website_event/data/event_data.xml
+1 -1
View File
@@ -25,7 +25,7 @@
<field name="inherit_id" ref="event.view_event_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='speaker_confirmed']" position="after">
<xpath expr="//field[@name='visibility']" position="after">
<field name="twitter_hashtag"/>
</xpath>
</data>
addons/website_event_track/__openerp__.py
+1 -2
View File
@@ -15,9 +15,8 @@ Online Events
'data': [
'data/event_view.xml',
'data/event_data.xml',
'views/website_event.xml',
'security/ir.model.access.csv',
'security/website_event.xml',
'security/event.xml',
],
'qweb': ['static/src/xml/*.xml'],
'demo': [
addons/website_event_track/controllers/__init__.py
+2
View File
@@ -0,0 +1,2 @@
addons/website_event_track/data/event_view.xml
+21 -60
View File
@@ -14,7 +14,7 @@
<!-- EVENTS/CONFIGURATION/EVENT locations -->
<record model="ir.ui.view" id="view_event_location_form">
<field name="name">Event Locations</field>
<field name="model">event.location</field>
<field name="model">event.track.location</field>
<field name="arch" type="xml">
<form string="Event Location" version="7.0">
<field name="name"/>
@@ -23,43 +23,47 @@
</record>
<record model="ir.ui.view" id="view_event_location_tree">
<field name="name">Event Location</field>
<field name="model">event.location</field>
<field name="model">event.track.location</field>
<field name="arch" type="xml">
<tree string="Event Location">
<field name="name"/>
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="action_event_location">
<record model="ir.actions.act_window" id="action_event_track_location">
<field name="name">Event Locations</field>
<field name="res_model">event.location</field>
<field name="res_model">event.track.location</field>
</record>
<menuitem name="Event Locations" id="menu_event_location" action="action_event_location" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
<menuitem name="Event Locations" id="menu_event_track_location"
action="action_event_track_location" parent="base.menu_marketing_config_root"
groups="base.group_no_one"/>
<!-- EVENTS/CONFIGURATION/EVENT Stages -->
<record model="ir.ui.view" id="view_event_stage_form">
<record model="ir.ui.view" id="view_event_track_stage_form">
<field name="name">Event Stages</field>
<field name="model">event.stage</field>
<field name="model">event.track.stage</field>
<field name="arch" type="xml">
<form string="Event Stage" version="7.0">
<field name="name"/>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_event_stage_tree">
<record model="ir.ui.view" id="view_event_track_stage_tree">
<field name="name">Event Stage</field>
<field name="model">event.stage</field>
<field name="model">event.track.stage</field>
<field name="arch" type="xml">
<tree string="Event Stage">
<field name="name"/>
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="action_event_stage">
<record model="ir.actions.act_window" id="action_event_track_stage">
<field name="name">Event Stages</field>
<field name="res_model">event.stage</field>
<field name="res_model">event.track.stage</field>
</record>
<menuitem name="Event Stages" id="menu_event_stage" action="action_event_stage" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
<menuitem name="Event Stages" id="menu_event_track_stage"
action="action_event_track_stage" parent="base.menu_marketing_config_root"
groups="base.group_no_one"/>
<!-- EVENTS/CONFIGURATION/EVENT Tags -->
<record model="ir.ui.view" id="view_event_tag_form">
@@ -90,16 +94,16 @@
<record model="ir.ui.view" id="view_event_track_form">
<field name="name">Event Tracks</field>
<field name="inherit_id" ref="event.view_event_from"/>
<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">
<field name="tag_ids"/>
</xpath>
<xpath expr="div[@class='oe_button_box']" position="inside">
<button name="%(event.act_event_list_tracks)d" type="action" string="Tracks"/>
<button name="%(event.act_event_list_tracks)d" type="action" string="Activate Blog"/>
<button name="%(event.act_event_list_tracks)d" type="action" string="Desactivate Blog"/>
<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"/>
</xpath>
</field>
</record>
@@ -147,7 +151,7 @@
<field name="model">event.track</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<calendar color="type" date_start="date" date_duration="duration" string="Event Tracks">
<calendar color="type" date_start="date" date_delay="duration" string="Event Tracks">
<field name="name"/>
<field name="event_id"/>
</calendar>
@@ -227,48 +231,5 @@
</field>
</record>
<!-- Search view of event registration -->
<record model="ir.ui.view" id="view_registration_search">
<field name="name">Registrations</field>
<field name="model">event.registration</field>
<field name="arch" type="xml">
<search string="Event Registration">
<field name="name" string="Participant" filter_domain="['|','|',('name','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
<filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
<separator/>
<filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
<separator/>
<filter icon="terp-personal" string="My Registrations" help="My Registrations" domain="[('user_id','=',uid)]"/>
<field name="event_id"/>
<field name="user_id"/>
<field name="partner_id"/>
<group expand="0" string="Group By...">
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_registration">
<field name="name">Registrations</field>
<field name="res_model">event.registration</field>
<field name="view_type">form</field>
<field name="domain"></field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="context">{}</field>
<field name="search_view_id" ref="view_registration_search"/>
</record>
<menuitem name="Registrations"
id="menu_action_registration" parent="base.menu_event_main"
action="action_registration" groups="event.group_event_manager,event.group_event_user"/>
<menuitem name="Reporting" id="base.menu_report_association" parent="event_main_menu" sequence="20"/>
</data>
</openerp>
addons/website_event_track/models/__init__.py
+1
View File
@@ -0,0 +1 @@
import event
addons/website_event_track/models/event.py
+4 -4
View File
@@ -52,8 +52,8 @@ class event_track(osv.osv):
_columns = {
'name': fields.char('Track Title', required=True),
'user_id': fields.many2one('res.users', 'Responsible'),
'speaker_ids': fields.many2many('res.partner'),
'tag_ids': fields.many2many('event.track.tag'),
'speaker_ids': fields.many2many('res.partner', 'Speakers'),
'tag_ids': fields.many2many('event.tag', 'Tags'),
'stage_id': fields.many2one('event.track.stage'),
'description': fields.html('Track Description'),
'date': fields.datetime('Track Date'),
@@ -76,8 +76,8 @@ class event_track(osv.osv):
class event_event(osv.osv):
_inherit = "event.event"
_columns = {
'tag_ids': fields.many2many('Tags'),
'tag_ids': fields.many2many('event.tag', 'Tags'),
'track_ids': fields.one2many('event.track', 'event_id', 'Tracks'),
'blog_id': fields.many2one('blog.blog', 'Event Blog'),
'blog_id': fields.many2one('blog.category', 'Event Blog'),
}
addons/website_event_track/security/event_security.xml
-17
View File
@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="event_track_public" model="ir.rule">
<field name="name">event tracks: Public</field>
<field name="model_id" ref="event.model_event_track"/>
<field name="domain_force">[('website_published', '=', True)]</field>
<field name="groups" eval="[(4, ref('base.group_public')), (4, ref('base.group_portal'))]"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
</record>
</data>
</openerp>