diff --git a/account_payment_partner/i18n/account_payment_partner.pot b/account_payment_partner/i18n/account_payment_partner.pot
index 852e7f331..2fc36123e 100644
--- a/account_payment_partner/i18n/account_payment_partner.pot
+++ b/account_payment_partner/i18n/account_payment_partner.pot
@@ -65,6 +65,7 @@ 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 ""
 
@@ -123,11 +124,13 @@ 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 ""
 
@@ -148,6 +151,7 @@ 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 ""
 
diff --git a/account_payment_partner/i18n/ca.po b/account_payment_partner/i18n/ca.po
index 49c190d6c..eeda8328e 100644
--- a/account_payment_partner/i18n/ca.po
+++ b/account_payment_partner/i18n/ca.po
@@ -19,38 +19,76 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "# of chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_chars
+msgid "# of digits for customer bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Bank Account:</strong>"
 msgstr ""
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr "<strong>Mode de pagament:</strong>"
 
 #. module: account_payment_partner
-#: model:ir.model.fields,help:account_payment_partner.field_account_invoice_bank_account_required
+#: 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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice__partner_bank_id
+msgid "Bank Account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_invoice__partner_bank_id
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Vendor Credit Note, otherwise a "
+"Partner bank account number."
+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.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_from_journal
+msgid "Bank account from journals"
+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
+#: 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
+#: selection:account.payment.mode,show_bank_account:0
+msgid "First n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Full"
+msgstr ""
+
 #. module: account_payment_partner
 #: model:ir.model,name:account_payment_partner.model_account_invoice
 msgid "Invoice"
@@ -61,6 +99,16 @@ msgstr ""
 msgid "Journal Item"
 msgstr ""
 
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Last n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "No"
+msgstr ""
+
 #. module: account_payment_partner
 #: code:addons/account_payment_partner/tests/test_account_payment_partner.py:35
 #, python-format
@@ -68,9 +116,9 @@ 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
+#: 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_terms:ir.ui.view,arch_db:account_payment_partner.view_account_invoice_filter
 msgid "Payment Mode"
 msgstr "Mode de pagament"
 
@@ -80,37 +128,52 @@ msgid "Payment Modes"
 msgstr ""
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
+#: model_terms: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
+#: 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
+#: 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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "Show bank account in invoice report"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show in invoices partial or full bank account number"
+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
+#: code:addons/account_payment_partner/models/account_invoice.py:117
 #, 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
+#: code:addons/account_payment_partner/models/account_payment_mode.py:35
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Invoice with this "
@@ -118,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_payment_mode.py:28
+#: code:addons/account_payment_partner/models/account_payment_mode.py:46
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Journal Item with "
diff --git a/account_payment_partner/i18n/da_DK.po b/account_payment_partner/i18n/da_DK.po
index 4828a7c8c..08672ced7 100644
--- a/account_payment_partner/i18n/da_DK.po
+++ b/account_payment_partner/i18n/da_DK.po
@@ -20,38 +20,76 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "# of chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_chars
+msgid "# of digits for customer bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Bank Account:</strong>"
 msgstr ""
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr ""
 
 #. module: account_payment_partner
-#: model:ir.model.fields,help:account_payment_partner.field_account_invoice_bank_account_required
+#: 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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice__partner_bank_id
+msgid "Bank Account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_invoice__partner_bank_id
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Vendor Credit Note, otherwise a "
+"Partner bank account number."
+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.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_from_journal
+msgid "Bank account from journals"
+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
+#: 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
+#: selection:account.payment.mode,show_bank_account:0
+msgid "First n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Full"
+msgstr ""
+
 #. module: account_payment_partner
 #: model:ir.model,name:account_payment_partner.model_account_invoice
 msgid "Invoice"
@@ -62,6 +100,16 @@ msgstr ""
 msgid "Journal Item"
 msgstr ""
 
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Last n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "No"
+msgstr ""
+
 #. module: account_payment_partner
 #: code:addons/account_payment_partner/tests/test_account_payment_partner.py:35
 #, python-format
@@ -69,9 +117,9 @@ 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
+#: 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_terms:ir.ui.view,arch_db:account_payment_partner.view_account_invoice_filter
 msgid "Payment Mode"
 msgstr "Betalingsform"
 
