[MERGE]

bzr revid: hmo@tinyerp.com-20101103095029-r33uaeia8ufb133s

1 files changed, 4 insertions, 3 deletions

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 0f58419d1e1..75d6dd0d465 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -52,13 +52,14 @@ class email_server(osv.osv):
             ('imap', 'IMAP Server'),
         ], 'Server Type', select=True, readonly=False),
         'is_ssl':fields.boolean('SSL ?', required=False),
-        'attach':fields.boolean('Add Attachments ?', required=False),
+        'attach':fields.boolean('Add Attachments ?', required=False, help="Fetches mail with attachments if true."),
         'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
         'user' : fields.char('User Name', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}),
         'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly', False)]}),
         'note': fields.text('Description'),
-        'action_id':fields.many2one('ir.actions.server', 'Reply Email', required=False, domain="[('state','=','email')]"),
-        'object_id': fields.many2one('ir.model', "Model", required=True),
+        'action_id':fields.many2one('ir.actions.server', 'Reply Email', required=False, domain="[('state','=','email')]", 
+                                    help="A Email Server Action. It will be run whenever an e-mail is fetched from server."),
+        'object_id': fields.many2one('ir.model', "Model", required=True, help="OpenObject Model. Generates a record of this model."),
         'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"),
         'user_id':fields.many2one('res.users', 'User', required=False),
     }