diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 36c9b128b3a..04d6ae85725 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -20,7 +20,7 @@
-
+
crm.case.section.form
@@ -61,8 +61,10 @@
form
-
+
+
+
Cases by section
crm.case.section
@@ -70,7 +72,6 @@
tree
-
@@ -211,6 +212,7 @@
+
diff --git a/addons/crm/report/report_businessopp.py b/addons/crm/report/report_businessopp.py
index 31d9f9290ac..026b50252cc 100644
--- a/addons/crm/report/report_businessopp.py
+++ b/addons/crm/report/report_businessopp.py
@@ -68,7 +68,7 @@ class report_custom(report_int):
res = cr.dictfetchall()
for row in res:
- proba = row['probability'] or 0
+ proba = row['probability'] or 0 / 100.0
cost = row['planned_cost'] or 0
revenue = row['planned_revenue'] or 0
userid = row['user_id'] or 0
diff --git a/addons/crm_configuration/__init__.py b/addons/crm_configuration/__init__.py
index e5fff24af67..ad922cf5550 100644
--- a/addons/crm_configuration/__init__.py
+++ b/addons/crm_configuration/__init__.py
@@ -1,5 +1,5 @@
# -*- encoding: utf-8 -*-
import crm_config
import report
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+import wizard
diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py
index 135a5b50f7e..929c327f2eb 100644
--- a/addons/crm_configuration/__terp__.py
+++ b/addons/crm_configuration/__terp__.py
@@ -17,37 +17,41 @@ meetings, eso.
""",
"depends" : ["crm","report_crm", "process"],
"init_xml" : [
- "crm_config_view.xml",
- "crm_bugs_view.xml",
- "crm_jobs_view.xml",
- "crm_lead_view.xml",
- "crm_meeting_view.xml",
- "crm_opportunity_view.xml",
- "crm_fund_view.xml",
- "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_configuration_wizard.xml",
+ "crm_config_view.xml",
+ "crm_bugs_view.xml",
+ "crm_jobs_view.xml",
+ "crm_lead_view.xml",
+ "crm_meeting_view.xml",
+ "crm_opportunity_view.xml",
+ "crm_fund_view.xml",
+ "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",
+ ],
+ "update_xml" : [
+# "crm_bugs_data.xml",
+# "crm_fund_data.xml",
+# "crm_jobs_data.xml",
+# "crm_meeting_data.xml",
+# "crm_lead_data.xml",
+# "crm_bugs_menu.xml",
+# "crm_fund_menu.xml",
+# "crm_jobs_menu.xml",
+# "crm_helpdesk_menu.xml",
+# "crm_lead_menu.xml",
+# "crm_meeting_menu.xml",
+# "crm_opportunity_data.xml",
+# "crm_opportunity_menu.xml",
+ "security/ir.model.access.csv",
+ "process/crm_configuration_process.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",
- "security/ir.model.access.csv",
- "process/crm_configuration_process.xml",
- ],
"active": False,
"installable": True
}
diff --git a/addons/crm_configuration/crm_bugs_menu.xml b/addons/crm_configuration/crm_bugs_menu.xml
index e2caeb9818e..6b4835e5600 100644
--- a/addons/crm_configuration/crm_bugs_menu.xml
+++ b/addons/crm_configuration/crm_bugs_menu.xml
@@ -1,650 +1,652 @@
-
- Bug Tracking
- BugSup
-
-
- Bugs
-
-
-
- Patches
-
-
-
- Feature Requests
-
-
-
- Fixed
-
-
-
- Awaiting Response
-
-
-
- Future
-
-
-
-
- ######################## BUG TRACKING (menu) ###########################
-
-
- All Bugs
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
+
-
- Bugs Waiting Approval
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ Bug Tracking
+ BugSup
+
+
+ Bugs
+
+
+
+ Patches
+
+
+
+ Feature Requests
+
+
+
+ Fixed
+
+
+
+ Awaiting Response
+
+
+
+ Future
+
+
+
+
+ ######################## BUG TRACKING (menu) ###########################
+
+
+ All Bugs
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
-
- Open Bugs
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ Bugs Waiting Approval
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- Bugs With Patches Waiting Approval
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ Open Bugs
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- Bugs Not Fixed
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ Bugs With Patches Waiting Approval
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- Pending Bugs
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ Bugs Not Fixed
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- Planned For Future Release
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ Pending Bugs
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+
+ Planned For Future Release
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- Waiting For Reporter Response
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ Waiting For Reporter Response
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- Old Bugs
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
- My Bugs
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
-
- New Bug
- crm.case
- form
- form,tree
-
-
-
-
-
- form
-
-
-
-
-
- tree
-
-
-
-
-
-
- My Open Bugs
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ Old Bugs
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+ My Bugs
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+
+ New Bug
+ crm.case
+ form
+ form,tree
+
+
+
+
+
+ form
+
+
+
+
+
+ tree
+
+
+
+
+
+
+ My Open Bugs
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- My Bugs With Patches
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ My Bugs With Patches
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- My Bugs Not Fixed
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ My Bugs Not Fixed
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
-
- All Feature Request
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
-
- New Feature Request
- crm.case
- form
- form,tree
-
-
-
-
-
- form
-
-
-
-
-
- tree
-
-
-
-
+
+
+ All Feature Request
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+
+ New Feature Request
+ crm.case
+ form
+ form,tree
+
+
+
+
+
+ form
+
+
+
+
+
+ tree
+
+
+
+
-
- Feature Requests Waiting Approval
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
- Open Feature Requests
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ Feature Requests Waiting Approval
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+ Open Feature Requests
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- Pending Feature Requests
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ Pending Feature Requests
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- Planned For Future Release
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ Planned For Future Release
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- Waiting For Reporter Response
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ Waiting For Reporter Response
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- Old Feature Requests
- crm.case
- form
- tree,calendar
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
+
+ Old Feature Requests
+ crm.case
+ form
+ tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index 4651825e0c9..fe7d9e8c4c9 100644
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -1,145 +1,142 @@
-
-
+
+
- # ------------------------------------------------------
- # Bug Tracking
- # ------------------------------------------------------
+ # ------------------------------------------------------
+ # Bug Tracking
+ # ------------------------------------------------------
-
- CRM - Bug Tracker Form
- crm.case
- form
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CRM - Bug Tracker Tree
+ crm.case
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CRM - Bug Tracker Calendar
+ crm.case
+ calendar
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py
index 71d99a581a3..7551d208b8b 100644
--- a/addons/crm_configuration/crm_config.py
+++ b/addons/crm_configuration/crm_config.py
@@ -75,7 +75,6 @@ class crm_cases(osv.osv):
'partner_phone': fields.char('Phone', size=16),
'partner_mobile': fields.char('Mobile', size=16),
}
-
crm_cases()
class crm_menu_config_wizard(osv.osv_memory):
@@ -103,6 +102,7 @@ class crm_menu_config_wizard(osv.osv_memory):
if moddemo:
lst = ('data','menu','demo')
res = self.read(cr,uid,ids)[0]
+ idref = {}
for section in ['meeting','lead','opportunity','jobs','bugs','fund','helpdesk'] :
if (not res[section]):
continue
@@ -113,7 +113,9 @@ class crm_menu_config_wizard(osv.osv_memory):
except IOError, e:
fp = None
if fp:
- tools.convert_xml_import(cr, 'crm_configuration', fp, {}, 'init', *args)
+ tools.convert_xml_import(cr, 'crm_configuration', fp, idref, 'init', noupdate=True)
+ for name in idref.keys():
+ cr.execute('delete from ir_model_data where name=%s and module=%s', (name, 'crm_configuration'))
return {
'view_type': 'form',
"view_mode": 'form',
diff --git a/addons/crm_configuration/crm_fund_demo.xml b/addons/crm_configuration/crm_fund_demo.xml
index e7b6cd2bde5..be402b573c9 100644
--- a/addons/crm_configuration/crm_fund_demo.xml
+++ b/addons/crm_configuration/crm_fund_demo.xml
@@ -1,146 +1,146 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
index 8385c45b088..070a39f55bd 100644
--- a/addons/crm_configuration/crm_fund_view.xml
+++ b/addons/crm_configuration/crm_fund_view.xml
@@ -1,149 +1,149 @@
-
+
- # ------------------------------------------------------
- # Fund Raising
- # ------------------------------------------------------
-
- CRM - Funds Tree
- crm.case
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CRM - Funds Form
- crm.case
- form
-
-
+
+
+
+ CRM - Funds Calendar
+ crm.case
+ calendar
+
+
+
+
+
+
+
+
+
+ CRM - Funds Graph
+ crm.case
+ graph
+
+
+
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
index 6a3c21d347e..9413bc08496 100644
--- a/addons/crm_configuration/crm_helpdesk_menu.xml
+++ b/addons/crm_configuration/crm_helpdesk_menu.xml
@@ -1,372 +1,373 @@
-
+
+
Helpdesk and Support
support
######################## Help Desk (menu) ###########################
-
- All Helpdesk Requests
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
-
- My Helpdesk
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
-
-
- New Helpdesk
- crm.case
- form,tree
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
+
+ All Helpdesk Requests
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- My Unclosed Requests
- crm.case
- tree,calendar,form
-
-
-
-
-
-
- tree
-
-
-
-
-
-
- calendar
-
-
-
-
-
-
- form
-
-
-
-
-
+
+ My Helpdesk
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+
+
+ New Helpdesk
+ crm.case
+ form,tree
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
-
- My helpdesk Propositions to Review
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ My Unclosed Requests
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+
+ tree
+
+
+
+
+
+
+ calendar
+
+
+
+
+
+
+ form
+
+
+
+
+
-
- My Pending helpdesk Requests
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ My helpdesk Propositions to Review
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- My Open Helpdesk Requests
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
-
-
- Calendar of Helpdesk
- crm.case
- calendar,tree,form
-
-
-
-
-
- calendar
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
-
+
+ My Pending helpdesk Requests
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
-
+
+ My Open Helpdesk Requests
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+
+
+ Calendar of Helpdesk
+ crm.case
+ calendar,tree,form
+
+
+
+
+
+ calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+
-
- All Unclosed Requests
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+
-
- All Helpdesk Propositions
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ All Unclosed Requests
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- All Pending Helpdesk Requests
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ All Helpdesk Propositions
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+
+ All Pending Helpdesk Requests
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- All Open Helpdesk Requests
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ All Open Helpdesk Requests
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- Calendar of Helpdesk
- crm.case
- calendar,tree,form
-
-
-
-
-
- calendar
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
-
+
+ Calendar of Helpdesk
+ crm.case
+ calendar,tree,form
+
+
+
+
+
+ calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml
index be91b1357a4..f5b2075d8de 100644
--- a/addons/crm_configuration/crm_jobs_menu.xml
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -1,439 +1,454 @@
-
- Jobs
- jobs
-
+
- ######################## JOB OPPORTUNITIES (menu) ###########################
-
- All Jobs Requests
- crm.case
- tree,calendar,form,graph
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
+
+ Jobs
+ jobs
+
-
-
- My Jobs Requests
- crm.case
- tree,calendar,form,graph
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
+ ######################## JOB OPPORTUNITIES (menu) ###########################
+
+ All Jobs Requests
+ crm.case
+ tree,calendar,form,graph
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
-
- New Jobs Requests
- crm.case
- form,tree
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
+
+
+ My Jobs Requests
+ crm.case
+ tree,calendar,form,graph
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
-
- My Unclosed Requests
- crm.case
- tree,calendar,form,graph
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
+
+ New Job Request
+ crm.case
+ form,tree
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
-
- My Jobs Propositions to Review
- crm.case
- tree,calendar,form,graph
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
+
+ My Current Jobs Requests
+ crm.case
+ tree,calendar,form,graph
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
-
- My Pending Jobs Requests
- crm.case
- tree,calendar,form,graph
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
+
+ My Jobs Propositions to Review
+ crm.case
+ tree,calendar,form,graph
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
-
- My Open Jobs Requests
- crm.case
- tree,calendar,form,graph
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
-
-
-
- Calendar Of Jobs Meetings
- crm.case
- calendar,tree,form,graph
-
-
-
-
-
- calendar
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
-
-
-
-
+
+ My Pending Jobs Requests
+ crm.case
+ tree,calendar,form,graph
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
-
- All Unclosed Requests
- crm.case
- tree,calendar,form,graph
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
+
+ My Open Jobs Requests
+ crm.case
+ tree,calendar,form,graph
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
-
- All Jobs Propositions
- crm.case
- tree,calendar,form,graph
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
+
+ Calendar Of My Interviews
+ crm.case
+ calendar,tree,form,graph
+
+
+
+
+
+ calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
+
+
+
+
-
- All Pending Jobs Requests
- crm.case
- tree,calendar,form,graph
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
+
+ Current Requests
+ crm.case
+ tree,calendar,form,graph
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
+
+ All Jobs Propositions to Review
+ crm.case
+ tree,calendar,form,graph
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
-
- All Open Jobs Requests
- crm.case
- tree,calendar,form,graph
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
+
+ All Pending Jobs Requests
+ crm.case
+ tree,calendar,form,graph
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
-
- Calendar Of Jobs Meetings
- crm.case
- calendar,tree,form,graph
-
-
-
-
-
- calendar
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
- graph
-
-
-
-
-
+
+ All Open Jobs Requests
+ crm.case
+ tree,calendar,form,graph
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
+
+
+ Calendar Of Interviews
+ crm.case
+ calendar,tree,form,graph
+
+
+
+
+
+ calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
+ graph
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index 78c0757a375..9593bf4f1b2 100644
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -1,150 +1,149 @@
-
- # ------------------------------------------------------
- # Jobs
- # ------------------------------------------------------
+
+ # ------------------------------------------------------
+ # Jobs
+ # ------------------------------------------------------
-
- CRM - Jobs Requests Tree
- crm.case
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ CRM - Jobs Requests Tree
+ crm.case
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- CRM - Jobs Requests Form
- crm.case
- form
-
-
+
+
-
- CRM - Jobs Requests Calendar
- crm.case
- calendar
-
-
-
-
-
-
-
-
-
-
+
+ CRM - Jobs Requests Calendar
+ crm.case
+ calendar
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_lead_data.xml b/addons/crm_configuration/crm_lead_data.xml
index a761961968c..b7ea4c05c98 100644
--- a/addons/crm_configuration/crm_lead_data.xml
+++ b/addons/crm_configuration/crm_lead_data.xml
@@ -24,10 +24,6 @@
Partner
-
- Campaign
-
-
Website
diff --git a/addons/crm_configuration/crm_lead_demo.xml b/addons/crm_configuration/crm_lead_demo.xml
index 7ba46a406a8..2711c8ef84b 100644
--- a/addons/crm_configuration/crm_lead_demo.xml
+++ b/addons/crm_configuration/crm_lead_demo.xml
@@ -20,7 +20,7 @@
-
+
diff --git a/addons/crm_configuration/crm_lead_menu.xml b/addons/crm_configuration/crm_lead_menu.xml
index 06eb2a12b3c..d0be061dd06 100644
--- a/addons/crm_configuration/crm_lead_menu.xml
+++ b/addons/crm_configuration/crm_lead_menu.xml
@@ -1,461 +1,383 @@
-
- Leads
- leads
-
-
-
+
-
- All Leads
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
+
+ Leads
+ leads
+
-
- All Unclosed Leads
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
-
- All Draft Leads
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ All Leads
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
-
- All Open Leads
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ Current Leads
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- All Pending Leads
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ Unassigned Leads
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- All Cancelled Leads
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ All Draft Leads
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- Calendar Of All Leads Meetings
- crm.case
- calendar,tree,form
-
-
-
-
-
- calendar
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
+
+ All Open Leads
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
+
+
+ All Pending Leads
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- My Leads
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ My Leads
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- New Leads
- crm.case
- form
- form,tree
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
+
+ New Lead
+ crm.case
+ form
+ form,tree,calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
-
- My Unclosed Leads
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ My Current Leads
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- My Draft Leads
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ My Draft Leads
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- My Open Leads
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ My Open Leads
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- My Pending Leads
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+ My Pending Leads
+ crm.case
+ tree,calendar,form
+
+
+
+
+
+ tree
+
+
+
+
+
+ calendar
+
+
+
+
+
+ form
+
+
+
+
-
- My Cancelled Leads
- crm.case
- tree,calendar,form
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
+
+
-
- Calendar Of My Leads Meetings
- crm.case
- calendar,tree,form
-
-
-
-
-
- calendar
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
+
+ report.crm.case.user
+ form
+ graph,tree
+
+
+
+
+ report.crm.case.section.categ2
+ form
+ graph,tree
+
+
+
-
-
+
+ report.crm.case.section.stage
+ form
+ graph,tree
+
+
+
-
- report.crm.case.user
- form
- graph,tree
-
-
-
+
+ report.crm.case.section.categ.stage
+ form
+ tree
+
+
+
+
+ report.crm.case.section.categ.categ2
+ form
+ tree
+
+
+
-
- report.crm.case.section.categ2
- form
- graph,tree
-
-
-
-
-
- report.crm.case.section.stage
- form
- graph,tree
-
-
-
-
-
- report.crm.case.section.categ.stage
- form
- tree
-
-
-
-
-
- report.crm.case.section.categ.categ2
- form
- tree
-
-
-
-
-
+
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 61191290563..473e5952e80 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -1,147 +1,146 @@
-
+
- # ------------------------------------------------------
- # Leads
- # ------------------------------------------------------
+ # ------------------------------------------------------
+ # Leads
+ # ------------------------------------------------------
-
- CRM - Leads Form
- crm.case
- form
-
-
-
-
-
- CRM - Leads Tree
- crm.case
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CRM - Leads Calendar
- crm.case
- calendar
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CRM - Leads Tree
+ crm.case
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CRM - Leads Calendar
+ crm.case
+ calendar
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_meeting_menu.xml b/addons/crm_configuration/crm_meeting_menu.xml
index 8e547559416..7a165e096d7 100644
--- a/addons/crm_configuration/crm_meeting_menu.xml
+++ b/addons/crm_configuration/crm_meeting_menu.xml
@@ -1,230 +1,123 @@
-
- Meetings
- Mtngs
-
-
- ######################## MEETINGS (menu) ###########################
-
- crm.case
- calendar,tree,form
-
-
-
-
- calendar
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
+
+ Calendar
+ Mtngs
+
-
-
- crm.case
- calendar,tree,form
-
-
-
-
-
- calendar
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
+ ######################## MEETINGS (menu) ###########################
+
+ crm.case
+ calendar,tree,form
+
+
+
+
+ calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
-
- New Meeting
- crm.case
- form
- form,tree
-
-
-
-
- form
-
-
-
-
-
- tree
-
-
-
-
+
+
+ crm.case
+ calendar,tree,form,graph
+
+
+
+
+
+ calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
-
- Draft Meetings
- crm.case
- calendar,tree,form
-
-
-
-
-
- calendar
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
+
+ New Meeting
+ crm.case
+ form
+ form,tree
+
+
+
+
+
+ form
+
+
+
+
+
+ tree
+
+
+
+
-
- Confirmed Meetings
- crm.case
- calendar,tree,form
-
-
-
-
-
- calendar
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
+
+
+
+ Next Meetings
+ crm.case
+ form
+ tree,calendar,form
+
+
+
+
+
+ calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
-
-
-
-
- Draft Meetings
- crm.case
- calendar,tree,form
-
-
-
-
-
- calendar
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
-
- Confirmed Meetings
- crm.case
- calendar,tree,form
-
-
-
-
-
- calendar
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
-
- Next Deadlines
- crm.case
- form
- calendar,tree,form
-
-
-
-
-
- calendar
-
-
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
-
-
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
index 5e2de1d0de4..b506241d087 100644
--- a/addons/crm_configuration/crm_meeting_view.xml
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -13,35 +13,29 @@
+
+
+
+ CRM - Opportunities Tree
+ crm.case
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CRM - Opportunities Calendar
+ crm.case
+ calendar
+
+
+
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_report_view.xml b/addons/crm_configuration/crm_report_view.xml
index 1f71e321279..fc4a95e1610 100644
--- a/addons/crm_configuration/crm_report_view.xml
+++ b/addons/crm_configuration/crm_report_view.xml
@@ -1,242 +1,242 @@
- #
- # Cases by section and category2 of case
- #
+ #
+ # Cases by section and category2 of case
+ #
-
- CRM Report - Sections and Category2(Tree)
- report.crm.case.section.categ2
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CRM Report - Sections and Category2(Form)
- report.crm.case.section.categ2
- form
-
-
-
-
-
- CRM Report - Sections and Category2(Graph)
- report.crm.case.section.categ2
- graph
-
-
-
-
-
-
-
-
+
+ CRM Report - Sections and Category2(Tree)
+ report.crm.case.section.categ2
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CRM Report - Sections and Category2(Form)
+ report.crm.case.section.categ2
+ form
+
+
+
+
+
+ CRM Report - Sections and Category2(Graph)
+ report.crm.case.section.categ2
+ graph
+
+
+
+
+
+
+
+
-
- report.crm.case.section.categ2
- form
- graph,tree
- [('name','=',time.strftime('%Y-%m-01'))]
-
-
+
+ report.crm.case.section.categ2
+ form
+ graph,tree
+ [('name','=',time.strftime('%Y-%m-01'))]
+
+
-
- report.crm.case.section.categ2
- form
- graph,tree
-
-
+
+ report.crm.case.section.categ2
+ form
+ graph,tree
+
+
- #
- # Cases by section and stage
- #
+ #
+ # Cases by section and stage
+ #
-
- CRM Report - Sections and Stage(Tree)
- report.crm.case.section.stage
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
- CRM Report - Sections and Stage(Form)
- report.crm.case.section.stage
- form
-
-
-
-
-
- CRM Report - Sections and Stage(Graph)
- report.crm.case.section.stage
- graph
-
-
-
-
-
-
-
-
+
+ CRM Report - Sections and Stage(Tree)
+ report.crm.case.section.stage
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CRM Report - Sections and Stage(Form)
+ report.crm.case.section.stage
+ form
+
+
+
+
+
+ CRM Report - Sections and Stage(Graph)
+ report.crm.case.section.stage
+ graph
+
+
+
+
+
+
+
+
-
- report.crm.case.section.stage
- form
- graph,tree
- [('name','=',time.strftime('%Y-%m-01'))]
-
-
-
- report.crm.case.section.stage
- form
- graph,tree
-
-
+
+ report.crm.case.section.stage
+ form
+ graph,tree
+ [('name','=',time.strftime('%Y-%m-01'))]
+
+
+
+ report.crm.case.section.stage
+ form
+ graph,tree
+
+
- #
- # Cases by section, category and stage
- #
+ #
+ # Cases by section, category and stage
+ #
-
- CRM Report - Section, Category and Stage(Tree)
- report.crm.case.section.categ.stage
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CRM Report - Section, Category and Stage(Form)
- report.crm.case.section.categ.stage
- form
-
-
-
-
+
+ CRM Report - Section, Category and Stage(Tree)
+ report.crm.case.section.categ.stage
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CRM Report - Section, Category and Stage(Form)
+ report.crm.case.section.categ.stage
+ form
+
+
+
+
-
- report.crm.case.section.categ.stage
- form
- tree
- [('name','=',time.strftime('%Y-%m-01'))]
-
-
-
- report.crm.case.section.categ.stage
- form
- tree
-
-
+
+ report.crm.case.section.categ.stage
+ form
+ tree
+ [('name','=',time.strftime('%Y-%m-01'))]
+
+
+
+ report.crm.case.section.categ.stage
+ form
+ tree
+
+
- #
- # Cases by section, category and category2
- #
+ #
+ # Cases by section, category and category2
+ #
-
- CRM Report - Section, Category and Category2(Tree)
- report.crm.case.section.categ.categ2
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CRM Report - Section, Category and Category2(Form)
- report.crm.case.section.categ.categ2
- form
-
-
-
-
+
+ CRM Report - Section, Category and Category2(Tree)
+ report.crm.case.section.categ.categ2
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CRM Report - Section, Category and Category2(Form)
+ report.crm.case.section.categ.categ2
+ form
+
+
+
+
-
- report.crm.case.section.categ.categ2
- form
- tree
- [('name','=',time.strftime('%Y-%m-01'))]
-
-
-
- report.crm.case.section.categ.categ2
- form
- tree
-
-
+
+ report.crm.case.section.categ.categ2
+ form
+ tree
+ [('name','=',time.strftime('%Y-%m-01'))]
+
+
+
+ report.crm.case.section.categ.categ2
+ form
+ tree
+
+
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 15a3969cf3c..89a8efc770f 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -99,7 +99,7 @@
-
+
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 876534f61e8..9a25d722689 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -98,6 +98,7 @@
2
+ open
Analysis, Data Importation
@@ -105,6 +106,7 @@
20
16.0
16.0
+ open
Parameters
@@ -114,6 +116,7 @@
32.0
32.0
+ open
Start of the doc redaction + MRP
@@ -123,6 +126,7 @@
24.0
+ done
MRP Tests
@@ -197,6 +201,7 @@
32.0
+ open
In house trainings
2007-06-06
diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml
index e1d81f7212c..38ba36a077e 100644
--- a/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@ -62,7 +62,11 @@
[('name','=',time.strftime('%Y-%m-01'))]
-
+
+
+
+
+
Cases by User and Section
diff --git a/addons/stock/product.py b/addons/stock/product.py
index de035b213de..5b89a4cd2df 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -41,7 +41,7 @@ class product_product(osv.osv):
def get_product_available(self,cr,uid,ids,context=None):
if not context:
- context = {}
+ context = {}
states=context.get('states',[])
what=context.get('what',())
if not ids:
@@ -69,7 +69,7 @@ class product_product(osv.osv):
location_ids = context['location']
else:
cr.execute("select lot_stock_id from stock_warehouse")
- location_ids = [id for (id,) in cr.fetchall()]
+ location_ids = [id for (id,) in cr.fetchall()]
# build the list of ids of children of the location given by id
child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
@@ -90,11 +90,11 @@ class product_product(osv.osv):
to_date=context.get('to_date',False)
date_str=False
if from_date and to_date:
- date_str="date>='%s' and date<='%s'"%(from_date,to_date)
+ date_str="date_planned>='%s' and date_planned<='%s'"%(from_date,to_date)
elif from_date:
- date_str="date>='%s'"%(from_date)
+ date_str="date_planned>='%s'"%(from_date)
elif to_date:
- date_str="date<='%s'"%(to_date)
+ date_str="date_planned<='%s'"%(to_date)
if 'in' in what:
# all moves from a location out of the set to a location in the set
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 409c040a752..412a4b84272 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -900,7 +900,6 @@ class stock_move(osv.osv):
'price_unit': fields.float('Unit Price',
digits=(16, int(config['price_accuracy']))),
}
-
_constraints = [
(_check_tracking,
'You must assign a production lot for this product',
@@ -908,7 +907,6 @@ class stock_move(osv.osv):
(_check_product_lot,
'You try to assign a lot which is not from the same product',
['prodlot_id'])]
-
def _default_location_destination(self, cr, uid, context={}):
if context.get('move_line', []):
return context['move_line'][0][2]['location_dest_id']
@@ -1195,16 +1193,13 @@ class stock_move(osv.osv):
'ref': ref,
'date': date})
]
- self.pool.get('account.move').create(cr, uid,
- {
- 'name': move.name,
- 'journal_id': journal_id,
- 'line_id': lines,
- 'ref': ref,
- })
-
- self.write(cr, uid, ids, {'state':'done'})
-
+ self.pool.get('account.move').create(cr, uid, {
+ 'name': move.name,
+ 'journal_id': journal_id,
+ 'line_id': lines,
+ 'ref': ref,
+ })
+ self.write(cr, uid, ids, {'state':'done','date_planned':time.strftime('%Y-%m-%d %H:%M:%S')})
wf_service = netsvc.LocalService("workflow")
for id in ids:
wf_service.trg_trigger(uid, 'stock.move', id, cr)