diff --git a/account_payment_purchase/README.rst b/account_payment_purchase/README.rst
new file mode 100644
index 000000000..b5f403209
--- /dev/null
+++ b/account_payment_purchase/README.rst
@@ -0,0 +1,89 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+========================
+Account Payment Purchase
+========================
+
+This module adds 2 fields on purchase orders: *Bank Account* and *Payment
+Mode*. These fields are copied from partner to purchase order and then from
+purchase order to supplier invoice.
+
+This module is similar to the *purchase_payment* module; the main difference
+is that it doesn't depend on the *account_payment_extension* module (it's not
+the only module to conflict with *account_payment_extension*; all the SEPA
+modules in the banking addons conflict with *account_payment_extension*).
+
+Installation
+============
+
+This module depends on :
+- purchase
+- account_payment_partner
+
+This module is part of the OCA/bank-payment suite.
+
+Configuration
+=============
+
+There is nothing to configure.
+
+Usage
+=====
+
+You are able to add a payment mode directly on a partner.
+This payment mode is automatically associated to the purchase order, then on
+related invoice.
+This default value could be change in a draft purchase or draft invoice.
+When you create a payment order, only invoices related to chosen payment mode
+are displayed.
+Invoices without any payment mode are displayed too.
+
+
+This module doesn't add any feature, but it is used by several other modules.
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/173/9.0
+
+Known issues / Roadmap
+======================
+
+ * No known issues.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/bank-payment/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smashing it by providing a detailed and welcomed feedback.
+
+Credits
+=======
+
+Contributors
+------------
+
+* Pedro M. Baeza
+* Alexis de Lattre
+* Alexandre Fayolle
+* Danimar Ribeiro
+* Raphaël Valyi
+* Vicent Cubells <vicent.cubells@tecnativa.com>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.
diff --git a/account_payment_purchase/__init__.py b/account_payment_purchase/__init__.py
new file mode 100644
index 000000000..59f15b0fb
--- /dev/null
+++ b/account_payment_purchase/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Akretion (<http://www.akretion.com>).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/account_payment_purchase/__openerp__.py b/account_payment_purchase/__openerp__.py
new file mode 100644
index 000000000..089a02898
--- /dev/null
+++ b/account_payment_purchase/__openerp__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Akretion (<http://www.akretion.com>).
+# Copyright 2017 Tecnativa - Vicent Cubells
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+{
+    'name': 'Account Payment Purchase',
+    'version': '9.0.1.0.0',
+    'category': 'Banking addons',
+    'license': 'AGPL-3',
+    'summary': "Adds Bank Account and Payment Mode on Purchase Orders",
+    'author': "Akretion, "
+              "Tecnativa, "
+              "Odoo Community Association (OCA)",
+    'website': 'http://www.akretion.com',
+    'depends': [
+        'purchase',
+        'account_payment_partner'
+    ],
+    'data': [
+        'views/purchase_order_view.xml',
+    ],
+    'installable': True,
+    'auto_install': True,
+}
diff --git a/account_payment_purchase/i18n/de.po b/account_payment_purchase/i18n/de.po
new file mode 100644
index 000000000..8a82c851b
--- /dev/null
+++ b/account_payment_purchase/i18n/de.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_payment_purchase
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-payment (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-12-10 17:00+0000\n"
+"PO-Revision-Date: 2016-04-06 00:16+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: German (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr "Zahlweise"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr "Pickliste"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_procurement_order
+msgid "Procurement"
+msgstr "Beschaffung"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr "Bestellauftrag"
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid ""
+"Select the bank account of your supplier on which your company should send "
+"the payment. This field is copied from the partner and will be copied to the"
+" supplier invoice."
+msgstr ""
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr ""
diff --git a/account_payment_purchase/i18n/es.po b/account_payment_purchase/i18n/es.po
new file mode 100644
index 000000000..4c48a59ed
--- /dev/null
+++ b/account_payment_purchase/i18n/es.po
@@ -0,0 +1,64 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_payment_purchase
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-payment (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-11-20 00:07+0000\n"
+"PO-Revision-Date: 2016-10-14 01:51+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: Spanish (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr "Modo de pago"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_procurement_order
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr "Pedido de compra"
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid ""
+"Select the bank account of your supplier on which your company should send "
+"the payment. This field is copied from the partner and will be copied to the"
+" supplier invoice."
+msgstr "Seleccione la cuenta bancaria de su proveedor a la que la compañía debe enviar el pago. Este campo se copia del proveedor si está rellenado, y se trasladará a la factura de proveedor."
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr "Cuenta bancaria del proveedor"
+
+#. module: account_payment_purchase
+#: code:addons/account_payment_purchase/models/account_invoice.py:22
+#, python-format
+msgid "Selected purchase order have different payment mode."
+msgstr "El pedido de compra tiene diferente modo de pago."
+
+#. module: account_payment_purchase
+#: code:addons/account_payment_purchase/models/account_invoice.py:29
+#, python-format
+msgid "Selected purchase order have different supplier bank."
+msgstr "El pedido de compra tiene diferente banco de proveedor."
+
diff --git a/account_payment_purchase/i18n/es_MX.po b/account_payment_purchase/i18n/es_MX.po
new file mode 100644
index 000000000..97e9e2e9d
--- /dev/null
+++ b/account_payment_purchase/i18n/es_MX.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_payment_purchase
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-payment (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-12-01 18:13+0000\n"
+"PO-Revision-Date: 2016-04-06 00:16+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_procurement_order
+msgid "Procurement"
+msgstr "Contratación"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid ""
+"Select the bank account of your supplier on which your company should send "
+"the payment. This field is copied from the partner and will be copied to the"
+" supplier invoice."
+msgstr ""
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr ""
diff --git a/account_payment_purchase/i18n/fi.po b/account_payment_purchase/i18n/fi.po
new file mode 100644
index 000000000..37b89e03d
--- /dev/null
+++ b/account_payment_purchase/i18n/fi.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_payment_purchase
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-payment (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-03 11:43+0000\n"
+"PO-Revision-Date: 2016-04-06 00:16+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Finnish (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr "Maksutapa"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr "Keräilylista"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr "Ostotilaus"
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid ""
+"Select the bank account of your supplier on which your company should send "
+"the payment. This field is copied from the partner and will be copied to the"
+" supplier invoice."
+msgstr ""
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr ""
diff --git a/account_payment_purchase/i18n/fr.po b/account_payment_purchase/i18n/fr.po
new file mode 100644
index 000000000..6a3d075ac
--- /dev/null
+++ b/account_payment_purchase/i18n/fr.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_payment_purchase
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-payment (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-12-10 17:00+0000\n"
+"PO-Revision-Date: 2016-12-23 11:34+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: French (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr "Mode de paiement"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr "Bon de livraison"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_procurement_order
+msgid "Procurement"
+msgstr "Procurement"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr "Bon de commande"
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid ""
+"Select the bank account of your supplier on which your company should send "
+"the payment. This field is copied from the partner and will be copied to the"
+" supplier invoice."
+msgstr "Selectionnez le compte bancaire du fournisseur sur lequel votre société devra effectuer le règlement. Ce champ est copié depuis le partenaire et sera recopié sur la facture fournisseur."
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr "Compte bancaire du fournisseur"
diff --git a/account_payment_purchase/i18n/fr_FR.po b/account_payment_purchase/i18n/fr_FR.po
new file mode 100644
index 000000000..ac6fd345f
--- /dev/null
+++ b/account_payment_purchase/i18n/fr_FR.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_payment_purchase
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-payment (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-01-21 01:10+0000\n"
+"PO-Revision-Date: 2016-04-06 00:16+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: French (France) (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/fr_FR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fr_FR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr "Bon de commande"
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid ""
+"Select the bank account of your supplier on which your company should send "
+"the payment. This field is copied from the partner and will be copied to the"
+" supplier invoice."
+msgstr ""
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr ""
diff --git a/account_payment_purchase/i18n/hr.po b/account_payment_purchase/i18n/hr.po
new file mode 100644
index 000000000..30635dfed
--- /dev/null
+++ b/account_payment_purchase/i18n/hr.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_payment_purchase
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-payment (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-09-21 10:50+0000\n"
+"PO-Revision-Date: 2016-04-06 00:16+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Croatian (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_procurement_order
+msgid "Procurement"
+msgstr "Nabava"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid ""
+"Select the bank account of your supplier on which your company should send "
+"the payment. This field is copied from the partner and will be copied to the"
+" supplier invoice."
+msgstr ""
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr ""
diff --git a/account_payment_purchase/i18n/it.po b/account_payment_purchase/i18n/it.po
new file mode 100644
index 000000000..850d2a07f
--- /dev/null
+++ b/account_payment_purchase/i18n/it.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_payment_purchase
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-payment (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-11-20 00:07+0000\n"
+"PO-Revision-Date: 2016-04-06 00:16+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Italian (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr "Modo di pagamento"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr "Lista Picking"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_procurement_order
+msgid "Procurement"
+msgstr "Approvvigionamento"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr "Ordine Acquisto"
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid ""
+"Select the bank account of your supplier on which your company should send "
+"the payment. This field is copied from the partner and will be copied to the"
+" supplier invoice."
+msgstr ""
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr ""
diff --git a/account_payment_purchase/i18n/nl.po b/account_payment_purchase/i18n/nl.po
new file mode 100644
index 000000000..07115b8af
--- /dev/null
+++ b/account_payment_purchase/i18n/nl.po
@@ -0,0 +1,49 @@
+# Dutch translation for banking-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the banking-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: banking-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-06-09 23:23+0000\n"
+"PO-Revision-Date: 2014-06-26 14:15+0000\n"
+"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-06-27 07:13+0000\n"
+"X-Generator: Launchpad (build 17077)\n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr "Betaalwijze"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr "Verzamellijst"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr "Inkooporder"
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid ""
+"Select the bank account of your supplier on which your company should send "
+"the payment. This field is copied from the partner and will be copied to the "
+"supplier invoice."
+msgstr ""
+"Selecteer de bankrekening van de leverancier waarop uw bedrijf de betaling "
+"moet sturen. Dit veld wordt gekopieerd van de leverancier en wordt "
+"gekopieerd naar de inkoopfactuur."
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr "Bankrekening leverancier"
diff --git a/account_payment_purchase/i18n/pt_BR.po b/account_payment_purchase/i18n/pt_BR.po
new file mode 100644
index 000000000..1241e9a20
--- /dev/null
+++ b/account_payment_purchase/i18n/pt_BR.po
@@ -0,0 +1,52 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_payment_purchase
+# 
+# Translators:
+# danimaribeiro <danimaribeiro@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-payment (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-08 00:46+0000\n"
+"PO-Revision-Date: 2016-04-06 01:03+0000\n"
+"Last-Translator: danimaribeiro <danimaribeiro@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr "Modo de Pagamento"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr "Lista de Separação"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_procurement_order
+msgid "Procurement"
+msgstr "Aquisição"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr "Pedido de Compra"
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid ""
+"Select the bank account of your supplier on which your company should send "
+"the payment. This field is copied from the partner and will be copied to the"
+" supplier invoice."
+msgstr "Selecione a conta bancária do seu fornecedor para a qual sua empresa deve mandar o pagamento. Este campo é copiado do parceiro e será copiado para a fatura do fornecedor."
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr "Conta Bancária do Fornecedor"
diff --git a/account_payment_purchase/i18n/pt_PT.po b/account_payment_purchase/i18n/pt_PT.po
new file mode 100644
index 000000000..dbfa579db
--- /dev/null
+++ b/account_payment_purchase/i18n/pt_PT.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_payment_purchase
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-payment (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-12-31 01:24+0000\n"
+"PO-Revision-Date: 2016-04-06 00:16+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_procurement_order
+msgid "Procurement"
+msgstr "Aquisições"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid ""
+"Select the bank account of your supplier on which your company should send "
+"the payment. This field is copied from the partner and will be copied to the"
+" supplier invoice."
+msgstr ""
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr ""
diff --git a/account_payment_purchase/i18n/sl.po b/account_payment_purchase/i18n/sl.po
new file mode 100644
index 000000000..f3b0b47dd
--- /dev/null
+++ b/account_payment_purchase/i18n/sl.po
@@ -0,0 +1,52 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_payment_purchase
+# 
+# Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-payment (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-08 00:46+0000\n"
+"PO-Revision-Date: 2016-04-08 05:50+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr "Metoda plačila"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr "Zbirni seznam"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_procurement_order
+msgid "Procurement"
+msgstr "Oskrba"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr "Nabavni nalog"
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid ""
+"Select the bank account of your supplier on which your company should send "
+"the payment. This field is copied from the partner and will be copied to the"
+" supplier invoice."
+msgstr "Izberite bančni račun dobavitelja, na katerega bo vaša družba izvedla nakazilo. To polje se kopira iz partnerja in bo kopirano na prejeti račun."
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr "Bančni račun dobavitelja"
diff --git a/account_payment_purchase/i18n/tr.po b/account_payment_purchase/i18n/tr.po
new file mode 100644
index 000000000..a8c9bdabb
--- /dev/null
+++ b/account_payment_purchase/i18n/tr.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_payment_purchase
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-payment (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-12-31 01:24+0000\n"
+"PO-Revision-Date: 2016-04-06 00:16+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Turkish (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr "Toplama Listesi"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid ""
+"Select the bank account of your supplier on which your company should send "
+"the payment. This field is copied from the partner and will be copied to the"
+" supplier invoice."
+msgstr ""
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr ""
diff --git a/account_payment_purchase/i18n/tr_TR.po b/account_payment_purchase/i18n/tr_TR.po
new file mode 100644
index 000000000..59d1d68ed
--- /dev/null
+++ b/account_payment_purchase/i18n/tr_TR.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_payment_purchase
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-payment (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-12-31 01:24+0000\n"
+"PO-Revision-Date: 2016-04-06 00:16+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/tr_TR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: tr_TR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr "Seçim listesi"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_procurement_order
+msgid "Procurement"
+msgstr "Satın alma"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid ""
+"Select the bank account of your supplier on which your company should send "
+"the payment. This field is copied from the partner and will be copied to the"
+" supplier invoice."
+msgstr ""
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr ""
diff --git a/account_payment_purchase/i18n/zh_CN.po b/account_payment_purchase/i18n/zh_CN.po
new file mode 100644
index 000000000..ed9bafe26
--- /dev/null
+++ b/account_payment_purchase/i18n/zh_CN.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_payment_purchase
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-payment (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-12-10 17:00+0000\n"
+"PO-Revision-Date: 2016-04-06 00:16+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_procurement_order
+msgid "Procurement"
+msgstr "补货"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid ""
+"Select the bank account of your supplier on which your company should send "
+"the payment. This field is copied from the partner and will be copied to the"
+" supplier invoice."
+msgstr ""
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr ""
diff --git a/account_payment_purchase/models/__init__.py b/account_payment_purchase/models/__init__.py
new file mode 100644
index 000000000..29a6c4cc8
--- /dev/null
+++ b/account_payment_purchase/models/__init__.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Akretion (<http://www.akretion.com>).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from . import procurement_order
+from . import purchase_order
+from . import account_invoice
diff --git a/account_payment_purchase/models/account_invoice.py b/account_payment_purchase/models/account_invoice.py
new file mode 100644
index 000000000..36b70aacb
--- /dev/null
+++ b/account_payment_purchase/models/account_invoice.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Akretion (<http://www.akretion.com>).
+# Copyright 2017 Tecnativa - Vicent Cubells.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from openerp import _, api, models
+
+
+class AccountInvoice(models.Model):
+    _inherit = "account.invoice"
+
+    @api.onchange('purchase_id')
+    def purchase_order_change(self):
+        new_mode = self.purchase_id.payment_mode_id.id or False
+        new_bank = self.purchase_id.supplier_partner_bank_id.id or False
+        res = super(AccountInvoice, self).purchase_order_change()
+        if self.payment_mode_id and self.payment_mode_id.id != new_mode:
+            res['warning'] = {
+                'title': _('Warning'),
+                'message': _('Selected purchase order have different '
+                             'payment mode.'),
+            }
+            return res
+        if self.partner_bank_id and self.partner_bank_id.id != new_bank:
+            res['warning'] = {
+                'title': _('Warning'),
+                'message': _('Selected purchase order have different '
+                             'supplier bank.'),
+            }
+            return res
+        self.payment_mode_id = new_mode
+        self.partner_bank_id = new_bank
diff --git a/account_payment_purchase/models/procurement_order.py b/account_payment_purchase/models/procurement_order.py
new file mode 100644
index 000000000..e8fd073cf
--- /dev/null
+++ b/account_payment_purchase/models/procurement_order.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 Tecnativa - Pedro M. Baeza
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from openerp import api, models
+
+
+class ProcurementOrder(models.Model):
+    _inherit = "procurement.order"
+
+    @api.multi
+    def _prepare_purchase_order(self, partner):
+        """Propagate payment mode on MTO/drop shipping."""
+        values = super(ProcurementOrder, self)._prepare_purchase_order(partner)
+        if partner:
+            values['payment_mode_id'] = partner.with_context(
+                force_company=self.company_id.id).supplier_payment_mode_id.id
+            values['supplier_partner_bank_id'] = (
+                self.env['purchase.order']._get_default_supplier_partner_bank(
+                    partner))
+        return values
diff --git a/account_payment_purchase/models/purchase_order.py b/account_payment_purchase/models/purchase_order.py
new file mode 100644
index 000000000..5cc4c8cb3
--- /dev/null
+++ b/account_payment_purchase/models/purchase_order.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 Akretion (<http://www.akretion.com>).
+# Copyright 2017 Tecnativa - Vicent Cubells.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from openerp import api, fields, models
+
+
+class PurchaseOrder(models.Model):
+    _inherit = "purchase.order"
+
+    supplier_partner_bank_id = fields.Many2one(
+        comodel_name='res.partner.bank',
+        string='Supplier Bank Account',
+        domain="[('partner_id', '=', partner_id)]",
+        help="Select the bank account of your supplier on which your company "
+             "should send the payment. This field is copied from the partner "
+             "and will be copied to the supplier invoice.",
+    )
+    payment_mode_id = fields.Many2one(
+        comodel_name='account.payment.mode',
+        string='Payment Mode',
+        domain="[('payment_type', '=', 'outbound')]",
+    )
+
+    @api.model
+    def _get_default_supplier_partner_bank(self, partner):
+        """This function is designed to be inherited"""
+        return partner.bank_ids and partner.bank_ids[0].id or False
+
+    @api.onchange('partner_id')
+    def onchange_partner_id(self):
+        super(PurchaseOrder, self).onchange_partner_id()
+        if self.partner_id:
+            self.supplier_partner_bank_id = \
+                self._get_default_supplier_partner_bank(self.partner_id)
+            self.payment_mode_id = self.partner_id.supplier_payment_mode_id
+        else:
+            self.supplier_partner_bank_id = False
+            self.payment_mode_id = False
diff --git a/account_payment_purchase/static/description/icon.png b/account_payment_purchase/static/description/icon.png
new file mode 100644
index 000000000..3a0328b51
Binary files /dev/null and b/account_payment_purchase/static/description/icon.png differ
diff --git a/account_payment_purchase/tests/__init__.py b/account_payment_purchase/tests/__init__.py
new file mode 100644
index 000000000..5af37be3f
--- /dev/null
+++ b/account_payment_purchase/tests/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Copyright 2013-2015 Tecnativa - Pedro M. Baeza
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from . import test_account_payment_purchase
diff --git a/account_payment_purchase/tests/test_account_payment_purchase.py b/account_payment_purchase/tests/test_account_payment_purchase.py
new file mode 100644
index 000000000..2235f3a68
--- /dev/null
+++ b/account_payment_purchase/tests/test_account_payment_purchase.py
@@ -0,0 +1,148 @@
+# -*- coding: utf-8 -*-
+# Copyright 2013-2015 Tecnativa - Pedro M. Baeza
+# Copyright 2017 Tecnativa - Vicent Cubells
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from openerp import fields
+from openerp.tests import common
+
+
+class TestAccountPaymentPurchase(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestAccountPaymentPurchase, cls).setUpClass()
+        cls.bank = cls.env['res.partner.bank'].create(
+            {'bank_name': 'Test bank',
+             'acc_number': '1234567890'})
+        cls.bank2 = cls.env['res.partner.bank'].create(
+            {'bank_name': 'Test bank #2',
+             'acc_number': '0123456789'})
+        cls.journal = cls.env['account.journal'].create(
+            {'name': 'Test journal',
+             'code': 'TEST',
+             'type': 'general'})
+        cls.payment_mode = cls.env['account.payment.mode'].create(
+            {'name': 'Test payment mode',
+             'fixed_journal_id': cls.journal.id,
+             'bank_account_link': 'variable',
+             'payment_method_id': cls.env.ref(
+                 'account.account_payment_method_manual_in').id})
+        cls.partner = cls.env['res.partner'].create(
+            {'name': 'Test partner',
+             'supplier_payment_mode_id': cls.payment_mode.id})
+        cls.uom_id = cls.env.ref('product.product_uom_unit').id
+        cls.mto_product = cls.env['product.product'].create(
+            {'name': 'Test buy product',
+             'type': 'product',
+             'uom_id': cls.uom_id,
+             'uom_po_id': cls.uom_id,
+             'seller_ids': [(0, 0, {'name': cls.partner.id})]})
+        cls.purchase = cls.env['purchase.order'].create(
+            {'partner_id': cls.partner.id,
+             'payment_mode_id': cls.payment_mode.id,
+             'order_line': [(0, 0, {'name': 'Test line',
+                                    'product_qty': 1.0,
+                                    'product_id': cls.mto_product.id,
+                                    'product_uom': cls.uom_id,
+                                    'date_planned': fields.Date.today(),
+                                    'price_unit': 1.0})]})
+
+    def test_onchange_partner_id_purchase_order(self):
+        self.purchase.onchange_partner_id()
+        self.assertEqual(self.purchase.payment_mode_id, self.payment_mode)
+
+    def test_purchase_order_invoicing(self):
+        self.purchase.button_confirm()
+        picking = self.purchase.picking_ids[0]
+        picking.force_assign()
+        picking.pack_operation_product_ids.write({'qty_done': 1.0})
+        picking.do_new_transfer()
+
+        invoice = self.env['account.invoice'].create({
+            'partner_id': self.partner.id,
+            'purchase_id': self.purchase.id,
+            'account_id': self.partner.property_account_payable_id.id,
+        })
+        invoice.purchase_order_change()
+        self.assertEqual(
+            self.purchase.invoice_ids[0].payment_mode_id, self.payment_mode)
+
+    def test_picking_from_purchase_order_invoicing(self):
+        # Test payment mode
+        stockable_product = self.env['product.product'].create(
+            {'name': 'Test stockable product',
+             'type': 'product'})
+        self.purchase.order_line[0].product_id = stockable_product.id
+        self.purchase.button_confirm()
+        picking = self.purchase.picking_ids[0]
+        picking.force_assign()
+        picking.pack_operation_product_ids.write({'qty_done': 1.0})
+        picking.do_new_transfer()
+
+        invoice = self.env['account.invoice'].create({
+            'partner_id': self.partner.id,
+            'purchase_id': self.purchase.id,
+            'account_id': self.partner.property_account_payable_id.id,
+        })
+        invoice.purchase_order_change()
+        self.assertEqual(invoice.payment_mode_id, self.payment_mode)
+        purchase2 = self.purchase.copy()
+        payment_mode2 = self.payment_mode.copy()
+        purchase2.payment_mode_id = payment_mode2.id
+        purchase2.button_confirm()
+        picking = purchase2.picking_ids[0]
+        picking.force_assign()
+        picking.pack_operation_product_ids.write({'qty_done': 1.0})
+        picking.do_new_transfer()
+        invoice.purchase_id = purchase2.id
+        result = invoice.purchase_order_change()
+        self.assertEqual(result['warning']['title'], 'Warning')
+
+    def test_picking_from_purchase_order_invoicing_bank(self):
+        # Test patner_bank
+        stockable_product = self.env['product.product'].create(
+            {'name': 'Test stockable product',
+             'type': 'product'})
+        self.purchase.order_line[0].product_id = stockable_product.id
+        self.purchase.payment_mode_id = False
+        self.purchase.supplier_partner_bank_id = self.bank.id
+        self.purchase.button_confirm()
+        picking = self.purchase.picking_ids[0]
+        picking.force_assign()
+        picking.pack_operation_product_ids.write({'qty_done': 1.0})
+        picking.do_new_transfer()
+
+        invoice = self.env['account.invoice'].create({
+            'partner_id': self.partner.id,
+            'purchase_id': self.purchase.id,
+            'account_id': self.partner.property_account_payable_id.id,
+        })
+        invoice.purchase_order_change()
+        self.assertEqual(invoice.partner_bank_id, self.bank)
+        purchase2 = self.purchase.copy()
+        purchase2.supplier_partner_bank_id = self.bank2.id
+        purchase2.button_confirm()
+        picking = purchase2.picking_ids[0]
+        picking.force_assign()
+        picking.pack_operation_product_ids.write({'qty_done': 1.0})
+        picking.do_new_transfer()
+        invoice.purchase_id = purchase2.id
+        result = invoice.purchase_order_change()
+        self.assertEqual(result['warning']['title'], 'Warning')
+
+    def test_procurement_buy_payment_mode(self):
+        route = self.env.ref('purchase.route_warehouse0_buy')
+        rule = self.env['procurement.rule'].search(
+            [('route_id', '=', route.id)], limit=1)
+        procurement_order = self.env['procurement.order'].create({
+            'product_id': self.mto_product.id,
+            'rule_id': rule.id,
+            'location_id': self.env['stock.location'].search([], limit=1).id,
+            'warehouse_id': self.env['stock.warehouse'].search([], limit=1).id,
+            'product_qty': 1,
+            'product_uom': self.mto_product.uom_id.id,
+            'name': 'Procurement order test',
+        })
+        procurement_order.run()
+        self.assertEqual(
+            procurement_order.purchase_id.payment_mode_id, self.payment_mode)
diff --git a/account_payment_purchase/views/purchase_order_view.xml b/account_payment_purchase/views/purchase_order_view.xml
new file mode 100644
index 000000000..8f8713acc
--- /dev/null
+++ b/account_payment_purchase/views/purchase_order_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 - Alexis de Lattre <alexis.delattre@akretion.com>
+     Copyright 2017 - Tecnativa <vicent.cubells@tecnativa.com>
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record id="purchase_order_form" model="ir.ui.view">
+        <field name="name">account_payment_purchase.purchase_order.form</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_form"/>
+        <field name="arch" type="xml">
+            <field name="payment_term_id" position="after">
+                <field name="payment_mode_id"
+                    domain="[('payment_type', '=', 'outbound')]"
+                    widget="selection"/>
+                <field name="supplier_partner_bank_id"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>