[FIX] share: users may have an empty signature
authorOlivier Dony <odo@openerp.com>
Wed, 14 Dec 2011 14:52:00 +0000 (15:52 +0100)
committerOlivier Dony <odo@openerp.com>
Wed, 14 Dec 2011 14:52:00 +0000 (15:52 +0100)
lp bug: https://launchpad.net/bugs/902106 fixed
lp bug: https://launchpad.net/bugs/902898 fixed

bzr revid: odo@openerp.com-20111214145200-9ly20dra7n2s1l6p

addons/share/wizard/share_wizard.py

index 3466b37..6c6c6ab 100644 (file)
@@ -712,7 +712,7 @@ class share_wizard(osv.osv_memory):
                 body += _("The documents have been automatically added to your current OpenERP documents.\n")
                 body += _("You may use your current login (%s) and password to view them.\n") % result_line.user_id.login
             body += "\n\n"
-            body += user.signature
+            body += (user.signature or '')
             body += "\n\n"
             body += "--\n"
             body += _("OpenERP is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n"
@@ -728,7 +728,7 @@ class share_wizard(osv.osv_memory):
         # force direct delivery, as users expect instant notification
         mail_message.send(cr, uid, msg_ids, context=context)
         self._logger.info('%d share notification(s) sent.', len(msg_ids))
-share_wizard()
+
 
 class share_result_line(osv.osv_memory):
     _name = 'share.wizard.result.line'
@@ -753,6 +753,5 @@ class share_result_line(osv.osv_memory):
     _defaults = {
         'newly_created': True,
     }
-share_result_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: