[IMP] event: removed the dependancies to crm, product and marketing module

bzr revid: qdp-launchpad@openerp.com-20120224132014-aw1ajxsjuub6jb7z

8 files changed, 20 insertions, 85 deletions

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 16b6978a404..44db8486e21 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -39,9 +39,10 @@ Note that:
         Association / Configuration / Types of Events
 """,
     'author': 'OpenERP SA',
-    'depends': ['crm','marketing','product','email_template'],
+    'depends': ['email_template'],
     'init_xml': [],
     'update_xml': [
+        'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_confirm_view.xml',
         'event_view.xml',
diff --git a/addons/event/event.py b/addons/event/event.py
index b745cd4d485..a97ebb27678 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -243,7 +243,6 @@ class event_registration(osv.osv):
     }
     _order = 'create_date desc'
 
-
     def do_draft(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
@@ -255,7 +254,7 @@ class event_registration(osv.osv):
         self.message_append(cr, uid, ids, _('Open'))
         return res
 
-    def case_close(self, cr, uid, ids, context=None):
+    def button_reg_close(self, cr, uid, ids, context=None):
         """ Close Registration
         """
         if context is None:
@@ -266,33 +265,12 @@ class event_registration(osv.osv):
         self.message_append(cr, uid, ids, msg)
         return res
 
-    # event uses add_note wizard from crm, which expects case_* methods
-    def case_open(self, cr, uid, ids, context):
-        return self.registration_open(cr, uid, ids, context)
-
-    # event uses add_note wizard from crm, which expects case_* methods
-    def case_cancel(self, cr, uid, ids, context=None):
+    def button_reg_cancel(self, cr, uid, ids, context=None, *args):
         """ Cancel Registration
         """
         self.message_append(cr, uid, ids, _('Cancel'))
         return self.write(cr, uid, ids, {'state': 'cancel'})
 
-    # event uses add_note wizard from crm, which expects case_* methods
-    def case_reset(self, cr, uid, ids, context=None):
-        pass
-
-    # event uses add_note wizard from crm, which expects case_* methods
-    def case_pending(self, cr, uid, ids, context=None):
-        pass
-
-    def button_reg_close(self, cr, uid, ids, context=None):
-        """This Function Close Event Registration.
-        """
-        return self.case_close(cr, uid, ids)
-
-    def button_reg_cancel(self, cr, uid, ids, context=None, *args):
-        return self.case_cancel(cr, uid, ids)
-
     def mail_user(self, cr, uid, ids, confirm=False, context=None):
         """
         Send email to user with email_template when registration is done
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index ac61b50e724..7b6c644f570 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -2,39 +2,10 @@
 <openerp>
     <data>
     <record id="base.user_demo" model="res.users">
-             <field name="groups_id" eval="[(4, ref('marketing.group_marketing_user')),(4, ref('base.group_sale_salesman'))]"/>
+             <field name="groups_id" eval="[(4, ref('event.group_event_user'))]"/>
      </record>
 
 
-<!-- Demo Data for Product -->
-    <record id="event_product_0" model="product.product">
-        <field name="list_price">68.00</field>
-        <field name="standard_price">15.00</field>
-        <field name="uom_id" ref="product.product_uom_unit"/>
-        <field name="uom_po_id" ref="product.product_uom_unit"/>
-        <field name="name">Ticket for Concert</field>
-        <field name="categ_id" model="product.category" search="[]"/>
-    </record>
-
-    <record id="event_product_1" model="product.product">
-        <field name="list_price">24.00</field>
-        <field name="standard_price">15.00</field>
-        <field name="uom_id" ref="product.product_uom_unit"/>
-        <field name="uom_po_id" ref="product.product_uom_unit"/>
-        <field name="name">Ticket for Opera</field>
-        <field name="categ_id" model="product.category" search="[]"/>
-    </record>
-
-    <record id="event_product_2" model="product.product">
-        <field name="list_price">15.50</field>
-        <field name="standard_price">5.00</field>
-        <field name="uom_id" ref="product.product_uom_unit"/>
-        <field name="uom_po_id" ref="product.product_uom_unit"/>
-        <field name="name">Ticket for Conference</field>
-        <field name="categ_id" model="product.category" search="[]"/>
-    </record>
-
-
 <!-- Demo Data for Event Type -->
     <record id="event_type_0" model="event.type">
         <field name="name">Seminar</field>
@@ -61,7 +32,6 @@
         <field name="name">Concert of Bon Jovi</field>
         <field eval="time.strftime('%Y-%m-01 19:05:15')" name="date_begin"/>
         <field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
-        <field name="product_id" ref="event_product_0"/>
         <field name="unit_price">68.00</field>
         <field name="mail_auto_registr">True</field>
         <field name="mail_auto_confirm">True</field>
@@ -74,7 +44,6 @@
         <field name="name">Opera of Verdi</field>
         <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date_begin"/>
         <field eval="time.strftime('%Y-%m-05 21:00:00')" name="date_end"/>
-        <field name="product_id" ref="event_product_1"/>
         <field name="unit_price">24.00</field>
         <field name="type" ref="event_type_1"/>
         <field name="user_id" ref="base.user_root"/>
@@ -85,7 +54,6 @@
         <field name="name">Conference on ERP Buisness</field>
         <field eval="time.strftime('%Y-%m-05 14:00:00')" name="date_begin"/>
         <field eval="time.strftime('%Y-%m-05 16:30:00')" name="date_end"/>
-        <field name="product_id" ref="event_product_2"/>
         <field name="unit_price">15.50</field>
         <field name="type" ref="event_type_2"/>
         <field name="register_max">200</field>
@@ -103,14 +71,12 @@
         <field name="event_id" ref="event_1"/>
         <field name="partner_id_address" ref="base.res_partner_asus"/>
         <field name="nb_register">5</field>