@@ -81,37 +129,52 @@ msgid "Payment Modes"
 msgstr ""
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
+#: model_terms: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
+#: 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
+#: 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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "Show bank account in invoice report"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show in invoices partial or full bank account number"
+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
+#: code:addons/account_payment_partner/models/account_invoice.py:117
 #, 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
+#: code:addons/account_payment_partner/models/account_payment_mode.py:35
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Invoice with this "
@@ -119,7 +182,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_payment_mode.py:28
+#: code:addons/account_payment_partner/models/account_payment_mode.py:46
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Journal Item with "
diff --git a/account_payment_partner/i18n/de.po b/account_payment_partner/i18n/de.po
index 90e0f89bc..43223c8e2 100644
--- a/account_payment_partner/i18n/de.po
+++ b/account_payment_partner/i18n/de.po
@@ -19,17 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "# of chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_chars
+msgid "# of digits for customer bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Bank Account:</strong>"
 msgstr "<strong>Bankkonto:</strong>"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr "<strong>Zahlungsmethode:</strong>"
 
 #. module: account_payment_partner
-#: model:ir.model.fields,help:account_payment_partner.field_account_invoice_bank_account_required
+#: 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."
@@ -38,21 +48,50 @@ msgstr ""
 "des Kunden oder Lieferanten bekannt sein muss."
 
 #. module: account_payment_partner
-#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice_bank_account_required
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice__partner_bank_id
+#, fuzzy
+msgid "Bank Account"
+msgstr "Bankkonto erforderlich"
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_invoice__partner_bank_id
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Vendor Credit Note, otherwise a "
+"Partner bank account number."
+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 "Bankkonto erforderlich"
 
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_from_journal
+msgid "Bank account from journals"
+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
+#: 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 "Zahlungsmethode des Kunden"
 
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "First n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Full"
+msgstr ""
+
 #. module: account_payment_partner
 #: model:ir.model,name:account_payment_partner.model_account_invoice
 msgid "Invoice"
@@ -63,6 +102,16 @@ msgstr "Rechnung"
 msgid "Journal Item"
 msgstr "Logbuch Eintrag"
 
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Last n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "No"
+msgstr ""
+
 #. module: account_payment_partner
 #: code:addons/account_payment_partner/tests/test_account_payment_partner.py:35
 #, python-format
@@ -70,9 +119,9 @@ 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
+#: 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_terms:ir.ui.view,arch_db:account_payment_partner.view_account_invoice_filter
 msgid "Payment Mode"
 msgstr "Zahlungsmodus"
 
@@ -82,37 +131,52 @@ msgid "Payment Modes"
 msgstr "Zahlungsmodi"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
 msgid "Payments"
 msgstr "Zahlungen"
 
 #. 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
+#: 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 "Wähle die standard Zahlungsmethode für diesen Kunden."
 
 #. 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
+#: 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 "Wähle die standard Zahlungsmethode für diesen Lieferanten."
 
 #. 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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "Show bank account in invoice report"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show in invoices partial or full bank account number"
+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 "Zahlungsmethode des Lieferanten"
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_invoice.py:119
+#: code:addons/account_payment_partner/models/account_invoice.py:117
 #, 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
+#: code:addons/account_payment_partner/models/account_payment_mode.py:35
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Invoice with this "
@@ -120,7 +184,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_payment_mode.py:28
+#: code:addons/account_payment_partner/models/account_payment_mode.py:46
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Journal Item with "
diff --git a/account_payment_partner/i18n/es.po b/account_payment_partner/i18n/es.po
index f30143010..19313b610 100644
--- a/account_payment_partner/i18n/es.po
+++ b/account_payment_partner/i18n/es.po
@@ -20,42 +20,66 @@ msgstr ""
 "X-Generator: Weblate 3.0.1\n"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
 msgid "# of chars"
 msgstr "Nº de caracteres"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_chars
+msgid "# of digits for customer bank account"
+msgstr "Nº de dígitos de cuenta bancaria del cliente"
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Bank Account:</strong>"
 msgstr "<strong>Cuenta bancaria:</strong>"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr "<strong>Modo de pago:</strong>"
 
 #. 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 "Activa esta opción si este método de pago debe requerirte informar el número de cuenta bancaria de tu cliente o proveedor"
