Merge lp:~openerp-dev/openobject-addons/trunk-bug-1136950-Jaydeep into lp:openobject-addons

[Jaydeep Barot(OpenERP)]

Hello,
           change to addons module base_setup and note module in py file

Unmerged revisions

8595. By Jaydeep Barot(OpenERP) on 2013-03-05

[FIX] Solve some help bubbles missing in general settings

=== modified file 'base_setup/res_config.py'
--- base_setup/res_config.py	2012-12-17 14:43:06 +0000
+++ base_setup/res_config.py	2013-03-05 13:33:20 +0000
@@ -34,8 +34,8 @@
             help="""Give your customers access to their documents."""),
         'module_portal_anonymous': fields.boolean('Activate the public portal',
             help="""Enable the public part of openerp, openerp becomes a public website."""),
-        'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'),
-        'module_base_import': fields.boolean("Allow users to import data from CSV files"),
+        'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...',help="""Enable the use external part of use social sites google or facebook."""),
+        'module_base_import': fields.boolean("Allow users to import data from CSV files",help="""Enable to Allow users to import data from CSV files """),
     }
 
     def open_company(self, cr, uid, ids, context=None):

=== modified file 'note/note.py'
--- note/note.py	2013-01-24 10:46:25 +0000
+++ note/note.py	2013-03-05 13:33:20 +0000
@@ -172,8 +172,8 @@
 class note_base_config_settings(osv.osv_memory):
     _inherit = 'base.config.settings'
     _columns = {
-        'module_note_pad': fields.boolean('Use collaborative pads (etherpad)'),
-        'group_note_fancy': fields.boolean('Use fancy layouts for notes', implied_group='note.group_note_fancy'),
+        'module_note_pad': fields.boolean('Use collaborative pads (etherpad)',help="""Enable to use collaborative pads """),
+        'group_note_fancy': fields.boolean('Use fancy layouts for notes', implied_group='note.group_note_fancy',help="""Enable to Use fancy layouts for notes """),
     }
 
 class res_users(osv.Model):