diff --git a/modules/banquepopulaire/pages.py b/modules/banquepopulaire/pages.py index 1d822c67..73be06e3 100644 --- a/modules/banquepopulaire/pages.py +++ b/modules/banquepopulaire/pages.py @@ -95,7 +95,7 @@ class Transaction(FrenchTransaction): FrenchTransaction.TYPE_WITHDRAWAL), (re.compile('^(?P.*) RETRAIT DU (?P
\d{2})(?P\d{2})(?P\d{2}) .*'), FrenchTransaction.TYPE_WITHDRAWAL), - (re.compile('(\w+) (?P
\d{2})(?P\d{2})(?P\d{2}) CB:[^ ]+ (?P.*)'), + (re.compile('(\w+) (?P
\d{2})(?P\d{2})(?P\d{2}) CB[:\*][^ ]+ (?P.*)'), FrenchTransaction.TYPE_CARD), (re.compile('^VIR(EMENT)? (?P.*)'), FrenchTransaction.TYPE_TRANSFER), (re.compile('^PRLV (?P.*)'), FrenchTransaction.TYPE_ORDER), diff --git a/modules/cragr/pages/accounts_list.py b/modules/cragr/pages/accounts_list.py index e6139a50..c99ce03c 100644 --- a/modules/cragr/pages/accounts_list.py +++ b/modules/cragr/pages/accounts_list.py @@ -40,7 +40,7 @@ class Transaction(FrenchTransaction): (re.compile('^(?PInterets\s*.*)', re.IGNORECASE), FrenchTransaction.TYPE_BANK), (re.compile('^(?PPrelev\.\s*(C\.r\.d\.s\.|R\.s\.a\.|C\.a\.p\.s\.|C\.s\.g|P\.s\.))', re.IGNORECASE), FrenchTransaction.TYPE_BANK), - (re.compile('^ACH.CARTE (?P.*)', re.IGNORECASE), FrenchTransaction.TYPE_CARD), + (re.compile('^(ACH.)?CARTE (?P.*)', re.IGNORECASE), FrenchTransaction.TYPE_CARD), (re.compile('^RET.CARTE (?P.*)', re.IGNORECASE), FrenchTransaction.TYPE_WITHDRAWAL), ] diff --git a/modules/societegenerale/pages/accounts_list.py b/modules/societegenerale/pages/accounts_list.py index 6b7622e4..168d27bc 100644 --- a/modules/societegenerale/pages/accounts_list.py +++ b/modules/societegenerale/pages/accounts_list.py @@ -110,6 +110,8 @@ class Transaction(FrenchTransaction): FrenchTransaction.TYPE_LOAN_PAYMENT), (re.compile(r'^(?PREMISE CHEQUES)(?P.*)'), FrenchTransaction.TYPE_DEPOSIT), + (re.compile(r'^CARTE RETRAIT (?P.*)'), + FrenchTransaction.TYPE_WITHDRAWAL), ] class AccountHistory(BasePage):