+#: 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 ""
+"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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice__partner_bank_id
+#, fuzzy
+msgid "Bank Account"
+msgstr "Cuenta bancaria requerida"
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_invoice__partner_bank_id
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Vendor Credit Note, otherwise a "
+"Partner bank account number."
+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 "Cuenta bancaria requerida"
 
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_from_journal
+msgid "Bank account from journals"
+msgstr "Cuenta bancaria de los diarios"
+
 #. module: account_payment_partner
 #: model:ir.model,name:account_payment_partner.model_res_partner
 msgid "Contact"
 msgstr "Contacto"
 
-#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode_show_bank_account_from_journal
-msgid "Bank account from journals"
-msgstr "Cuenta bancaria de los diarios"
-
 #. 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
+#: 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 "Modo de pago de cliente"
 
@@ -79,12 +103,6 @@ msgstr "Factura"
 msgid "Journal Item"
 msgstr "Apunte contable"
 
-#. 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 "No se ha definido un Plan Contable!"
-
 #. module: account_payment_partner
 #: selection:account.payment.mode,show_bank_account:0
 msgid "Last n chars"
@@ -96,24 +114,15 @@ msgid "No"
 msgstr "No"
 
 #. module: account_payment_partner
-#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode_show_bank_account_chars
-msgid "# of digits for customer bank account"
-msgstr "Nº de dígitos de cuenta bancaria del cliente"
+#: code:addons/account_payment_partner/tests/test_account_payment_partner.py:35
+#, python-format
+msgid "No Chart of Account Template has been defined !"
+msgstr "No se ha definido un Plan Contable!"
 
 #. module: account_payment_partner
-#: model:ir.model,name:account_payment_partner.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: account_payment_partner
-#: model:ir.model,name:account_payment_partner.model_account_payment_method
-msgid "Payment Methods"
-msgstr "Métodos de pago"
-
-#. 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
+#: 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_terms:ir.ui.view,arch_db:account_payment_partner.view_account_invoice_filter
 msgid "Payment Mode"
 msgstr "Modo de pago"
 
@@ -123,51 +132,56 @@ msgid "Payment Modes"
 msgstr "Modos de pago"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
 msgid "Payments"
 msgstr "Pagos"
 
 #. 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_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 "Seleccione el modo de pago por defecto cuando esta empresa actúa como cliente."
+msgstr ""
+"Seleccione el modo de pago por defecto cuando esta empresa actúa como "
+"cliente."
 
 #. 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
+#: 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 "Seleccione el modo de pago por defecto cuando esta empresa actúa como proveedor."
+msgstr ""
+"Seleccione el modo de pago por defecto cuando esta empresa actúa como "
+"proveedor."
 
 #. module: account_payment_partner
-#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode_show_bank_account
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account
 msgid "Show bank account"
 msgstr "Mostrar cuenta bancaria"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
 msgid "Show bank account in invoice report"
 msgstr "Mostrar cuenta bancaria en informe factura"
 
 #. module: account_payment_partner
-#: model:ir.model.fields,help:account_payment_partner.field_account_payment_mode_show_bank_account
+#: model:ir.model.fields,help:account_payment_partner.field_account_payment_mode__show_bank_account
 msgid "Show in invoices partial or full bank account number"
 msgstr "Mostrar en facturas nº de cuenta bancaria parcial o completo"
 
 #. 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
+#: 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 "Modo de pago de proveedor"
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_invoice.py:119
+#: code:addons/account_payment_partner/models/account_invoice.py:117
 #, python-format
 msgid ""
 "The company of the invoice %s does not match with that of the payment mode"
 msgstr "La compañía de la factura %s no corresponde con la del modo de pago"
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_payment_mode.py:17
+#: code:addons/account_payment_partner/models/account_payment_mode.py:35
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Invoice with this "
@@ -177,7 +191,7 @@ msgstr ""
 "Modo de Pago asignado a otra Compañía."
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_payment_mode.py:28
+#: code:addons/account_payment_partner/models/account_payment_mode.py:46
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Journal Item with "
@@ -185,3 +199,9 @@ msgid ""
 msgstr ""
 "No puede cambiar la Compañía. Existe como mínimo una elemento del Diario con "
 "este Modo de Pago que ya está asignado a otra Compañía."
