diff --git a/addons/portal_project_issue/security/ir.model.access.csv b/addons/portal_project_issue/security/ir.model.access.csv index 360e0ccd997..65eff9bed1b 100644 --- a/addons/portal_project_issue/security/ir.model.access.csv +++ b/addons/portal_project_issue/security/ir.model.access.csv @@ -1,4 +1,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_issues,project_issue,project_issue.model_project_issue,base.group_portal,1,0,0,0 -access_case_section,crm_case_section,crm.model_crm_case_section,base.group_portal,1,0,0,0 +access_case_section,crm_case_section,sales_team.model_crm_case_section,base.group_portal,1,0,0,0 access_issues_public,project_issue,project_issue.model_project_issue,base.group_public,1,0,0,0 \ No newline at end of file diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py index 97b6f736f54..4f7045f6aca 100644 --- a/addons/project_issue/__openerp__.py +++ b/addons/project_issue/__openerp__.py @@ -37,7 +37,7 @@ It allows the manager to quickly check the issues, assign them and decide on the 'website': 'http://www.openerp.com', 'images': ['images/issue_analysis.jpeg','images/project_issue.jpeg'], 'depends': [ - 'crm', + 'sales_team', 'project', ], 'data': [ diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 9bbcd43ae19..dd3b0a2d61f 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -23,7 +23,6 @@ from datetime import datetime from openerp import SUPERUSER_ID from openerp import tools -from openerp.addons.crm import crm from openerp.osv import fields, osv, orm from openerp.tools import html2plaintext from openerp.tools.translate import _ @@ -259,7 +258,7 @@ class project_issue(osv.Model): 'date_closed': fields.datetime('Closed', readonly=True,select=True), 'date': fields.datetime('Date'), 'date_last_stage_update': fields.datetime('Last Stage Update', select=True), - 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."), + 'channel': fields.char('Channel', help="Communication channel."), 'categ_ids': fields.many2many('project.category', string='Tags'), 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority', select=True), 'version_id': fields.many2one('project.issue.version', 'Version'), diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index b8778918f87..5ac7b6e48c6 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -52,7 +52,7 @@ class project_issue_report(osv.osv): 'version_id': fields.many2one('project.issue.version', 'Version'), 'user_id' : fields.many2one('res.users', 'Assigned to',readonly=True), 'partner_id': fields.many2one('res.partner','Contact'), - 'channel_id': fields.many2one('crm.case.channel', 'Channel',readonly=True), + 'channel': fields.char('Channel', readonly=True, help="Communication Channel."), 'task_id': fields.many2one('project.task', 'Task'), 'email': fields.integer('# Emails', size=128, readonly=True), } @@ -81,7 +81,7 @@ class project_issue_report(osv.osv): c.version_id as version_id, 1 as nbr, c.partner_id, - c.channel_id, + c.channel, c.task_id, date_trunc('day',c.create_date) as create_date, c.day_open as delay_open, diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv index ef4edfdc13a..400e118a6d0 100644 --- a/addons/project_issue/security/ir.model.access.csv +++ b/addons/project_issue/security/ir.model.access.csv @@ -5,6 +5,6 @@ access_project_issue_version_project,project_issue_version manager,model_project access_project_issue_version_project_user,project_issue_version user,model_project_issue_version,project.group_project_user,1,0,0,0 access_resource_calendar_project_manager,resource.calendar.project.manager,resource.model_resource_calendar,project.group_project_manager,1,1,1,1 access_project_issue_report_user,project.issue.report user,model_project_issue_report,project.group_project_user,1,0,0,0 -access_crm_case_section,crm.case.section,crm.model_crm_case_section,project.group_project_user,1,0,0,0 +access_crm_case_section,crm.case.section,sales_team.model_crm_case_section,project.group_project_user,1,0,0,0 access_project_issue_salesman,project.issue,model_project_issue,base.group_sale_salesman,1,0,0,0 access_project_issue_manager,project.issue,model_project_issue,base.group_sale_manager,1,0,0,0