[banquepopulaire] Fix redirection to Natixis space & type some accounts

The name of a query parameter has changed, so the redirection URL was
not recognized.

modules/banquepopulaire/browser.py

@@ -219,7 +219,7 @@ class BanquePopulaire(LoginBrowser):
 
     # natixis
     natixis_redirect = URL(
-        r'https://www.assurances.natixis.fr/espaceinternet-bp/views/common/routage.xhtml.*?windowId=[a-f0-9]+$',
+        r'https://www.assurances.natixis.fr/espaceinternet-bp/views/common/routage.xhtml.*?dswid=-?[a-f0-9]+$',
         NatixisRedirect
     )
     natixis_choice = URL(

modules/banquepopulaire/pages.py

@@ -702,6 +702,7 @@ class GenericAccountsPage(LoggedPage, MyHTMLPage):
     }
 
     ACCOUNT_PATTERNS = [
+        (re.compile(r'.*Livret.*'), Account.TYPE_SAVINGS),
         (re.compile(r'.*Titres Pea.*'), Account.TYPE_PEA),
         (re.compile(r".*Plan D'epargne En Actions.*"), Account.TYPE_PEA),
         (re.compile(r".*Compte Especes Pea.*"), Account.TYPE_PEA),
@@ -710,7 +711,7 @@ class GenericAccountsPage(LoggedPage, MyHTMLPage):
         (re.compile(r'.*Selection Vie.*'), Account.TYPE_LIFE_INSURANCE),
         (re.compile(r'^Fructi Pulse.*'), Account.TYPE_LIFE_INSURANCE),
         (re.compile(r'^Fructi Neo.*'), Account.TYPE_LIFE_INSURANCE),
-        (re.compile(r'^(Quintessa|Solevia|Irriga|Delfea).*'), Account.TYPE_LIFE_INSURANCE),
+        (re.compile(r'^(Quintessa|Solevia|Irriga|Delfea|Maritime).*'), Account.TYPE_LIFE_INSURANCE),
         (re.compile(r'^Plan Epargne Enfant Mul.*'), Account.TYPE_MARKET),
         (re.compile(r'^Alc Premium'), Account.TYPE_MARKET),
         (re.compile(r'^Plan Epargne Enfant Msu.*'), Account.TYPE_LIFE_INSURANCE),