diff --git a/account_banking_sepa_direct_debit/__openerp__.py b/account_banking_sepa_direct_debit/__openerp__.py
index 30aef6211..1a05f730f 100644
--- a/account_banking_sepa_direct_debit/__openerp__.py
+++ b/account_banking_sepa_direct_debit/__openerp__.py
@@ -32,6 +32,8 @@
         },
     'data': [
         'account_banking_sdd_view.xml',
+        'sdd_mandate_view.xml',
+        'res_partner_bank_view.xml',
         'account_payment_view.xml',
         'company_view.xml',
         'mandate_expire_cron.xml',
diff --git a/account_banking_sepa_direct_debit/account_banking_sdd.py b/account_banking_sepa_direct_debit/account_banking_sdd.py
index 56eb7097a..14c01a6c4 100644
--- a/account_banking_sepa_direct_debit/account_banking_sdd.py
+++ b/account_banking_sepa_direct_debit/account_banking_sdd.py
@@ -327,6 +327,29 @@ class payment_line(orm.Model):
                     vals['sdd_mandate_id'] = mandate_ids[0]
         return super(payment_line, self).create(cr, uid, vals, context=context)
 
+    def _check_mandate_bank_link(self, cr, uid, ids):
+        for payline in self.browse(cr, uid, ids):
+            if (payline.sdd_mandate_id and payline.bank_id
+                    and payline.sdd_mandate_id.partner_bank_id.id !=
+                    payline.bank_id.id):
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("The payment line with reference '%s' has a bank account '%s' which is not attached to the mandate '%s' (this mandate is attached to the bank account '%s').")
+                    % (payline.name,
+                    self.pool['res.partner.bank'].name_get(
+                        cr, uid, [payline.bank_id.id])[0][1],
+                    payline.sdd_mandate_id.unique_mandate_reference,
+                    self.pool['res.partner.bank'].name_get(
+                        cr, uid,
+                        [payline.sdd_mandate_id.partner_bank_id.id])[0][1],
+                    ))
+        return True
+
+    _constraints = [
+        (_check_mandate_bank_link, 'Error msg in raise',
+            ['sdd_mandate_id', 'bank_id']),
+    ]
+
 
 class account_invoice(orm.Model):
     _inherit = 'account.invoice'
diff --git a/account_banking_sepa_direct_debit/account_banking_sdd_view.xml b/account_banking_sepa_direct_debit/account_banking_sdd_view.xml
index cf6c98fb5..079e2023b 100644
--- a/account_banking_sepa_direct_debit/account_banking_sdd_view.xml
+++ b/account_banking_sepa_direct_debit/account_banking_sdd_view.xml
@@ -78,179 +78,5 @@
     view_mode="tree,form"
 />
 
