diff options
| author | Rvo (Open ERP) <rvo@tinyerp.co.in> | 2010-09-18 11:56:08 +0530 |
|---|---|---|
| committer | Rvo (Open ERP) <rvo@tinyerp.co.in> | 2010-09-18 11:56:08 +0530 |
| commit | bf1de4c7d5f95c577e3a67e68f8d595f3ebd4e73 (patch) | |
| tree | fd9221e330dfab98061dacafb33404ea567b1397 /addons/idea | |
| parent | 050344d175dc19e6b3cfa306bb2c01ddc977100a (diff) | |
| parent | 558352fba2af69a1015ec9a4c7bad90cc6683b4a (diff) | |
[MERGE]: lp:trunk-dev-addons2
bzr revid: rvo@tinyerp.co.in-20100918062608-gddpu7210ynvvuz4
Diffstat (limited to 'addons/idea')
| -rw-r--r-- | addons/idea/idea.py | 2 | ||||
| -rw-r--r-- | addons/idea/test/test_idea.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/idea/idea.py b/addons/idea/idea.py index 9a07b28c0b0..b7b7840a3f5 100644 --- a/addons/idea/idea.py +++ b/addons/idea/idea.py @@ -167,7 +167,7 @@ class idea_idea(osv.osv): 'state': fields.selection([('draft', 'Draft'), ('open', 'Opened'), ('close', 'Accepted'), - ('cancel', 'Cancelled')], + ('cancel', 'Refused')], 'State', readonly=True, help='When the Idea is created the state is \'Draft\'.\n It is \ opened by the user, the state is \'Opened\'.\ diff --git a/addons/idea/test/test_idea.yml b/addons/idea/test/test_idea.yml index bdf66af961e..4f6ea4bd568 100644 --- a/addons/idea/test/test_idea.yml +++ b/addons/idea/test/test_idea.yml @@ -11,7 +11,7 @@ - !record {model: idea.idea, id: idea_idea_0}: category_id: idea_category_technical0 - created_date: '05/13/2010 19:16:26' + created_date: '2010-05-13 19:16:26' description: I want that Technical presentation are arranged for 1 hours in every day.\nso, on that presentation, we can know all things what improvement and development are done in our company.\n\n\n\n\n |