diff --git a/account_payment_partner/i18n/account_payment_partner.pot b/account_payment_partner/i18n/account_payment_partner.pot
new file mode 100644
index 000000000..12f3f19b2
--- /dev/null
+++ b/account_payment_partner/i18n/account_payment_partner.pot
@@ -0,0 +1,115 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_payment_partner
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_payment_partner
+#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+msgid "Bank Account:"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+msgid "Payment Mode:"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_invoice_bank_account_required
+msgid "Activate this option if this payment method requires you to know the bank account number of your customer or supplier."
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice_bank_account_required
+msgid "Bank Account Required"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model,name:account_payment_partner.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_res_partner_customer_payment_mode_id
+#: model:ir.model.fields,field_description:account_payment_partner.field_res_users_customer_payment_mode_id
+msgid "Customer Payment Mode"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model,name:account_payment_partner.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model,name:account_payment_partner.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: account_payment_partner
+#: code:addons/account_payment_partner/tests/test_account_payment_partner.py:35
+#, python-format
+msgid "No Chart of Account Template has been defined !"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice_payment_mode_id
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_move_line_payment_mode_id
+#: model:ir.ui.view,arch_db:account_payment_partner.view_account_invoice_filter
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model,name:account_payment_partner.model_account_payment_mode
+msgid "Payment Modes"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
+msgid "Payments"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_res_partner_customer_payment_mode_id
+#: model:ir.model.fields,help:account_payment_partner.field_res_users_customer_payment_mode_id
+msgid "Select the default payment mode for this customer."
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_res_partner_supplier_payment_mode_id
+#: model:ir.model.fields,help:account_payment_partner.field_res_users_supplier_payment_mode_id
+msgid "Select the default payment mode for this supplier."
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_res_partner_supplier_payment_mode_id
+#: model:ir.model.fields,field_description:account_payment_partner.field_res_users_supplier_payment_mode_id
+msgid "Supplier Payment Mode"
+msgstr ""
+
+#. module: account_payment_partner
+#: code:addons/account_payment_partner/models/account_invoice.py:119
+#, python-format
+msgid "The company of the invoice %s does not match with that of the payment mode"
+msgstr ""
+
+#. module: account_payment_partner
+#: code:addons/account_payment_partner/models/account_payment_mode.py:17
+#, python-format
+msgid "You cannot change the Company. There exists at least one Invoice with this Payment Mode, already assigned to another Company."
+msgstr ""
+
+#. module: account_payment_partner
+#: code:addons/account_payment_partner/models/account_payment_mode.py:28
+#, python-format
+msgid "You cannot change the Company. There exists at least one Journal Item with this Payment Mode, already assigned to another Company."
+msgstr ""
+
diff --git a/account_payment_partner/i18n/ca.po b/account_payment_partner/i18n/ca.po
index 039a564a7..49c190d6c 100644
--- a/account_payment_partner/i18n/ca.po
+++ b/account_payment_partner/i18n/ca.po
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_payment_partner
-#
+#
# Translators:
# OCA Transbot , 2018
msgid ""
@@ -12,10 +12,10 @@ msgstr ""
"PO-Revision-Date: 2018-02-02 03:43+0000\n"
"Last-Translator: OCA Transbot , 2018\n"
"Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
+"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
-"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: account_payment_partner
@@ -103,7 +103,7 @@ msgid "Supplier Payment Mode"
msgstr ""
#. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_invoice.py:118
+#: code:addons/account_payment_partner/models/account_invoice.py:119
#, python-format
msgid ""
"The company of the invoice %s does not match with that of the payment mode"
diff --git a/account_payment_partner/i18n/da_DK.po b/account_payment_partner/i18n/da_DK.po
index 65ef580b6..4828a7c8c 100644
--- a/account_payment_partner/i18n/da_DK.po
+++ b/account_payment_partner/i18n/da_DK.po
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_payment_partner
-#
+#
# Translators:
# OCA Transbot , 2018
msgid ""
@@ -11,11 +11,12 @@ msgstr ""
"POT-Creation-Date: 2018-02-02 03:43+0000\n"
"PO-Revision-Date: 2018-02-02 03:43+0000\n"
"Last-Translator: OCA Transbot , 2018\n"
-"Language-Team: Danish (Denmark) (https://www.transifex.com/oca/teams/23907/da_DK/)\n"
+"Language-Team: Danish (Denmark) (https://www.transifex.com/oca/teams/23907/"
+"da_DK/)\n"
+"Language: da_DK\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
-"Language: da_DK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: account_payment_partner
@@ -103,7 +104,7 @@ msgid "Supplier Payment Mode"
msgstr ""
#. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_invoice.py:118
+#: code:addons/account_payment_partner/models/account_invoice.py:119
#, python-format
msgid ""
"The company of the invoice %s does not match with that of the payment mode"
diff --git a/account_payment_partner/i18n/de.po b/account_payment_partner/i18n/de.po
index 1f69befa9..90e0f89bc 100644
--- a/account_payment_partner/i18n/de.po
+++ b/account_payment_partner/i18n/de.po
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_payment_partner
-#
+#
# Translators:
# OCA Transbot , 2017
msgid ""
@@ -12,10 +12,10 @@ msgstr ""
"PO-Revision-Date: 2017-11-23 03:38+0000\n"
"Last-Translator: OCA Transbot , 2017\n"
"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
+"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_partner
@@ -105,7 +105,7 @@ msgid "Supplier Payment Mode"
msgstr "Zahlungsmethode des Lieferanten"
#. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_invoice.py:118
+#: code:addons/account_payment_partner/models/account_invoice.py:119
#, python-format
msgid ""
"The company of the invoice %s does not match with that of the payment mode"
diff --git a/account_payment_partner/i18n/es.po b/account_payment_partner/i18n/es.po
index bd7a14e49..ce9afa051 100644
--- a/account_payment_partner/i18n/es.po
+++ b/account_payment_partner/i18n/es.po
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_payment_partner
-#
+#
# Translators:
# OCA Transbot , 2017
msgid ""
@@ -12,10 +12,10 @@ msgstr ""
"PO-Revision-Date: 2017-11-23 03:38+0000\n"
"Last-Translator: OCA Transbot , 2017\n"
"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
+"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_partner
@@ -34,8 +34,8 @@ msgid ""
"Activate this option if this payment method requires you to know the bank "
"account number of your customer or supplier."
msgstr ""
-"Activa esta opción si este método de pago debe requerirte informar el número"
-" de cuenta bancaria de tu cliente o proveedor"
+"Activa esta opción si este método de pago debe requerirte informar el número "
+"de cuenta bancaria de tu cliente o proveedor"
#. module: account_payment_partner
#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice_bank_account_required
@@ -109,7 +109,7 @@ msgid "Supplier Payment Mode"
msgstr "Modo de pago de proveedor"
#. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_invoice.py:118
+#: code:addons/account_payment_partner/models/account_invoice.py:119
#, python-format
msgid ""
"The company of the invoice %s does not match with that of the payment mode"
diff --git a/account_payment_partner/i18n/fr.po b/account_payment_partner/i18n/fr.po
index d06657fd7..c4ab4aaa2 100644
--- a/account_payment_partner/i18n/fr.po
+++ b/account_payment_partner/i18n/fr.po
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_payment_partner
-#
+#
# Translators:
# OCA Transbot , 2017
# Quentin THEURET , 2018
@@ -10,14 +10,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-10 02:10+0000\n"
-"PO-Revision-Date: 2018-02-10 02:10+0000\n"
+"POT-Creation-Date: 2018-05-23 11:14+0000\n"
+"PO-Revision-Date: 2018-05-23 11:14+0000\n"
"Last-Translator: Nicolas JEUDY , 2018\n"
"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
+"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_partner
@@ -107,7 +107,7 @@ msgid "Supplier Payment Mode"
msgstr "Mode de règlement fournisseur"
#. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_invoice.py:118
+#: code:addons/account_payment_partner/models/account_invoice.py:119
#, python-format
msgid ""
"The company of the invoice %s does not match with that of the payment mode"
diff --git a/account_payment_partner/i18n/hr.po b/account_payment_partner/i18n/hr.po
index 112067f0c..189a4b6da 100644
--- a/account_payment_partner/i18n/hr.po
+++ b/account_payment_partner/i18n/hr.po
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_payment_partner
-#
+#
# Translators:
# OCA Transbot , 2017
msgid ""
@@ -12,11 +12,12 @@ msgstr ""
"PO-Revision-Date: 2017-11-23 03:38+0000\n"
"Last-Translator: OCA Transbot , 2017\n"
"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
+"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"
+"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_partner
#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
@@ -103,7 +104,7 @@ msgid "Supplier Payment Mode"
msgstr ""
#. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_invoice.py:118
+#: code:addons/account_payment_partner/models/account_invoice.py:119
#, python-format
msgid ""
"The company of the invoice %s does not match with that of the payment mode"
diff --git a/account_payment_partner/i18n/nb_NO.po b/account_payment_partner/i18n/nb_NO.po
index a140ee50a..33d7e9e73 100644
--- a/account_payment_partner/i18n/nb_NO.po
+++ b/account_payment_partner/i18n/nb_NO.po
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_payment_partner
-#
+#
# Translators:
# Imre Kristoffer Eilertsen , 2016
msgid ""
@@ -11,11 +11,12 @@ msgstr ""
"POT-Creation-Date: 2016-07-30 07:37+0000\n"
"PO-Revision-Date: 2016-07-30 07:37+0000\n"
"Last-Translator: Imre Kristoffer Eilertsen , 2016\n"
-"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/teams/23907/nb_NO/)\n"
+"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/"
+"teams/23907/nb_NO/)\n"
+"Language: nb_NO\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
-"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: account_payment_partner
@@ -40,8 +41,14 @@ msgstr ""
msgid "Bank Account Required"
msgstr "Bankkonto påkrevd"
+#. module: account_payment_partner
+#: model:ir.model,name:account_payment_partner.model_res_partner
+msgid "Contact"
+msgstr ""
+
#. module: account_payment_partner
#: model:ir.model.fields,field_description:account_payment_partner.field_res_partner_customer_payment_mode_id
+#: model:ir.model.fields,field_description:account_payment_partner.field_res_users_customer_payment_mode_id
msgid "Customer Payment Mode"
msgstr ""
@@ -56,8 +63,9 @@ msgid "Journal Item"
msgstr "Journalgjenstand"
#. module: account_payment_partner
-#: model:ir.model,name:account_payment_partner.model_res_partner
-msgid "Partner"
+#: code:addons/account_payment_partner/tests/test_account_payment_partner.py:35
+#, python-format
+msgid "No Chart of Account Template has been defined !"
msgstr ""
#. module: account_payment_partner
@@ -67,6 +75,12 @@ msgstr ""
msgid "Payment Mode"
msgstr ""
+#. module: account_payment_partner
+#: model:ir.model,name:account_payment_partner.model_account_payment_mode
+#, fuzzy
+msgid "Payment Modes"
+msgstr "Betalinger"
+
#. module: account_payment_partner
#: model:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
msgid "Payments"
@@ -74,15 +88,41 @@ msgstr "Betalinger"
#. module: account_payment_partner
#: model:ir.model.fields,help:account_payment_partner.field_res_partner_customer_payment_mode_id
+#: model:ir.model.fields,help:account_payment_partner.field_res_users_customer_payment_mode_id
msgid "Select the default payment mode for this customer."
msgstr ""
#. module: account_payment_partner
#: model:ir.model.fields,help:account_payment_partner.field_res_partner_supplier_payment_mode_id
+#: model:ir.model.fields,help:account_payment_partner.field_res_users_supplier_payment_mode_id
msgid "Select the default payment mode for this supplier."
msgstr ""
#. module: account_payment_partner
#: model:ir.model.fields,field_description:account_payment_partner.field_res_partner_supplier_payment_mode_id
+#: model:ir.model.fields,field_description:account_payment_partner.field_res_users_supplier_payment_mode_id
msgid "Supplier Payment Mode"
msgstr ""
+
+#. module: account_payment_partner
+#: code:addons/account_payment_partner/models/account_invoice.py:119
+#, python-format
+msgid ""
+"The company of the invoice %s does not match with that of the payment mode"
+msgstr ""
+
+#. module: account_payment_partner
+#: code:addons/account_payment_partner/models/account_payment_mode.py:17
+#, python-format
+msgid ""
+"You cannot change the Company. There exists at least one Invoice with this "
+"Payment Mode, already assigned to another Company."
+msgstr ""
+
+#. module: account_payment_partner
+#: code:addons/account_payment_partner/models/account_payment_mode.py:28
+#, python-format
+msgid ""
+"You cannot change the Company. There exists at least one Journal Item with "
+"this Payment Mode, already assigned to another Company."
+msgstr ""
diff --git a/account_payment_partner/i18n/nl.po b/account_payment_partner/i18n/nl.po
index 211e0689e..de30033a1 100644
--- a/account_payment_partner/i18n/nl.po
+++ b/account_payment_partner/i18n/nl.po
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_payment_partner
-#
+#
# Translators:
# OCA Transbot , 2017
msgid ""
@@ -12,10 +12,10 @@ msgstr ""
"PO-Revision-Date: 2017-11-23 03:38+0000\n"
"Last-Translator: OCA Transbot , 2017\n"
"Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n"
+"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
-"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: account_payment_partner
@@ -34,8 +34,8 @@ msgid ""
"Activate this option if this payment method requires you to know the bank "
"account number of your customer or supplier."
msgstr ""
-"Activeer deze optie als de betaalwijze verwacht dat u het bankrekeningnummer"
-" van uw klant of leverancier kent."
+"Activeer deze optie als de betaalwijze verwacht dat u het bankrekeningnummer "
+"van uw klant of leverancier kent."
#. module: account_payment_partner
#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice_bank_account_required
@@ -105,7 +105,7 @@ msgid "Supplier Payment Mode"
msgstr "Betaalwijze leverancier"
#. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_invoice.py:118
+#: code:addons/account_payment_partner/models/account_invoice.py:119
#, python-format
msgid ""
"The company of the invoice %s does not match with that of the payment mode"
diff --git a/account_payment_partner/i18n/pt_BR.po b/account_payment_partner/i18n/pt_BR.po
index ba790b008..d2f047a74 100644
--- a/account_payment_partner/i18n/pt_BR.po
+++ b/account_payment_partner/i18n/pt_BR.po
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_payment_partner
-#
+#
# Translators:
# OCA Transbot , 2017
msgid ""
@@ -11,11 +11,12 @@ msgstr ""
"POT-Creation-Date: 2017-11-23 03:38+0000\n"
"PO-Revision-Date: 2017-11-23 03:38+0000\n"
"Last-Translator: OCA Transbot , 2017\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/"
+"teams/23907/pt_BR/)\n"
+"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_partner
@@ -103,7 +104,7 @@ msgid "Supplier Payment Mode"
msgstr "Modo de Pagamento do Fornecedor"
#. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_invoice.py:118
+#: code:addons/account_payment_partner/models/account_invoice.py:119
#, python-format
msgid ""
"The company of the invoice %s does not match with that of the payment mode"
diff --git a/account_payment_partner/i18n/sl.po b/account_payment_partner/i18n/sl.po
index 9bd46dd3b..d2ea03235 100644
--- a/account_payment_partner/i18n/sl.po
+++ b/account_payment_partner/i18n/sl.po
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_payment_partner
-#
+#
# Translators:
# OCA Transbot , 2017
msgid ""
@@ -12,11 +12,12 @@ msgstr ""
"PO-Revision-Date: 2017-11-23 03:38+0000\n"
"Last-Translator: OCA Transbot , 2017\n"
"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
+"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"
+"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_partner
#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
@@ -103,7 +104,7 @@ msgid "Supplier Payment Mode"
msgstr "Metoda plačila dobavitelja"
#. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_invoice.py:118
+#: code:addons/account_payment_partner/models/account_invoice.py:119
#, python-format
msgid ""
"The company of the invoice %s does not match with that of the payment mode"