-<record id="sdd_mandate_form" model="ir.ui.view">
-    <field name="name">sdd.mandate.form</field>
-    <field name="model">sdd.mandate</field>
-    <field name="arch" type="xml">
-        <form string="SEPA Direct Debit Mandate" version="7.0">
-            <header>
-                <button name="validate" type="object" string="Validate" states="draft"/>
-                <button name="cancel" type="object" string="Cancel" states="draft,valid"/>
-                <field name="state" widget="statusbar"/>
-            </header>
-            <sheet>
-                <div class="oe_title">
-                    <h1>
-                        <field name="unique_mandate_reference" class="oe_inline"/>
-                    </h1>
-                </div>
-                <group name="main">
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="partner_id" invisible="not context.get('sdd_mandate_main_view')"/>
-                    <field name="type" on_change="mandate_type_change(type)"/>
-                    <field name="recurrent_sequence_type" attrs="{'invisible': [('type', '=', 'oneoff')], 'required': [('type', '=', 'recurrent')]}"/>
-                    <field name="signature_date"/>
-                    <field name="scan"/>
-                    <field name="last_debit_date"/>
-                    <field name="partner_bank_id"
-                        on_change="mandate_partner_bank_change(partner_bank_id, type, recurrent_sequence_type, last_debit_date, state)"
-                        invisible="not context.get('sdd_mandate_main_view')"
-                        domain="[('partner_id', '=', partner_id)]"/>
-                </group>
-                <group name="payment_lines" string="Related Payment Lines">
-                    <field name="payment_line_ids" nolabel="1"/>
-                </group>
-            </sheet>
-            <div class="oe_chatter">
-                <field name="message_follower_ids" widget="mail_followers"/>
-                <field name="message_ids" widget="mail_thread"/>
-            </div>
-        </form>
-    </field>
-</record>
-
-<record id="sdd_mandate_tree" model="ir.ui.view">
-    <field name="name">sdd.mandate.tree</field>
-    <field name="model">sdd.mandate</field>
-    <field name="arch" type="xml">
-        <tree string="SEPA Direct Debit Mandate" colors="blue:state=='draft';black:state in ('expired', 'cancel')">
-            <field name="company_id" groups="base.group_multi_company"/>
-            <field name="partner_id" invisible="not context.get('sdd_mandate_main_view')"/>
-            <field name="unique_mandate_reference" string="Reference"/>
-            <field name="type" string="Type"/>
-            <field name="signature_date" string="Signature Date"/>
-            <field name="last_debit_date"/>
-            <field name="state"/>
-        </tree>
-    </field>
-</record>
-
-<record id="sdd_mandate_search" model="ir.ui.view">
-    <field name="name">sdd.mandate.search</field>
-    <field name="model">sdd.mandate</field>
-    <field name="arch" type="xml">
-        <search string="Search SEPA Direct Debit Mandates">
-            <field name="partner_id"/>
-            <filter name="draft" string="Draft" domain="[('state', '=', 'draft')]" />
-            <filter name="valid" string="Valid" domain="[('state', '=', 'valid')]" />
-            <filter name="cancel" string="Cancelled" domain="[('state', '=', 'cancel')]" />
-            <filter name="expired" string="Expired" domain="[('state', '=', 'expired')]" />
-            <filter name="oneoff" string="One-Off" domain="[('type', '=', 'oneoff')]" />
-            <filter name="recurrent" string="Recurrent" domain="[('type', '=', 'recurrent')]" />
-        </search>
-    </field>
-</record>
-
-<record id="sdd_mandate_action" model="ir.actions.act_window">
-    <field name="name">SEPA Direct Debit Mandates</field>
-    <field name="res_model">sdd.mandate</field>
-    <field name="view_type">form</field>
-    <field name="view_mode">tree,form</field>
-    <field name="context">{'sdd_mandate_main_view': True}</field>
-    <field name="help" type="html">
-        <p class="oe_view_nocontent_create">
-        Click to create a new SEPA Direct Debit Mandate.
-        </p><p>
-        The SEPA Direct Debit Mandate is a document signed by your customer that gives you the autorization to do one or several direct debits on his bank account.
-        </p>
-    </field>
-</record>
-
-<menuitem id="sdd_mandate_menu"
-          parent="account_banking.menu_finance_banking_actions"
-          action="sdd_mandate_action"
-          sequence="20"
-          />
-
-<!-- notifications in the chatter -->
-<record id="mandate_valid" model="mail.message.subtype">
-    <field name="name">Mandate Validated</field>
-    <field name="res_model">sdd.mandate</field>
-    <field name="default" eval="False"/>
-    <field name="description">SEPA Direct Debit Mandate Validated</field>
-</record>
-
-<record id="mandate_expired" model="mail.message.subtype">
-    <field name="name">Mandate Expired</field>
-    <field name="res_model">sdd.mandate</field>
-    <field name="default" eval="False"/>
-    <field name="description">SEPA Direct Debit Mandate has Expired</field>
-</record>
-
-<record id="mandate_cancel" model="mail.message.subtype">
-    <field name="name">Mandate Cancelled</field>
-    <field name="res_model">sdd.mandate</field>
-    <field name="default" eval="False"/>
-    <field name="description">SEPA Direct Debit Mandate Cancelled</field>
-</record>
-
-<record id="recurrent_sequence_type_first" model="mail.message.subtype">
-    <field name="name">Sequence Type set to First</field>
-    <field name="res_model">sdd.mandate</field>
-    <field name="default" eval="False"/>
-    <field name="description">Sequence Type set to First</field>
-</record>
-
-<record id="recurrent_sequence_type_recurring" model="mail.message.subtype">
-    <field name="name">Sequence Type set to Recurring</field>
-    <field name="res_model">sdd.mandate</field>
-    <field name="default" eval="False"/>
-    <field name="description">Sequence Type set to Recurring</field>
-</record>
-
-<record id="recurrent_sequence_type_final" model="mail.message.subtype">
-    <field name="name">Sequence Type set to Final</field>
-    <field name="res_model">sdd.mandate</field>
-    <field name="default" eval="False"/>
-    <field name="description">Sequence Type set to Final</field>
-</record>
-
-
-<record id="sdd_mandate_partner_bank_form" model="ir.ui.view">
-    <field name="name">sdd.mandate.res.partner.bank.form</field>
-    <field name="model">res.partner.bank</field>
-    <field name="inherit_id" ref="base.view_partner_bank_form"/>
-    <field name="arch" type="xml">
-        <group name="bank" position="after">
-            <group name="sdd_mandates" string="SEPA Direct Debit Mandates" colspan="4">
-                <field name="sdd_mandate_ids" context="{'default_partner_bank_id': active_id}" nolabel="1"/>
-            </group>
-        </group>
-    </field>
-</record>
-
-<record id="sdd_mandate_partner_bank_tree" model="ir.ui.view">
-    <field name="name">sdd.mandate.res.partner.bank.tree</field>
-    <field name="model">res.partner.bank</field>
-    <field name="inherit_id" ref="base.view_partner_bank_tree"/>
-    <field name="arch" type="xml">
-        <field name="partner_id" position="after">
-            <field name="sdd_mandate_ids" string="SDD Mandates"/>
-        </field>
-    </field>
-</record>
-
-<!-- also add number of mandates on partner form -->
-<record id="sdd_mandate_partner_form" model="ir.ui.view">
-    <field name="name">sdd.mandate.partner.form</field>
-    <field name="model">res.partner</field>
-    <field name="inherit_id" ref="account.view_partner_property_form"/>
-    <field name="arch" type="xml">
-        <xpath expr="//field[@name='bank_ids']/tree/field[@name='owner_name']" position="after">
-            <field name="sdd_mandate_ids" string="SDD Mandates"/>
-        </xpath>
-    </field>
-</record>
-
 </data>
 </openerp>
