diff --git a/account_banking_payment_transfer/model/__init__.py b/account_banking_payment_transfer/model/__init__.py
index ce4014976..7a8cfda04 100644
--- a/account_banking_payment_transfer/model/__init__.py
+++ b/account_banking_payment_transfer/model/__init__.py
@@ -1,5 +1,4 @@
 from . import account_payment
 from . import payment_line
 from . import payment_mode
-from . import payment_order_create
 from . import account_move_reconcile
diff --git a/account_banking_payment_transfer/view/payment_mode.xml b/account_banking_payment_transfer/view/payment_mode.xml
index 96eef616b..20770de32 100644
--- a/account_banking_payment_transfer/view/payment_mode.xml
+++ b/account_banking_payment_transfer/view/payment_mode.xml
@@ -3,7 +3,7 @@
     <data>
 
         <!-- 
-             Add the payment mode type and transfer settings
+             Add the payment mode transfer account settings
         -->
         <record id="view_payment_mode_form_inherit" model="ir.ui.view">
             <field name="name">payment.mode.form.inherit</field>
@@ -11,29 +11,21 @@
             <field name="inherit_id" ref="account_banking_payment_export.view_payment_mode_form_inherit"/>
             <field name="arch" type="xml">
                 <field name="type" position="after">
-                    <group colspan="4" col="4">
-                        <group colspan="2">
-                            <separator colspan="2"
-                                       string="Transfer move settings" />
-                            <field name="transfer_account_id"
-                                   domain="[('type', '=', 'other'),
-                                           ('reconcile', '=', True),
-                                           ('company_id', '=', company_id)]"
-                                   context="{
-                                       'default_type': 'other',
-                                       'default_reconcile': True,
-                                       'default_company_id': company_id}"
-                                   />
-                            <field name="transfer_journal_id"
-                                   domain="[('company_id', '=', company_id)]"
-                                   />
-                        </group>
-                        <group colspan="2">
-                            <!--  TODO: extract to account_banking_payment_term -->
-                            <separator colspan="2"
-                                       string="Optional filter by payment term" />
-                            <field name="payment_term_ids" nolabel="1" colspan="2"/>
-                        </group>
+                    <group colspan="2">
+                        <separator colspan="2"
+                                   string="Transfer move settings" />
+                        <field name="transfer_account_id"
+                               domain="[('type', '=', 'other'),
+                                       ('reconcile', '=', True),
+                                       ('company_id', '=', company_id)]"
+                               context="{
+                                   'default_type': 'other',
+                                   'default_reconcile': True,
+                                   'default_company_id': company_id}"
+                               />
+                        <field name="transfer_journal_id"
+                               domain="[('company_id', '=', company_id)]"
+                               />
                     </group>
                 </field>
             </field>
diff --git a/account_payment_mode_term/__init__.py b/account_payment_mode_term/__init__.py
new file mode 100644
index 000000000..0650744f6
--- /dev/null
+++ b/account_payment_mode_term/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/account_payment_mode_term/__openerp__.py b/account_payment_mode_term/__openerp__.py
new file mode 100644
index 000000000..487443e26
--- /dev/null
+++ b/account_payment_mode_term/__openerp__.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
+#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
+#              (C) 2014 ACSONE SA/NV (<http://acsone.eu>).
+#
+#    All other contributions are (C) by their respective contributors
+#
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Account Banking - Payments Term Filter',
+    'version': '0.1.1',
+    'license': 'AGPL-3',
+    'author': 'Banking addons community',
+    'website': 'https://github.com/OCA/banking',
+    'category': 'Banking addons',
+    'depends': [
+        'account_banking_payment_export',
+    ],
+    'data': [
+        'views/payment_mode.xml',
+    ],
+    'description': '''Payment term filter on payment mode.
+
+    When set, only open invoices corresponding to the mode's
+    payment term are proposed when populating payment orders.
+    ''',
+    'auto_install': False,
+    'installable': True,
+}
diff --git a/account_payment_mode_term/models/__init__.py b/account_payment_mode_term/models/__init__.py
new file mode 100644
index 000000000..5a3528e17
--- /dev/null
+++ b/account_payment_mode_term/models/__init__.py
@@ -0,0 +1,2 @@
+from . import payment_mode
+from . import payment_order_create
diff --git a/account_payment_mode_term/models/payment_mode.py b/account_payment_mode_term/models/payment_mode.py
new file mode 100644
index 000000000..b37f0dede
--- /dev/null
+++ b/account_payment_mode_term/models/payment_mode.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
+#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
+#              (C) 2014 ACSONE SA/NV (<http://acsone.eu>).
+#
+#    All other contributions are (C) by their respective contributors
+#
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+
+
+class payment_mode(orm.Model):
+    _inherit = "payment.mode"
+
+    _columns = {
+        'payment_term_ids': fields.many2many(
+            'account.payment.term', 'account_payment_order_terms_rel',
+            'mode_id', 'term_id', 'Payment terms',
+            help=('Limit selected invoices to invoices with these payment '
+                  'terms')
+            ),
+        }
diff --git a/account_banking_payment_transfer/model/payment_order_create.py b/account_payment_mode_term/models/payment_order_create.py
similarity index 95%
rename from account_banking_payment_transfer/model/payment_order_create.py
rename to account_payment_mode_term/models/payment_order_create.py
index b0693da68..dd4f07fec 100644
--- a/account_banking_payment_transfer/model/payment_order_create.py
+++ b/account_payment_mode_term/models/payment_order_create.py
@@ -27,9 +27,6 @@
 from openerp.osv import orm
 
 
-# TODO: extract this in anoter module such as account_banking_payment_term
-
-
 class payment_order_create(orm.TransientModel):
     _inherit = 'payment.order.create'
 
diff --git a/account_payment_mode_term/views/payment_mode.xml b/account_payment_mode_term/views/payment_mode.xml
new file mode 100644
index 000000000..20c6cf083
--- /dev/null
+++ b/account_payment_mode_term/views/payment_mode.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- 
+             Add the payment mode term filter settings
+        -->
+        <record id="view_payment_mode_form_inherit" model="ir.ui.view">
+            <field name="name">payment.mode.form.inherit</field>
+            <field name="model">payment.mode</field>
+            <field name="inherit_id" ref="account_banking_payment_export.view_payment_mode_form_inherit"/>
+            <field name="arch" type="xml">
+                <field name="type" position="after">
+                    <group colspan="2">
+                        <separator colspan="2"
+                                   string="Optional filter by payment term" />
+                        <field name="payment_term_ids" nolabel="1" colspan="2"/>
+                    </group>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>