+
+#~ msgid "Partner"
+#~ msgstr "Empresa"
+
+#~ msgid "Payment Methods"
+#~ msgstr "Métodos de pago"
diff --git a/account_payment_partner/i18n/fr.po b/account_payment_partner/i18n/fr.po
index c4ab4aaa2..9757e6acd 100644
--- a/account_payment_partner/i18n/fr.po
+++ b/account_payment_partner/i18n/fr.po
@@ -21,17 +21,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "# of chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_chars
+msgid "# of digits for customer bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Bank Account:</strong>"
 msgstr "<strong>Compte bancaire:</strong>"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr "<strong>Mode de paiement :</strong>"
 
 #. module: account_payment_partner
-#: model:ir.model.fields,help:account_payment_partner.field_account_invoice_bank_account_required
+#: 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."
@@ -40,21 +50,50 @@ msgstr ""
 "numéro de compte bancaire de votre client ou fournisseur."
 
 #. module: account_payment_partner
-#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice_bank_account_required
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice__partner_bank_id
+#, fuzzy
+msgid "Bank Account"
+msgstr "Compte bancaire requis"
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_invoice__partner_bank_id
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Vendor Credit Note, otherwise a "
+"Partner bank account number."
+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 "Compte bancaire requis"
 
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_from_journal
+msgid "Bank account from journals"
+msgstr ""
+
 #. module: account_payment_partner
 #: model:ir.model,name:account_payment_partner.model_res_partner
 msgid "Contact"
 msgstr "Contacte"
 
 #. 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
+#: 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 "Mode de paiement client"
 
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "First n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Full"
+msgstr ""
+
 #. module: account_payment_partner
 #: model:ir.model,name:account_payment_partner.model_account_invoice
 msgid "Invoice"
@@ -65,6 +104,16 @@ msgstr "Facture"
 msgid "Journal Item"
 msgstr "Élément de journal"
 
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Last n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "No"
+msgstr ""
+
 #. module: account_payment_partner
 #: code:addons/account_payment_partner/tests/test_account_payment_partner.py:35
 #, python-format
@@ -72,9 +121,9 @@ msgid "No Chart of Account Template has been defined !"
 msgstr "Aucun modèle de plan comptable n'a été défini !"
 
 #. 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
+#: 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_terms:ir.ui.view,arch_db:account_payment_partner.view_account_invoice_filter
 msgid "Payment Mode"
 msgstr "Mode de paiement"
 
@@ -84,30 +133,45 @@ msgid "Payment Modes"
 msgstr "Mode de paiement"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
 msgid "Payments"
 msgstr "Règlements"
 
 #. 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
+#: 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 "Sélectionnez le mode de paiement par défaut pour ce client."
 
 #. 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
+#: 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 "Sélectionnez le mode de paiement par défaut pour ce fournisseur."
 
 #. 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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "Show bank account in invoice report"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show in invoices partial or full bank account number"
+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 "Mode de règlement fournisseur"
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_invoice.py:119
+#: code:addons/account_payment_partner/models/account_invoice.py:117
 #, python-format
 msgid ""
 "The company of the invoice %s does not match with that of the payment mode"
@@ -115,7 +179,7 @@ msgstr ""
 "La société de la facture %s ne correspond pas à celle du mode de paiement"
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_payment_mode.py:17
+#: code:addons/account_payment_partner/models/account_payment_mode.py:35
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Invoice with this "
@@ -125,7 +189,7 @@ msgstr ""
 "ce mode de paiement, déjà affectée à une autre société."
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_payment_mode.py:28
+#: code:addons/account_payment_partner/models/account_payment_mode.py:46
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Journal Item with "
diff --git a/account_payment_partner/i18n/hr.po b/account_payment_partner/i18n/hr.po
index 189a4b6da..06df5021e 100644
--- a/account_payment_partner/i18n/hr.po
+++ b/account_payment_partner/i18n/hr.po
@@ -20,38 +20,77 @@ msgstr ""
 "%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
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "# of chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_chars
+msgid "# of digits for customer bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Bank Account:</strong>"
 msgstr ""
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr ""
 
 #. module: account_payment_partner
