summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorolt@tinyerp.com <>2012-12-21 13:17:53 +0100
committerolt@tinyerp.com <>2012-12-21 13:17:53 +0100
commita9999ddaba228aaee7e964996c09392f8cc3fdc8 (patch)
tree0b67834a9d838656cf1ec0084c3ca5e17afe678d
parent18cdeb2f0ba8758ebafe704415b1356a62dd10c8 (diff)
[FIX] revert (needs testing)
bzr revid: olt@tinyerp.com-20121221121753-tenexccn5wzr862u
-rw-r--r--addons/project_issue/project_issue.py2
-rw-r--r--addons/project_issue/test/cancel_issue.yml6
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 59149a4175d..0015bc3fa50 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -448,7 +448,7 @@ class project_issue(base_stage, osv.osv):
def case_cancel(self, cr, uid, ids, context=None):
""" Cancels case """
- self.case_set(cr, uid, ids, 'cancel', {'active': True}, context=context)
+ self.case_set(cr, uid, ids, 'cancelled', {'active': True}, context=context)
return True
def case_escalate(self, cr, uid, ids, context=None):
diff --git a/addons/project_issue/test/cancel_issue.yml b/addons/project_issue/test/cancel_issue.yml
index 6c823b4e47b..76ffa212638 100644
--- a/addons/project_issue/test/cancel_issue.yml
+++ b/addons/project_issue/test/cancel_issue.yml
@@ -7,7 +7,7 @@
I check the issue is in cancel state.
-
!assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in cancel state}:
- - state == 'cancel'
+ - state == 'cancelled'
-
I re-open the Issue.
-
@@ -37,7 +37,7 @@
I check the issue is in cancel state.
-
!assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in cancel state}:
- - state == 'cancel'
+ - state == 'cancelled'
-
I close Issue.
-
@@ -57,4 +57,4 @@
I check the issue is in cancel state.
-
!assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in cancel state}:
- - state == 'cancel'
+ - state == 'cancelled'