audrius/account-financial-tools
1
0
Fork 0
mirror of https://github.com/OCA/account-financial-tools.git synced 2025-02-02 12:47:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] redability of error message

Browse Source
This commit is contained in:
Nicolas Bessi
2014-04-28 13:18:37 +02:00
parent b89ada6a0a
commit 4c67871ac8
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
account_credit_control/run.py
View File

@@ -82,17 +82,22 @@ class CreditControlRun(orm.Model):
def _check_run_date(self, cr, uid, ids, controlling_date, context=None):
"""Ensure that there is no credit line in the future using controlling_date"""
run_obj = self.pool['credit.control.run']
lines = run_obj.search(cr, uid, [('date', '>', controlling_date)],
order='date DESC', limit=1, context=context)
if not lines:
line_obj = self.pool['credit.control.line']
lines = line_obj.search(cr, uid, [('date', '>', controlling_date)],
order='date DESC', limit=1, context=context)
runs = run_obj.search(cr, uid, [('date', '>', controlling_date)],
order='date DESC', limit=1, context=context)
if runs:
run = run_obj.browse(cr, uid, runs[0], context=context)
raise orm.except_orm(_('Error'),
_('A run has already been executed more '
'recently than %s') % (run.date))
line_obj = self.pool['credit.control.line']
lines = line_obj.search(cr, uid, [('date', '>', controlling_date)],
order='date DESC', limit=1, context=context)
if lines:
line = line_obj.browse(cr, uid, lines[0], context=context)
raise orm.except_orm(_('Error'),
_('A run has already been executed more '
'recently than %s') % (line.date))
_('A credit control line more '
'recent than %s exists') % (line.date))
return True
def _generate_credit_lines(self, cr, uid, run_id, context=None):
@@ -153,7 +158,7 @@ class CreditControlRun(orm.Model):
"""
try:
cr.execute('SELECT id FROM credit_control_run'
' LIMIT 1 FOR UPDATE NOWAIT')
' LIMIT 1 FOR UPDATE NOWAIT')
except Exception as exc:
# in case of exception openerp will do a rollback for us and free the lock
raise orm.except_orm(_('Error'),