diff --git a/modules/afer/module.py b/modules/afer/module.py
index 34063b36e72574a907a67a6e697b1b87d3354aae..0bbe9c2550fb0e790141d5c626e11dee4cc66447 100644
--- a/modules/afer/module.py
+++ b/modules/afer/module.py
@@ -19,7 +19,7 @@
from weboob.capabilities.base import find_object
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -29,7 +29,7 @@
__all__ = ['AferModule']
-class AferModule(Module, CapBank):
+class AferModule(Module, CapBankWealth):
NAME = 'afer'
DESCRIPTION = u'afer website'
MAINTAINER = u'James GALT'
diff --git a/modules/amundi/module.py b/modules/amundi/module.py
index 2ca6d706b738ba858261dcae342b2d289bb4e6ca..769705eb91c9a389ac492632b0850a0aa4aed2e8 100644
--- a/modules/amundi/module.py
+++ b/modules/amundi/module.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.capabilities.base import find_object
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword, Value
@@ -28,7 +28,7 @@
__all__ = ['AmundiModule']
-class AmundiModule(Module, CapBank):
+class AmundiModule(Module, CapBankWealth):
NAME = 'amundi'
DESCRIPTION = u'amundi website'
MAINTAINER = u'James GALT'
diff --git a/modules/apivie/module.py b/modules/apivie/module.py
index 34be7c67c671ff0d6aef9e47f953f109c11ae9a2..5e68c90864ba6e4119eefb5cc57c4b54a6f68f49 100644
--- a/modules/apivie/module.py
+++ b/modules/apivie/module.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.bank import CapBank
+from weboob.capabilities.bank import CapBankWealth
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -27,7 +27,7 @@
__all__ = ['ApivieModule']
-class ApivieModule(Module, CapBank):
+class ApivieModule(Module, CapBankWealth):
NAME = 'apivie'
DESCRIPTION = u'Apivie'
MAINTAINER = u'Romain Bignon'
diff --git a/modules/axabanque/module.py b/modules/axabanque/module.py
index b8ae7a9a9ba67606572bb64f82db7a5634e75849..6f757ecd8113669fb169a690b22d52e6f10b437e 100644
--- a/modules/axabanque/module.py
+++ b/modules/axabanque/module.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.capabilities.base import find_object, NotAvailable
from weboob.capabilities.bank import Account
from weboob.capabilities.bill import CapDocument, Subscription, Document, DocumentNotFound, SubscriptionNotFound
@@ -31,7 +31,7 @@
__all__ = ['AXABanqueModule']
-class AXABanqueModule(Module, CapBank, CapDocument):
+class AXABanqueModule(Module, CapBankWealth, CapDocument):
NAME = 'axabanque'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/banquepopulaire/module.py b/modules/banquepopulaire/module.py
index 24d8f60888e663de6c8906c48fd08c1c34716095..56f6e32d9cac241900ef600686fef2956da736b1 100644
--- a/modules/banquepopulaire/module.py
+++ b/modules/banquepopulaire/module.py
@@ -20,7 +20,7 @@
from collections import OrderedDict
from functools import reduce
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.capabilities.contact import CapContact
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword, Value
@@ -31,7 +31,7 @@
__all__ = ['BanquePopulaireModule']
-class BanquePopulaireModule(Module, CapBank, CapContact):
+class BanquePopulaireModule(Module, CapBankWealth, CapContact):
NAME = 'banquepopulaire'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/barclays/module.py b/modules/barclays/module.py
index 2c11684dfe1e9271d8b36b07f56ca1c11ae849e8..cadd3c144f6d09f51f8a65095feffb9e9724d398 100644
--- a/modules/barclays/module.py
+++ b/modules/barclays/module.py
@@ -20,7 +20,7 @@
from __future__ import unicode_literals
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword
from weboob.capabilities.base import find_object
@@ -31,7 +31,7 @@
__all__ = ['BarclaysModule']
-class BarclaysModule(Module, CapBank):
+class BarclaysModule(Module, CapBankWealth):
NAME = 'barclays'
MAINTAINER = u'Jean Walrave'
EMAIL = 'jwalrave@budget-insight.com'
diff --git a/modules/bforbank/module.py b/modules/bforbank/module.py
index b36d36eca65f2961adeae6a7ee54f74dc6a9515c..f2202fe6de78ea5c9bf7fba3b2eb96af4d0ca52e 100644
--- a/modules/bforbank/module.py
+++ b/modules/bforbank/module.py
@@ -19,7 +19,7 @@
from weboob.tools.backend import Module, BackendConfig
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.capabilities.base import find_object
from weboob.tools.value import ValueBackendPassword, ValueDate
from .browser import BforbankBrowser
@@ -28,7 +28,7 @@
__all__ = ['BforbankModule']
-class BforbankModule(Module, CapBank):
+class BforbankModule(Module, CapBankWealth):
NAME = 'bforbank'
DESCRIPTION = u'BforBank'
MAINTAINER = u'Baptiste Delpey'
diff --git a/modules/bnporc/module.py b/modules/bnporc/module.py
index d2c292528107a59b97c234e2bbc26d94bd60df2b..bec02fe1a231ae4799040f1affcb90702dd9761d 100644
--- a/modules/bnporc/module.py
+++ b/modules/bnporc/module.py
@@ -23,7 +23,7 @@
from datetime import datetime, timedelta
from weboob.capabilities.bank import (
- CapBankTransferAddRecipient, AccountNotFound, Account, TransferError, RecipientNotFound,
+ CapBankWealth, CapBankTransferAddRecipient, AccountNotFound, Account, TransferError, RecipientNotFound,
TransferInvalidLabel,
)
from weboob.capabilities.messages import CapMessages, Thread
@@ -41,7 +41,7 @@
__all__ = ['BNPorcModule']
-class BNPorcModule(Module, CapBankTransferAddRecipient, CapMessages, CapContact, CapProfile):
+class BNPorcModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapMessages, CapContact, CapProfile):
NAME = 'bnporc'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/boursorama/module.py b/modules/boursorama/module.py
index 397089cf504aca5843d379761c51b4331014cd95..0306bf0cc1b112ea74046ffc63578439d0991799 100644
--- a/modules/boursorama/module.py
+++ b/modules/boursorama/module.py
@@ -20,7 +20,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import CapBankTransferAddRecipient, Account, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, CapBankTransferAddRecipient, Account, AccountNotFound
from weboob.capabilities.profile import CapProfile
from weboob.capabilities.contact import CapContact
from weboob.tools.backend import Module, BackendConfig
@@ -32,7 +32,7 @@
__all__ = ['BoursoramaModule']
-class BoursoramaModule(Module, CapBankTransferAddRecipient, CapProfile, CapContact):
+class BoursoramaModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapProfile, CapContact):
NAME = 'boursorama'
MAINTAINER = u'Gabriel Kerneis'
EMAIL = 'gabriel@kerneis.info'
diff --git a/modules/bp/module.py b/modules/bp/module.py
index 414d16a745a4993d186c09d1ece37e7148b7be5a..1cafb4808cf6f5baf625fbac5906bf3b60b566ec 100644
--- a/modules/bp/module.py
+++ b/modules/bp/module.py
@@ -19,7 +19,7 @@
from decimal import Decimal
-from weboob.capabilities.bank import CapBankTransferAddRecipient, Account, AccountNotFound, RecipientNotFound, TransferError
+from weboob.capabilities.bank import CapBankWealth, CapBankTransferAddRecipient, Account, AccountNotFound, RecipientNotFound, TransferError
from weboob.capabilities.contact import CapContact
from weboob.capabilities.base import find_object
from weboob.tools.backend import Module, BackendConfig
@@ -31,7 +31,7 @@
__all__ = ['BPModule']
-class BPModule(Module, CapBankTransferAddRecipient, CapContact):
+class BPModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapContact):
NAME = 'bp'
MAINTAINER = u'Nicolas Duhamel'
EMAIL = 'nicolas@jombi.fr'
diff --git a/modules/caels/module.py b/modules/caels/module.py
index 536e12062eef6fa6ae0182d62391942390ba51a6..dec3ed91cef57416ab32561cd24b276c87c77f93 100644
--- a/modules/caels/module.py
+++ b/modules/caels/module.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.capabilities.base import find_object
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -29,7 +29,7 @@
__all__ = ['CaelsModule']
-class CaelsModule(Module, CapBank):
+class CaelsModule(Module, CapBankWealth):
NAME = 'caels'
DESCRIPTION = u'Crédit Agricole - Epargne Longue des Salariés'
MAINTAINER = u'Edouard Lambert'
diff --git a/modules/caissedepargne/module.py b/modules/caissedepargne/module.py
index 7123ed6efa0843b93feb23ccbc0ab0ab6f034fbb..4f13c8e720f29c5f3a1518589ea60771816dd3fc 100644
--- a/modules/caissedepargne/module.py
+++ b/modules/caissedepargne/module.py
@@ -21,7 +21,7 @@
from functools import wraps
import re
-from weboob.capabilities.bank import CapBankTransferAddRecipient, AccountNotFound, Account, RecipientNotFound
+from weboob.capabilities.bank import CapBankWealth, CapBankTransferAddRecipient, AccountNotFound, Account, RecipientNotFound
from weboob.capabilities.contact import CapContact
from weboob.capabilities.profile import CapProfile
from weboob.capabilities.base import find_object
@@ -66,7 +66,7 @@ def wrapper(self, *args, **kwargs):
return wrapper
-class CaisseEpargneModule(Module, CapBankTransferAddRecipient, CapContact, CapProfile):
+class CaisseEpargneModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapContact, CapProfile):
NAME = 'caissedepargne'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/carrefourbanque/module.py b/modules/carrefourbanque/module.py
index 8040593f40a1bc902d13b8cd7714e5ba174b44bb..238cef6e7a8e947f12069e524603a01c0cbc94d5 100644
--- a/modules/carrefourbanque/module.py
+++ b/modules/carrefourbanque/module.py
@@ -19,7 +19,7 @@
from weboob.capabilities.base import find_object
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -29,7 +29,7 @@
__all__ = ['CarrefourBanqueModule']
-class CarrefourBanqueModule(Module, CapBank):
+class CarrefourBanqueModule(Module, CapBankWealth):
NAME = 'carrefourbanque'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/cices/module.py b/modules/cices/module.py
index 39933a0061515e93332effe1e1832fa94f9fc679..951f60dbc52b6ac622660ced9b8f1e89e94fb669 100644
--- a/modules/cices/module.py
+++ b/modules/cices/module.py
@@ -20,7 +20,7 @@
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.capabilities.base import find_object
from .browser import CmesBrowser
@@ -29,7 +29,7 @@
__all__ = ['CicesModule']
-class CicesModule(Module, CapBank):
+class CicesModule(Module, CapBankWealth):
NAME = 'cices'
DESCRIPTION = u'CIC Épargne Salariale'
MAINTAINER = u'Edouard Lambert'
diff --git a/modules/cmes/module.py b/modules/cmes/module.py
index 3b4190a1eeec6df06e17c04e8e6314bb88b9c0d1..0a4df636fc802deaf2ebd96e3bfed1eff8e96f5f 100644
--- a/modules/cmes/module.py
+++ b/modules/cmes/module.py
@@ -20,7 +20,7 @@
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.capabilities.base import find_object
from .browser import CmesBrowser
@@ -29,7 +29,7 @@
__all__ = ['CmesModule']
-class CmesModule(Module, CapBank):
+class CmesModule(Module, CapBankWealth):
NAME = 'cmes'
DESCRIPTION = u'Crédit Mutuel Épargne Salariale'
MAINTAINER = u'Edouard Lambert'
diff --git a/modules/cmso/module.py b/modules/cmso/module.py
index db8d0251d833fd151afdd6eeb6b9caba5d563ec8..adaeb156ede70d51bf2f61dc407dbac8610ab214 100644
--- a/modules/cmso/module.py
+++ b/modules/cmso/module.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.capabilities.contact import CapContact
from weboob.capabilities.base import find_object
from weboob.tools.backend import Module, BackendConfig
@@ -31,7 +31,7 @@
__all__ = ['CmsoModule']
-class CmsoModule(Module, CapBank, CapContact):
+class CmsoModule(Module, CapBankWealth, CapContact):
NAME = 'cmso'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/cragr/module.py b/modules/cragr/module.py
index 609117e6b52c2a5cbf20818e03a80c8612c8e095..42efc6f04b7d9b5de2ed5018f59c505fbc886598 100644
--- a/modules/cragr/module.py
+++ b/modules/cragr/module.py
@@ -22,7 +22,7 @@
import re
from weboob.capabilities.base import find_object
-from weboob.capabilities.bank import Account, AccountNotFound, CapBankTransferAddRecipient
+from weboob.capabilities.bank import Account, AccountNotFound, CapBankWealth, CapBankTransferAddRecipient
from weboob.capabilities.contact import CapContact
from weboob.capabilities.profile import CapProfile
from weboob.tools.backend import Module, BackendConfig
@@ -34,7 +34,7 @@
__all__ = ['CragrModule']
-class CragrModule(Module, CapBankTransferAddRecipient, CapContact, CapProfile):
+class CragrModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapContact, CapProfile):
NAME = 'cragr'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/creditdunord/module.py b/modules/creditdunord/module.py
index b6f084e7316b68604e7d5bdeb44a06753260051e..0dac5130524f77a240f242fbd92389757e3afd34 100644
--- a/modules/creditdunord/module.py
+++ b/modules/creditdunord/module.py
@@ -19,7 +19,7 @@
from collections import OrderedDict
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.capabilities.profile import CapProfile
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword, Value
@@ -30,7 +30,7 @@
__all__ = ['CreditDuNordModule']
-class CreditDuNordModule(Module, CapBank, CapProfile):
+class CreditDuNordModule(Module, CapBankWealth, CapProfile):
NAME = 'creditdunord'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/creditdunordpee/module.py b/modules/creditdunordpee/module.py
index 5a0fb50f413e27c9a65c6debca5ec3959345774e..df19ac80b1aa82b5e16821c20b27c88d1075d6d9 100644
--- a/modules/creditdunordpee/module.py
+++ b/modules/creditdunordpee/module.py
@@ -21,7 +21,7 @@
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword
-from weboob.capabilities.bank import CapBank
+from weboob.capabilities.bank import CapBankWealth
from .browser import CreditdunordpeeBrowser
@@ -29,7 +29,7 @@
__all__ = ['CreditdunordpeeModule']
-class CreditdunordpeeModule(Module, CapBank):
+class CreditdunordpeeModule(Module, CapBankWealth):
NAME = 'creditdunordpee'
DESCRIPTION = u'Site de gestion du PEE du groupe Credit du nord'
MAINTAINER = u'Bezleputh'
diff --git a/modules/creditmutuel/module.py b/modules/creditmutuel/module.py
index 5672ba3254642b827660b202b933ab1165e070ed..20df54bca35ce42146e61cdfeb3585c15d504aec 100644
--- a/modules/creditmutuel/module.py
+++ b/modules/creditmutuel/module.py
@@ -22,7 +22,7 @@
from decimal import Decimal
from weboob.capabilities.base import find_object
-from weboob.capabilities.bank import CapBankTransferAddRecipient, AccountNotFound, RecipientNotFound, \
+from weboob.capabilities.bank import CapBankWealth, CapBankTransferAddRecipient, AccountNotFound, RecipientNotFound, \
Account, TransferError
from weboob.capabilities.contact import CapContact
from weboob.capabilities.profile import CapProfile
@@ -35,7 +35,7 @@
__all__ = ['CreditMutuelModule']
-class CreditMutuelModule(Module, CapBankTransferAddRecipient, CapContact, CapProfile):
+class CreditMutuelModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapContact, CapProfile):
NAME = 'creditmutuel'
MAINTAINER = u'Julien Veyssier'
EMAIL = 'julien.veyssier@aiur.fr'
diff --git a/modules/fortuneo/module.py b/modules/fortuneo/module.py
index a7c8e38af1e80e578ae86a71e56f0ddb38834f7f..cc529c180f180a1533e9ea61e72c3a3ab8199bcf 100644
--- a/modules/fortuneo/module.py
+++ b/modules/fortuneo/module.py
@@ -19,7 +19,7 @@
from weboob.capabilities.base import find_object
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword
@@ -29,7 +29,7 @@
__all__ = ['FortuneoModule']
-class FortuneoModule(Module, CapBank):
+class FortuneoModule(Module, CapBankWealth):
NAME = 'fortuneo'
MAINTAINER = u'Gilles-Alexandre Quenot'
EMAIL = 'gilles.quenot@gmail.com'
diff --git a/modules/groupama/module.py b/modules/groupama/module.py
index bc1c035954deede4b7d24cdc8268e40468db9e08..97d426e0671bd3e66337b2b0bfe253fbf496aba5 100644
--- a/modules/groupama/module.py
+++ b/modules/groupama/module.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.capabilities.base import find_object
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import Value, ValueBackendPassword
@@ -29,7 +29,7 @@
__all__ = ['GroupamaModule']
-class GroupamaModule(Module, CapBank):
+class GroupamaModule(Module, CapBankWealth):
NAME = 'groupama'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/groupamaes/module.py b/modules/groupamaes/module.py
index a63c36b58df7269820f0117296a86e5bc28b9d0b..9fd02141aafee95438cca43c3ac64045e046aaf7 100644
--- a/modules/groupamaes/module.py
+++ b/modules/groupamaes/module.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see .
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankPockets, AccountNotFound
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword
from weboob.capabilities.base import find_object
@@ -28,7 +28,7 @@
__all__ = ['GroupamaesModule']
-class GroupamaesModule(Module, CapBank):
+class GroupamaesModule(Module, CapBankPockets):
NAME = 'groupamaes'
DESCRIPTION = u"Groupama Épargne Salariale"
MAINTAINER = u'Bezleputh'
diff --git a/modules/hsbc/module.py b/modules/hsbc/module.py
index 45b2f859ee26c82f0e338d8e429406641920d5db..226ccc1b7afc981aa429c198939f69a1b03c0743 100644
--- a/modules/hsbc/module.py
+++ b/modules/hsbc/module.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.capabilities.base import find_object
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword, Value
@@ -29,7 +29,7 @@
__all__ = ['HSBCModule']
-class HSBCModule(Module, CapBank):
+class HSBCModule(Module, CapBankWealth):
NAME = 'hsbc'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/ing/module.py b/modules/ing/module.py
index 855d3b3ade2e13c1027e1f0702274b672032f5b5..9f5c241cca5c0a056f0a5758fba71538e5c008d0 100644
--- a/modules/ing/module.py
+++ b/modules/ing/module.py
@@ -20,7 +20,7 @@
import re
from datetime import timedelta
-from weboob.capabilities.bank import CapBankTransfer, Account, AccountNotFound, RecipientNotFound
+from weboob.capabilities.bank import CapBankWealth, CapBankTransfer, Account, AccountNotFound, RecipientNotFound
from weboob.capabilities.bill import CapDocument, Bill, Subscription,\
SubscriptionNotFound, DocumentNotFound
from weboob.capabilities.profile import CapProfile
@@ -34,7 +34,7 @@
__all__ = ['INGModule']
-class INGModule(Module, CapBankTransfer, CapDocument, CapProfile):
+class INGModule(Module, CapBankWealth, CapBankTransfer, CapDocument, CapProfile):
NAME = 'ing'
MAINTAINER = u'Florent Fourcot'
EMAIL = 'weboob@flo.fourcot.fr'
diff --git a/modules/lcl/module.py b/modules/lcl/module.py
index c2e65b373991867d71ba6c493893652187568c93..4f001b319e84b3f75560b7f82f8f2a0e9223f384 100644
--- a/modules/lcl/module.py
+++ b/modules/lcl/module.py
@@ -22,7 +22,7 @@
from functools import wraps
import re
-from weboob.capabilities.bank import CapBankTransferAddRecipient, AccountNotFound, \
+from weboob.capabilities.bank import CapBankWealth, CapBankTransferAddRecipient, AccountNotFound, \
RecipientNotFound, TransferError, Account
from weboob.capabilities.bill import CapDocument, Subscription, SubscriptionNotFound, \
Document, DocumentNotFound
@@ -53,7 +53,7 @@ def wrapper(self, *args, **kwargs):
return decorator
-class LCLModule(Module, CapBankTransferAddRecipient, CapContact, CapProfile, CapDocument):
+class LCLModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapContact, CapProfile, CapDocument):
NAME = 'lcl'
MAINTAINER = u'Romain Bignon'
EMAIL = 'romain@weboob.org'
diff --git a/modules/pradoepargne/module.py b/modules/pradoepargne/module.py
index 077958859a10aacf6b3a548beb3d002c5f91b119..d43aa2a5e0b92abfa6599e1023d25220bf0a880d 100644
--- a/modules/pradoepargne/module.py
+++ b/modules/pradoepargne/module.py
@@ -18,7 +18,7 @@
# along with weboob. If not, see .
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword
from weboob.capabilities.base import find_object
@@ -29,7 +29,7 @@
__all__ = ['PradoepargneModule']
-class PradoepargneModule(Module, CapBank):
+class PradoepargneModule(Module, CapBankWealth):
NAME = 'pradoepargne'
DESCRIPTION = u'Prado Épargne Salariale'
MAINTAINER = u'Edouard Lambert'
diff --git a/modules/s2e/module.py b/modules/s2e/module.py
index 56d88a67f9d55148322f5ec1e84b9598fb543567..ed12168c20c0d4e2fa7bcea64135b6d8d6cdaed5 100644
--- a/modules/s2e/module.py
+++ b/modules/s2e/module.py
@@ -19,11 +19,11 @@
from weboob.tools.backend import Module
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankPockets, AccountNotFound
from weboob.capabilities.base import find_object
-class S2eModule(Module, CapBank):
+class S2eModule(Module, CapBankPockets):
NAME = 's2e'
DESCRIPTION = u'Épargne Salariale'
MAINTAINER = u'Edouard Lambert'
diff --git a/modules/societegenerale/module.py b/modules/societegenerale/module.py
index 0b927de7f69d7150718684176d8cadeb8b47fbf5..c0c46e59849bf3af6e54af29bfcfc7f57fca6140 100644
--- a/modules/societegenerale/module.py
+++ b/modules/societegenerale/module.py
@@ -22,7 +22,7 @@
from decimal import Decimal
from datetime import timedelta
-from weboob.capabilities.bank import CapBankTransferAddRecipient, AccountNotFound, Account, RecipientNotFound
+from weboob.capabilities.bank import CapBankWealth, CapBankTransferAddRecipient, AccountNotFound, Account, RecipientNotFound
from weboob.capabilities.contact import CapContact
from weboob.capabilities.profile import CapProfile
from weboob.tools.backend import Module, BackendConfig
@@ -36,7 +36,7 @@
__all__ = ['SocieteGeneraleModule']
-class SocieteGeneraleModule(Module, CapBankTransferAddRecipient, CapContact, CapProfile):
+class SocieteGeneraleModule(Module, CapBankWealth, CapBankTransferAddRecipient, CapContact, CapProfile):
NAME = 'societegenerale'
MAINTAINER = u'Jocelyn Jaubert'
EMAIL = 'jocelyn.jaubert@gmail.com'
diff --git a/modules/spirica/module.py b/modules/spirica/module.py
index afd8afb12749857731199a78947413268ac1f966..04b50bdc742fe9df19666e59c622b3b9b91cb30c 100644
--- a/modules/spirica/module.py
+++ b/modules/spirica/module.py
@@ -20,7 +20,7 @@
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.capabilities.base import find_object
from .browser import SpiricaBrowser
@@ -29,7 +29,7 @@
__all__ = ['SpiricaModule']
-class SpiricaModule(Module, CapBank):
+class SpiricaModule(Module, CapBankWealth):
NAME = 'spirica'
DESCRIPTION = u'Spirica'
MAINTAINER = u'Edouard Lambert'
diff --git a/modules/yomoni/module.py b/modules/yomoni/module.py
index d24c5a92287410d59fa4311ca35602b6e13845e7..6cb9aef2c68d860c13eedf8dbe80bc4cef0cbaa2 100644
--- a/modules/yomoni/module.py
+++ b/modules/yomoni/module.py
@@ -20,7 +20,7 @@
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword
-from weboob.capabilities.bank import CapBank, AccountNotFound
+from weboob.capabilities.bank import CapBankWealth, AccountNotFound
from weboob.capabilities.base import find_object
from .browser import YomoniBrowser
@@ -29,7 +29,7 @@
__all__ = ['YomoniModule']
-class YomoniModule(Module, CapBank):
+class YomoniModule(Module, CapBankWealth):
NAME = 'yomoni'
DESCRIPTION = u'Yomoni'
MAINTAINER = u'Edouard Lambert'
diff --git a/weboob/capabilities/bank.py b/weboob/capabilities/bank.py
index 24e433b48407240eb419dbf1dcdaee54ea931c51..d854dc2c256e999201139098dd92309971129ae1 100644
--- a/weboob/capabilities/bank.py
+++ b/weboob/capabilities/bank.py
@@ -510,6 +510,18 @@ def iter_coming(self, account):
"""
raise NotImplementedError()
+
+class CapCgp(CapBank):
+ """
+ Capability of cgp website to see accounts and transactions.
+ """
+
+
+class CapBankWealth(CapBank):
+ """
+ Capability of bank websites to see investment.
+ """
+
def iter_investment(self, account):
"""
Iter investment of a market account
@@ -521,6 +533,12 @@ def iter_investment(self, account):
"""
raise NotImplementedError()
+
+class CapBankPockets(CapBankWealth):
+ """
+ Capability of bank websites to see pockets.
+ """
+
def iter_pocket(self, account):
"""
Iter pocket
@@ -533,12 +551,6 @@ def iter_pocket(self, account):
raise NotImplementedError()
-class CapCgp(CapBank):
- """
- Capability of cgp website to see accounts and transactions.
- """
-
-
class CapBankTransfer(CapBank):
def iter_transfer_recipients(self, account):
"""