-#: model:ir.model.fields,help:account_payment_partner.field_account_invoice_bank_account_required
+#: 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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice__partner_bank_id
+#, fuzzy
+msgid "Bank Account"
+msgstr "Bankovni račun je obavezan"
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_invoice__partner_bank_id
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Vendor Credit Note, otherwise a "
+"Partner bank account number."
+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 "Bankovni račun je obavezan"
 
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_from_journal
+msgid "Bank account from journals"
+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
+#: 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
+#: selection:account.payment.mode,show_bank_account:0
+msgid "First n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Full"
+msgstr ""
+
 #. module: account_payment_partner
 #: model:ir.model,name:account_payment_partner.model_account_invoice
 msgid "Invoice"
@@ -62,6 +101,16 @@ msgstr ""
 msgid "Journal Item"
 msgstr ""
 
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Last n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "No"
+msgstr ""
+
 #. module: account_payment_partner
 #: code:addons/account_payment_partner/tests/test_account_payment_partner.py:35
 #, python-format
@@ -69,9 +118,9 @@ 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
+#: 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_terms:ir.ui.view,arch_db:account_payment_partner.view_account_invoice_filter
 msgid "Payment Mode"
 msgstr ""
 
@@ -81,37 +130,52 @@ msgid "Payment Modes"
 msgstr "Modeli plaćanja"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
+#: model_terms: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
+#: 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
+#: 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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "Show bank account in invoice report"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show in invoices partial or full bank account number"
+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
+#: code:addons/account_payment_partner/models/account_invoice.py:117
 #, 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
+#: code:addons/account_payment_partner/models/account_payment_mode.py:35
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Invoice with this "
@@ -119,7 +183,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_payment_mode.py:28
+#: code:addons/account_payment_partner/models/account_payment_mode.py:46
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Journal Item with "
diff --git a/account_payment_partner/i18n/nb_NO.po b/account_payment_partner/i18n/nb_NO.po
index 33d7e9e73..1928800cd 100644
--- a/account_payment_partner/i18n/nb_NO.po
+++ b/account_payment_partner/i18n/nb_NO.po
@@ -20,38 +20,77 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "# of chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_chars
+msgid "# of digits for customer bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Bank Account:</strong>"
 msgstr ""
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr ""
 
 #. module: account_payment_partner
-#: model:ir.model.fields,help:account_payment_partner.field_account_invoice_bank_account_required
+#: 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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice__partner_bank_id
+#, fuzzy
+msgid "Bank Account"
+msgstr "Bankkonto påkrevd"
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_invoice__partner_bank_id
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Vendor Credit Note, otherwise a "
+"Partner bank account number."
+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 "Bankkonto påkrevd"
 
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_from_journal
+msgid "Bank account from journals"
+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
+#: 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
+#: selection:account.payment.mode,show_bank_account:0
+msgid "First n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Full"
+msgstr ""
+
 #. module: account_payment_partner
 #: model:ir.model,name:account_payment_partner.model_account_invoice
 msgid "Invoice"
@@ -62,6 +101,16 @@ msgstr ""
 msgid "Journal Item"
 msgstr "Journalgjenstand"
 
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Last n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "No"
+msgstr ""
+
 #. module: account_payment_partner
 #: code:addons/account_payment_partner/tests/test_account_payment_partner.py:35
 #, python-format
@@ -69,9 +118,9 @@ 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
+#: 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_terms:ir.ui.view,arch_db:account_payment_partner.view_account_invoice_filter
 msgid "Payment Mode"
 msgstr ""
 
@@ -82,37 +131,52 @@ msgid "Payment Modes"
 msgstr "Betalinger"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
 msgid "Payments"
 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
+#: 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
+#: 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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "Show bank account in invoice report"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show in invoices partial or full bank account number"
+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
+#: code:addons/account_payment_partner/models/account_invoice.py:117
 #, 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
