audrius/account-reconcile
1
0
Fork 1
mirror of https://github.com/OCA/account-reconcile.git synced 2025-01-20 12:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] better error log for completion rules + global error message is logged

Browse Source
This commit is contained in:
unknown
2013-04-30 11:39:29 +02:00
parent 6500ac2765
commit ccc419b349
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
account_statement_base_completion/statement.py
View File

@@ -45,6 +45,9 @@ class ErrorTooManyPartner(Exception):
def __str__(self): def __str__(self):
return repr(self.value) return repr(self.value)
def __repr__(self):
return repr(self.value)
class AccountStatementProfil(orm.Model): class AccountStatementProfil(orm.Model):
""" """
@@ -303,12 +306,14 @@ class AccountStatementCompletionRule(orm.Model):
pairs = cr.fetchall() pairs = cr.fetchall()
for pair in pairs: for pair in pairs:
context['label_memoizer'][pair[0]].append(partner) context['label_memoizer'][pair[0]].append(partner)
if st_line['id'] in context['label_memoizer']: if st_line['id'] in context['label_memoizer']:
found_partner = context['label_memoizer'][st_line['id']] found_partner = context['label_memoizer'][st_line['id']]
if len(found_partner) > 1: if len(found_partner) > 1:
raise ErrorTooManyPartner(_('Line named "%s" (Ref:%s) was matched by ' msg = (_('Line named "%s" (Ref:%s) was matched by '
'more than one partner while looking on partner label') % 'more than one partner while looking on partner label: %s') %
(st_line['name'], st_line['ref'])) (st_line['name'], st_line['ref'], ','.join([x.name for x in found_partner])))
raise ErrorTooManyPartner(msg)
res['partner_id'] = found_partner[0].id res['partner_id'] = found_partner[0].id
st_vals = st_obj.get_values_for_line(cr, st_vals = st_obj.get_values_for_line(cr,
uid, uid,
@@ -451,8 +456,8 @@ class AccountBankSatement(orm.Model):
log = log if log else "" log = log if log else ""
completion_date = datetime.datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT) completion_date = datetime.datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT)
message = (_("%s Bank Statement ID %s has %s lines completed by %s \n%s\n") % message = (_("%s Bank Statement ID %s has %s lines completed by %s \n%s\n%s\n") %
(completion_date, stat_id, number_imported, user_name, log)) (completion_date, stat_id, number_imported, user_name, error_msg, log))
self.write(cr, uid, [stat_id], {'completion_logs': message}, context=context) self.write(cr, uid, [stat_id], {'completion_logs': message}, context=context)
body = (_('Statement ID %s auto-completed for %s lines completed') % body = (_('Statement ID %s auto-completed for %s lines completed') %