[IMP] remove merged conflict
bzr revid: mat@openerp.com-20130911121132-47g2d267ld4b2cyl
This commit is contained in:
parent
c48504fdba
commit
c312cac0fa
|
@ -1,32 +1,4 @@
|
|||
-
|
||||
<<<<<<< TREE
|
||||
Project user can subscribe issue, so let's check data with giving the access rights of user.
|
||||
-
|
||||
!context
|
||||
uid: 'res_users_project_issue_user'
|
||||
-
|
||||
In order to test process of issue tracking in OpenERP, I Open the Issue.
|
||||
-
|
||||
!python {model: project.issue}: |
|
||||
self.case_open(cr, uid, [ref("crm_case_buginaccountsmodule0")])
|
||||
-
|
||||
I check state of Issue after opened it.
|
||||
-
|
||||
!assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in open state}:
|
||||
- state == 'open'
|
||||
-
|
||||
Now I put Issue in pending due to need more information.
|
||||
-
|
||||
!python {model: project.issue}: |
|
||||
self.case_pending(cr, uid, [ref("crm_case_buginaccountsmodule0")])
|
||||
-
|
||||
I check state after put in pending.
|
||||
-
|
||||
!assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in pending state}:
|
||||
- state == 'pending'
|
||||
-
|
||||
=======
|
||||
>>>>>>> MERGE-SOURCE
|
||||
I send mail to get more details. TODO revert mail.mail to mail.compose.message (conversion to customer should be automatic).
|
||||
-
|
||||
!python {model: mail.mail }: |
|
||||
|
@ -48,21 +20,3 @@
|
|||
-
|
||||
!python {model: project.issue}: |
|
||||
self.convert_issue_task(cr, uid, [ref("crm_case_buginaccountsmodule0")])
|
||||
<<<<<<< TREE
|
||||
-
|
||||
After resolving Issue Project user can close issue, so let's check data with giving the access rights of user.
|
||||
-
|
||||
!context
|
||||
uid: 'res_users_project_issue_user'
|
||||
-
|
||||
I close Issue after resolving it
|
||||
-
|
||||
!python {model: project.issue}: |
|
||||
self.case_close(cr, uid, [ref("crm_case_buginaccountsmodule0")])
|
||||
-
|
||||
I Check state of Issue after closed.
|
||||
-
|
||||
!assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in done state}:
|
||||
- state == 'done'
|
||||
=======
|
||||
>>>>>>> MERGE-SOURCE
|
||||
|
|
Loading…
Reference in New Issue