diff --git a/addons/idea/__init__.py b/addons/idea/__init__.py
index e6f7333e055..8b550800117 100644
--- a/addons/idea/__init__.py
+++ b/addons/idea/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-Today OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 8f32e1e91c4..878342d6d00 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-Today OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -43,7 +43,7 @@ Once installed, check the menu 'Ideas' in the 'Tools' main menu.""",
         'idea_workflow.xml',
     ],
     'demo': ['idea_data.xml'],
-    'test':[],
+    'test': [],
     'installable': True,
     'images': [],
 }
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index d1e250ce9a5..2cd7a9858d1 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-Today OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -21,13 +21,13 @@
 
 from openerp.osv import osv
 from openerp.osv import fields
-from openerp.tools.translate import _
-import time
+
 
 VoteValues = [('-1', 'Not Voted'), ('0', 'Very Bad'), ('25', 'Bad'), \
-              ('50', 'Normal'), ('75', 'Good'), ('100', 'Very Good') ]
+              ('50', 'Normal'), ('75', 'Good'), ('100', 'Very Good')]
 DefaultVoteValue = '50'
 
+
 class idea_category(osv.osv):
     """ Category of Idea """
     _name = "idea.category"
@@ -42,20 +42,24 @@ class idea_category(osv.osv):
 
 
 class idea_idea(osv.osv):
-    """ Idea """
+    """ Model of an Idea """
     _name = 'idea.idea'
     _inherit = ['mail.thread']
     _columns = {
         'create_uid': fields.many2one('res.users', 'Creator', required=True, readonly=True),
-        'name': fields.char('Idea Summary', size=64, required=True, readonly=True, oldname='title', states={'draft': [('readonly', False)]}),
-        'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft': [('readonly', False)]}),
-        'category_ids': fields.many2many('idea.category', string='Tags', readonly=True, states={'draft': [('readonly', False)]}),
+        'name': fields.char('Idea Summary', size=64, required=True, readonly=True,
+            states={'draft': [('readonly', False)]},
+            oldname='title'),
+        'description': fields.text('Description', readonly=True,
+            states={'draft': [('readonly', False)]},
+            help='Content of the idea'),
+        'category_ids': fields.many2many('idea.category', string='Tags', readonly=True,
+            states={'draft': [('readonly', False)]}),
         'state': fields.selection([('draft', 'New'),
-            ('open', 'Accepted'),
-            ('cancel', 'Refused'),
-            ('close', 'Done')],
-            'Status', readonly=True, track_visibility='onchange',
-        )
+                                    ('open', 'Accepted'),
+                                    ('cancel', 'Refused'),
+                                    ('close', 'Done')],
+            'Status', readonly=True, track_visibility='onchange'),
     }
     _sql_constraints = [
         ('name', 'unique(name)', 'The name of the idea must be unique')
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 53734d53919..e1a4b942e83 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -3,18 +3,19 @@
     <data>
         <!-- Top menu item -->
         <menuitem name="Tools" id="base.menu_tools" sequence="120" groups="base.group_tool_user"/>
-    <!-- Idea Categories Search View-->
-    <record model="ir.ui.view" id="view_idea_category_search">
-        <field name="name">idea.category.search</field>
-        <field name="model">idea.category</field>
-        <field name="arch" type="xml">
-            <search string="Ideas Categories">
-                <field name="name" string="Category"/>
-            </search>
-        </field>
-    </record>
 
-    <!-- Idea Category Form View -->
+        <!-- Idea Categories Search View-->
+        <record model="ir.ui.view" id="view_idea_category_search">
+            <field name="name">idea.category.search</field>
+            <field name="model">idea.category</field>
+            <field name="arch" type="xml">
+                <search string="Ideas Categories">
+                    <field name="name" string="Category"/>
+                </search>
+            </field>
+        </record>
+
+        <!-- Idea Category Form View -->
         <record model="ir.ui.view" id="view_idea_category_form">
             <field name="name">idea.category.form</field>
             <field name="model">idea.category</field>
@@ -40,96 +41,95 @@
         </record>
 
         <!-- Idea Category Action -->
+        <record model="ir.actions.act_window" id="action_idea_category">
+            <field name="name">Categories</field>
+            <field name="res_model">idea.category</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_idea_category_search"/>
+        </record>
 
-    <record model="ir.actions.act_window" id="action_idea_category">
-        <field name="name">Categories</field>
-        <field name="res_model">idea.category</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_idea_category_search"/>
-    </record>
+        <menuitem name="Configuration" parent="base.menu_tools"
+                id="base.menu_lunch_survey_root" sequence="20"/>
 
-    <menuitem name="Configuration" parent="base.menu_tools"
-         id="base.menu_lunch_survey_root" sequence="20" />
+        <menuitem name="Ideas" parent="base.menu_lunch_survey_root"
+                id="menu_ideas" sequence="3"/>
 
-    <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas" sequence="3"/>
-
-    <menuitem name="Categories" parent="menu_ideas" id="menu_idea_category" action="action_idea_category" />
+        <menuitem name="Categories" parent="menu_ideas"
+                id="menu_idea_category" action="action_idea_category"/>
 
 
-<!-- New Idea Form View -->
+        <!-- New Idea Form View -->
+        <record model="ir.ui.view" id="view_idea_idea_form">
+            <field name="name">idea.idea.form</field>
+            <field name="model">idea.idea</field>
+            <field name="arch" type="xml">
+                <form string="Idea" version="7.0">
+                    <header>
+                        <button name="idea_open" string="Open" states="draft" class="oe_highlight"/>
+                        <button name="idea_close" string="Accept" states="open" class="oe_highlight"/>
+                        <button name="idea_cancel" string="Refuse" states="open"  class="oe_highlight"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
+                    </header>
+                    <sheet>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1><field name="name"/></h1>
+                        <label for="category_ids" class="oe_edit_only"/>
+                        <field name="category_ids" widget="many2many_tags"/>
+                        <label for="description"/><newline/>
+                        <field name="description"/>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </form>
+            </field>
+        </record>
 
-    <record model="ir.ui.view" id="view_idea_idea_form">
-        <field name="name">idea.idea.form</field>
-        <field name="model">idea.idea</field>
-        <field name="arch" type="xml">
-            <form string="Idea" version="7.0">
-                <header>
-                    <button name="idea_open" string="Open" states="draft" class="oe_highlight"/>
-                    <button name="idea_close" string="Accept" states="open" class="oe_highlight"/>
-                    <button name="idea_cancel" string="Refuse" states="open"  class="oe_highlight"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
-                </header>
-                <sheet>
-                    <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name"/></h1>
-                    <label for="category_ids" class="oe_edit_only"/>
-                    <field name="category_ids" widget="many2many_tags"/>
-                    <label for="description"/><newline/>
-                    <field name="description"/>
-                </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="message_ids" widget="mail_thread"/>
-                </div>
-            </form>
-        </field>
-    </record>
+        <!-- New Idea Tree View -->
+        <record model="ir.ui.view" id="view_idea_idea_tree">
+            <field name="name">idea.idea.tree</field>
+            <field name="model">idea.idea</field>
+            <field name="arch" type="xml">
+            <tree colors="blue:state == 'draft';black:state in ('open','close');gray:state == 'cancel'" string="Ideas">
+                <field name="name"/>
+                <field name="create_uid"/>
+                <field name="state"/>
+            </tree>
+            </field>
+        </record>
 
-    <!-- New Idea Tree View -->
+        <!-- Search Idea  -->
+        <record model="ir.ui.view" id="view_idea_idea_search">
+            <field name="name">idea.idea.search</field>
+            <field name="model">idea.idea</field>
+            <field name="arch" type="xml">
+                <search string="Ideas">
+                    <field name="name" string="Idea"/>
+                    <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
+                    <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
+                    <filter icon="terp-check" string="Accepted" domain="[('state','=','close')]" help="Accepted Ideas" />
+                    <field name="category_ids"/>
+                    <group expand="0" string="Group By...">
+                        <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'create_uid'}"/>
+                        <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_ids'}"/>
+                        <filter icon="terp-stock_effects-object-colorize" string="Status" help="By States" context="{'group_by':'state'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
-    <record model="ir.ui.view" id="view_idea_idea_tree">
-        <field name="name">idea.idea.tree</field>
-        <field name="model">idea.idea</field>
-        <field name="arch" type="xml">
-        <tree colors="blue:state == 'draft';black:state in ('open','close');gray:state == 'cancel'" string="Ideas">
-            <field name="name"/>
-            <field name="create_uid"/>
-            <field name="state"/>
-        </tree>
-        </field>
-    </record>
+        <record model="ir.actions.act_window" id="action_idea_idea">
+            <field name="name">Ideas</field>
+            <field name="res_model">idea.idea</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_idea_idea_search"/>
+        </record>
 
-    <!-- Search Idea  -->
-
-    <record model="ir.ui.view" id="view_idea_idea_search">
-        <field name="name">idea.idea.search</field>
-        <field name="model">idea.idea</field>
-        <field name="arch" type="xml">
-            <search string="Ideas">
-                <field name="name" string="Idea"/>
-                <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
-                <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
-                <filter icon="terp-check" string="Accepted" domain="[('state','=','close')]" help="Accepted Ideas" />
-                <field name="category_ids"/>
-                <group expand="0" string="Group By...">
-                    <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'create_uid'}"/>
-                    <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_ids'}"/>
-                    <filter icon="terp-stock_effects-object-colorize" string="Status" help="By States" context="{'group_by':'state'}"/>
-                </group>
-            </search>
-        </field>
-    </record>
-
-    <record model="ir.actions.act_window" id="action_idea_idea">
-        <field name="name">Ideas</field>
-        <field name="res_model">idea.idea</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_idea_idea_search"/>
-    </record>
-
-    <menuitem name="Ideas" parent="menu_ideas" id="menu_idea_idea" action="action_idea_idea" sequence="1"/>
+        <menuitem name="Ideas" parent="menu_ideas"
+                id="menu_idea_idea" action="action_idea_idea" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 8743252c9e5..c72608863b0 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
+    <data>
 
-    <record model="res.groups" id="base.group_tool_user">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_tools"/>
-    </record>
+        <record model="res.groups" id="base.group_tool_user">
+            <field name="name">User</field>
+            <field name="category_id" ref="base.module_category_tools"/>
+        </record>
 
-</data>
+    </data>
 </openerp>