diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-09-14 16:18:06 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-09-14 16:18:06 +0200 |
| commit | f910cf4e722a7daa75488ab3701fedcd2d1c49b9 (patch) | |
| tree | 6beafa74cd5f33fa0c0a6b1e2c74c4636dc4b80d /addons/project_issue | |
| parent | 994441ae4a2af6d55248d431682ce64cd943e2a8 (diff) | |
| parent | 53bd6a6c582b1e162b1156832e353a74d672fb9c (diff) | |
[MERGE] Merged with addons/trunk, except access rules for mail_mail.
bzr revid: tde@openerp.com-20120914141806-lprl9h4eaa4d4bvk
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/res_config.py | 2 | ||||
| -rw-r--r-- | addons/project_issue/test/issue_process.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/project_issue/res_config.py b/addons/project_issue/res_config.py index 9fdbf502a62..f286f9cac25 100644 --- a/addons/project_issue/res_config.py +++ b/addons/project_issue/res_config.py @@ -26,7 +26,7 @@ class project_issue_settings(osv.osv_memory): _inherit = ['project.config.settings', 'fetchmail.config.settings'] _columns = { - 'fetchmail_issue': fields.boolean("create issues from an incoming email account ", + 'fetchmail_issue': fields.boolean("Create issues from an incoming email account ", fetchmail_model='project.issue', fetchmail_name='Incoming Issues', help="""Allows you to configure your incoming mail server, and create issues from incoming emails."""), } diff --git a/addons/project_issue/test/issue_process.yml b/addons/project_issue/test/issue_process.yml index d5900bb1b4f..afb68a9b6c2 100644 --- a/addons/project_issue/test/issue_process.yml +++ b/addons/project_issue/test/issue_process.yml @@ -19,9 +19,9 @@ !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in pending state}: - state == 'pending' - - I send mail to get more details. + I send mail to get more details. TODO revert mail.mail to mail.compose.message (conversion to customer should be automatic). - - !python {model: mail.compose.message }: | + !python {model: mail.mail }: | ctx = context.copy() ctx.update({'active_model': 'project.issue', 'active_id': ref("crm_case_buginaccountsmodule0"), 'active_ids': [ref("crm_case_buginaccountsmodule0")]}) vals = self.default_get(cr, uid , [], context=ctx) |