-        <field name="event_product">Ticket for Opera</field>
     </record>
 
     <record id="reg_1_2" model="event.registration">
         <field name="event_id" ref="event_1"/>
         <field name="partner_id_address" ref="base.res_partner_agrolait"/>
         <field name="nb_register">10</field>
-        <field name="event_product">Ticket for Opera</field>
     </record>
 
 
@@ -118,7 +84,6 @@
         <field name="event_id" ref="event_0"/>
         <field name="partner_id_address" ref="base.res_partner_c2c"/>
         <field name="nb_register">6</field>
-        <field name="event_product">Ticket for Concert</field>
     </record>
 
 
@@ -127,7 +92,6 @@
         <field name="event_id" ref="event_2"/>
         <field name="partner_id" ref="base.res_partner_c2c"/>
         <field name="nb_register">5</field>
-        <field name="event_product">Ticket for Conference</field>
     </record>
 
     </data>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 16eeebf0b3b..2f25c7cf7f8 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -71,7 +71,7 @@
                                 <field name="nb_register" />
                                 <field name="state"/>
                                 <button name="button_reg_close" string="participated" states="open" type="object" icon="gtk-apply"/>
-                                <button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                                 <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                             </tree>
                             <form string="Registration">
@@ -91,7 +91,7 @@
                                         <newline/>
                                         <field name="state" select="1" colspan="2"/>
                                         <button name="button_reg_close" string="participated" states="open" type="object" icon="gtk-apply"/>
-                                        <button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                                         <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                     </group>
                             </form>
@@ -270,8 +270,8 @@
                     <field name="origin" groups="base.group_extended"/>
                     <field name="state"/>
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                    <button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                    <button name="case_close" string="Attended" states="open" type="object" icon="gtk-apply"/>
+                    <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                    <button name="_close" string="Attended" states="open" type="object" icon="gtk-apply"/>
                     <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
                 </tree>
             </field>
@@ -312,7 +312,7 @@
                                 <field name="state" select="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                                 <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                 <button name="button_reg_close" string="Attended" states="open" type="object" icon="gtk-apply"/>
-                                <button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                                 <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
@@ -328,10 +328,6 @@
                                         icon="terp-mail-replied" type="action" />
                                 </tree>
                             </field>
-                            <button string="Add Internal Note"
-                                name="%(crm.action_crm_add_note)d"
-                                context="{'model': 'crm.lead' }"
-                                icon="terp-document-new" type="action" />
                             <button string="Send New Email"
                                 name="%(mail.action_email_compose_message_wizard)d"
                                 icon="terp-mail-message-new" type="action"/>
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index bc6ac5f91fb..caaebe409c0 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -142,7 +142,7 @@
             <field name="act_window_id" ref="action_report_event_registration"/>
        </record>
 
-        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="marketing.group_marketing_manager"/>
+        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="event.group_event_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/event/res_partner.py b/addons/event/res_partner.py
index 3952f2f82b6..1d5582f7929 100644
--- a/addons/event/res_partner.py
+++ b/addons/event/res_partner.py
@@ -32,4 +32,4 @@ class res_partner(osv.osv):
 
 res_partner()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index 5eb65fc7e7f..cf95d00876e 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -1,12 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

-access_event_type,event.type,model_event_type,marketing.group_marketing_user,1,0,0,0

-access_event_type_manager,event.type manager,model_event_type,marketing.group_marketing_manager,1,1,1,1

-access_event_event,event.event,model_event_event,marketing.group_marketing_user,1,1,1,0

-access_event_registration,event.registration,model_event_registration,marketing.group_marketing_user,1,1,1,0

-access_report_event_registration,report.event.registration,model_report_event_registration,marketing.group_marketing_user,1,1,1,1

-access_event_event_manager,event.event manager,model_event_event,marketing.group_marketing_manager,1,0,0,0

-access_event_registration_manager,event.registration manager,model_event_registration,marketing.group_marketing_manager,1,0,0,0

-access_crm_case_section_manager,crm.case.section manager,crm.model_crm_case_section,marketing.group_marketing_manager,1,1,1,1

-access_product_product,product.product.product manager,product.model_product_product,marketing.group_marketing_manager,1,1,1,1

-access_event_event_sale_salesman,event.event.sale,model_event_event,base.group_sale_salesman,1,0,0,0

-access_event_registration_sale_user,event.registration.sale.user,model_event_registration,base.group_sale_salesman,1,0,0,0

+access_event_type,event.type,model_event_type,event.group_event_user,1,0,0,0

+access_event_type_manager,event.type manager,model_event_type,event.group_event_manager,1,1,1,1

+access_event_event,event.event,model_event_event,event.group_event_user,1,1,1,0

+access_event_registration,event.registration,model_event_registration,event.group_event_user,1,1,1,0

+access_report_event_registration,report.event.registration,model_report_event_registration,event.group_event_user,1,1,1,1

+access_event_event_manager,event.event manager,model_event_event,event.group_event_manager,1,0,0,0

+access_event_registration_manager,event.registration manager,model_event_registration,event.group_event_manager,1,0,0,0

diff --git a/addons/event/test/process/event_draft2done.yml b/addons/event/test/process/event_draft2done.yml
index 5e269ffc112..ada755ba419 100644
--- a/addons/event/test/process/event_draft2done.yml
+++ b/addons/event/test/process/event_draft2done.yml
@@ -25,7 +25,7 @@
    I confirm the registration1
 -
    !python {model: event.registration}: |
-     self.case_open(cr, uid, [ref("event_registration1")],context=context)
+     self.registration_open(cr, uid, [ref("event_registration1")],context=context)
 -
    I check that registration is "confirmed"
 -