+#: code:addons/account_payment_partner/models/account_payment_mode.py:35
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Invoice with this "
@@ -120,7 +184,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_payment_mode.py:28
+#: code:addons/account_payment_partner/models/account_payment_mode.py:46
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Journal Item with "
diff --git a/account_payment_partner/i18n/nl.po b/account_payment_partner/i18n/nl.po
index de30033a1..180106b76 100644
--- a/account_payment_partner/i18n/nl.po
+++ b/account_payment_partner/i18n/nl.po
@@ -19,17 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "# of chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_chars
+msgid "# of digits for customer bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Bank Account:</strong>"
 msgstr "<strong>Bankrekening:</strong>"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr "<strong>Betaalmode:</strong>"
 
 #. module: account_payment_partner
-#: model:ir.model.fields,help:account_payment_partner.field_account_invoice_bank_account_required
+#: 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."
@@ -38,21 +48,50 @@ msgstr ""
 "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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice__partner_bank_id
+#, fuzzy
+msgid "Bank Account"
+msgstr "Bankrekening verplicht"
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_invoice__partner_bank_id
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Vendor Credit Note, otherwise a "
+"Partner bank account number."
+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 "Bankrekening verplicht"
 
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_from_journal
+msgid "Bank account from journals"
+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
+#: 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 "Betaalwijze klant"
 
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "First n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Full"
+msgstr ""
+
 #. module: account_payment_partner
 #: model:ir.model,name:account_payment_partner.model_account_invoice
 msgid "Invoice"
@@ -63,6 +102,16 @@ msgstr "Factuur"
 msgid "Journal Item"
 msgstr "Boekingsregel"
 
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Last n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "No"
+msgstr ""
+
 #. module: account_payment_partner
 #: code:addons/account_payment_partner/tests/test_account_payment_partner.py:35
 #, python-format
@@ -70,9 +119,9 @@ 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
+#: 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_terms:ir.ui.view,arch_db:account_payment_partner.view_account_invoice_filter
 msgid "Payment Mode"
 msgstr "Betaalwijze"
 
@@ -82,37 +131,52 @@ msgid "Payment Modes"
 msgstr "Betaalwijze"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
 msgid "Payments"
 msgstr "Betalingen"
 
 #. 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
+#: 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 "Selecteer de standaard betaalwijze voor deze klant."
 
 #. 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
+#: 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 "Selecteer de standaard betaalwijze voor deze leverancier."
 
 #. 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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "Show bank account in invoice report"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show in invoices partial or full bank account number"
+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 "Betaalwijze leverancier"
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_invoice.py:119
+#: code:addons/account_payment_partner/models/account_invoice.py:117
 #, 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
+#: code:addons/account_payment_partner/models/account_payment_mode.py:35
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Invoice with this "
@@ -120,7 +184,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_payment_mode.py:28
+#: code:addons/account_payment_partner/models/account_payment_mode.py:46
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Journal Item with "
diff --git a/account_payment_partner/i18n/pt_BR.po b/account_payment_partner/i18n/pt_BR.po
index d2f047a74..da3861817 100644
--- a/account_payment_partner/i18n/pt_BR.po
+++ b/account_payment_partner/i18n/pt_BR.po
@@ -20,38 +20,76 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "# of chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_chars
+msgid "# of digits for customer bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Bank Account:</strong>"
 msgstr ""
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr ""
 
 #. module: account_payment_partner
-#: model:ir.model.fields,help:account_payment_partner.field_account_invoice_bank_account_required
+#: 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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice__partner_bank_id
+msgid "Bank Account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_invoice__partner_bank_id
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Vendor Credit Note, otherwise a "
+"Partner bank account number."
+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.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_from_journal
+msgid "Bank account from journals"
+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
+#: 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 "Modo de Pagamento do Cliente"
 
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "First n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Full"
+msgstr ""
+
 #. module: account_payment_partner
 #: model:ir.model,name:account_payment_partner.model_account_invoice
 msgid "Invoice"
@@ -62,6 +100,16 @@ msgstr "Fatura"
 msgid "Journal Item"
 msgstr ""
 
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Last n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "No"
+msgstr ""
+
 #. module: account_payment_partner
 #: code:addons/account_payment_partner/tests/test_account_payment_partner.py:35
 #, python-format
