Pinakin Nayi (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-base-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-base-warning-imp-pna/+merge/114796
Hello,
I improved Exceptions, Constraint errors and Warning message of base modules.
Thanks,
pna
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-base-warning-imp-pna/+merge/114796
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr.
=== modified file 'base_action_rule/base_action_rule.py'
--- base_action_rule/base_action_rule.py 2012-06-25 13:42:53 +0000
+++ base_action_rule/base_action_rule.py 2012-07-13 08:35:32 +0000
@@ -490,7 +490,7 @@
return True
_constraints = [
- (_check_mail, 'Error: The mail is not well formated', ['act_mail_body']),
+ (_check_mail, 'Error: The mail is not well formated.', ['act_mail_body']),
]
base_action_rule()
=== modified file 'base_action_rule/i18n/base_action_rule.pot'
--- base_action_rule/i18n/base_action_rule.pot 2012-06-25 13:42:53 +0000
+++ base_action_rule/i18n/base_action_rule.pot 2012-07-13 08:35:32 +0000
@@ -332,7 +332,7 @@
#. module: base_action_rule
#: constraint:base.action.rule:0
-msgid "Error: The mail is not well formated"
+msgid "Error: The mail is not well formated."
msgstr ""
#. module: base_action_rule
=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py 2012-06-01 13:25:59 +0000
+++ base_calendar/base_calendar.py 2012-07-13 08:35:32 +0000
@@ -413,7 +413,7 @@
cal = vobject.iCalendar()
event = cal.add('vevent')
if not event_obj.date_deadline or not event_obj.date:
- raise osv.except_osv(_('Warning !'),_("Couldn't Invite because date is not specified!"))
+ raise osv.except_osv(_('Warning !'),_("First specified the date for Invitation."))
event.add('created').value = ics_datetime(time.strftime('%Y-%m-%d %H:%M:%S'))
event.add('dtstart').value = ics_datetime(event_obj.date)
event.add('dtend').value = ics_datetime(event_obj.date_deadline)
@@ -1000,9 +1000,9 @@
for datas in self.read(cr, uid, ids, ['id','byday','recurrency', 'month_list','end_date', 'rrule_type', 'select1', 'interval', 'count', 'end_type', 'mo', 'tu', 'we', 'th', 'fr', 'sa', 'su', 'exrule', 'day', 'week_list' ], context=context):
event = datas['id']
if datas.get('interval', 0) < 0:
- raise osv.except_osv(_('Warning!'), _('Interval cannot be negative'))
+ raise osv.except_osv(_('Warning!'), _('Interval cannot be negative.'))
if datas.get('count', 0) < 0:
- raise osv.except_osv(_('Warning!'), _('Count cannot be negative'))
+ raise osv.except_osv(_('Warning!'), _('Count cannot be negative.'))
if datas['recurrency']:
result[event] = self.compute_rule_string(datas)
else:
@@ -1191,7 +1191,7 @@
def get_month_string(freq, datas):
if freq == 'monthly':
if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
- raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
+ raise osv.except_osv(_('Error!'), ("Please select proper Day of month."))
if datas.get('select1')=='day':
return ';BYDAY=' + datas.get('byday') + datas.get('week_list')
@@ -1408,7 +1408,7 @@
context = {}
if 'date' in groupby:
- raise osv.except_osv(_('Warning !'), _('Group by date not supported, use the calendar view instead'))
+ raise osv.except_osv(_('Warning !'), _('Group by date not supported, use the calendar view instead.'))
virtual_id = context.get('virtual_id', True)
context.update({'virtual_id': False})
res = super(calendar_event, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby)
=== modified file 'base_calendar/i18n/base_calendar.pot'
--- base_calendar/i18n/base_calendar.pot 2012-05-10 15:19:39 +0000
+++ base_calendar/i18n/base_calendar.pot 2012-07-13 08:35:32 +0000
@@ -108,7 +108,7 @@
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:1006
#, python-format
-msgid "Count cannot be negative"
+msgid "Count cannot be negative."
msgstr ""
#. module: base_calendar
@@ -261,7 +261,7 @@
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:1004
#, python-format
-msgid "Interval cannot be negative"
+msgid "Interval cannot be negative."
msgstr ""
#. module: base_calendar
@@ -273,7 +273,7 @@
#. module: base_calendar
#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
#, python-format
-msgid "%s must have an email address to send mail"
+msgid "%s must have an email address to send mail."
msgstr ""
#. module: base_calendar
@@ -407,7 +407,7 @@
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:1411
#, python-format
-msgid "Group by date not supported, use the calendar view instead"
+msgid "Group by date not supported, use the calendar view instead."
msgstr ""
#. module: base_calendar
@@ -1405,7 +1405,7 @@
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:418
#, python-format
-msgid "Couldn't Invite because date is not specified!"
+msgid "First specified the date for Invitation."
msgstr ""
#. module: base_calendar
=== modified file 'base_calendar/wizard/base_calendar_invite_attendee.py'
--- base_calendar/wizard/base_calendar_invite_attendee.py 2012-03-05 11:52:12 +0000
+++ base_calendar/wizard/base_calendar_invite_attendee.py 2012-07-13 08:35:32 +0000
@@ -93,7 +93,7 @@
if type == 'internal':
if not datas.get('user_ids'):
- raise osv.except_osv(_('Error!'), ("Please select any User"))
+ raise osv.except_osv(_('Error!'), ("Please select any User."))
for user_id in datas.get('user_ids'):
user = user_obj.browse(cr, uid, user_id)
res = {
@@ -140,7 +140,7 @@
if not mail_to:
name = map(lambda x: x[1], filter(lambda x: type==x[0], \
self._columns['type'].selection))
- raise osv.except_osv(_('Error!'), _("%s must have an email address to send mail") %(name[0]))
+ raise osv.except_osv(_('Error!'), _("%s must have an email address to send mail.") %(name[0]))
att_obj._send_mail(cr, uid, attendees, mail_to, \
email_from = current_user.user_email or tools.config.get('email_from', False))
=== modified file 'base_crypt/crypt.py'
--- base_crypt/crypt.py 2012-06-22 06:48:54 +0000
+++ base_crypt/crypt.py 2012-07-13 08:35:32 +0000
@@ -181,7 +181,7 @@
cr = pooler.get_db(db).cursor()
return self._login(cr, db, login, password)
except Exception:
- _logger.exception('Could not authenticate')
+ _logger.exception('Cannot authenticate!')
return Exception('Access Denied')
finally:
if cr is not None:
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py 2011-12-19 16:54:40 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py 2012-07-13 08:35:32 +0000
@@ -56,14 +56,14 @@
while totalsent < size:
sent = self.sock.send(msg[totalsent:])
if sent == 0:
- raise RuntimeError, "socket connection broken"
+ raise RuntimeError, "Socket connection broken!"
totalsent = totalsent + sent
def myreceive(self):
buf=''
while len(buf) < 8:
chunk = self.sock.recv(8 - len(buf))
if chunk == '':
- raise RuntimeError, "socket connection broken"
+ raise RuntimeError, "Socket connection broken!"
buf += chunk
size = int(buf)
buf = self.sock.recv(1)
@@ -75,7 +75,7 @@
while len(msg) < size:
chunk = self.sock.recv(size-len(msg))
if chunk == '':
- raise RuntimeError, "socket connection broken"
+ raise RuntimeError, "Socket connection broken!"
msg = msg + chunk
msgio = cStringIO.StringIO(msg)
unpickler = cPickle.Unpickler(msgio)
=== modified file 'base_status/base_stage.py'
--- base_status/base_stage.py 2012-06-11 05:36:44 +0000
+++ base_status/base_stage.py 2012-07-13 08:35:32 +0000
@@ -202,7 +202,7 @@
if case.section_id.parent_id.user_id:
data['user_id'] = case.section_id.parent_id.user_id.id
else:
- raise osv.except_osv(_('Error !'), _('You can not escalate, you are already at the top level regarding your sales-team category.'))
+ raise osv.except_osv(_('Error !'), _("You are already at the top level of your sales-team category.\n That's why you cannot escalate."))
self.write(cr, uid, [case.id], data, context=context)
case.case_escalate_send_note(case.section_id.parent_id, context=context)
cases = self.browse(cr, uid, ids, context=context)
_______________________________________________
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
