diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py index 43f61ed2392..38d3f2e787e 100644 --- a/addons/association/__openerp__.py +++ b/addons/association/__openerp__.py @@ -26,7 +26,7 @@ 'category': 'Profile', 'description': """This module is to create Profile for Associates""", 'author': 'Tiny', - 'depends': ['membership', 'board_association'], + 'depends': ['membership', 'event'], 'update_xml': ['security/ir.model.access.csv', 'profile_association.xml'], 'demo_xml': [], 'installable': True, diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py index 586ed3f8639..ab437baf2c8 100644 --- a/addons/association/profile_association.py +++ b/addons/association/profile_association.py @@ -22,7 +22,6 @@ from osv import fields, osv import pooler - class profile_association_config_install_modules_wizard(osv.osv_memory): _name='profile.association.config.install_modules_wizard' _inherit = 'res.config.installer' @@ -30,9 +29,7 @@ class profile_association_config_install_modules_wizard(osv.osv_memory): _columns = { 'hr_expense':fields.boolean('Expenses Tracking', help="Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."), 'project':fields.boolean('Project Management'), - 'board_document':fields.boolean('Document Management', help= "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."), - 'segmentation':fields.boolean('Segmentation'), - 'crm_configuration' : fields.boolean('Partner Relation & Calendars'), + 'event_project':fields.boolean('Organization and management of events', help="This module allows you to create retro planning for managing your events."), 'project_gtd':fields.boolean('Getting Things Done', help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."), 'wiki': fields.boolean('Wiki', diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index 0d0a65b3644..c1ee9e163fe 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -24,10 +24,10 @@ + + - -