audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] fix cleanup bugs

Browse Source
This commit is contained in:
Stefan Rijnhart
2012-01-12 12:46:48 +01:00
parent efb52095ce
commit 91d0336d14
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_banking/__openerp__.py
View File

@@ -30,7 +30,7 @@
############################################################################## ##############################################################################
{ {
'name': 'Account Banking', 'name': 'Account Banking',
'version': '0.1.98', 'version': '0.1.99',
'license': 'GPL-3', 'license': 'GPL-3',
'author': 'Banking addons community', 'author': 'Banking addons community',
'website': 'https://launchpad.net/banking-addons', 'website': 'https://launchpad.net/banking-addons',

5
account_banking/bank_import_transaction.py
View File

@@ -131,7 +131,7 @@ class banking_import_transaction(osv.osv):
def is_zero(total): def is_zero(total):
return self.pool.get('res.currency').is_zero( return self.pool.get('res.currency').is_zero(
cr, uid, trans.statement_id.currency_id, total) cr, uid, trans.statement_id.currency, total)
payment_order_obj = self.pool.get('payment.order') payment_order_obj = self.pool.get('payment.order')
order_ids = payment_order_obj.search( order_ids = payment_order_obj.search(
@@ -147,7 +147,7 @@ class banking_import_transaction(osv.osv):
if len(candidates) > 0: if len(candidates) > 0:
# retrieve the common account_id, if any # retrieve the common account_id, if any
account_id = False account_id = False
for line in candidate[0].line_ids[0].debit_move_line_id.move_id.line_id: for line in candidates[0].line_ids[0].debit_move_line_id.move_id.line_id:
if line.account_id.type == 'other': if line.account_id.type == 'other':
account_id = line.account_id.id account_id = line.account_id.id
break break
@@ -1689,6 +1689,7 @@ class account_bank_statement_line(osv.osv):
def cancel(self, cr, uid, ids, context=None): def cancel(self, cr, uid, ids, context=None):
if ids and isinstance(ids, (int, float)): if ids and isinstance(ids, (int, float)):
ids = [ids] ids = [ids]
account_move_obj = self.pool.get('account.move')
import_transaction_obj = self.pool.get('banking.import.transaction') import_transaction_obj = self.pool.get('banking.import.transaction')
transaction_cancel_ids = [] transaction_cancel_ids = []
move_unlink_ids = [] move_unlink_ids = []