merge

bzr revid: olt@tinyerp.com-20081009113529-n9gqx33oq8f17mhh

merge
aeb0e309 · Olivier Laurent · d94ed9be · 2aa390a6 · aeb0e309
Commit aeb0e309 authored 16 years ago by Olivier Laurent
--- a/addons/crm_configuration/__terp__.py
+++ b/addons/crm_configuration/__terp__.py
@@ -39,7 +39,7 @@
                    "crm_jobs_menu.xml", "crm_opportunity_menu.xml",
                    "crm_helpdesk_menu.xml", "crm_lead_menu.xml",
                    "crm_meeting_menu.xml",
-                    "process/crm_configuration_process.xml"                 
+#                    "process/crm_configuration_process.xml",
                    ],
    "active": False,
    "installable": True