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

event: Merge the board_association into event 

bzr revid: sbh@tinyerp.com-20100608091610-njudv0i5aab4x1l0
This commit is contained in:
sbh (Open ERP) 2010-06-08 14:46:10 +05:30
parent b5f6b59723
commit 3e60910420
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/event/__openerp__.py
View File

@ -49,8 +49,9 @@
'wizard/event_registration_view.xml',
'wizard/event_registrations_partner.xml',
'wizard/event_make_invoice_view.xml',
'board_association_view.xml',
],
'demo_xml': ['event_demo.xml'],
'demo_xml': ['event_demo.xml','board_association_demo.xml'],
'installable': True,
'active': False,
'certificate': '0083059161581',

0
addons/board_association/board_association_demo.xml → addons/event/board_association_demo.xml
View File

26
addons/board_association/board_association_view.xml → addons/event/board_association_view.xml
View File

@ -1,10 +1,23 @@
<?xml version="1.0"?>
<openerp>
<data>
<!-- Need to merge this action in associations -->
<!-- <action
string="My Tasks"
name="%(project.action_view_task)d"
colspan="4"
height="200"
width="510"
domain="[('user_id', '=', uid),('state','in',('open','draft'))]"/>
<action
string="New members"
name="%(membership.action_report_partner_member_year_tree)d"
view_mode="graph,tree" colspan="4"/>-->
<record model="board.note.type" id="note_association_type">
<field name="name">associations</field>
</record>
<record model="ir.ui.view" id="board_associations_manager_form">
<field name="name">board.associations.manager.form</field>
<field name="model">board.board</field>
@ -16,13 +29,6 @@
<action string="Next Events"
name="%(event.action_event_registration)d"
colspan="4"/>
<action
string="My Tasks"
name="%(project.action_view_task)d"
colspan="4"
height="200"
width="510"
domain="[('user_id', '=', uid),('state','in',('open','draft'))]"/>
<action
string="Unpaid Invoices"
name="%(account.action_invoice_tree)d"
@ -31,10 +37,6 @@
</child1>
<child2>
<action
string="New members"
name="%(membership.action_report_partner_member_year_tree)d"
view_mode="graph,tree" colspan="4"/>
<action
string="Registrations by Events"
name="%(event.action_event_type_registration)d"