From 3e6091042020565dc60fde42e64885201516dc06 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 8 Jun 2010 14:46:10 +0530
Subject: [PATCH] event: Merge the board_association into event

bzr revid: sbh@tinyerp.com-20100608091610-njudv0i5aab4x1l0
---
 addons/event/__openerp__.py                   |  3 ++-
 .../board_association_demo.xml                |  0
 .../board_association_view.xml                | 26 ++++++++++---------
 3 files changed, 16 insertions(+), 13 deletions(-)
 rename addons/{board_association => event}/board_association_demo.xml (100%)
 rename addons/{board_association => event}/board_association_view.xml (79%)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 3e76b9d19a2..23843c27ab0 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -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',
diff --git a/addons/board_association/board_association_demo.xml b/addons/event/board_association_demo.xml
similarity index 100%
rename from addons/board_association/board_association_demo.xml
rename to addons/event/board_association_demo.xml
diff --git a/addons/board_association/board_association_view.xml b/addons/event/board_association_view.xml
similarity index 79%
rename from addons/board_association/board_association_view.xml
rename to addons/event/board_association_view.xml
index 56b66cf150a..b2ef9879061 100644
--- a/addons/board_association/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -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"