mirror of
https://github.com/OCA/bank-statement-import.git
synced 2025-01-20 12:37:43 +02:00
Consider refund line
Avoid to return paypal_email_account as a bank account Put file transaction ref in name to work with base_transaction_ref Remove thousands separator
This commit is contained in:
committed by
Carlos Roca
parent
ae0726c632
commit
c980f1d2ad
@@ -47,7 +47,7 @@ class AccountBankStatementImport(models.TransientModel):
|
|||||||
@api.model
|
@api.model
|
||||||
def _valid_paypal_line(self, line):
|
def _valid_paypal_line(self, line):
|
||||||
'''This method is designed to be inherited'''
|
'''This method is designed to be inherited'''
|
||||||
if line[5].startswith('Termin'):
|
if line[5].startswith('Termin') or line[5].startswith('Rembours'):
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
@@ -56,7 +56,8 @@ class AccountBankStatementImport(models.TransientModel):
|
|||||||
def _paypal_convert_amount(self, amount_str):
|
def _paypal_convert_amount(self, amount_str):
|
||||||
'''This method is designed to be inherited'''
|
'''This method is designed to be inherited'''
|
||||||
valstr = re.sub(r'[^\d,.-]', '', amount_str)
|
valstr = re.sub(r'[^\d,.-]', '', amount_str)
|
||||||
valstrdot = valstr.replace(',', '.')
|
valstrdot = valstr.replace('.', '')
|
||||||
|
valstrdot = valstrdot.replace(',', '.')
|
||||||
return float(valstrdot)
|
return float(valstrdot)
|
||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
@@ -190,8 +191,8 @@ class AccountBankStatementImport(models.TransientModel):
|
|||||||
partner_id = False
|
partner_id = False
|
||||||
vals_line = {
|
vals_line = {
|
||||||
'date': fline['date'],
|
'date': fline['date'],
|
||||||
'name': fline['name'],
|
'name': fline['ref'],
|
||||||
'ref': fline['ref'],
|
'ref': fline['name'],
|
||||||
'unique_import_id': fline['ref'],
|
'unique_import_id': fline['ref'],
|
||||||
'amount': fline['amount'],
|
'amount': fline['amount'],
|
||||||
'partner_id': partner_id,
|
'partner_id': partner_id,
|
||||||
@@ -219,4 +220,4 @@ class AccountBankStatementImport(models.TransientModel):
|
|||||||
'balance_end_real': end_balance,
|
'balance_end_real': end_balance,
|
||||||
'transactions': transactions,
|
'transactions': transactions,
|
||||||
}
|
}
|
||||||
return None, paypal_email_account, [vals_bank_statement]
|
return None, None, [vals_bank_statement]
|
||||||
|
|||||||
Reference in New Issue
Block a user