[IMP] Improved warning messages for crm* modules
bzr revid: pso@tinyerp.com-20120725115743-y0i71256pjeqgt7o
This commit is contained in:
parent
3e34fcc23e
commit
ded2fedc83
|
@ -59,7 +59,7 @@ class base_action_rule(osv.osv):
|
|||
else:
|
||||
reply_to = emailfrom
|
||||
if not emailfrom:
|
||||
raise osv.except_osv(_('Error!'), _("No Email Found for your Company address."))
|
||||
raise osv.except_osv(_('Error!'), _("There is no Email for your Company address."))
|
||||
return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model=obj._name, reply_to=reply_to, res_id=obj.id)
|
||||
|
||||
def do_check(self, cr, uid, action, obj, context=None):
|
||||
|
|
|
@ -784,7 +784,7 @@ class crm_lead(base_stage, osv.osv):
|
|||
for lead in self.browse(cr, uid, ids, context):
|
||||
if (not lead.section_id.allow_unlink) and (lead.state != 'draft'):
|
||||
raise osv.except_osv(_('Error'),
|
||||
_("You cannot delete lead '%s'; because it's not in 'Draft' state " \
|
||||
_("You cannot delete lead '%s'; because it is not in 'Draft' state. " \
|
||||
"You should better cancel it, instead of deleting it.") % lead.name)
|
||||
return super(crm_lead, self).unlink(cr, uid, ids, context)
|
||||
|
||||
|
|
|
@ -113,7 +113,7 @@ class res_users(osv.osv):
|
|||
'user_id': user_id}, context=context)
|
||||
except:
|
||||
# Tolerate a missing shortcut. See product/product.py for similar code.
|
||||
_logger.debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
|
||||
_logger.debug('Skipped meetings shortcut for user "%s".', data.get('name','<new'))
|
||||
return user_id
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -284,7 +284,7 @@ class crm_phonecall(base_state, osv.osv):
|
|||
return True
|
||||
|
||||
def _call_set_partner_send_note(self, cr, uid, ids, context=None):
|
||||
return self.message_append_note(cr, uid, ids, body=_("Partner has been <b>created</b>"), context=context)
|
||||
return self.message_append_note(cr, uid, ids, body=_("Partner has been <b>created</b>."), context=context)
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -802,7 +802,7 @@ msgstr ""
|
|||
#: code:addons/crm/crm_lead.py:832
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot delete lead '%s'; because it's not in 'Draft' state You "
|
||||
"You cannot delete lead '%s'; because it is not in 'Draft' state. You "
|
||||
"should better cancel it, instead of deleting it."
|
||||
msgstr ""
|
||||
|
||||
|
@ -3401,7 +3401,7 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: code:addons/crm/crm_action_rule.py:61
|
||||
#, python-format
|
||||
msgid "No Email Found for your Company address."
|
||||
msgid "There is no Email for your Company address."
|
||||
msgstr ""
|
||||
|
||||
#. module: crm
|
||||
|
|
Loading…
Reference in New Issue