Pinakin Nayi (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-crm-warning-imp-pna
into lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr.
Requested reviews:
Kuldeep Joshi(OpenERP) (kjo-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-crm-warning-imp-pna/+merge/114794
Hello ,
I improved Exceptions, Constraint errors and Warning message of CRM modules.
Thanks,
pna
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-crm-warning-imp-pna/+merge/114794
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr.
=== modified file 'crm/crm_action_rule.py'
--- crm/crm_action_rule.py 2012-06-25 13:42:53 +0000
+++ crm/crm_action_rule.py 2012-07-13 08:32:28 +0000
@@ -59,7 +59,7 @@
else:
reply_to = emailfrom
if not emailfrom:
- raise osv.except_osv(_('Error!'), _("No Email Found for your Company address!"))
+ raise osv.except_osv(_('Error!'), _("No Email Found 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):
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py 2012-07-06 12:29:59 +0000
+++ crm/crm_lead.py 2012-07-13 08:32:28 +0000
@@ -784,7 +784,7 @@
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'; it must be in state 'Draft' to be deleted. " \
+ _("You cannot delete lead '%s'; because it's 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)
=== modified file 'crm/i18n/crm.pot'
--- crm/i18n/crm.pot 2012-06-25 13:42:53 +0000
+++ crm/i18n/crm.pot 2012-07-13 08:32:28 +0000
@@ -110,7 +110,7 @@
#. module: crm
#: code:addons/crm/wizard/crm_add_note.py:28
#, python-format
-msgid "Can not add note!"
+msgid "Cannot add note."
msgstr ""
#. module: crm
@@ -802,7 +802,7 @@
#: code:addons/crm/crm_lead.py:832
#, python-format
msgid ""
-"You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
+"You cannot delete lead '%s'; because it's not in 'Draft' state You "
"should better cancel it, instead of deleting it."
msgstr ""
@@ -3184,7 +3184,7 @@
#. module: crm
#: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
#, python-format
-msgid "Closed/Cancelled Leads can not be converted into Opportunity"
+msgid "Closed/Cancelled Leads cannot be converted into Opportunity."
msgstr ""
#. module: crm
@@ -3273,7 +3273,7 @@
#. module: crm
#: constraint:crm.segmentation:0
-msgid "Error ! You can not create recursive profiles."
+msgid "Error ! You cannot create recursive profiles."
msgstr ""
#. module: crm
@@ -3401,7 +3401,7 @@
#. module: crm
#: code:addons/crm/crm_action_rule.py:61
#, python-format
-msgid "No Email Found for your Company address!"
+msgid "No Email Found for your Company address."
msgstr ""
#. module: crm
=== modified file 'crm/wizard/crm_add_note.py'
--- crm/wizard/crm_add_note.py 2012-01-31 13:36:57 +0000
+++ crm/wizard/crm_add_note.py 2012-07-13 08:32:28 +0000
@@ -25,7 +25,7 @@
context = {}
if not context.get('active_model'):
- raise osv.except_osv(_('Error'), _('Can not add note!'))
+ raise osv.except_osv(_('Error'), _('Cannot add note.'))
model = context.get('active_model')
case_pool = self.pool.get(model)
=== modified file 'crm/wizard/crm_lead_to_opportunity.py'
--- crm/wizard/crm_lead_to_opportunity.py 2012-03-05 11:03:46 +0000
+++ crm/wizard/crm_lead_to_opportunity.py 2012-07-13 08:32:28 +0000
@@ -99,7 +99,7 @@
lead_obj = self.pool.get('crm.lead')
for lead in lead_obj.browse(cr, uid, context.get('active_ids', []), context=context):
if lead.state in ['done', 'cancel']:
- raise osv.except_osv(_("Warning !"), _("Closed/Cancelled Leads can not be converted into Opportunity"))
+ raise osv.except_osv(_("Warning !"), _("Closed/Cancelled Leads cannot be converted into Opportunity."))
return False
def _convert_opportunity(self, cr, uid, ids, vals, context=None):
=== modified file 'crm_partner_assign/i18n/crm_partner_assign.pot'
--- crm_partner_assign/i18n/crm_partner_assign.pot 2012-06-25 13:42:53 +0000
+++ crm_partner_assign/i18n/crm_partner_assign.pot 2012-07-13 08:32:28 +0000
@@ -115,7 +115,7 @@
#. module: crm_partner_assign
#: code:addons/crm_partner_assign/partner_geo_assign.py:37
#, python-format
-msgid "Could not contact geolocation servers, please make sure you have a working internet connection (%s)"
+msgid "Cannot contact geolocation servers, please make sure you have a working internet connection (%s)."
msgstr ""
#. module: crm_partner_assign
=== modified file 'crm_partner_assign/partner_geo_assign.py'
--- crm_partner_assign/partner_geo_assign.py 2012-03-22 10:21:04 +0000
+++ crm_partner_assign/partner_geo_assign.py 2012-07-13 08:32:28 +0000
@@ -34,7 +34,7 @@
xml = urllib.urlopen(url).read()
except Exception, e:
raise osv.except_osv(_('Network error'),
- _('Could not contact geolocation servers, please make sure you have a working internet connection (%s)') % e)
+ _('Cannot contact geolocation servers, please make sure you have a working internet connection (%s).') % e)
if '<error>' in xml:
return None
=== modified file 'crm_profiling/crm_profiling.py'
--- crm_profiling/crm_profiling.py 2012-06-19 15:06:47 +0000
+++ crm_profiling/crm_profiling.py 2012-07-13 08:32:28 +0000
@@ -234,7 +234,7 @@
}
_constraints = [
- (osv.osv._check_recursion, 'Error ! You can not create recursive profiles.', ['parent_id'])
+ (osv.osv._check_recursion, 'Error ! You cannot create recursive profiles.', ['parent_id'])
]
def process_continue(self, cr, uid, ids, start=False):
=== modified file 'crm_profiling/i18n/crm_profiling.pot'
--- crm_profiling/i18n/crm_profiling.pot 2012-05-10 13:00:12 +0000
+++ crm_profiling/i18n/crm_profiling.pot 2012-07-13 08:32:28 +0000
@@ -129,7 +129,7 @@
#. module: crm_profiling
#: constraint:crm.segmentation:0
-msgid "Error ! You can not create recursive profiles."
+msgid "Error ! You cannot create recursive profiles."
msgstr ""
#. module: crm_profiling
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
