← Back to branch summary

~syleam/openobject-server/5.0-fix-576987

« back to all changes in this revision

Viewing changes to bin/addons/base/ir/ir_actions.py

  • Committer: Jay(Open ERP)
  • Date: 2010-04-30 14:02:56 UTC
  • Revision ID: jvo@tinyerp.com-20100430140256-xr0ihg6r0q3snd0y
[FIX] Server Actions: Cleaner legend help and error message

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/addons/base/ir/ir_actions.py
551
551
                if not address:
552
552
                    raise osv.except_osv(_('Error'), _("Please specify the Partner Email address !"))
553
553
                if not user:
554
 
                    raise osv.except_osv(_('Error'), _("Please specify server option --smtp-from !"))
 
554
                    raise osv.except_osv(_('Error'), _("Please specify server option --email-from !"))
555
555
                
556
556
                subject = self.merge_message(cr, uid, action.subject, action, context)
557
557
                body = self.merge_message(cr, uid, action.message, action, context)