diff --git a/account_banking_sepa_direct_debit/account_payment_view.xml b/account_banking_sepa_direct_debit/account_payment_view.xml
index 795f30222..74098c44e 100644
--- a/account_banking_sepa_direct_debit/account_payment_view.xml
+++ b/account_banking_sepa_direct_debit/account_payment_view.xml
@@ -13,7 +13,7 @@
     <field name="inherit_id" ref="account_payment.view_payment_order_form"/>
     <field name="arch" type="xml">
         <xpath expr="//field[@name='line_ids']/form/notebook/page/group/field[@name='bank_id']" position="after">
-            <field name="sdd_mandate_id" domain="[('partner_bank_id', '=', bank_id), ('state', '=', 'valid')]" invisible="context.get('default_payment_order_type')!='debit'" />
+            <field name="sdd_mandate_id" domain="[('partner_bank_id', '=', bank_id), ('state', '=', 'valid')]" invisible="context.get('default_payment_order_type')!='debit'" context="{'default_partner_bank_id': bank_id}"/>
             <newline />
         </xpath>
         <xpath expr="//field[@name='line_ids']/tree/field[@name='bank_id']" position="after">
diff --git a/account_banking_sepa_direct_debit/res_partner_bank_view.xml b/account_banking_sepa_direct_debit/res_partner_bank_view.xml
new file mode 100644
index 000000000..0b32e9f1c
--- /dev/null
+++ b/account_banking_sepa_direct_debit/res_partner_bank_view.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2013 Akretion (http://www.akretion.com)
+  @author: Alexis de Lattre <alexis.delattre@akretion.com>
+  The licence is in the file __openerp__.py
+-->
+<openerp>
+<data>
+
+<record id="sdd_mandate_partner_bank_form" model="ir.ui.view">
+    <field name="name">sdd.mandate.res.partner.bank.form</field>
+    <field name="model">res.partner.bank</field>
+    <field name="inherit_id" ref="base.view_partner_bank_form"/>
+    <field name="arch" type="xml">
+        <group name="bank" position="after">
+            <group name="sdd_mandates" string="SEPA Direct Debit Mandates" colspan="4">
+                <field name="sdd_mandate_ids" context="{'default_partner_bank_id': active_id, 'sdd_mandate_bank_partner_view': True}" nolabel="1"/>
+            </group>
+        </group>
+    </field>
+</record>
+
+<record id="sdd_mandate_partner_bank_tree" model="ir.ui.view">
+    <field name="name">sdd.mandate.res.partner.bank.tree</field>
+    <field name="model">res.partner.bank</field>
+    <field name="inherit_id" ref="base.view_partner_bank_tree"/>
+    <field name="arch" type="xml">
+        <field name="partner_id" position="after">
+            <field name="sdd_mandate_ids" string="SDD Mandates"/>
+        </field>
+    </field>
+</record>
+
+<!-- add number of mandates in this list of bank accounts
+on the partner form -->
+<record id="sdd_mandate_partner_form" model="ir.ui.view">
+    <field name="name">sdd.mandate.partner.form</field>
+    <field name="model">res.partner</field>
+    <field name="inherit_id" ref="account.view_partner_property_form"/>
+    <field name="arch" type="xml">
+        <xpath expr="//field[@name='bank_ids']/tree/field[@name='owner_name']" position="after">
+            <field name="sdd_mandate_ids" string="SDD Mandates"/>
+        </xpath>
+    </field>
+</record>
+
+</data>
+</openerp>
diff --git a/account_banking_sepa_direct_debit/sdd_mandate_view.xml b/account_banking_sepa_direct_debit/sdd_mandate_view.xml
new file mode 100644
index 000000000..0d73d00f3
--- /dev/null
+++ b/account_banking_sepa_direct_debit/sdd_mandate_view.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2013 Akretion (http://www.akretion.com)
+  @author: Alexis de Lattre <alexis.delattre@akretion.com>
+  The licence is in the file __openerp__.py
+-->
+<openerp>
+<data>
+
+<record id="sdd_mandate_form" model="ir.ui.view">
+    <field name="name">sdd.mandate.form</field>
+    <field name="model">sdd.mandate</field>
+    <field name="arch" type="xml">
+        <form string="SEPA Direct Debit Mandate" version="7.0">
+            <header>
+                <button name="validate" type="object" string="Validate" states="draft"/>
+                <button name="cancel" type="object" string="Cancel" states="draft,valid"/>
+                <field name="state" widget="statusbar"/>
+            </header>
+            <sheet>
+                <div class="oe_title">
+                    <h1>
+                        <field name="unique_mandate_reference" class="oe_inline"/>
+                    </h1>
+                </div>
+                <group name="main">
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="partner_id" invisible="context.get('sdd_mandate_bank_partner_view')"/>
+                    <field name="type" on_change="mandate_type_change(type)"/>
+                    <field name="recurrent_sequence_type" attrs="{'invisible': [('type', '=', 'oneoff')], 'required': [('type', '=', 'recurrent')]}"/>
+                    <field name="signature_date"/>
+                    <field name="scan"/>
+                    <field name="last_debit_date"/>
+                    <field name="partner_bank_id"
+                        on_change="mandate_partner_bank_change(partner_bank_id, type, recurrent_sequence_type, last_debit_date, state)"
+                        invisible="context.get('sdd_mandate_bank_partner_view')"
+                        domain="[('partner_id', '=', partner_id)]"/>
+                </group>
+                <group name="payment_lines" string="Related Payment Lines">
+                    <field name="payment_line_ids" nolabel="1"/>
+                </group>
+            </sheet>
+            <div class="oe_chatter">
+                <field name="message_follower_ids" widget="mail_followers"/>
+                <field name="message_ids" widget="mail_thread"/>
+            </div>
+        </form>
+    </field>
+</record>
+
+<record id="sdd_mandate_tree" model="ir.ui.view">
+    <field name="name">sdd.mandate.tree</field>
+    <field name="model">sdd.mandate</field>
+    <field name="arch" type="xml">
+        <tree string="SEPA Direct Debit Mandate" colors="blue:state=='draft';black:state in ('expired', 'cancel')">
+            <field name="company_id" groups="base.group_multi_company"/>
+            <field name="partner_id" invisible="context.get('sdd_mandate_bank_partner_view')"/>
+            <field name="unique_mandate_reference" string="Reference"/>
+            <field name="type" string="Type"/>
+            <field name="signature_date" string="Signature Date"/>
+            <field name="last_debit_date"/>
+            <field name="state"/>
+        </tree>
+    </field>
+</record>
+
+<record id="sdd_mandate_search" model="ir.ui.view">
+    <field name="name">sdd.mandate.search</field>
+    <field name="model">sdd.mandate</field>
+    <field name="arch" type="xml">
+        <search string="Search SEPA Direct Debit Mandates">
+            <field name="partner_id"/>
+            <filter name="draft" string="Draft" domain="[('state', '=', 'draft')]" />
+            <filter name="valid" string="Valid" domain="[('state', '=', 'valid')]" />
+            <filter name="cancel" string="Cancelled" domain="[('state', '=', 'cancel')]" />
+            <filter name="expired" string="Expired" domain="[('state', '=', 'expired')]" />
+            <filter name="oneoff" string="One-Off" domain="[('type', '=', 'oneoff')]" />
+            <filter name="recurrent" string="Recurrent" domain="[('type', '=', 'recurrent')]" />
+        </search>
+    </field>
+</record>
+
+<record id="sdd_mandate_action" model="ir.actions.act_window">
+    <field name="name">SEPA Direct Debit Mandates</field>
+    <field name="res_model">sdd.mandate</field>
+    <field name="view_type">form</field>
+    <field name="view_mode">tree,form</field>
+    <field name="help" type="html">
+        <p class="oe_view_nocontent_create">
+        Click to create a new SEPA Direct Debit Mandate.
+        </p><p>
+        The SEPA Direct Debit Mandate is a document signed by your customer that gives you the autorization to do one or several direct debits on his bank account.
+        </p>
+    </field>
+</record>
+
+<menuitem id="sdd_mandate_menu"
+          parent="account_banking.menu_finance_banking_actions"
+          action="sdd_mandate_action"
+          sequence="20"
+          />
+
+<!-- notifications in the chatter -->
+<record id="mandate_valid" model="mail.message.subtype">
+    <field name="name">Mandate Validated</field>
+    <field name="res_model">sdd.mandate</field>
+    <field name="default" eval="False"/>
+    <field name="description">SEPA Direct Debit Mandate Validated</field>
+</record>
+
+<record id="mandate_expired" model="mail.message.subtype">
+    <field name="name">Mandate Expired</field>
+    <field name="res_model">sdd.mandate</field>
+    <field name="default" eval="False"/>
+    <field name="description">SEPA Direct Debit Mandate has Expired</field>
+</record>
+
+<record id="mandate_cancel" model="mail.message.subtype">
+    <field name="name">Mandate Cancelled</field>
+    <field name="res_model">sdd.mandate</field>
+    <field name="default" eval="False"/>
+    <field name="description">SEPA Direct Debit Mandate Cancelled</field>
+</record>
+
+<record id="recurrent_sequence_type_first" model="mail.message.subtype">
+    <field name="name">Sequence Type set to First</field>
+    <field name="res_model">sdd.mandate</field>
+    <field name="default" eval="False"/>
+    <field name="description">Sequence Type set to First</field>
+</record>
+
+<record id="recurrent_sequence_type_recurring" model="mail.message.subtype">
+    <field name="name">Sequence Type set to Recurring</field>
+    <field name="res_model">sdd.mandate</field>
+    <field name="default" eval="False"/>
+    <field name="description">Sequence Type set to Recurring</field>
+</record>
+
+<record id="recurrent_sequence_type_final" model="mail.message.subtype">
+    <field name="name">Sequence Type set to Final</field>
+    <field name="res_model">sdd.mandate</field>
+    <field name="default" eval="False"/>
+    <field name="description">Sequence Type set to Final</field>
+</record>
+
+</data>
+</openerp>