diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 46ef999604a..80b06bf7aba 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -508,62 +508,6 @@ def _links_get(self, cr, uid, context=None):
res = obj.read(cr, uid, ids, ['object', 'name'], context)
return [(r['object'], r['name']) for r in res]
-
-class crm_case_log(osv.osv):
- """ Case Communication History """
- _name = "crm.case.log"
- _description = "Case Communication History"
-
- _order = "id desc"
- _columns = {
- 'name': fields.char('Status', size=64),
- 'date': fields.datetime('Date'),
- 'section_id': fields.many2one('crm.case.section', 'Sales Team'),
- 'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
- 'model_id': fields.many2one('ir.model', "Model"),
- 'res_id': fields.integer('Resource ID'),
- }
-
- _defaults = {
- 'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
- }
-
-crm_case_log()
-
-class crm_case_history(osv.osv):
- """Case history"""
-
- _name = "crm.case.history"
- _description = "Case history"
- _order = "id desc"
- _inherits = {'crm.case.log': "log_id"}
-
- def _note_get(self, cursor, user, ids, name, arg, context=None):
- """ Gives case History Description
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of case History’s IDs
- @param context: A standard dictionary for contextual values
- """
- res = {}
- for hist in self.browse(cursor, user, ids, context or {}):
- res[hist.id] = (hist.email_from or '/') + ' (' + str(hist.date) + ')\n'
- res[hist.id] += (hist.description or '')
- return res
-
- _columns = {
- 'description': fields.text('Description'),
- 'note': fields.function(_note_get, method=True, string="Description", type="text"),
- 'email_to': fields.char('Email To', size=84),
- 'email_from' : fields.char('Email From', size=84),
- 'log_id': fields.many2one('crm.case.log','Log',ondelete='cascade'),
- 'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email Server.", select=True),
- }
-
-crm_case_history()
-
-
class users(osv.osv):
_inherit = 'res.users'
_description = "Users"
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 1d7a357e992..6e03295aa23 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -232,318 +232,7 @@
-
-
- crm.case.history.tree
- crm.case.history
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
- crm.case.calendar
- mailgate.thread
- calendar
-
-
-
-
-
-
-
-
-
-
-
-
- crm.case.tree
- mailgate.thread
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- crm.case.form
- mailgate.thread
- form
-
-
-
-
-
-
-
-
-
-
- crm.case.select
- mailgate.thread
- search
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Cases
- mailgate.thread
- form
-
-
-
-
-
- Open Cases
- mailgate.thread
- form
-
- [('state','<>','done'),('state','<>','cancel'),('state','<>','pending')]
-
-
-
-
-
- Cases
- mailgate.thread
- [('section_id','child_of',[active_id])]
- form
- tree,form,calendar
-
-
-
-
- Open Cases
-
-
-
-
-
-
-
- crm.case.history.form
- crm.case.history
- form
-
-
-
-
-
-
-
-
- crm.case.history.select
- crm.case.history
- search
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Histories
- crm.case.history
- form
- tree,form
-
-
-
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index f78044ea38e..1f90f74f281 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -6,12 +6,8 @@
"access_crm_meeting","crm.meeting","model_crm_meeting","crm.group_crm_manager",1,1,1,1
"access_crm_lead","crm.lead","model_crm_lead","crm.group_crm_manager",1,1,1,1
"access_crm_phonecall","crm.phonecall","model_crm_phonecall","crm.group_crm_manager",1,1,1,1
-"access_crm_case_log","crm.case.log","model_crm_case_log","crm.group_crm_user",1,1,1,1
-"access_crm_case_history","crm.case.history","model_crm_case_history","crm.group_crm_user",1,1,1,1
-"o","crm.case.section.manager","model_crm_case_section","crm.group_crm_manager",1,1,1,1
+"access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","crm.group_crm_manager",1,1,1,1
"access_crm_case_categ_manager","crm.case.categ.manager","model_crm_case_categ","crm.group_crm_manager",1,1,1,1
-"access_crm_case_log_manager","crm.case.log manager","model_crm_case_log","crm.group_crm_manager",1,1,1,1
-"access_crm_case_history_manager","crm.case.history manager","model_crm_case_history","crm.group_crm_manager",1,1,1,1
"access_crm_case_stage","crm.case.stage","model_crm_case_stage","crm.group_crm_user",1,0,0,0
"access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","crm.group_crm_manager",1,1,1,1
"access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","crm.group_crm_user",1,0,0,0
diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 98d5392faa3..153f136cfb2 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -176,7 +176,6 @@ class crm_lead_forward_to_partner(osv.osv_memory):
this = self.browse(cr, uid, ids[0], context=context)
- hist_obj = self.pool.get('crm.case.history')
smtp_pool = self.pool.get('email.smtpclient')
case_pool = self.pool.get(model)
case = case_pool.browse(cr, uid, res_id, context=context)
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index f4cecbe508f..12edf5edc6d 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -57,7 +57,6 @@ class crm_lead2opportunity(osv.osv_memory):
lead_obj = self.pool.get('crm.lead')
data_obj = self.pool.get('ir.model.data')
- history_obj = self.pool.get('crm.case.history')
model_obj = self.pool.get('ir.model')
# Get Opportunity views
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 7c7764a2e37..ed031672360 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -22,7 +22,7 @@
-
+