diff options
| author | Rajesh Prajapati (OpenERP) <rpr@tinyerp.com> | 2012-10-05 17:35:03 +0530 |
|---|---|---|
| committer | Rajesh Prajapati (OpenERP) <rpr@tinyerp.com> | 2012-10-05 17:35:03 +0530 |
| commit | cdff4611b0a588546afb9b706bbd2d0fbda7bf2f (patch) | |
| tree | 0a0a99b33e52547987ab69b2a29f3ec23c188142 /addons/idea | |
| parent | 7202b8f7efbc76e2a40b1a4a8d7a95ed0d2ce573 (diff) | |
| parent | ba97319054728490e4d8a601382dd6fd2ab4f970 (diff) | |
[MERGE] merge with main addons
bzr revid: rpr@tinyerp.com-20121005120503-07e0zo8ucv8k0q3s
Diffstat (limited to 'addons/idea')
| -rw-r--r-- | addons/idea/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/idea/idea.py | 13 | ||||
| -rw-r--r-- | addons/idea/idea_data.xml | 1 | ||||
| -rw-r--r-- | addons/idea/idea_view.xml | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py index 3c7a3fca1b0..8f32e1e91c4 100644 --- a/addons/idea/__openerp__.py +++ b/addons/idea/__openerp__.py @@ -35,7 +35,7 @@ The managers can obtain an easy view of best ideas from all the users. Once installed, check the menu 'Ideas' in the 'Tools' main menu.""", 'author': 'OpenERP SA', 'website': 'http://openerp.com', - 'depends': ['base_tools','mail'], + 'depends': ['mail'], 'data': [ 'security/idea_security.xml', 'security/ir.model.access.csv', diff --git a/addons/idea/idea.py b/addons/idea/idea.py index e2e5ec50ddf..a382948e15c 100644 --- a/addons/idea/idea.py +++ b/addons/idea/idea.py @@ -39,6 +39,7 @@ class idea_category(osv.osv): ('name', 'unique(name)', 'The name of the category must be unique' ) ] _order = 'name asc' + idea_category() class idea_idea(osv.osv): @@ -65,24 +66,22 @@ class idea_idea(osv.osv): } _order = 'name asc' - def idea_cancel(self, cr, uid, ids, context={}): + def idea_cancel(self, cr, uid, ids, context=None): self.write(cr, uid, ids, { 'state': 'cancel' }) self.message_post(cr, uid, ids, body=_('Idea canceled.'), context=context) return True def idea_open(self, cr, uid, ids, context={}): - self.write(cr, uid, ids, { 'state': 'open'}) + self.write(cr, uid, ids, {'state': 'open'}, context=context) self.message_post(cr, uid, ids, body=_('Idea accepted.'), context=context) return True def idea_close(self, cr, uid, ids, context={}): - self.message_post(cr, uid, ids, body=_('Idea done.'), context=context) - self.write(cr, uid, ids, { 'state': 'close' }) + self.write(cr, uid, ids, {'state': 'close'}, context=context) + self.message_post(cr, uid, ids, body=_('Idea closed.'), context=context) return True def idea_draft(self, cr, uid, ids, context={}): + self.write(cr, uid, ids, {'state': 'draft'}, context=context) self.message_post(cr, uid, ids, body=_('Idea reset to draft.'), context=context) - self.write(cr, uid, ids, { 'state': 'draft' }) return True -idea_idea() - diff --git a/addons/idea/idea_data.xml b/addons/idea/idea_data.xml index d63eb907ef8..421cb6a9eef 100644 --- a/addons/idea/idea_data.xml +++ b/addons/idea/idea_data.xml @@ -15,6 +15,7 @@ <record id="base.user_demo" model="res.users"> <field name="groups_id" eval="[(4,ref('base.group_tool_user'))]"/> </record> + </data> </openerp> diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index eab3d03ceea..5a1482830e1 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -1,6 +1,8 @@ <?xml version="1.0"?> <openerp> <data> + <!-- Top menu item --> + <menuitem name="Tools" id="base.menu_tools" sequence="160"/> <!-- Idea Categories Search View--> <record model="ir.ui.view" id="view_idea_category_search"> <field name="name">idea.category.search</field> |