[IMP] all the error messages now start with 'Error\!' (not 'Error' or 'Error \!')
bzr revid: abo@openerp.com-20120807113137-44vehm0mthqawlo3
This commit is contained in:
parent
b0e8ae4c7d
commit
8a64e7580a
|
@ -800,7 +800,7 @@ class account_move_line(osv.osv):
|
|||
company_list.append(line.company_id.id)
|
||||
for line in unrec_lines:
|
||||
if line.state <> 'valid':
|
||||
raise osv.except_osv(_('Error'),
|
||||
raise osv.except_osv(_('Error!'),
|
||||
_('Entry "%s" is not valid !') % line.name)
|
||||
credit += line['credit']
|
||||
debit += line['debit']
|
||||
|
|
|
@ -67,7 +67,7 @@ class accounting_report(osv.osv_memory):
|
|||
result['date_to'] = data['form']['date_to_cmp']
|
||||
elif data['form']['filter_cmp'] == 'filter_period':
|
||||
if not data['form']['period_from_cmp'] or not data['form']['period_to_cmp']:
|
||||
raise osv.except_osv(_('Error'),_('Select a starting and an ending period'))
|
||||
raise osv.except_osv(_('Error!'),_('Select a starting and an ending period'))
|
||||
result['period_from'] = data['form']['period_from_cmp']
|
||||
result['period_to'] = data['form']['period_to_cmp']
|
||||
return result
|
||||
|
|
|
@ -33,7 +33,7 @@ def _create_yaml(self, cr, uid, data, context=None):
|
|||
try:
|
||||
res_xml = mod.generate_yaml(cr, uid)
|
||||
except Exception, e:
|
||||
raise osv.except_osv(_('Error'),_(str(e)))
|
||||
raise osv.except_osv(_('Error!'),_(str(e)))
|
||||
return {
|
||||
'yaml_file': base64.encodestring(res_xml),
|
||||
}
|
||||
|
|
|
@ -108,7 +108,7 @@ class res_partner(osv.osv):
|
|||
def button_check_vat(self, cr, uid, ids, context=None):
|
||||
if not self.check_vat(cr, uid, ids, context=context):
|
||||
msg = self._construct_constraint_msg(cr, uid, ids, context=context)
|
||||
raise osv.except_osv(_('Error'), msg)
|
||||
raise osv.except_osv(_('Error!'), msg)
|
||||
|
||||
def check_vat(self, cr, uid, ids, context=None):
|
||||
user_company = self.pool.get('res.users').browse(cr, uid, uid).company_id
|
||||
|
|
|
@ -788,7 +788,7 @@ class crm_lead(base_stage, osv.osv):
|
|||
def unlink(self, cr, uid, ids, context=None):
|
||||
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'),
|
||||
raise osv.except_osv(_('Error!'),
|
||||
_("You cannot delete lead '%s' because it is not in 'Draft' state. " \
|
||||
"You can still cancel it, instead of deleting it.") % lead.name)
|
||||
return super(crm_lead, self).unlink(cr, uid, ids, context)
|
||||
|
|
|
@ -74,7 +74,7 @@ class google_login(osv.osv_memory):
|
|||
}
|
||||
self.pool.get('res.users').write(cr, uid, uid, res, context=context)
|
||||
else:
|
||||
raise osv.except_osv(_('Error'), _("Authentication failed. Check the user and password."))
|
||||
raise osv.except_osv(_('Error!'), _("Authentication failed. Check the user and password."))
|
||||
|
||||
return self._get_next_action(cr, uid, context=context)
|
||||
|
||||
|
|
|
@ -101,7 +101,7 @@ class account_analytic_line(osv.osv):
|
|||
product_id = data['product'][0]
|
||||
product = product_obj.browse(cr, uid, product_id, context=context2)
|
||||
if not product:
|
||||
raise osv.except_osv(_('Error'), _('There is no product defined for the line %s. Please select one or force the product through the wizard.') % (line_name))
|
||||
raise osv.except_osv(_('Error!'), _('There is no product defined for the line %s. Please select one or force the product through the wizard.') % (line_name))
|
||||
factor = invoice_factor_obj.browse(cr, uid, factor_id, context=context2)
|
||||
factor_name = product_obj.name_get(cr, uid, [product_id], context=context2)[0][1]
|
||||
if factor.customer_name:
|
||||
|
|
|
@ -127,13 +127,13 @@ class synchronize_google(osv.osv_memory):
|
|||
gmail_pwd = user_obj.gmail_password
|
||||
google = self.pool.get('google.login')
|
||||
if not gmail_user or not gmail_pwd:
|
||||
raise osv.except_osv(_('Error'), _("Invalid login detail !\nPlease specify correct username and password."))
|
||||
raise osv.except_osv(_('Error!'), _("Invalid login detail !\nPlease specify correct username and password."))
|
||||
|
||||
if context.get('contact'):
|
||||
msg = " Your contacts are being imported in background, an email to %s will be sent when the process is over." % (user_obj.gmail_user)
|
||||
gd_client = google.google_login(gmail_user, gmail_pwd, type='contact')
|
||||
if not gd_client:
|
||||
raise osv.except_osv(_('Error'), _("Please specify correct username and password!"))
|
||||
raise osv.except_osv(_('Error!'), _("Please specify correct username and password!"))
|
||||
if obj.group_name not in ['all']:
|
||||
context.update({ 'group_name': obj.group_name})
|
||||
tables.append('Contact')
|
||||
|
|
|
@ -372,17 +372,17 @@ def _create_dta(obj, cr, uid, data, context=None):
|
|||
# raise osv.except_osv(_('Order not confirmed'),
|
||||
# _('Please confirm it'))
|
||||
if not payment.mode:
|
||||
raise osv.except_osv(_('Error'),
|
||||
raise osv.except_osv(_('Error!'),
|
||||
_('No payment mode.'))
|
||||
bank = payment.mode.bank_id
|
||||
if not bank:
|
||||
raise osv.except_osv(_('Error'), _('No bank account for the company.'))
|
||||
raise osv.except_osv(_('Error!'), _('No bank account for the company.'))
|
||||
|
||||
v['comp_bank_name']= bank.bank and bank.bank.name or False
|
||||
v['comp_bank_clearing'] = bank.bank.clearing
|
||||
|
||||
if not v['comp_bank_clearing']:
|
||||
raise osv.except_osv(_('Error'),
|
||||
raise osv.except_osv(_('Error!'),
|
||||
_('You must provide a Clearing Number for your bank account.'))
|
||||
|
||||
user = pool.get('res.users').browse(cr,uid,[uid])[0]
|
||||
|
@ -404,7 +404,7 @@ def _create_dta(obj, cr, uid, data, context=None):
|
|||
#else:
|
||||
# v['comp_bank_iban'] = ''
|
||||
if not v['comp_bank_iban']:
|
||||
raise osv.except_osv(_('Error'),
|
||||
raise osv.except_osv(_('Error!'),
|
||||
_('No IBAN for the company bank account.'))
|
||||
|
||||
res_partner_bank_obj = pool.get('res.partner.bank')
|
||||
|
@ -415,10 +415,10 @@ def _create_dta(obj, cr, uid, data, context=None):
|
|||
|
||||
for pline in payment.line_ids:
|
||||
if not pline.bank_id:
|
||||
raise osv.except_osv(_('Error'), _('No bank account defined\n' \
|
||||
raise osv.except_osv(_('Error!'), _('No bank account defined\n' \
|
||||
'on line: %s') % pline.name)
|
||||
if not pline.bank_id.bank:
|
||||
raise osv.except_osv(_('Error'), _('No bank defined\n' \
|
||||
raise osv.except_osv(_('Error!'), _('No bank defined\n' \
|
||||
'for the bank account: %s\n' \
|
||||
'on the partner: %s\n' \
|
||||
'on line: %s') + (pline.bank_id.state, pline.partner_id.name, pline.name))
|
||||
|
@ -431,7 +431,7 @@ def _create_dta(obj, cr, uid, data, context=None):
|
|||
v['partner_bank_name'] = pline.bank_id.bank.name or False
|
||||
v['partner_bank_clearing'] = pline.bank_id.bank.clearing or False
|
||||
if not v['partner_bank_name'] :
|
||||
raise osv.except_osv(_('Error'), _('No bank name defined\n' \
|
||||
raise osv.except_osv(_('Error!'), _('No bank name defined\n' \
|
||||
'for the bank account: %s\n' \
|
||||
'on the partner: %s\n' \
|
||||
'on line: %s') % (pline.bank_id.state, pline.partner_id.name, pline.name))
|
||||
|
@ -460,7 +460,7 @@ def _create_dta(obj, cr, uid, data, context=None):
|
|||
v['partner_bvr'] = v['partner_bvr'].rjust(9, '0')
|
||||
is_9_pos_adherent = False
|
||||
else:
|
||||
raise osv.except_osv(_('Error'),
|
||||
raise osv.except_osv(_('Error!'),
|
||||
_('Wrong postal number format.\n'
|
||||
'It must be 12-123456-9 or 12345 format'))
|
||||
|
||||
|
@ -519,7 +519,7 @@ def _create_dta(obj, cr, uid, data, context=None):
|
|||
v['comp_country'] = co_addr.country_id and co_addr.country_id.code+'-' or ''
|
||||
record_type = record_gt836
|
||||
if not v['partner_bank_iban']:
|
||||
raise osv.except_osv(_('Error'), _('No IBAN defined \n' \
|
||||
raise osv.except_osv(_('Error!'), _('No IBAN defined \n' \
|
||||
'for the bank account: %s\n' + \
|
||||
'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name))
|
||||
|
||||
|
@ -535,27 +535,27 @@ def _create_dta(obj, cr, uid, data, context=None):
|
|||
+ ' ' + v['partner_bank_city'] \
|
||||
+ ' ' + v['partner_bank_country']
|
||||
else:
|
||||
raise osv.except_osv(_('Error'), _('You must provide the bank city '
|
||||
raise osv.except_osv(_('Error!'), _('You must provide the bank city '
|
||||
'or the bic code for the partner bank: \n %d\n' + \
|
||||
'on line: %s') %(res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1], pline.name))
|
||||
|
||||
elif elec_pay == 'bvrbank' or elec_pay == 'bvrpost':
|
||||
from tools import mod10r
|
||||
if not v['reference']:
|
||||
raise osv.except_osv(_('Error'),
|
||||
raise osv.except_osv(_('Error!'),
|
||||
_('You must provide ' \
|
||||
'a BVR reference number \n' \
|
||||
'for the line: %s') % pline.name)
|
||||
v['reference'] = v['reference'].replace(' ', '')
|
||||
if is_9_pos_adherent:
|
||||
if len(v['reference']) > 27:
|
||||
raise osv.except_osv(_('Error'),
|
||||
raise osv.except_osv(_('Error!'),
|
||||
_('BVR reference number is not valid \n'
|
||||
'for the line: %s. \n'
|
||||
'Reference is too long.') % pline.name)
|
||||
# do a mod10 check
|
||||
if mod10r(v['reference'][:-1]) != v['reference']:
|
||||
raise osv.except_osv(_('Error'),
|
||||
raise osv.except_osv(_('Error!'),
|
||||
_('BVR reference number is not valid \n'
|
||||
'for the line: %s. \n'
|
||||
'Mod10 check failed.') % pline.name)
|
||||
|
@ -565,7 +565,7 @@ def _create_dta(obj, cr, uid, data, context=None):
|
|||
# reference of BVR adherent with 5 positions number
|
||||
# have 15 positions references
|
||||
if len(v['reference']) > 15:
|
||||
raise osv.except_osv(_('Error'),
|
||||
raise osv.except_osv(_('Error!'),
|
||||
_('BVR reference number is not valid \n'
|
||||
'for the line: %s. \n'
|
||||
'Reference is too long '
|
||||
|
@ -575,19 +575,19 @@ def _create_dta(obj, cr, uid, data, context=None):
|
|||
v['reference'] = v['reference'].rjust(15, '0').ljust(27, ' ')
|
||||
|
||||
if not v['partner_bvr']:
|
||||
raise osv.except_osv(_('Error'), _('You must provide a BVR number\n'
|
||||
raise osv.except_osv(_('Error!'), _('You must provide a BVR number\n'
|
||||
'for the bank account: %s' \
|
||||
'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id],context)[0][1] ,pline.name))
|
||||
record_type = record_gt826
|
||||
|
||||
elif elec_pay == 'bvbank':
|
||||
if not v['partner_bank_number'] :
|
||||
raise osv.except_osv(_('Error'), _('You must provide ' \
|
||||
raise osv.except_osv(_('Error!'), _('You must provide ' \
|
||||
'a bank number \n' \
|
||||
'for the partner bank: %s\n' \
|
||||
'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name))
|
||||
if not v['partner_bank_clearing']:
|
||||
raise osv.except_osv(_('Error'), _('You must provide ' \
|
||||
raise osv.except_osv(_('Error!'), _('You must provide ' \
|
||||
'a Clearing Number\n' \
|
||||
'for the partner bank: %s\n' \
|
||||
'on line %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name))
|
||||
|
@ -595,7 +595,7 @@ def _create_dta(obj, cr, uid, data, context=None):
|
|||
record_type = record_gt827
|
||||
elif elec_pay == 'bvpost':
|
||||
if not v['partner_post_number']:
|
||||
raise osv.except_osv(_('Error'), _('You must provide ' \
|
||||
raise osv.except_osv(_('Error!'), _('You must provide ' \
|
||||
'a post number \n' \
|
||||
'for the partner bank: %s\n' \
|
||||
'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] ,pline.name))
|
||||
|
@ -603,7 +603,7 @@ def _create_dta(obj, cr, uid, data, context=None):
|
|||
v['partner_bank_number'] = '/C/'+v['partner_post_number']
|
||||
record_type = record_gt827
|
||||
else:
|
||||
raise osv.except_osv(_('Error'), _('The Bank type %s of the bank account: %s is not supported.') \
|
||||
raise osv.except_osv(_('Error!'), _('The Bank type %s of the bank account: %s is not supported.') \
|
||||
% (elec_pay, res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1],))
|
||||
|
||||
dta_line = record_type(v).generate()
|
||||
|
|
|
@ -50,12 +50,12 @@ class res_partner_bank(osv.osv):
|
|||
# compute the key
|
||||
key = 97 - (100 * int(rib)) % 97
|
||||
if int(bank_acc.key) != key:
|
||||
raise osv.except_osv(_('Error'),
|
||||
raise osv.except_osv(_('Error!'),
|
||||
_("The RIB key %s does not correspond to the other codes: %s %s %s.") % \
|
||||
(bank_acc.key, bank_acc.bank_code, bank_acc.office, bank_acc.rib_acc_number) )
|
||||
if bank_acc.acc_number:
|
||||
if not self.is_iban_valid(cr, uid, bank_acc.acc_number):
|
||||
raise osv.except_osv(_('Error'), _("The IBAN %s is not valid.") % bank_acc.acc_number)
|
||||
raise osv.except_osv(_('Error!'), _("The IBAN %s is not valid.") % bank_acc.acc_number)
|
||||
return True
|
||||
|
||||
def onchange_bank_id(self, cr, uid, ids, bank_id, context=None):
|
||||
|
|
|
@ -99,7 +99,7 @@ class sale_advance_payment_inv(osv.osv_memory):
|
|||
for sale in sale_obj.browse(cr, uid, sale_ids, context=context):
|
||||
if sale.order_policy == 'postpaid':
|
||||
raise osv.except_osv(
|
||||
_('Error'),
|
||||
_('Error!'),
|
||||
_("You cannot make an advance on a sales order \
|
||||
that is defined as 'Automatic Invoice after delivery'."))
|
||||
|
||||
|
|
|
@ -516,7 +516,7 @@ class stock_tracking(osv.osv):
|
|||
return res
|
||||
|
||||
def unlink(self, cr, uid, ids, context=None):
|
||||
raise osv.except_osv(_('Error'), _('You cannot remove a lot line.'))
|
||||
raise osv.except_osv(_('Error!'), _('You cannot remove a lot line.'))
|
||||
|
||||
def action_traceability(self, cr, uid, ids, context={}):
|
||||
""" It traces the information of a product
|
||||
|
@ -1154,7 +1154,7 @@ class stock_picking(osv.osv):
|
|||
return True
|
||||
for move in pick.move_lines:
|
||||
if move.state == 'done':
|
||||
raise osv.except_osv(_('Error'), _('You cannot cancel picking because stock move is in done state!'))
|
||||
raise osv.except_osv(_('Error!'), _('You cannot cancel picking because stock move is in done state!'))
|
||||
return True
|
||||
def unlink(self, cr, uid, ids, context=None):
|
||||
move_obj = self.pool.get('stock.move')
|
||||
|
@ -1162,7 +1162,7 @@ class stock_picking(osv.osv):
|
|||
context = {}
|
||||
for pick in self.browse(cr, uid, ids, context=context):
|
||||
if pick.state in ['done','cancel']:
|
||||
raise osv.except_osv(_('Error'), _('You cannot remove the picking which is in %s state!')%(pick.state,))
|
||||
raise osv.except_osv(_('Error!'), _('You cannot remove the picking which is in %s state!')%(pick.state,))
|
||||
else:
|
||||
ids2 = [move.id for move in pick.move_lines]
|
||||
ctx = context.copy()
|
||||
|
|
Loading…
Reference in New Issue