← Back to branch summary

~therp-nl/banking-addons/6.1_mt940_line_endings

« back to all changes in this revision

Viewing changes to account_direct_debit/model/account_payment.py

  • Committer: Holger Brunn
  • Author(s): stefan at therp
  • Date: 2013-10-28 14:51:41 UTC
  • mfrom: (178.5.3 6.1-sepa-fixes)
  • Revision ID: hbrunn@therp.nl-20131028145141-g8hj0mduqbgyrowu
[FIX] Wizard should not have ACL
[FIX] Undefined reference to orm.except_orm

Show diffs side-by-side

added added

removed removed

Lines of Context:
account_direct_debit/model/account_payment.py
336
336
            payment_line_id = payment_line_id[0]
337
337
        reconcile_obj = self.pool.get('account.move.reconcile')
338
338
        move_line_obj = self.pool.get('account.move.line')
339
 
        payment_line = self.browse(cr, uid, payment_line_id, context=context)
340
 
 
341
 
        debit_move_line = payment_line.debit_move_line_id
342
 
        torec_move_line = payment_line.move_line_id
343
 
 
344
 
        if payment_line.storno:
 
339
        payment_line_record = self.browse(cr, uid, payment_line_id, context=context)
 
340
 
 
341
        debit_move_line = payment_line_record.debit_move_line_id
 
342
        torec_move_line = payment_line_record.move_line_id
 
343
 
 
344
        if payment_line_record.storno:
345
345
            raise osv.except_osv(
346
346
                _('Can not reconcile'),
347
347
                _('Cancelation of payment line \'%s\' has already been ' +
348
 
                  'processed') % payment_line.name)
 
348
                  'processed') % payment_line_record.name)
349
349
        if (not debit_move_line or not torec_move_line):
350
350
            raise osv.except_osv(
351
351
                _('Can not reconcile'),
352
 
                _('No move line for line %s') % payment_line.name)     
 
352
                _('No move line for line %s') % payment_line_record.name)     
353
353
        if torec_move_line.reconcile_id: # torec_move_line.reconcile_partial_id:
354
354
            raise osv.except_osv(
355
355
                _('Error'),
370
370
        line_ids = [debit_move_line.id, torec_move_line.id]
371
371
        if torec_move_line.reconcile_partial_id:
372
372
            line_ids = [
373
 
                x.id for x in debit_move_line.reconcile_partial_id.line_partial_ids] + [torec_move_line_id]
 
373
                x.id for x in torec_move_line.reconcile_partial_id.line_partial_ids] + [debit_move_line.id]
374
374
 
375
375
        total = move_line_obj.get_balance(cr, uid, line_ids)
376
376
        vals = {