diff options
| author | Harry (OpenERP) <hmo@tinyerp.com> | 2011-04-04 16:26:39 +0530 |
|---|---|---|
| committer | Harry (OpenERP) <hmo@tinyerp.com> | 2011-04-04 16:26:39 +0530 |
| commit | 1cf2e0e8842cfc7d21e655697b1b2e9ef54c4e71 (patch) | |
| tree | 507c4a314ddd14b9fcd810ed5a67c23eef42a21b /addons/project_issue | |
| parent | 894b4cbb6a6c76918f696f351eacb37aac6eb0fa (diff) | |
| parent | 4d3b805cf935bf775ab103ff5ad2c7f4310d3bdb (diff) | |
[MERGE] rename module: email with mail due to conflicts python packages
bzr revid: hmo@tinyerp.com-20110404105639-147c1wj9c17lp4sk
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 6 | ||||
| -rw-r--r-- | addons/project_issue/security/ir.model.access.csv | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 93df5636a87..5fed2baceed 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -103,7 +103,7 @@ <field name="history" invisible="1"/> <button string="Reply" attrs="{'invisible': [('history', '!=', True)]}" - name="%(email.action_email_compose_message_wizard)d" + name="%(mail.action_email_compose_message_wizard)d" context="{'mail':'reply', 'message_id':active_id}" icon="terp-mail-replied" type="action" /> </tree> @@ -121,7 +121,7 @@ <group attrs="{'invisible': [('history', '!=', True)]}"> <field name="body" colspan="4" nolabel="1" height="250"/> <button colspan="4" string="Reply" - name="%(email.action_email_compose_message_wizard)d" + name="%(mail.action_email_compose_message_wizard)d" context="{'mail':'reply', 'message_id':active_id}" icon="terp-mail-replied" type="action"/> </group> @@ -141,7 +141,7 @@ context="{'model': 'crm.lead' }" icon="terp-document-new" type="action" /> <button string="Send New Email" - name="%(email.action_email_compose_message_wizard)d" + name="%(mail.action_email_compose_message_wizard)d" context="{'email_model':'project.issue', 'email_res_id': active_id}" icon="terp-mail-message-new" type="action"/> </page> diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv index 59f67eda7e0..3015a900f70 100644 --- a/addons/project_issue/security/ir.model.access.csv +++ b/addons/project_issue/security/ir.model.access.csv @@ -1,11 +1,11 @@ -"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_project_issue_all","project.issue","model_project_issue","project.group_project_manager",1,1,1,1 -"access_project_issue_user","project.issue","model_project_issue","project.group_project_user",1,1,1,1 -"access_project_issue_report_all","project.issue.report","model_project_issue_report","project.group_project_manager",1,1,1,1 -"access_crm_case_categ_id","crm.case.categ","crm.model_crm_case_categ","project.group_project_manager",1,1,1,1 -"access_project_issue_version_project","project_issue_version manager","model_project_issue_version","project.group_project_manager",1,1,1,1 -"access_project_issue_version_project_user","project_issue_version user","model_project_issue_version","project.group_project_user",1,0,0,0 -"access_email_message_project_manager","email.message.manager","email.model_email_message","project.group_project_manager",1,1,1,1 -"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_email_message_issue_project_user","project.mailgate.message.issue.user","email.model_email_message","project.group_project_user",1,1,1,0 +"id";"name";"model_id:id";"group_id:id";"perm_read";"perm_write";"perm_create";"perm_unlink" +"access_project_issue_all";"project.issue";"model_project_issue";"project.group_project_manager";1;1;1;1 +"access_project_issue_user";"project.issue";"model_project_issue";"project.group_project_user";1;1;1;1 +"access_project_issue_report_all";"project.issue.report";"model_project_issue_report";"project.group_project_manager";1;1;1;1 +"access_crm_case_categ_id";"crm.case.categ";"crm.model_crm_case_categ";"project.group_project_manager";1;1;1;1 +"access_project_issue_version_project";"project_issue_version manager";"model_project_issue_version";"project.group_project_manager";1;1;1;1 +"access_project_issue_version_project_user";"project_issue_version user";"model_project_issue_version";"project.group_project_user";1;0;0;0 +"access_email_message_project_manager";"email.message.manager";"mail.model_email_message";"project.group_project_manager";1;1;1;1 +"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_email_message_issue_project_user";"email.message..user";"mail.model_email_message";"project.group_project_user";1;1;1;0 |