From ded2fedc839a6c4dd8d1337d731928e6ffb7e765 Mon Sep 17 00:00:00 2001 From: "Saurang Suthar(OpenERP)" <> Date: Wed, 25 Jul 2012 17:27:43 +0530 Subject: [PATCH] [IMP] Improved warning messages for crm* modules bzr revid: pso@tinyerp.com-20120725115743-y0i71256pjeqgt7o --- addons/crm/crm_action_rule.py | 2 +- addons/crm/crm_lead.py | 2 +- addons/crm/crm_meeting.py | 2 +- addons/crm/crm_phonecall.py | 2 +- addons/crm/i18n/crm.pot | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py index daa6534ecea..56b5393c535 100644 --- a/addons/crm/crm_action_rule.py +++ b/addons/crm/crm_action_rule.py @@ -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): diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 006daf043fe..af1c811b4e5 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -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) diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py index b34d1b9f090..13171d95b9b 100644 --- a/addons/crm/crm_meeting.py +++ b/addons/crm/crm_meeting.py @@ -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','created"), context=context) + return self.message_append_note(cr, uid, ids, body=_("Partner has been created."), context=context) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot index 4c34fc6d953..1c331ab151d 100644 --- a/addons/crm/i18n/crm.pot +++ b/addons/crm/i18n/crm.pot @@ -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