@@ -69,9 +117,9 @@ 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
+#: 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_terms:ir.ui.view,arch_db:account_payment_partner.view_account_invoice_filter
 msgid "Payment Mode"
 msgstr "Modo de Pagamento"
 
@@ -81,37 +129,52 @@ msgid "Payment Modes"
 msgstr ""
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
+#: model_terms: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
+#: 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 "Selecione o modo de pagamento padrão para este cliente."
 
 #. 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
+#: 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 "Selecione o modo de pagamento padrão para este fornecedor."
 
 #. 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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "Show bank account in invoice report"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show in invoices partial or full bank account number"
+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 "Modo de Pagamento do Fornecedor"
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_invoice.py:119
+#: code:addons/account_payment_partner/models/account_invoice.py:117
 #, 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
+#: code:addons/account_payment_partner/models/account_payment_mode.py:35
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Invoice with this "
@@ -119,7 +182,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_payment_mode.py:28
+#: code:addons/account_payment_partner/models/account_payment_mode.py:46
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Journal Item with "
diff --git a/account_payment_partner/i18n/sl.po b/account_payment_partner/i18n/sl.po
index d2ea03235..dd371f252 100644
--- a/account_payment_partner/i18n/sl.po
+++ b/account_payment_partner/i18n/sl.po
@@ -20,38 +20,76 @@ msgstr ""
 "%100==4 ? 2 : 3);\n"
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "# of chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_chars
+msgid "# of digits for customer bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Bank Account:</strong>"
 msgstr ""
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr ""
 
 #. module: account_payment_partner
-#: model:ir.model.fields,help:account_payment_partner.field_account_invoice_bank_account_required
+#: 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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice__partner_bank_id
+msgid "Bank Account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_invoice__partner_bank_id
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Vendor Credit Note, otherwise a "
+"Partner bank account number."
+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.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account_from_journal
+msgid "Bank account from journals"
+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
+#: 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 "Metoda plačila kupca"
 
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "First n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Full"
+msgstr ""
+
 #. module: account_payment_partner
 #: model:ir.model,name:account_payment_partner.model_account_invoice
 msgid "Invoice"
@@ -62,6 +100,16 @@ msgstr "Račun"
 msgid "Journal Item"
 msgstr ""
 
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "Last n chars"
+msgstr ""
+
+#. module: account_payment_partner
+#: selection:account.payment.mode,show_bank_account:0
+msgid "No"
+msgstr ""
+
 #. module: account_payment_partner
 #: code:addons/account_payment_partner/tests/test_account_payment_partner.py:35
 #, python-format
@@ -69,9 +117,9 @@ 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
+#: 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_terms:ir.ui.view,arch_db:account_payment_partner.view_account_invoice_filter
 msgid "Payment Mode"
 msgstr "Metoda plačila"
 
@@ -81,37 +129,52 @@ msgid "Payment Modes"
 msgstr ""
 
 #. module: account_payment_partner
-#: model:ir.ui.view,arch_db:account_payment_partner.view_move_line_form
+#: model_terms: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
+#: 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 "Izbira privzete metode plačila za tega kupca."
 
 #. 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
+#: 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 "Izbira privzete metode plačila za tega dobavitelja."
 
 #. 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
+#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show bank account"
+msgstr ""
+
+#. module: account_payment_partner
+#: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form
+msgid "Show bank account in invoice report"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model.fields,help:account_payment_partner.field_account_payment_mode__show_bank_account
+msgid "Show in invoices partial or full bank account number"
+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 "Metoda plačila dobavitelja"
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_invoice.py:119
+#: code:addons/account_payment_partner/models/account_invoice.py:117
 #, 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
+#: code:addons/account_payment_partner/models/account_payment_mode.py:35
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Invoice with this "
@@ -119,7 +182,7 @@ msgid ""
 msgstr ""
 
 #. module: account_payment_partner
-#: code:addons/account_payment_partner/models/account_payment_mode.py:28
+#: code:addons/account_payment_partner/models/account_payment_mode.py:46
 #, python-format
 msgid ""
 "You cannot change the Company. There exists at least one Journal Item with "