diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py
index ba9f560644e..135a5b50f7e 100644
--- a/addons/crm_configuration/__terp__.py
+++ b/addons/crm_configuration/__terp__.py
@@ -5,11 +5,17 @@
"author" : "Tiny",
"website" : "http://tinyerp.com/module_crm.html",
"category" : "Generic Modules/CRM & SRM",
- "description": """ The Tiny ERP case and request tracker enables a group of
- people to intelligently and efficiently manage tasks, issues,
- and requests. It manages key tasks such as communication,
- identification, prioritization, assignment, resolution and notification.""",
- "depends" : ["crm","report_crm", "process", "account", "board_document"],
+ "description": """
+The Tiny ERP case and request tracker enables a group of
+people to intelligently and efficiently manage tasks, issues,
+and requests. It manages key tasks such as communication,
+identification, prioritization, assignment, resolution and notification.
+
+This module provide screens like: jobs hiring process, leads, business
+opportunities, fund raising trackings, support & helpdesk, calendar of
+meetings, eso.
+""",
+ "depends" : ["crm","report_crm", "process"],
"init_xml" : [
"crm_config_view.xml",
"crm_bugs_view.xml",
@@ -21,24 +27,24 @@
"crm_report_view.xml"
],
"demo_xml" : [
- "crm_bugs_demo.xml",
- "crm_fund_demo.xml",
- "crm_jobs_demo.xml",
- "crm_meeting_demo.xml",
- "crm_lead_demo.xml",
- "crm_opportunity_demo.xml",
- ],
+# "crm_bugs_demo.xml",
+# "crm_fund_demo.xml",
+# "crm_jobs_demo.xml",
+# "crm_meeting_demo.xml",
+# "crm_lead_demo.xml",
+# "crm_opportunity_demo.xml",
+ ],
"update_xml" : [
- "crm_bugs_data.xml",
- "crm_fund_data.xml",
- "crm_jobs_data.xml",
- "crm_meeting_data.xml",
- "crm_lead_data.xml",
- "crm_opportunity_data.xml",
- "crm_bugs_menu.xml", "crm_fund_menu.xml",
- "crm_jobs_menu.xml", "crm_opportunity_menu.xml",
- "crm_helpdesk_menu.xml", "crm_lead_menu.xml",
- "crm_meeting_menu.xml",
+# "crm_bugs_data.xml",
+# "crm_fund_data.xml",
+# "crm_jobs_data.xml",
+# "crm_meeting_data.xml",
+# "crm_lead_data.xml",
+# "crm_opportunity_data.xml",
+# "crm_bugs_menu.xml", "crm_fund_menu.xml",
+# "crm_jobs_menu.xml", "crm_opportunity_menu.xml",
+# "crm_helpdesk_menu.xml", "crm_lead_menu.xml",
+# "crm_meeting_menu.xml",
"security/ir.model.access.csv",
"process/crm_configuration_process.xml",
],
diff --git a/addons/crm_configuration/crm_bugs_data.xml b/addons/crm_configuration/crm_bugs_data.xml
index bc03ac1f4b1..ba5f5edbf81 100644
--- a/addons/crm_configuration/crm_bugs_data.xml
+++ b/addons/crm_configuration/crm_bugs_data.xml
@@ -1,78 +1,78 @@
-
-
- Bug Tracking
- BugSup
-
+
+
+ Bug Tracking
+ BugSup
+
-
-
+
+
-
- Bugs
-
-
-
- Patches
-
-
-
- Feature Requests
-
-
+
+ Bugs
+
+
+
+ Patches
+
+
+
+ Feature Requests
+
+
-
-
-
- Version 4.2
-
-
-
- Version 4.4
-
-
+
+
+
+ Version 4.2
+
+
+
+ Version 4.4
+
+
-
-
+
+
-
- Accepted as Bug
-
-
-
- Fixed
-
-
-
- Won't fix
-
-
-
- Invalid
-
-
-
- Awaiting Response
-
-
-
- Works For Me
-
-
-
- Future
-
-
+
+ Accepted as Bug
+
+
+
+ Fixed
+
+
+
+ Won't fix
+
+
+
+ Invalid
+
+
+
+ Awaiting Response
+
+
+
+ Works For Me
+
+
+
+ Future
+
+
diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py
index e04b5d8825f..71d99a581a3 100644
--- a/addons/crm_configuration/crm_config.py
+++ b/addons/crm_configuration/crm_config.py
@@ -97,17 +97,23 @@ class crm_menu_config_wizard(osv.osv_memory):
'opportunity': lambda *args: True,
}
def action_create(self, cr, uid, ids, *args):
- for res in self.read(cr,uid,ids):
- res.__delitem__('id')
- # 'update'
- for section in res :
- if res[section]:
- file_name = 'crm_'+section+'_menu.xml'
- try:
- tools.convert_xml_import(cr, 'crm_configuration', tools.file_open(os.path.join('crm_configuration',file_name )), {}, 'init', *args)
- except Exception, e:
- raise osv.except_osv('Error !', e)
-
+ modid = self.pool.get('ir.module.module').search(cr, uid, [('name','=','crm_configuration')])
+ moddemo = self.pool.get('ir.module.module').browse(cr, uid, modid[0]).demo
+ lst= ('data','menu')
+ if moddemo:
+ lst = ('data','menu','demo')
+ res = self.read(cr,uid,ids)[0]
+ for section in ['meeting','lead','opportunity','jobs','bugs','fund','helpdesk'] :
+ if (not res[section]):
+ continue
+ for fname in lst:
+ file_name = 'crm_'+section+'_'+fname+'.xml'
+ try:
+ fp = tools.file_open(os.path.join('crm_configuration',file_name ))
+ except IOError, e:
+ fp = None
+ if fp:
+ tools.convert_xml_import(cr, 'crm_configuration', fp, {}, 'init', *args)
return {
'view_type': 'form',
"view_mode": 'form',
diff --git a/addons/crm_configuration/crm_config_view.xml b/addons/crm_configuration/crm_config_view.xml
index 64b63f16973..2bb17dbe7b2 100644
--- a/addons/crm_configuration/crm_config_view.xml
+++ b/addons/crm_configuration/crm_config_view.xml
@@ -10,7 +10,7 @@
form