From 8ddb60476e3a2a75d83b283eff7317d0304d5ed4 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Tue, 25 Feb 2014 00:19:57 +0100 Subject: [PATCH 001/196] Add 4 new modules to handle payment type and bank accounts: - account_payment_partner - account_payment_sale - account_payment_sale_stock - account_payment_purchase Filter the selection of invoices per payment type. Add active field on payment.mode and payment.mode.type. Add menu entry for Payment Types. --- account_payment_partner/__init__.py | 23 ++++++++ account_payment_partner/__openerp__.py | 55 ++++++++++++++++++ account_payment_partner/demo/partner_demo.xml | 51 +++++++++++++++++ .../i18n/account_payment_partner.pot | 57 +++++++++++++++++++ account_payment_partner/model/__init__.py | 25 ++++++++ .../model/account_invoice.py | 56 ++++++++++++++++++ account_payment_partner/model/partner.py | 44 ++++++++++++++ .../model/payment_order_create.py | 39 +++++++++++++ .../view/account_invoice.xml | 38 +++++++++++++ account_payment_partner/view/partner.xml | 31 ++++++++++ 10 files changed, 419 insertions(+) create mode 100644 account_payment_partner/__init__.py create mode 100644 account_payment_partner/__openerp__.py create mode 100644 account_payment_partner/demo/partner_demo.xml create mode 100644 account_payment_partner/i18n/account_payment_partner.pot create mode 100644 account_payment_partner/model/__init__.py create mode 100644 account_payment_partner/model/account_invoice.py create mode 100644 account_payment_partner/model/partner.py create mode 100644 account_payment_partner/model/payment_order_create.py create mode 100644 account_payment_partner/view/account_invoice.xml create mode 100644 account_payment_partner/view/partner.xml diff --git a/account_payment_partner/__init__.py b/account_payment_partner/__init__.py new file mode 100644 index 00000000000..16112394480 --- /dev/null +++ b/account_payment_partner/__init__.py @@ -0,0 +1,23 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Account Payment Partner module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from . import model diff --git a/account_payment_partner/__openerp__.py b/account_payment_partner/__openerp__.py new file mode 100644 index 00000000000..4e0217c98cf --- /dev/null +++ b/account_payment_partner/__openerp__.py @@ -0,0 +1,55 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Account Payment Partner module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + + +{ + 'name': 'Account Payment Partner', + 'version': '0.1', + 'category': 'Banking addons', + 'license': 'AGPL-3', + 'summary': 'Adds payment mode on partners and invoices', + 'description': """ +Account Payment Partner +======================= + +This module adds severals fields : + +* the *Supplier Payment Mode* and *Customer Payment Mode* on Partners, + +* the *Payment Mode* on Invoices. + +On a Payment Order, in the wizard *Select Invoices to Pay*, the invoices will +be filtered per Payment Mode. + +Please contact Alexis de Lattre from Akretion +for any help or question about this module. + """, + 'author': 'Akretion', + 'website': 'http://www.akretion.com', + 'depends': ['account_banking_payment_export'], + 'data': [ + 'view/partner.xml', + 'view/account_invoice.xml', + ], + 'demo': ['demo/partner_demo.xml'], + 'active': False, +} diff --git a/account_payment_partner/demo/partner_demo.xml b/account_payment_partner/demo/partner_demo.xml new file mode 100644 index 00000000000..776058d44b9 --- /dev/null +++ b/account_payment_partner/demo/partner_demo.xml @@ -0,0 +1,51 @@ + + + + + + + + supplier_payment_mode_12 + + + + + + + + customer_payment_mode_12 + + + + + + + + + customer_payment_mode_2 + + + + + + + + + supplier_payment_mode_1 + + + + + + + + + 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 00000000000..ca26e532d4f --- /dev/null +++ b/account_payment_partner/i18n/account_payment_partner.pot @@ -0,0 +1,57 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * account_payment_partner +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-06-09 23:22+0000\n" +"PO-Revision-Date: 2014-06-09 23:22+0000\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 +#: field:res.partner,customer_payment_mode:0 +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_res_partner +msgid "Partner" +msgstr "" + +#. module: account_payment_partner +#: field:account.invoice,payment_mode_id:0 +msgid "Payment Mode" +msgstr "" + +#. module: account_payment_partner +#: help:res.partner,customer_payment_mode:0 +msgid "Select the default payment mode for this customer." +msgstr "" + +#. module: account_payment_partner +#: help:res.partner,supplier_payment_mode:0 +msgid "Select the default payment mode for this supplier." +msgstr "" + +#. module: account_payment_partner +#: field:res.partner,supplier_payment_mode:0 +msgid "Supplier Payment Mode" +msgstr "" + +#. module: account_payment_partner +#: model:ir.model,name:account_payment_partner.model_payment_order_create +msgid "payment.order.create" +msgstr "" + diff --git a/account_payment_partner/model/__init__.py b/account_payment_partner/model/__init__.py new file mode 100644 index 00000000000..16ab8bc9e1d --- /dev/null +++ b/account_payment_partner/model/__init__.py @@ -0,0 +1,25 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Account Payment Partner module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from . import partner +from . import account_invoice +from . import payment_order_create diff --git a/account_payment_partner/model/account_invoice.py b/account_payment_partner/model/account_invoice.py new file mode 100644 index 00000000000..607cda29a93 --- /dev/null +++ b/account_payment_partner/model/account_invoice.py @@ -0,0 +1,56 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Account Payment Partner module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from openerp.osv import orm, fields + + +class account_invoice(orm.Model): + _inherit = 'account.invoice' + + _columns = { + 'payment_mode_id': fields.many2one( + 'payment.mode', 'Payment Mode'), + } + + def onchange_partner_id( + self, cr, uid, ids, type, partner_id, date_invoice=False, + payment_term=False, partner_bank_id=False, company_id=False): + res = super(account_invoice, self).onchange_partner_id( + cr, uid, ids, type, partner_id, date_invoice=date_invoice, + payment_term=payment_term, partner_bank_id=partner_bank_id, + company_id=company_id) + if partner_id: + partner = self.pool['res.partner'].browse(cr, uid, partner_id) + if type == 'in_invoice': + res['value']['payment_mode_id'] = \ + partner.supplier_payment_mode.id or False + elif type == 'out_invoice': + res['value'].update({ + 'payment_mode_id': + partner.customer_payment_mode.id or False, + 'partner_bank_id': + partner.customer_payment_mode and + partner.customer_payment_mode.bank_id.id or False, + }) + else: + res['value']['payment_mode_id'] = False + return res diff --git a/account_payment_partner/model/partner.py b/account_payment_partner/model/partner.py new file mode 100644 index 00000000000..4bfe4c7879e --- /dev/null +++ b/account_payment_partner/model/partner.py @@ -0,0 +1,44 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Account Payment Partner module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from openerp.osv import orm, fields + + +class res_partner(orm.Model): + _inherit = 'res.partner' + + _columns = { + 'supplier_payment_mode': fields.property( + 'payment.mode', type='many2one', relation='payment.mode', + string='Supplier Payment Mode', view_load=True, + help="Select the default payment mode for this supplier."), + 'customer_payment_mode': fields.property( + 'payment.mode', type='many2one', relation='payment.mode', + string='Customer Payment Mode', view_load=True, + help="Select the default payment mode for this customer."), + } + + def _commercial_fields(self, cr, uid, context=None): + res = super(res_partner, self)._commercial_fields( + cr, uid, context=context) + res += ['supplier_payment_mode', 'customer_payment_mode'] + return res diff --git a/account_payment_partner/model/payment_order_create.py b/account_payment_partner/model/payment_order_create.py new file mode 100644 index 00000000000..ea8b1ccb3b0 --- /dev/null +++ b/account_payment_partner/model/payment_order_create.py @@ -0,0 +1,39 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Account Payment Partner module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from openerp.osv import orm + + +class payment_order_create(orm.TransientModel): + _inherit = 'payment.order.create' + + def extend_payment_order_domain( + self, cr, uid, payment_order, domain, context=None): + super(payment_order_create, self).extend_payment_order_domain( + cr, uid, payment_order, domain, context=context) + domain += [ + '|', '|', + ('invoice', '=', False), + ('invoice.payment_mode_id', '=', False), + ('invoice.payment_mode_id', '=', payment_order.mode.id) + ] + return True diff --git a/account_payment_partner/view/account_invoice.xml b/account_payment_partner/view/account_invoice.xml new file mode 100644 index 00000000000..0bfd2d1f563 --- /dev/null +++ b/account_payment_partner/view/account_invoice.xml @@ -0,0 +1,38 @@ + + + + + + + + + + account_payment_partner.invoice_form + account.invoice + + + + + + + + + + + account_payment_partner.invoice_supplier_form + account.invoice + + + + + + + + + + + diff --git a/account_payment_partner/view/partner.xml b/account_payment_partner/view/partner.xml new file mode 100644 index 00000000000..02eb8cc0f7a --- /dev/null +++ b/account_payment_partner/view/partner.xml @@ -0,0 +1,31 @@ + + + + + + + + + + account_partner_payment.partner_form + res.partner + + + + + + + + + + + + + + From 2517ac27426370929471f8996911cf7526e30eff Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of banking-addons-team Date: Fri, 27 Jun 2014 07:13:31 +0000 Subject: [PATCH 002/196] Launchpad automatic translations update. --- account_payment_partner/i18n/nl.po | 58 ++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 account_payment_partner/i18n/nl.po diff --git a/account_payment_partner/i18n/nl.po b/account_payment_partner/i18n/nl.po new file mode 100644 index 00000000000..4c90fe776e1 --- /dev/null +++ b/account_payment_partner/i18n/nl.po @@ -0,0 +1,58 @@ +# Dutch translation for banking-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the banking-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: banking-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2014-06-09 23:22+0000\n" +"PO-Revision-Date: 2014-06-26 14:13+0000\n" +"Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-06-27 07:13+0000\n" +"X-Generator: Launchpad (build 17077)\n" + +#. module: account_payment_partner +#: field:res.partner,customer_payment_mode:0 +msgid "Customer Payment Mode" +msgstr "Betaalwijze klant" + +#. module: account_payment_partner +#: model:ir.model,name:account_payment_partner.model_account_invoice +msgid "Invoice" +msgstr "Factuur" + +#. module: account_payment_partner +#: model:ir.model,name:account_payment_partner.model_res_partner +msgid "Partner" +msgstr "Relatie" + +#. module: account_payment_partner +#: field:account.invoice,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Betaalwijze" + +#. module: account_payment_partner +#: help:res.partner,customer_payment_mode:0 +msgid "Select the default payment mode for this customer." +msgstr "Selecteer de standaard betaalwijze voor deze klant." + +#. module: account_payment_partner +#: help:res.partner,supplier_payment_mode:0 +msgid "Select the default payment mode for this supplier." +msgstr "Selecteer de standaard betaalwijze voor deze leverancier." + +#. module: account_payment_partner +#: field:res.partner,supplier_payment_mode:0 +msgid "Supplier Payment Mode" +msgstr "Betaalwijze leverancier" + +#. module: account_payment_partner +#: model:ir.model,name:account_payment_partner.model_payment_order_create +msgid "payment.order.create" +msgstr "payment.order.create" From cf5975901a1835d490496543a516c63979b138b9 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 10 Sep 2014 12:19:20 +0200 Subject: [PATCH 003/196] [MIG] account_payment_partner: Migration to v8 * Migration and enhancement of all modules involved in SEPA * Clean files * Replace deprecated workflow calls * Translation template files * Translations to spanish * Use sale_ok and purchase_ok instead of tweaking payment type --- account_payment_partner/__init__.py | 3 +- account_payment_partner/__openerp__.py | 14 ++--- .../i18n/account_payment_partner.pot | 13 ++-- account_payment_partner/i18n/es.po | 52 ++++++++++++++++ account_payment_partner/i18n/fr.po | 57 ++++++++++++++++++ account_payment_partner/models/__init__.py | 24 ++++++++ .../{model => models}/account_invoice.py | 31 +++++----- .../{model => models}/payment_order_create.py | 7 +-- .../partner.py => models/res_partner.py} | 28 ++++----- .../static/description/icon.png | Bin 0 -> 9455 bytes .../view/account_invoice.xml | 38 ------------ .../views/account_invoice_view.xml | 40 ++++++++++++ .../res_partner_view.xml} | 8 +-- .../{model => wizard}/__init__.py | 2 - .../wizard/payment_order_create.py | 37 ++++++++++++ 15 files changed, 254 insertions(+), 100 deletions(-) create mode 100644 account_payment_partner/i18n/es.po create mode 100644 account_payment_partner/i18n/fr.po create mode 100644 account_payment_partner/models/__init__.py rename account_payment_partner/{model => models}/account_invoice.py (65%) rename account_payment_partner/{model => models}/payment_order_create.py (91%) rename account_payment_partner/{model/partner.py => models/res_partner.py} (60%) create mode 100644 account_payment_partner/static/description/icon.png delete mode 100644 account_payment_partner/view/account_invoice.xml create mode 100644 account_payment_partner/views/account_invoice_view.xml rename account_payment_partner/{view/partner.xml => views/res_partner_view.xml} (75%) rename account_payment_partner/{model => wizard}/__init__.py (95%) create mode 100644 account_payment_partner/wizard/payment_order_create.py diff --git a/account_payment_partner/__init__.py b/account_payment_partner/__init__.py index 16112394480..fe47437f23b 100644 --- a/account_payment_partner/__init__.py +++ b/account_payment_partner/__init__.py @@ -20,4 +20,5 @@ # ############################################################################## -from . import model +from . import models +from . import wizard diff --git a/account_payment_partner/__openerp__.py b/account_payment_partner/__openerp__.py index 4e0217c98cf..99df885eadf 100644 --- a/account_payment_partner/__openerp__.py +++ b/account_payment_partner/__openerp__.py @@ -23,7 +23,7 @@ { 'name': 'Account Payment Partner', - 'version': '0.1', + 'version': '8.0.0.1.0', 'category': 'Banking addons', 'license': 'AGPL-3', 'summary': 'Adds payment mode on partners and invoices', @@ -39,17 +39,15 @@ On a Payment Order, in the wizard *Select Invoices to Pay*, the invoices will be filtered per Payment Mode. - -Please contact Alexis de Lattre from Akretion -for any help or question about this module. """, - 'author': 'Akretion', + 'author': "Akretion,Odoo Community Association (OCA)", 'website': 'http://www.akretion.com', + 'contributors': ['Pedro M. Baeza '], 'depends': ['account_banking_payment_export'], 'data': [ - 'view/partner.xml', - 'view/account_invoice.xml', + 'views/res_partner_view.xml', + 'views/account_invoice_view.xml', ], 'demo': ['demo/partner_demo.xml'], - 'active': False, + 'installable': True, } diff --git a/account_payment_partner/i18n/account_payment_partner.pot b/account_payment_partner/i18n/account_payment_partner.pot index ca26e532d4f..3c5a3968684 100644 --- a/account_payment_partner/i18n/account_payment_partner.pot +++ b/account_payment_partner/i18n/account_payment_partner.pot @@ -1,13 +1,13 @@ -# Translation of OpenERP Server. +# Translation of Odoo Server. # This file contains the translation of the following modules: # * account_payment_partner # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-09 23:22+0000\n" -"PO-Revision-Date: 2014-06-09 23:22+0000\n" +"POT-Creation-Date: 2014-10-31 22:53+0000\n" +"PO-Revision-Date: 2014-10-31 22:53+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -50,8 +50,3 @@ msgstr "" msgid "Supplier Payment Mode" msgstr "" -#. module: account_payment_partner -#: model:ir.model,name:account_payment_partner.model_payment_order_create -msgid "payment.order.create" -msgstr "" - diff --git a/account_payment_partner/i18n/es.po b/account_payment_partner/i18n/es.po new file mode 100644 index 00000000000..63748b9887f --- /dev/null +++ b/account_payment_partner/i18n/es.po @@ -0,0 +1,52 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_partner +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-10-31 22:53+0000\n" +"PO-Revision-Date: 2014-10-31 22:53+0000\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 +#: field:res.partner,customer_payment_mode:0 +msgid "Customer Payment Mode" +msgstr "Modo de pago de cliente" + +#. module: account_payment_partner +#: model:ir.model,name:account_payment_partner.model_account_invoice +msgid "Invoice" +msgstr "Factura" + +#. module: account_payment_partner +#: model:ir.model,name:account_payment_partner.model_res_partner +msgid "Partner" +msgstr "Empresa" + +#. module: account_payment_partner +#: field:account.invoice,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Modo de pago" + +#. module: account_payment_partner +#: help:res.partner,customer_payment_mode:0 +msgid "Select the default payment mode for this customer." +msgstr "Seleccione el modo de pago por defecto cuando esta empresa actúa como cliente." + +#. module: account_payment_partner +#: help:res.partner,supplier_payment_mode:0 +msgid "Select the default payment mode for this supplier." +msgstr "Seleccione el modo de pago por defecto cuando esta empresa actúa como proveedor." + +#. module: account_payment_partner +#: field:res.partner,supplier_payment_mode:0 +msgid "Supplier Payment Mode" +msgstr "Modo de pago de proveedor" + diff --git a/account_payment_partner/i18n/fr.po b/account_payment_partner/i18n/fr.po new file mode 100644 index 00000000000..ca26e532d4f --- /dev/null +++ b/account_payment_partner/i18n/fr.po @@ -0,0 +1,57 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * account_payment_partner +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-06-09 23:22+0000\n" +"PO-Revision-Date: 2014-06-09 23:22+0000\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 +#: field:res.partner,customer_payment_mode:0 +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_res_partner +msgid "Partner" +msgstr "" + +#. module: account_payment_partner +#: field:account.invoice,payment_mode_id:0 +msgid "Payment Mode" +msgstr "" + +#. module: account_payment_partner +#: help:res.partner,customer_payment_mode:0 +msgid "Select the default payment mode for this customer." +msgstr "" + +#. module: account_payment_partner +#: help:res.partner,supplier_payment_mode:0 +msgid "Select the default payment mode for this supplier." +msgstr "" + +#. module: account_payment_partner +#: field:res.partner,supplier_payment_mode:0 +msgid "Supplier Payment Mode" +msgstr "" + +#. module: account_payment_partner +#: model:ir.model,name:account_payment_partner.model_payment_order_create +msgid "payment.order.create" +msgstr "" + diff --git a/account_payment_partner/models/__init__.py b/account_payment_partner/models/__init__.py new file mode 100644 index 00000000000..c2c7b405dad --- /dev/null +++ b/account_payment_partner/models/__init__.py @@ -0,0 +1,24 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Account Payment Partner module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from . import res_partner +from . import account_invoice diff --git a/account_payment_partner/model/account_invoice.py b/account_payment_partner/models/account_invoice.py similarity index 65% rename from account_payment_partner/model/account_invoice.py rename to account_payment_partner/models/account_invoice.py index 607cda29a93..e14c0d956d4 100644 --- a/account_payment_partner/model/account_invoice.py +++ b/account_payment_partner/models/account_invoice.py @@ -20,37 +20,34 @@ # ############################################################################## -from openerp.osv import orm, fields +from openerp import models, fields, api -class account_invoice(orm.Model): +class AccountInvoice(models.Model): _inherit = 'account.invoice' - _columns = { - 'payment_mode_id': fields.many2one( - 'payment.mode', 'Payment Mode'), - } + payment_mode_id = fields.Many2one( + comodel_name='payment.mode', string="Payment Mode", + domain="[('type', '=', type)]") + @api.multi def onchange_partner_id( - self, cr, uid, ids, type, partner_id, date_invoice=False, + self, type, partner_id, date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False): - res = super(account_invoice, self).onchange_partner_id( - cr, uid, ids, type, partner_id, date_invoice=date_invoice, + res = super(AccountInvoice, self).onchange_partner_id( + type, partner_id, date_invoice=date_invoice, payment_term=payment_term, partner_bank_id=partner_bank_id, company_id=company_id) if partner_id: - partner = self.pool['res.partner'].browse(cr, uid, partner_id) + partner = self.env['res.partner'].browse(partner_id) if type == 'in_invoice': res['value']['payment_mode_id'] = \ - partner.supplier_payment_mode.id or False + partner.supplier_payment_mode.id elif type == 'out_invoice': res['value'].update({ - 'payment_mode_id': - partner.customer_payment_mode.id or False, - 'partner_bank_id': - partner.customer_payment_mode and - partner.customer_payment_mode.bank_id.id or False, - }) + 'payment_mode_id': partner.customer_payment_mode.id, + 'partner_bank_id': partner.customer_payment_mode.bank_id.id + }) else: res['value']['payment_mode_id'] = False return res diff --git a/account_payment_partner/model/payment_order_create.py b/account_payment_partner/models/payment_order_create.py similarity index 91% rename from account_payment_partner/model/payment_order_create.py rename to account_payment_partner/models/payment_order_create.py index ea8b1ccb3b0..3b9b536a726 100644 --- a/account_payment_partner/model/payment_order_create.py +++ b/account_payment_partner/models/payment_order_create.py @@ -23,17 +23,16 @@ from openerp.osv import orm -class payment_order_create(orm.TransientModel): +class PaymentOrderCreate(orm.TransientModel): _inherit = 'payment.order.create' def extend_payment_order_domain( self, cr, uid, payment_order, domain, context=None): - super(payment_order_create, self).extend_payment_order_domain( + super(PaymentOrderCreate, self).extend_payment_order_domain( cr, uid, payment_order, domain, context=context) domain += [ '|', '|', ('invoice', '=', False), ('invoice.payment_mode_id', '=', False), - ('invoice.payment_mode_id', '=', payment_order.mode.id) - ] + ('invoice.payment_mode_id', '=', payment_order.mode.id)] return True diff --git a/account_payment_partner/model/partner.py b/account_payment_partner/models/res_partner.py similarity index 60% rename from account_payment_partner/model/partner.py rename to account_payment_partner/models/res_partner.py index 4bfe4c7879e..5726da44698 100644 --- a/account_payment_partner/model/partner.py +++ b/account_payment_partner/models/res_partner.py @@ -20,25 +20,23 @@ # ############################################################################## -from openerp.osv import orm, fields +from openerp import models, fields, api -class res_partner(orm.Model): +class ResPartner(models.Model): _inherit = 'res.partner' - _columns = { - 'supplier_payment_mode': fields.property( - 'payment.mode', type='many2one', relation='payment.mode', - string='Supplier Payment Mode', view_load=True, - help="Select the default payment mode for this supplier."), - 'customer_payment_mode': fields.property( - 'payment.mode', type='many2one', relation='payment.mode', - string='Customer Payment Mode', view_load=True, - help="Select the default payment mode for this customer."), - } + supplier_payment_mode = fields.Many2one( + 'payment.mode', string='Supplier Payment Mode', company_dependent=True, + domain="[('purchase_ok', '=', True)]", + help="Select the default payment mode for this supplier.") + customer_payment_mode = fields.Many2one( + 'payment.mode', string='Customer Payment Mode', company_dependent=True, + domain="[('sale_ok', '=', True)]", + help="Select the default payment mode for this customer.") - def _commercial_fields(self, cr, uid, context=None): - res = super(res_partner, self)._commercial_fields( - cr, uid, context=context) + @api.model + def _commercial_fields(self): + res = super(ResPartner, self)._commercial_fields() res += ['supplier_payment_mode', 'customer_payment_mode'] return res diff --git a/account_payment_partner/static/description/icon.png b/account_payment_partner/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}d0jUxM@u(PQx^-s)697TX`ehR4?GS^qbkof1cslKgkU)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~! zVpnB`o+K7|Al`Q_U;eD$B zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__ zc+blN2UAB0=617@>_u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_ zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)( z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx zOGVPhVRTGPtv0o}RfVP;Nd(|CB)I;*t&QO8h zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9 zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz# z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7tF#6nHA zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K= z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C zuVl&0duN<;uOsB3%T9Fp8t{ED108<+W(nOZd?gDnfNBC3>M8WE61$So|P zVvqH0SNtDTcsUdzaMDpT=Ty0pDHHNL@Z0w$Y`XO z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1 zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_ zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8 zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ> zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}aRBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=@hbCRcfT5jigwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&BE*}XfU|H&(FssBqY=hPCt`d zH?@s2>I(|;fcW&YM6#V#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD z#z-)AXwSRY?OPefw^iI+ z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd z$6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$ z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV z@;rlc*NRK7i3y5BETSKuumEN`Xu_8GP1Ri=OKQ$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6 zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5#ZRj8kg}dS7_V&^%#Do==#`u zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK#HN`!1vBJHnC+RM&yIh8{gG2q zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH zVWo*OwYElb#uyW{Imam6f2rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+ z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC) zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#Boo{AH8n$a zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x! zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X zZ3WYJtHp_ri(}SQAPjv+Y+0=fH4krOP@S&=zZ-t1jW1o@}z;xk8 z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n= z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~NBvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z zzCR$P#uktu+#!w)cX!lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@ zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y< zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6 zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6% z2(}&uGRF;p92eS*sE*oR$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(| z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4PdpwWDop%^}n;dD#K4s#DYA8SHZ z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^WYu2u5kubqmwp%drJ6 z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d} z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&YOi-3|1QKB z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/account_payment_partner/view/account_invoice.xml b/account_payment_partner/view/account_invoice.xml deleted file mode 100644 index 0bfd2d1f563..00000000000 --- a/account_payment_partner/view/account_invoice.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - account_payment_partner.invoice_form - account.invoice - - - - - - - - - - - account_payment_partner.invoice_supplier_form - account.invoice - - - - - - - - - - - diff --git a/account_payment_partner/views/account_invoice_view.xml b/account_payment_partner/views/account_invoice_view.xml new file mode 100644 index 00000000000..534822ea9aa --- /dev/null +++ b/account_payment_partner/views/account_invoice_view.xml @@ -0,0 +1,40 @@ + + + + + + + + + + account_payment_partner.invoice_form + account.invoice + + + + + + + + + + + account_payment_partner.invoice_supplier_form + account.invoice + + + + + + + + + + + diff --git a/account_payment_partner/view/partner.xml b/account_payment_partner/views/res_partner_view.xml similarity index 75% rename from account_payment_partner/view/partner.xml rename to account_payment_partner/views/res_partner_view.xml index 02eb8cc0f7a..3c6d670aaf6 100644 --- a/account_payment_partner/view/partner.xml +++ b/account_payment_partner/views/res_partner_view.xml @@ -9,23 +9,19 @@ - account_partner_payment.partner_form res.partner - + - + - diff --git a/account_payment_partner/model/__init__.py b/account_payment_partner/wizard/__init__.py similarity index 95% rename from account_payment_partner/model/__init__.py rename to account_payment_partner/wizard/__init__.py index 16ab8bc9e1d..f7107a63f08 100644 --- a/account_payment_partner/model/__init__.py +++ b/account_payment_partner/wizard/__init__.py @@ -20,6 +20,4 @@ # ############################################################################## -from . import partner -from . import account_invoice from . import payment_order_create diff --git a/account_payment_partner/wizard/payment_order_create.py b/account_payment_partner/wizard/payment_order_create.py new file mode 100644 index 00000000000..c26b7f9d923 --- /dev/null +++ b/account_payment_partner/wizard/payment_order_create.py @@ -0,0 +1,37 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Account Payment Partner module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from openerp import models, api + + +class PaymentOrderCreate(models.TransientModel): + _inherit = 'payment.order.create' + + @api.model + def extend_payment_order_domain(self, payment_order, domain): + res = super(PaymentOrderCreate, self).extend_payment_order_domain( + payment_order, domain) + domain += ['|', '|', + ('invoice', '=', False), + ('invoice.payment_mode_id', '=', False), + ('invoice.payment_mode_id', '=', payment_order.mode.id)] + return res From c58f4c6c9e875e20fcfcddfcabb11a5c371a4f9f Mon Sep 17 00:00:00 2001 From: Roberto Lizana Date: Thu, 27 Nov 2014 12:55:21 +0100 Subject: [PATCH 004/196] [FIX+IMP] account_payment_partner: 2 things: * IMP: Add filter group by payment mode in account invoices * FIX: Remove deprecated tag type --- .../views/account_invoice_view.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/account_payment_partner/views/account_invoice_view.xml b/account_payment_partner/views/account_invoice_view.xml index 534822ea9aa..5655e3d25bd 100644 --- a/account_payment_partner/views/account_invoice_view.xml +++ b/account_payment_partner/views/account_invoice_view.xml @@ -9,6 +9,17 @@ + + account_payment_partner.invoice_filter + account.invoice + + + + + + + + account_payment_partner.invoice_form From e244f303490304ecf6a60b19db5647e9461e4285 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 14 Jan 2015 15:25:50 +0100 Subject: [PATCH 005/196] [IMP] account_payment_partner: Several things: * move unused file + cleanup code * Add sale_ok and purchase_ok filters in partner/sale/purchase form views * Use widget=selection for payment_mode_id fields * Update demo data * Return res in inherit (even if res is empty in this case) --- .../models/payment_order_create.py | 38 ------------------- .../views/account_invoice_view.xml | 6 ++- .../views/res_partner_view.xml | 8 +++- 3 files changed, 10 insertions(+), 42 deletions(-) delete mode 100644 account_payment_partner/models/payment_order_create.py diff --git a/account_payment_partner/models/payment_order_create.py b/account_payment_partner/models/payment_order_create.py deleted file mode 100644 index 3b9b536a726..00000000000 --- a/account_payment_partner/models/payment_order_create.py +++ /dev/null @@ -1,38 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Partner module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from openerp.osv import orm - - -class PaymentOrderCreate(orm.TransientModel): - _inherit = 'payment.order.create' - - def extend_payment_order_domain( - self, cr, uid, payment_order, domain, context=None): - super(PaymentOrderCreate, self).extend_payment_order_domain( - cr, uid, payment_order, domain, context=context) - domain += [ - '|', '|', - ('invoice', '=', False), - ('invoice.payment_mode_id', '=', False), - ('invoice.payment_mode_id', '=', payment_order.mode.id)] - return True diff --git a/account_payment_partner/views/account_invoice_view.xml b/account_payment_partner/views/account_invoice_view.xml index 5655e3d25bd..72afbb2a543 100644 --- a/account_payment_partner/views/account_invoice_view.xml +++ b/account_payment_partner/views/account_invoice_view.xml @@ -28,7 +28,8 @@ + domain="[('sale_ok', '=', True)]" + widget="selection"/> @@ -41,7 +42,8 @@ + domain="[('purchase_ok', '=', True)]" + widget="selection"/> diff --git a/account_payment_partner/views/res_partner_view.xml b/account_payment_partner/views/res_partner_view.xml index 3c6d670aaf6..f52579b2c23 100644 --- a/account_payment_partner/views/res_partner_view.xml +++ b/account_payment_partner/views/res_partner_view.xml @@ -15,10 +15,14 @@ - + - + From 6193ed2b0021124f399a714bf6cee6d317ee0f6e Mon Sep 17 00:00:00 2001 From: Danimar Ribeiro Date: Fri, 13 Feb 2015 19:18:41 -0200 Subject: [PATCH 006/196] Portuguese translations --- account_payment_partner/i18n/pt_BR.po | 52 +++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 account_payment_partner/i18n/pt_BR.po diff --git a/account_payment_partner/i18n/pt_BR.po b/account_payment_partner/i18n/pt_BR.po new file mode 100644 index 00000000000..63cd2737f09 --- /dev/null +++ b/account_payment_partner/i18n/pt_BR.po @@ -0,0 +1,52 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_partner +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-10-31 22:53+0000\n" +"PO-Revision-Date: 2014-10-31 22:53+0000\n" +"Last-Translator: Danimar Ribeiro \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 +#: field:res.partner,customer_payment_mode:0 +msgid "Customer Payment Mode" +msgstr "Modo de Pagamento do Cliente" + +#. module: account_payment_partner +#: model:ir.model,name:account_payment_partner.model_account_invoice +msgid "Invoice" +msgstr "Fatura" + +#. module: account_payment_partner +#: model:ir.model,name:account_payment_partner.model_res_partner +msgid "Partner" +msgstr "Parceiro" + +#. module: account_payment_partner +#: field:account.invoice,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Modo de Pagamento" + +#. module: account_payment_partner +#: help:res.partner,customer_payment_mode:0 +msgid "Select the default payment mode for this customer." +msgstr "Selecione o modo de pagamento padrão para este cliente." + +#. module: account_payment_partner +#: help:res.partner,supplier_payment_mode:0 +msgid "Select the default payment mode for this supplier." +msgstr "Selecione o modo de pagamento padrão para este fornecedor." + +#. module: account_payment_partner +#: field:res.partner,supplier_payment_mode:0 +msgid "Supplier Payment Mode" +msgstr "Modo de Pagamento do Fornecedor" + From d3d3012fa6ccf28a785537c68ba2b69b16fe8e0a Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Mon, 16 Mar 2015 11:07:21 +0100 Subject: [PATCH 007/196] Add read access on payment.mode to employees --- account_payment_partner/__openerp__.py | 1 + account_payment_partner/security/ir.model.access.csv | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 account_payment_partner/security/ir.model.access.csv diff --git a/account_payment_partner/__openerp__.py b/account_payment_partner/__openerp__.py index 99df885eadf..e50726d481f 100644 --- a/account_payment_partner/__openerp__.py +++ b/account_payment_partner/__openerp__.py @@ -47,6 +47,7 @@ 'data': [ 'views/res_partner_view.xml', 'views/account_invoice_view.xml', + 'security/ir.model.access.csv', ], 'demo': ['demo/partner_demo.xml'], 'installable': True, diff --git a/account_payment_partner/security/ir.model.access.csv b/account_payment_partner/security/ir.model.access.csv new file mode 100644 index 00000000000..b277f0229eb --- /dev/null +++ b/account_payment_partner/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_payment_mode_read,Read access on payment.mode to Employees,account_payment.model_payment_mode,base.group_user,1,0,0,0 From 56a29436a10bd400a58ca609c64e02d0f92d00fe Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Mon, 9 Mar 2015 09:15:19 +0100 Subject: [PATCH 008/196] [FIX] account_payment_partner: Fix for finding account move lines without invoice (manual entries in receivables/payables) --- .../wizard/payment_order_create.py | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/account_payment_partner/wizard/payment_order_create.py b/account_payment_partner/wizard/payment_order_create.py index c26b7f9d923..a07ed280ec8 100644 --- a/account_payment_partner/wizard/payment_order_create.py +++ b/account_payment_partner/wizard/payment_order_create.py @@ -30,8 +30,29 @@ class PaymentOrderCreate(models.TransientModel): def extend_payment_order_domain(self, payment_order, domain): res = super(PaymentOrderCreate, self).extend_payment_order_domain( payment_order, domain) - domain += ['|', '|', - ('invoice', '=', False), + # Monkey patch for fixing problem with the core search function + # when args has ('invoice', '=', False), referred in the issue #4857 + # (https://github.com/odoo/odoo/issues/4857) + # + # Original domain: + # domain += ['|', '|', + # ('invoice', '=', False), + # ('invoice.payment_mode_id', '=', False), + # ('invoice.payment_mode_id', '=', payment_order.mode.id)] + self.env.cr.execute( + "SELECT l.id " + "FROM account_move_line l " + "LEFT OUTER JOIN account_invoice i " + "ON l.move_id = i.move_id " + "INNER JOIN account_account a " + "ON a.id = l.account_id " + "WHERE i.id IS NULL" + " AND l.reconcile_id IS NULL" + " AND a.type in ('receivable', 'payable')") + ids = [x[0] for x in self.env.cr.fetchall()] + domain += ['|', + ('id', 'in', ids), + '|', ('invoice.payment_mode_id', '=', False), ('invoice.payment_mode_id', '=', payment_order.mode.id)] return res From e70b36f0804cd2a9f2e4447de59a55b7fa62f7c6 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Mon, 25 May 2015 17:14:05 +0200 Subject: [PATCH 009/196] [IMP] Expand authors + manifest cleaning --- account_payment_partner/__openerp__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/account_payment_partner/__openerp__.py b/account_payment_partner/__openerp__.py index e50726d481f..4f5d9b7965d 100644 --- a/account_payment_partner/__openerp__.py +++ b/account_payment_partner/__openerp__.py @@ -40,9 +40,10 @@ On a Payment Order, in the wizard *Select Invoices to Pay*, the invoices will be filtered per Payment Mode. """, - 'author': "Akretion,Odoo Community Association (OCA)", - 'website': 'http://www.akretion.com', - 'contributors': ['Pedro M. Baeza '], + 'author': "Akretion, " + "Serv. Tecnol. Avanzados - Pedro M. Baeza, " + "Odoo Community Association (OCA)", + 'website': 'https://github.com/OCA/bank-payment', 'depends': ['account_banking_payment_export'], 'data': [ 'views/res_partner_view.xml', From b78532130aa4375d66459822b6ecf6b7e9ef57f3 Mon Sep 17 00:00:00 2001 From: Philippe Schmidt Date: Mon, 1 Jun 2015 17:10:58 +0200 Subject: [PATCH 010/196] Add requested descriptions in an OCA README.rst file --- account_payment_partner/README.rst | 79 ++++++++++++++++++++++++++ account_payment_partner/__openerp__.py | 13 ----- 2 files changed, 79 insertions(+), 13 deletions(-) create mode 100644 account_payment_partner/README.rst diff --git a/account_payment_partner/README.rst b/account_payment_partner/README.rst new file mode 100644 index 00000000000..e4e4d0a52ca --- /dev/null +++ b/account_payment_partner/README.rst @@ -0,0 +1,79 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :alt: License: AGPL-3 + +Account Payment Partner +======================= + +This module adds severals fields : + +* the *Supplier Payment Mode* and *Customer Payment Mode* on Partners, + +* the *Payment Mode* on Invoices. + +On a Payment Order, in the wizard *Select Invoices to Pay*, the invoices will +be filtered per Payment Mode. + +Installation +============ + +This module depends on : +* account_banking_payment_export + +This module is part of the OCA/bank-payment suite. + +Configuration +============= + +There is nothing to configure. + +Usage +===== + +You are able to add a payment mode directly on a partner. +This payment mode is automatically associated to the invoice related to the partner. This default value could be change in a draft invoice. +When you create an payment order, only invoices related to chosen payment mode are displayed. +Invoices without any payment mode are displayed to. + +For further information, please visit: + + * https://www.odoo.com/forum/help-1 + +Known issues / Roadmap +====================== + + * No known issues. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback +`here `_. + +Credits +======= + +Contributors +------------ + +* Pedro M. Baeza +* Alexis de Lattre +* Raphaël Valyi +* Stefan Rijnhart (Therp) +* Alexandre Fayolle +* Stéphane Bidoul +* Danimar Ribeiro + +Maintainer +---------- + +.. image:: http://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: http://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. + +To contribute to this module, please visit http://odoo-community.org. diff --git a/account_payment_partner/__openerp__.py b/account_payment_partner/__openerp__.py index 4f5d9b7965d..bb0fd91eb84 100644 --- a/account_payment_partner/__openerp__.py +++ b/account_payment_partner/__openerp__.py @@ -27,19 +27,6 @@ 'category': 'Banking addons', 'license': 'AGPL-3', 'summary': 'Adds payment mode on partners and invoices', - 'description': """ -Account Payment Partner -======================= - -This module adds severals fields : - -* the *Supplier Payment Mode* and *Customer Payment Mode* on Partners, - -* the *Payment Mode* on Invoices. - -On a Payment Order, in the wizard *Select Invoices to Pay*, the invoices will -be filtered per Payment Mode. - """, 'author': "Akretion, " "Serv. Tecnol. Avanzados - Pedro M. Baeza, " "Odoo Community Association (OCA)", From f997bf9ee8da5b94bbbbb9fe6c0ee5fbf49fb1e7 Mon Sep 17 00:00:00 2001 From: AngelMoya-Domatix Date: Thu, 2 Jul 2015 12:58:05 +0200 Subject: [PATCH 011/196] ADD description on payment mode and show it on invoice report FIX tabs FIX translate --- account_payment_partner/README.rst | 1 + account_payment_partner/__openerp__.py | 1 + .../i18n/account_payment_partner.pot | 14 ++++++++++++-- account_payment_partner/i18n/es.po | 14 ++++++++++++-- .../views/report_invoice.xml | 17 +++++++++++++++++ 5 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 account_payment_partner/views/report_invoice.xml diff --git a/account_payment_partner/README.rst b/account_payment_partner/README.rst index e4e4d0a52ca..2837e36a189 100644 --- a/account_payment_partner/README.rst +++ b/account_payment_partner/README.rst @@ -64,6 +64,7 @@ Contributors * Alexandre Fayolle * Stéphane Bidoul * Danimar Ribeiro +* Angel Moya Maintainer ---------- diff --git a/account_payment_partner/__openerp__.py b/account_payment_partner/__openerp__.py index bb0fd91eb84..ef8b028ce08 100644 --- a/account_payment_partner/__openerp__.py +++ b/account_payment_partner/__openerp__.py @@ -35,6 +35,7 @@ 'data': [ 'views/res_partner_view.xml', 'views/account_invoice_view.xml', + 'views/report_invoice.xml', 'security/ir.model.access.csv', ], 'demo': ['demo/partner_demo.xml'], diff --git a/account_payment_partner/i18n/account_payment_partner.pot b/account_payment_partner/i18n/account_payment_partner.pot index 3c5a3968684..82c70d780d7 100644 --- a/account_payment_partner/i18n/account_payment_partner.pot +++ b/account_payment_partner/i18n/account_payment_partner.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-31 22:53+0000\n" -"PO-Revision-Date: 2014-10-31 22:53+0000\n" +"POT-Creation-Date: 2015-07-02 10:53+0000\n" +"PO-Revision-Date: 2015-07-02 10:53+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,6 +15,11 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: account_payment_partner +#: view:website:account.report_invoice_document +msgid "Bank Account:" +msgstr "" + #. module: account_payment_partner #: field:res.partner,customer_payment_mode:0 msgid "Customer Payment Mode" @@ -35,6 +40,11 @@ msgstr "" msgid "Payment Mode" msgstr "" +#. module: account_payment_partner +#: view:website:account.report_invoice_document +msgid "Payment Mode:" +msgstr "" + #. module: account_payment_partner #: help:res.partner,customer_payment_mode:0 msgid "Select the default payment mode for this customer." diff --git a/account_payment_partner/i18n/es.po b/account_payment_partner/i18n/es.po index 63748b9887f..8d9b6b91a35 100644 --- a/account_payment_partner/i18n/es.po +++ b/account_payment_partner/i18n/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-31 22:53+0000\n" -"PO-Revision-Date: 2014-10-31 22:53+0000\n" +"POT-Creation-Date: 2015-07-02 10:55+0000\n" +"PO-Revision-Date: 2015-07-02 10:55+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,6 +15,11 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: account_payment_partner +#: view:website:account.report_invoice_document +msgid "Bank Account:" +msgstr "Cuenta bancaria:" + #. module: account_payment_partner #: field:res.partner,customer_payment_mode:0 msgid "Customer Payment Mode" @@ -35,6 +40,11 @@ msgstr "Empresa" msgid "Payment Mode" msgstr "Modo de pago" +#. module: account_payment_partner +#: view:website:account.report_invoice_document +msgid "Payment Mode:" +msgstr "Modo de pago:" + #. module: account_payment_partner #: help:res.partner,customer_payment_mode:0 msgid "Select the default payment mode for this customer." diff --git a/account_payment_partner/views/report_invoice.xml b/account_payment_partner/views/report_invoice.xml new file mode 100644 index 00000000000..356ec1d4d7c --- /dev/null +++ b/account_payment_partner/views/report_invoice.xml @@ -0,0 +1,17 @@ + + + + + + From 0e99948d120d4fe75ad286ee036c588abedb3e14 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Wed, 8 Jul 2015 14:55:31 +0200 Subject: [PATCH 012/196] [RFR] decorate overridable methods in wizard as api.multi --- account_payment_partner/wizard/payment_order_create.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_payment_partner/wizard/payment_order_create.py b/account_payment_partner/wizard/payment_order_create.py index a07ed280ec8..44204761042 100644 --- a/account_payment_partner/wizard/payment_order_create.py +++ b/account_payment_partner/wizard/payment_order_create.py @@ -26,7 +26,7 @@ class PaymentOrderCreate(models.TransientModel): _inherit = 'payment.order.create' - @api.model + @api.multi def extend_payment_order_domain(self, payment_order, domain): res = super(PaymentOrderCreate, self).extend_payment_order_domain( payment_order, domain) From a5425f877aa84b6b3f9921152d71932492b1a6fc Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Mon, 19 Oct 2015 17:50:53 +0200 Subject: [PATCH 013/196] [FIX+IMP] account_payment_partner: Several things: * Forgot to remove a usecase of debit_denied * Add ACL * Better filters on payment.order.create wizard * Add default values for those filters on payment.mode * FIX remove coma at end of line * Add translatable 'label' field on payment.mode, designed to be used in invoice report --- account_payment_partner/__openerp__.py | 2 + account_payment_partner/models/__init__.py | 23 +------ .../models/payment_mode.py | 35 +++++++++++ .../security/ir.model.access.csv | 1 + .../views/payment_mode.xml | 23 +++++++ .../wizard/payment_order_create.py | 60 ++++++++++--------- .../wizard/payment_order_create_view.xml | 25 ++++++++ 7 files changed, 119 insertions(+), 50 deletions(-) create mode 100644 account_payment_partner/models/payment_mode.py create mode 100644 account_payment_partner/views/payment_mode.xml create mode 100644 account_payment_partner/wizard/payment_order_create_view.xml diff --git a/account_payment_partner/__openerp__.py b/account_payment_partner/__openerp__.py index ef8b028ce08..2bbc92f96ff 100644 --- a/account_payment_partner/__openerp__.py +++ b/account_payment_partner/__openerp__.py @@ -36,7 +36,9 @@ 'views/res_partner_view.xml', 'views/account_invoice_view.xml', 'views/report_invoice.xml', + 'views/payment_mode.xml', 'security/ir.model.access.csv', + 'wizard/payment_order_create_view.xml', ], 'demo': ['demo/partner_demo.xml'], 'installable': True, diff --git a/account_payment_partner/models/__init__.py b/account_payment_partner/models/__init__.py index c2c7b405dad..be3f531bbe4 100644 --- a/account_payment_partner/models/__init__.py +++ b/account_payment_partner/models/__init__.py @@ -1,24 +1,5 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Partner module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- from . import res_partner from . import account_invoice +from . import payment_mode diff --git a/account_payment_partner/models/payment_mode.py b/account_payment_partner/models/payment_mode.py new file mode 100644 index 00000000000..62b8767e641 --- /dev/null +++ b/account_payment_partner/models/payment_mode.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Copyright (C) 2015 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from openerp import models, fields + + +class PaymentMode(models.Model): + _inherit = "payment.mode" + + label = fields.Char( + string='Label', translate=True, + help="This field is designed to be used in the invoice report") + default_payment_mode = fields.Selection([ + ('same', 'Same'), + ('same_or_null', 'Same or empty'), + ('any', 'Any'), + ], string='Payment Mode on Invoice', default='same') diff --git a/account_payment_partner/security/ir.model.access.csv b/account_payment_partner/security/ir.model.access.csv index b277f0229eb..ac6d96dfd12 100644 --- a/account_payment_partner/security/ir.model.access.csv +++ b/account_payment_partner/security/ir.model.access.csv @@ -1,2 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_payment_mode_read,Read access on payment.mode to Employees,account_payment.model_payment_mode,base.group_user,1,0,0,0 +access_payment_mode_type_read,Read access on payment.mode.type to Employees,account_banking_payment_export.model_payment_mode_type,base.group_user,1,0,0,0 diff --git a/account_payment_partner/views/payment_mode.xml b/account_payment_partner/views/payment_mode.xml new file mode 100644 index 00000000000..b32d52b0129 --- /dev/null +++ b/account_payment_partner/views/payment_mode.xml @@ -0,0 +1,23 @@ + + + + + + + account_payment_partner.payment.mode.form + payment.mode + + + + + + + + + + + + + + diff --git a/account_payment_partner/wizard/payment_order_create.py b/account_payment_partner/wizard/payment_order_create.py index 44204761042..fbf4939fb59 100644 --- a/account_payment_partner/wizard/payment_order_create.py +++ b/account_payment_partner/wizard/payment_order_create.py @@ -1,8 +1,8 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # -# Account Payment Partner module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) +# Account Payment Partner module for Odoo +# Copyright (C) 2014-2015 Akretion (http://www.akretion.com) # @author Alexis de Lattre # # This program is free software: you can redistribute it and/or modify @@ -20,39 +20,41 @@ # ############################################################################## -from openerp import models, api +from openerp import models, fields, api class PaymentOrderCreate(models.TransientModel): _inherit = 'payment.order.create' + payment_mode = fields.Selection([ + ('same', 'Same'), + ('same_or_null', 'Same or empty'), + ('any', 'Any'), + ], string='Payment Mode on Invoice') + + @api.model + def default_get(self, field_list): + res = super(PaymentOrderCreate, self).default_get(field_list) + context = self.env.context + assert context.get('active_model') == 'payment.order',\ + 'active_model should be payment.order' + assert context.get('active_id'), 'Missing active_id in context !' + pay_order = self.env['payment.order'].browse(context['active_id']) + res['payment_mode'] = pay_order.mode.default_payment_mode + return res + @api.multi def extend_payment_order_domain(self, payment_order, domain): res = super(PaymentOrderCreate, self).extend_payment_order_domain( payment_order, domain) - # Monkey patch for fixing problem with the core search function - # when args has ('invoice', '=', False), referred in the issue #4857 - # (https://github.com/odoo/odoo/issues/4857) - # - # Original domain: - # domain += ['|', '|', - # ('invoice', '=', False), - # ('invoice.payment_mode_id', '=', False), - # ('invoice.payment_mode_id', '=', payment_order.mode.id)] - self.env.cr.execute( - "SELECT l.id " - "FROM account_move_line l " - "LEFT OUTER JOIN account_invoice i " - "ON l.move_id = i.move_id " - "INNER JOIN account_account a " - "ON a.id = l.account_id " - "WHERE i.id IS NULL" - " AND l.reconcile_id IS NULL" - " AND a.type in ('receivable', 'payable')") - ids = [x[0] for x in self.env.cr.fetchall()] - domain += ['|', - ('id', 'in', ids), - '|', - ('invoice.payment_mode_id', '=', False), - ('invoice.payment_mode_id', '=', payment_order.mode.id)] + if self.invoice and self.payment_mode: + if self.payment_mode == 'same': + domain.append( + ('invoice.payment_mode_id', '=', payment_order.mode.id)) + elif self.payment_mode == 'same_or_null': + domain += [ + '|', + ('invoice.payment_mode_id', '=', False), + ('invoice.payment_mode_id', '=', payment_order.mode.id)] + # if payment_mode == 'any', don't modify domain return res diff --git a/account_payment_partner/wizard/payment_order_create_view.xml b/account_payment_partner/wizard/payment_order_create_view.xml new file mode 100644 index 00000000000..f163b8cd69d --- /dev/null +++ b/account_payment_partner/wizard/payment_order_create_view.xml @@ -0,0 +1,25 @@ + + + + + + + + account_payment_partner.payment.order.create.form + payment.order.create + + + + + + + + + + + From 9fa50fa25784c9880d02788742c509fe1375403b Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Mon, 15 Feb 2016 23:10:18 +0100 Subject: [PATCH 014/196] [IMP] account_payment_partner: Several things * Short headers * Remove label field There's already a field in the payment mode called 'note' that is printed on the invoices, so there's no need of another field for that purpose. This field is added by account_banking_payment_export * Bump version numbers * es translations * Name to filter for better inheratiblity --- account_payment_partner/__init__.py | 24 ++------------- account_payment_partner/__openerp__.py | 28 ++++-------------- account_payment_partner/i18n/es.po | 29 +++++++++++++++++-- .../models/account_invoice.py | 25 +++------------- .../models/payment_mode.py | 25 ++-------------- account_payment_partner/models/res_partner.py | 25 +++------------- .../views/account_invoice_view.xml | 2 +- .../views/payment_mode.xml | 3 -- 8 files changed, 47 insertions(+), 114 deletions(-) diff --git a/account_payment_partner/__init__.py b/account_payment_partner/__init__.py index fe47437f23b..794e1a24321 100644 --- a/account_payment_partner/__init__.py +++ b/account_payment_partner/__init__.py @@ -1,24 +1,6 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Partner module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- +# © 2014 Akretion - Alexis de Lattre +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models from . import wizard diff --git a/account_payment_partner/__openerp__.py b/account_payment_partner/__openerp__.py index 2bbc92f96ff..0460a7c26fc 100644 --- a/account_payment_partner/__openerp__.py +++ b/account_payment_partner/__openerp__.py @@ -1,29 +1,11 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Partner module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - +# -*- coding: utf-8 -*- +# © 2014 Akretion - Alexis de Lattre +# © 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Account Payment Partner', - 'version': '8.0.0.1.0', + 'version': '8.0.0.2.0', 'category': 'Banking addons', 'license': 'AGPL-3', 'summary': 'Adds payment mode on partners and invoices', diff --git a/account_payment_partner/i18n/es.po b/account_payment_partner/i18n/es.po index 8d9b6b91a35..c78c3e3440b 100644 --- a/account_payment_partner/i18n/es.po +++ b/account_payment_partner/i18n/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-02 10:55+0000\n" -"PO-Revision-Date: 2015-07-02 10:55+0000\n" +"POT-Creation-Date: 2016-02-16 08:01+0000\n" +"PO-Revision-Date: 2016-02-16 08:01+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,6 +15,12 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: account_payment_partner +#: selection:payment.mode,default_payment_mode:0 +#: selection:payment.order.create,payment_mode:0 +msgid "Any" +msgstr "Cualquiera" + #. module: account_payment_partner #: view:website:account.report_invoice_document msgid "Bank Account:" @@ -37,14 +43,33 @@ msgstr "Empresa" #. module: account_payment_partner #: field:account.invoice,payment_mode_id:0 +#: model:ir.model,name:account_payment_partner.model_payment_mode msgid "Payment Mode" msgstr "Modo de pago" +#. module: account_payment_partner +#: field:payment.mode,default_payment_mode:0 +#: field:payment.order.create,payment_mode:0 +msgid "Payment Mode on Invoice" +msgstr "Modo de pago en la factura" + #. module: account_payment_partner #: view:website:account.report_invoice_document msgid "Payment Mode:" msgstr "Modo de pago:" +#. module: account_payment_partner +#: selection:payment.mode,default_payment_mode:0 +#: selection:payment.order.create,payment_mode:0 +msgid "Same" +msgstr "Igual" + +#. module: account_payment_partner +#: selection:payment.mode,default_payment_mode:0 +#: selection:payment.order.create,payment_mode:0 +msgid "Same or empty" +msgstr "Igual o vacío" + #. module: account_payment_partner #: help:res.partner,customer_payment_mode:0 msgid "Select the default payment mode for this customer." diff --git a/account_payment_partner/models/account_invoice.py b/account_payment_partner/models/account_invoice.py index e14c0d956d4..4c5b971c67c 100644 --- a/account_payment_partner/models/account_invoice.py +++ b/account_payment_partner/models/account_invoice.py @@ -1,24 +1,7 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Partner module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- +# © 2014 Akretion - Alexis de Lattre +# © 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from openerp import models, fields, api diff --git a/account_payment_partner/models/payment_mode.py b/account_payment_partner/models/payment_mode.py index 62b8767e641..6d2fa946b43 100644 --- a/account_payment_partner/models/payment_mode.py +++ b/account_payment_partner/models/payment_mode.py @@ -1,23 +1,7 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# Copyright (C) 2015 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# © 2014 Akretion - Alexis de Lattre +# © 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from openerp import models, fields @@ -25,9 +9,6 @@ class PaymentMode(models.Model): _inherit = "payment.mode" - label = fields.Char( - string='Label', translate=True, - help="This field is designed to be used in the invoice report") default_payment_mode = fields.Selection([ ('same', 'Same'), ('same_or_null', 'Same or empty'), diff --git a/account_payment_partner/models/res_partner.py b/account_payment_partner/models/res_partner.py index 5726da44698..7b6c850aa75 100644 --- a/account_payment_partner/models/res_partner.py +++ b/account_payment_partner/models/res_partner.py @@ -1,24 +1,7 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Partner module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- +# © 2014 Akretion - Alexis de Lattre +# © 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from openerp import models, fields, api diff --git a/account_payment_partner/views/account_invoice_view.xml b/account_payment_partner/views/account_invoice_view.xml index 72afbb2a543..895e03bf561 100644 --- a/account_payment_partner/views/account_invoice_view.xml +++ b/account_payment_partner/views/account_invoice_view.xml @@ -15,7 +15,7 @@ - + diff --git a/account_payment_partner/views/payment_mode.xml b/account_payment_partner/views/payment_mode.xml index b32d52b0129..120ca6970ee 100644 --- a/account_payment_partner/views/payment_mode.xml +++ b/account_payment_partner/views/payment_mode.xml @@ -12,9 +12,6 @@ - - - From 0869cb694a4a0c613fb282506aacce759ad4383c Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sat, 30 Apr 2016 01:46:34 +0200 Subject: [PATCH 015/196] [MIG] account_payment_partner: Start to port bank-payment to v9 (with a lot of improvements) during the Sorrento Code sprint 2016 Improvements include: - full re-organisation of modules and big re-organisation of the code - simplification of the code related to the fact that support for direct debit is now in t he base module, not added by an optional module account_direct_debit (module was removed) - new design of the wizard to select move lines to pay - support for non-SEPA file transfer- - support for German direct debit SEPA files (fixes bug #129) - remove workflow of payment.order * Finalise the wizard of selection of move lines to pay * Add button "Add to payment/debit order" on invoice form view * Started to integrate payment transfer in account_payment_order (not finished at all though) * Copy payment mode and mandate from invoice to refund * Run dos2unix on the few files that had DOS carriage return * Add _id suffix on M2O fields customer_payment_mode and supplier_payment_mode (Odoo did the same on all the M2O property fields of res.partner) * Better handling of partner_bank_id and mandate_id on invoice: invisible/required/onchange * Move field bank_account_required from module account_payment_partner to account_payment_mode --- account_payment_partner/README.rst | 22 ++--- account_payment_partner/__init__.py | 1 - account_payment_partner/__openerp__.py | 8 +- account_payment_partner/demo/partner_demo.xml | 42 ++------- account_payment_partner/models/__init__.py | 2 +- .../models/account_invoice.py | 89 ++++++++++++++----- .../models/account_move_line.py | 12 +++ .../models/payment_mode.py | 16 ---- account_payment_partner/models/res_partner.py | 17 ++-- .../security/ir.model.access.csv | 3 - .../views/account_invoice_view.xml | 58 +++++++++--- .../views/account_move_line.xml | 28 ++++++ .../views/payment_mode.xml | 20 ----- .../views/report_invoice.xml | 2 +- .../views/res_partner_view.xml | 17 ++-- account_payment_partner/wizard/__init__.py | 23 ----- .../wizard/payment_order_create.py | 60 ------------- .../wizard/payment_order_create_view.xml | 25 ------ 18 files changed, 193 insertions(+), 252 deletions(-) create mode 100644 account_payment_partner/models/account_move_line.py delete mode 100644 account_payment_partner/models/payment_mode.py delete mode 100644 account_payment_partner/security/ir.model.access.csv create mode 100644 account_payment_partner/views/account_move_line.xml delete mode 100644 account_payment_partner/views/payment_mode.xml delete mode 100644 account_payment_partner/wizard/__init__.py delete mode 100644 account_payment_partner/wizard/payment_order_create.py delete mode 100644 account_payment_partner/wizard/payment_order_create_view.xml diff --git a/account_payment_partner/README.rst b/account_payment_partner/README.rst index 2837e36a189..704ca358ac7 100644 --- a/account_payment_partner/README.rst +++ b/account_payment_partner/README.rst @@ -1,6 +1,7 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg :alt: License: AGPL-3 +======================= Account Payment Partner ======================= @@ -17,7 +18,8 @@ Installation ============ This module depends on : -* account_banking_payment_export + +* account_payment_mode This module is part of the OCA/bank-payment suite. @@ -34,22 +36,22 @@ This payment mode is automatically associated to the invoice related to the part When you create an payment order, only invoices related to chosen payment mode are displayed. Invoices without any payment mode are displayed to. -For further information, please visit: - - * https://www.odoo.com/forum/help-1 +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/173/9.0 Known issues / Roadmap ====================== * No known issues. - + Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. -In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed feedback -`here `_. +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. Credits ======= @@ -58,7 +60,7 @@ Contributors ------------ * Pedro M. Baeza -* Alexis de Lattre +* Alexis de Lattre * Raphaël Valyi * Stefan Rijnhart (Therp) * Alexandre Fayolle diff --git a/account_payment_partner/__init__.py b/account_payment_partner/__init__.py index 794e1a24321..3845dd2da82 100644 --- a/account_payment_partner/__init__.py +++ b/account_payment_partner/__init__.py @@ -3,4 +3,3 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models -from . import wizard diff --git a/account_payment_partner/__openerp__.py b/account_payment_partner/__openerp__.py index 0460a7c26fc..8c106802195 100644 --- a/account_payment_partner/__openerp__.py +++ b/account_payment_partner/__openerp__.py @@ -5,7 +5,7 @@ { 'name': 'Account Payment Partner', - 'version': '8.0.0.2.0', + 'version': '9.0.1.0.0', 'category': 'Banking addons', 'license': 'AGPL-3', 'summary': 'Adds payment mode on partners and invoices', @@ -13,14 +13,12 @@ "Serv. Tecnol. Avanzados - Pedro M. Baeza, " "Odoo Community Association (OCA)", 'website': 'https://github.com/OCA/bank-payment', - 'depends': ['account_banking_payment_export'], + 'depends': ['account_payment_mode'], 'data': [ 'views/res_partner_view.xml', 'views/account_invoice_view.xml', + 'views/account_move_line.xml', 'views/report_invoice.xml', - 'views/payment_mode.xml', - 'security/ir.model.access.csv', - 'wizard/payment_order_create_view.xml', ], 'demo': ['demo/partner_demo.xml'], 'installable': True, diff --git a/account_payment_partner/demo/partner_demo.xml b/account_payment_partner/demo/partner_demo.xml index 776058d44b9..20545d978df 100644 --- a/account_payment_partner/demo/partner_demo.xml +++ b/account_payment_partner/demo/partner_demo.xml @@ -3,49 +3,23 @@ - - - supplier_payment_mode_12 + + Default Supplier Payment Mode + search="[('model','=','res.partner'),('name','=','supplier_payment_mode_id')]"/> + eval="'account.payment.mode,'+str(ref('account_payment_mode.payment_mode_outbound_ct1'))"/> - - - customer_payment_mode_12 + + Default Customer Payment Mode + search="[('model','=','res.partner'),('name','=','customer_payment_mode_id')]"/> + eval="'account.payment.mode,'+str(ref('account_payment_mode.payment_mode_inbound_ct1'))"/> - - - - customer_payment_mode_2 - - - - - - - - - supplier_payment_mode_1 - - - - - - - diff --git a/account_payment_partner/models/__init__.py b/account_payment_partner/models/__init__.py index be3f531bbe4..152bb919cff 100644 --- a/account_payment_partner/models/__init__.py +++ b/account_payment_partner/models/__init__.py @@ -2,4 +2,4 @@ from . import res_partner from . import account_invoice -from . import payment_mode +from . import account_move_line diff --git a/account_payment_partner/models/account_invoice.py b/account_payment_partner/models/account_invoice.py index 4c5b971c67c..14ac17a77d2 100644 --- a/account_payment_partner/models/account_invoice.py +++ b/account_payment_partner/models/account_invoice.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2014 Akretion - Alexis de Lattre +# © 2014-2016 Akretion - Alexis de Lattre # © 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -10,27 +10,70 @@ class AccountInvoice(models.Model): _inherit = 'account.invoice' payment_mode_id = fields.Many2one( - comodel_name='payment.mode', string="Payment Mode", - domain="[('type', '=', type)]") - - @api.multi - def onchange_partner_id( - self, type, partner_id, date_invoice=False, - payment_term=False, partner_bank_id=False, company_id=False): - res = super(AccountInvoice, self).onchange_partner_id( - type, partner_id, date_invoice=date_invoice, - payment_term=payment_term, partner_bank_id=partner_bank_id, - company_id=company_id) - if partner_id: - partner = self.env['res.partner'].browse(partner_id) - if type == 'in_invoice': - res['value']['payment_mode_id'] = \ - partner.supplier_payment_mode.id - elif type == 'out_invoice': - res['value'].update({ - 'payment_mode_id': partner.customer_payment_mode.id, - 'partner_bank_id': partner.customer_payment_mode.bank_id.id - }) + comodel_name='account.payment.mode', string="Payment Mode", + ondelete='restrict', + readonly=True, states={'draft': [('readonly', False)]}) + bank_account_required = fields.Boolean( + related='payment_mode_id.payment_method_id.bank_account_required', + readonly=True) + + @api.onchange('partner_id', 'company_id') + def _onchange_partner_id(self): + super(AccountInvoice, self)._onchange_partner_id() + if self.partner_id: + if self.type == 'in_invoice': + pay_mode = self.partner_id.supplier_payment_mode_id + self.payment_mode_id = pay_mode + if ( + pay_mode and + pay_mode.payment_type == 'outbound' and + pay_mode.payment_method_id.bank_account_required and + self.commercial_partner_id.bank_ids): + self.partner_bank_id =\ + self.commercial_partner_id.bank_ids[0] + elif self.type == 'out_invoice': + pay_mode = self.partner_id.customer_payment_mode_id + self.payment_mode_id = pay_mode + if pay_mode and pay_mode.bank_account_link == 'fixed': + self.partner_bank_id = pay_mode.fixed_journal_id.\ + bank_account_id else: - res['value']['payment_mode_id'] = False + self.payment_mode_id = False + if self.type == 'in_invoice': + self.partner_bank_id = False + + @api.onchange('payment_mode_id') + def payment_mode_id_change(self): + if ( + self.payment_mode_id and + self.payment_mode_id.payment_type == 'outbound' and + not self.payment_mode_id.payment_method_id. + bank_account_required): + self.partner_bank_id = False + elif not self.payment_mode_id: + self.partner_bank_id = False + + @api.model + def line_get_convert(self, line, part): + """Copy payment mode from invoice to account move line""" + res = super(AccountInvoice, self).line_get_convert(line, part) + if line.get('type') == 'dest' and line.get('invoice_id'): + invoice = self.browse(line['invoice_id']) + res['payment_mode_id'] = invoice.payment_mode_id.id or False return res + + # I think copying payment mode from invoice to refund by default + # is a good idea because the most common way of "paying" a refund is to + # deduct it on the payment of the next invoice (and OCA/bank-payment + # allows to have negative payment lines since March 2016) + @api.model + def _prepare_refund( + self, invoice, date_invoice=None, date=None, description=None, + journal_id=None): + vals = super(AccountInvoice, self)._prepare_refund( + invoice, date_invoice=date_invoice, date=date, + description=description, journal_id=journal_id) + vals['payment_mode_id'] = invoice.payment_mode_id.id + if invoice.type == 'in_invoice': + vals['partner_bank_id'] = invoice.partner_bank_id.id + return vals diff --git a/account_payment_partner/models/account_move_line.py b/account_payment_partner/models/account_move_line.py new file mode 100644 index 00000000000..080e7336961 --- /dev/null +++ b/account_payment_partner/models/account_move_line.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +# © 2016 Akretion (http://www.akretion.com/) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import models, fields + + +class AccountMoveLine(models.Model): + _inherit = 'account.move.line' + + payment_mode_id = fields.Many2one( + 'account.payment.mode', string='Payment Mode', ondelete='restrict') diff --git a/account_payment_partner/models/payment_mode.py b/account_payment_partner/models/payment_mode.py deleted file mode 100644 index 6d2fa946b43..00000000000 --- a/account_payment_partner/models/payment_mode.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# © 2014 Akretion - Alexis de Lattre -# © 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from openerp import models, fields - - -class PaymentMode(models.Model): - _inherit = "payment.mode" - - default_payment_mode = fields.Selection([ - ('same', 'Same'), - ('same_or_null', 'Same or empty'), - ('any', 'Any'), - ], string='Payment Mode on Invoice', default='same') diff --git a/account_payment_partner/models/res_partner.py b/account_payment_partner/models/res_partner.py index 7b6c850aa75..b7a35e93c4a 100644 --- a/account_payment_partner/models/res_partner.py +++ b/account_payment_partner/models/res_partner.py @@ -9,17 +9,20 @@ class ResPartner(models.Model): _inherit = 'res.partner' - supplier_payment_mode = fields.Many2one( - 'payment.mode', string='Supplier Payment Mode', company_dependent=True, - domain="[('purchase_ok', '=', True)]", + # v8 fields : same without the _id suffix + supplier_payment_mode_id = fields.Many2one( + 'account.payment.mode', string='Supplier Payment Mode', + company_dependent=True, + domain=[('payment_type', '=', 'outbound')], help="Select the default payment mode for this supplier.") - customer_payment_mode = fields.Many2one( - 'payment.mode', string='Customer Payment Mode', company_dependent=True, - domain="[('sale_ok', '=', True)]", + customer_payment_mode_id = fields.Many2one( + 'account.payment.mode', string='Customer Payment Mode', + company_dependent=True, + domain=[('payment_type', '=', 'inbound')], help="Select the default payment mode for this customer.") @api.model def _commercial_fields(self): res = super(ResPartner, self)._commercial_fields() - res += ['supplier_payment_mode', 'customer_payment_mode'] + res += ['supplier_payment_mode_id', 'customer_payment_mode_id'] return res diff --git a/account_payment_partner/security/ir.model.access.csv b/account_payment_partner/security/ir.model.access.csv deleted file mode 100644 index ac6d96dfd12..00000000000 --- a/account_payment_partner/security/ir.model.access.csv +++ /dev/null @@ -1,3 +0,0 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_payment_mode_read,Read access on payment.mode to Employees,account_payment.model_payment_mode,base.group_user,1,0,0,0 -access_payment_mode_type_read,Read access on payment.mode.type to Employees,account_banking_payment_export.model_payment_mode_type,base.group_user,1,0,0,0 diff --git a/account_payment_partner/views/account_invoice_view.xml b/account_payment_partner/views/account_invoice_view.xml index 895e03bf561..0e59c514d95 100644 --- a/account_payment_partner/views/account_invoice_view.xml +++ b/account_payment_partner/views/account_invoice_view.xml @@ -1,21 +1,20 @@ - - + - - account_payment_partner.invoice_filter + + account_payment_partner.account_invoice_search account.invoice - - + + @@ -28,8 +27,12 @@ + + + + 0 @@ -40,14 +43,43 @@ account.invoice - + + + + + + [('partner_id', '=', commercial_partner_id)] + 0 + {'invisible': [('bank_account_required', '=', False)], 'required': [('bank_account_required', '=', True)]} + + + + + + account_payment_partner.customer_invoice_tree + account.invoice + + + + + + + + + + account_payment_partner.supplier_invoice_tree + account.invoice + + + + - + diff --git a/account_payment_partner/views/account_move_line.xml b/account_payment_partner/views/account_move_line.xml new file mode 100644 index 00000000000..b0d0ca102a5 --- /dev/null +++ b/account_payment_partner/views/account_move_line.xml @@ -0,0 +1,28 @@ + + + + + + + + + + account_payment_partner.move_line_form + account.move.line + + + + + + + + + + + + + diff --git a/account_payment_partner/views/payment_mode.xml b/account_payment_partner/views/payment_mode.xml deleted file mode 100644 index 120ca6970ee..00000000000 --- a/account_payment_partner/views/payment_mode.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - account_payment_partner.payment.mode.form - payment.mode - - - - - - - - - - - diff --git a/account_payment_partner/views/report_invoice.xml b/account_payment_partner/views/report_invoice.xml index 356ec1d4d7c..9368238f18c 100644 --- a/account_payment_partner/views/report_invoice.xml +++ b/account_payment_partner/views/report_invoice.xml @@ -2,7 +2,7 @@ From 2aed5c33d302345e294c9c0a246185b933b30cec Mon Sep 17 00:00:00 2001 From: cubells Date: Mon, 3 Dec 2018 12:45:56 +0100 Subject: [PATCH 030/196] [IMP] account_payment_partner: Add several tests --- account_payment_partner/__init__.py | 4 +- .../models/account_invoice.py | 12 +- .../models/account_move_line.py | 7 +- account_payment_partner/models/res_partner.py | 9 +- .../readme/CONTRIBUTORS.rst | 4 +- .../readme/DESCRIPTION.rst | 4 +- account_payment_partner/readme/HISTORY.rst | 10 -- account_payment_partner/readme/USAGE.rst | 19 ++- account_payment_partner/tests/__init__.py | 1 - .../tests/test_account_payment_partner.py | 112 ++++++++++++++++++ .../views/account_invoice_view.xml | 4 +- .../views/account_move_line.xml | 3 +- .../views/report_invoice.xml | 2 +- .../views/res_partner_view.xml | 3 +- 14 files changed, 142 insertions(+), 52 deletions(-) diff --git a/account_payment_partner/__init__.py b/account_payment_partner/__init__.py index 50def6204d1..83e553ac462 100644 --- a/account_payment_partner/__init__.py +++ b/account_payment_partner/__init__.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# © 2014 Akretion - Alexis de Lattre -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/account_payment_partner/models/account_invoice.py b/account_payment_partner/models/account_invoice.py index 86942cbcf3a..0fc72bb143b 100644 --- a/account_payment_partner/models/account_invoice.py +++ b/account_payment_partner/models/account_invoice.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- -# © 2014-2016 Akretion - Alexis de Lattre -# © 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# Copyright 2014-16 Akretion - Alexis de Lattre +# Copyright 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import api, fields, models, _ from odoo.exceptions import ValidationError @@ -121,12 +120,13 @@ def partner_banks_to_show(self): if self.partner_bank_id: return self.partner_bank_id if self.payment_mode_id.show_bank_account_from_journal: - if self.payment_mode_id.bank_account_link: + if self.payment_mode_id.bank_account_link == 'fixed': return self.payment_mode_id.fixed_journal_id.bank_account_id else: return self.payment_mode_id.variable_journal_ids.mapped( 'bank_account_id') - if self.payment_mode_id.payment_method_id.code == 'sepa_direct_debit': + if self.payment_mode_id.payment_method_id.code == \ + 'sepa_direct_debit': # pragma: no cover return (self.mandate_id.partner_bank_id or self.partner_id.valid_mandate_id.partner_bank_id) # Return this as empty recordset diff --git a/account_payment_partner/models/account_move_line.py b/account_payment_partner/models/account_move_line.py index 9bdcec4e6af..4bfe0ff7087 100644 --- a/account_payment_partner/models/account_move_line.py +++ b/account_payment_partner/models/account_move_line.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- -# © 2016 Akretion (https://www.akretion.com/) -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# Copyright 2016 Akretion (http://www.akretion.com/) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import models, fields +from odoo import fields, models class AccountMoveLine(models.Model): diff --git a/account_payment_partner/models/res_partner.py b/account_payment_partner/models/res_partner.py index 0b6585aa005..aa60a42f8a1 100644 --- a/account_payment_partner/models/res_partner.py +++ b/account_payment_partner/models/res_partner.py @@ -1,9 +1,8 @@ -# -*- coding: utf-8 -*- -# © 2014 Akretion - Alexis de Lattre -# © 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# Copyright 2014 Akretion - Alexis de Lattre +# Copyright 2014 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import models, fields, api +from odoo import api, fields, models class ResPartner(models.Model): diff --git a/account_payment_partner/readme/CONTRIBUTORS.rst b/account_payment_partner/readme/CONTRIBUTORS.rst index 95f514aae85..df652cc3417 100644 --- a/account_payment_partner/readme/CONTRIBUTORS.rst +++ b/account_payment_partner/readme/CONTRIBUTORS.rst @@ -7,5 +7,5 @@ * Angel Moya * `Tecnativa `_: - * Pedro M. Baeza - * Carlos Dauden + * Pedro M. Baeza + * Carlos Dauden diff --git a/account_payment_partner/readme/DESCRIPTION.rst b/account_payment_partner/readme/DESCRIPTION.rst index 27c9e82be2b..8ad4f4f6416 100644 --- a/account_payment_partner/readme/DESCRIPTION.rst +++ b/account_payment_partner/readme/DESCRIPTION.rst @@ -1,6 +1,4 @@ -[ This file must be max 2-3 paragraphs, and is required. ] - -This module adds severals fields : +This module adds severals fields: * the *Supplier Payment Mode* and *Customer Payment Mode* on Partners, diff --git a/account_payment_partner/readme/HISTORY.rst b/account_payment_partner/readme/HISTORY.rst index a6168b33470..8424df5d0cf 100644 --- a/account_payment_partner/readme/HISTORY.rst +++ b/account_payment_partner/readme/HISTORY.rst @@ -1,13 +1,3 @@ -[ The change log. The goal of this file is to help readers - understand changes between version. The primary audience is - end users and integrators. Purely technical changes such as - code refactoring must not be mentioned here. - - This file may contain ONE level of section titles, underlined - with the ~ (tilde) character. Other section markers are - forbidden and will likely break the structure of the README.rst - or other documents where this fragment is included. ] - 10.0.1.2.0 (2018-05-24) ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/account_payment_partner/readme/USAGE.rst b/account_payment_partner/readme/USAGE.rst index c2bbf0fbc37..09ef2757751 100644 --- a/account_payment_partner/readme/USAGE.rst +++ b/account_payment_partner/readme/USAGE.rst @@ -1,12 +1,9 @@ -[ This file must be present and contains the usage instructions - for end-users. As all other rst files included in the README, - it MUST NOT contain reStructuredText sections - only body text (paragraphs, lists, tables, etc). Should you need - a more elaborate structure to explain the addon, please create a - Sphinx documentation (which may include this file as a "quick start" - section). ] - You are able to add a payment mode directly on a partner. -This payment mode is automatically associated to the invoice related to the partner. This default value could be change in a draft invoice. -When you create an payment order, only invoices related to chosen payment mode are displayed. -Invoices without any payment mode are displayed to. + +This payment mode is automatically associated to the invoice related to the +partner. This default value could be changed in a draft invoice. + +When you create a payment order, only invoices related to chosen payment mode +are displayed. + +Invoices without any payment mode are displayed too. diff --git a/account_payment_partner/tests/__init__.py b/account_payment_partner/tests/__init__.py index 0d757b02700..3449d9e90db 100644 --- a/account_payment_partner/tests/__init__.py +++ b/account_payment_partner/tests/__init__.py @@ -1,2 +1 @@ - from . import test_account_payment_partner diff --git a/account_payment_partner/tests/test_account_payment_partner.py b/account_payment_partner/tests/test_account_payment_partner.py index b0201646376..14ad3cb5995 100644 --- a/account_payment_partner/tests/test_account_payment_partner.py +++ b/account_payment_partner/tests/test_account_payment_partner.py @@ -132,6 +132,49 @@ def setUpClass(cls): [('user_type_id', '=', cls.acct_type_expenses.id), ('company_id', '=', cls.company.id)], limit=1) + cls.journal_bank = cls.env['res.partner.bank'].create({ + 'acc_number': 'GB95LOYD87430237296288', + 'partner_id': cls.env.user.company_id.id, + }) + cls.journal = cls.env['account.journal'].create({ + 'name': 'BANK TEST', + 'code': 'TEST', + 'type': 'bank', + 'bank_account_id': cls.journal_bank.id, + }) + mode_in = cls.env['account.payment.mode'].create({ + 'name': 'Payment Mode Inbound', + 'payment_method_id': + cls.env.ref('account.account_payment_method_manual_in').id, + 'bank_account_link': 'fixed', + 'fixed_journal_id': cls.journal.id, + }) + method_out = cls.env.ref('account.account_payment_method_manual_out') + method_out.bank_account_required = True + cls.mode_out = cls.env['account.payment.mode'].create({ + 'name': 'Payment Mode Outbound', + 'payment_method_id': method_out.id, + 'bank_account_link': 'fixed', + 'fixed_journal_id': cls.journal.id, + }) + cls.partner = cls.env['res.partner'].create({ + 'name': 'Test Partner', + 'customer': True, + 'customer_payment_mode_id': mode_in.id, + }) + cls.supplier = cls.env['res.partner'].create({ + 'name': 'Test Supplier', + 'supplier': True, + 'supplier_payment_mode_id': cls.mode_out.id, + }) + cls.supplier_bank = cls.env['res.partner.bank'].create({ + 'acc_number': 'GB18BARC20040131665123', + 'partner_id': cls.supplier.id, + }) + cls.supplier_invoice = cls.env['account.invoice'].create({ + 'partner_id': cls.supplier.id, + 'type': 'in_invoice', + }) def _create_invoice(self): @@ -313,3 +356,72 @@ def test_partner(self): self.customer.customer_payment_mode_id, self.customer_payment_mode ) + + def test_partner_onchange(self): + customer_invoice = self.env['account.invoice'].create({ + 'partner_id': self.partner.id, + 'type': 'out_invoice', + }) + customer_invoice._onchange_partner_id() + self.assertEqual(customer_invoice.payment_mode_id, + self.partner.customer_payment_mode_id) + + self.supplier_invoice._onchange_partner_id() + self.assertEqual(self.supplier_invoice.partner_bank_id, + self.supplier_bank) + vals = {'partner_id': False, 'type': 'out_invoice'} + invoice = self.env['account.invoice'].new(vals) + invoice._onchange_partner_id() + self.assertFalse(invoice.payment_mode_id) + vals = {'partner_id': False, 'type': 'in_invoice'} + invoice = self.env['account.invoice'].new(vals) + invoice._onchange_partner_id() + self.assertFalse(invoice.partner_bank_id) + + def test_payment_mode_id_change(self): + self.supplier_invoice.payment_mode_id = self.mode_out.id + self.supplier_invoice.payment_mode_id_change() + self.assertEqual(self.supplier_invoice.partner_bank_id, + self.supplier_bank) + self.mode_out.payment_method_id.bank_account_required = False + self.supplier_invoice.payment_mode_id = self.mode_out.id + self.supplier_invoice.payment_mode_id_change() + self.assertFalse(self.supplier_invoice.partner_bank_id) + self.supplier_invoice.payment_mode_id = False + self.supplier_invoice.payment_mode_id_change() + self.assertFalse(self.supplier_invoice.partner_bank_id) + + def test_print_report(self): + self.env['account.invoice.line'].create({ + 'invoice_id': self.supplier_invoice.id, + 'name': 'Product Text', + 'price_unit': 10.0, + 'account_id': self.env.ref('l10n_generic_coa.1_conf_o_income').id, + }) + self.supplier_invoice.action_invoice_open() + self.assertEqual( + self.supplier_invoice.move_id.line_ids[0].payment_mode_id, + self.supplier_invoice.payment_mode_id) + (res, _) = report.render_report( + self.env.cr, self.env.uid, + [self.supplier_invoice.id], 'account.report_invoice', {}) + self.assertRegexpMatches(res, self.supplier_bank.acc_number) + self.supplier_invoice.partner_bank_id = False + self.supplier_invoice.payment_mode_id\ + .show_bank_account_from_journal = True + (res, _) = report.render_report( + self.env.cr, self.env.uid, + [self.supplier_invoice.id], 'account.report_invoice', {}) + self.assertRegexpMatches(res, self.journal_bank.acc_number) + payment_mode = self.supplier_invoice.payment_mode_id + self.supplier_invoice.payment_mode_id = False + payment_mode.bank_account_link = 'variable' + payment_mode.variable_journal_ids = [ + (6, 0, [self.journal.id])] + self.supplier_invoice.payment_mode_id = payment_mode.id + self.supplier_invoice.payment_mode_id_change() + (res, _) = report.render_report( + self.env.cr, self.env.uid, + [self.supplier_invoice.id], 'account.report_invoice', {}) + self.assertRegexpMatches( + res, self.journal_bank.acc_number) diff --git a/account_payment_partner/views/account_invoice_view.xml b/account_payment_partner/views/account_invoice_view.xml index 859e4572c19..f76fac182b5 100644 --- a/account_payment_partner/views/account_invoice_view.xml +++ b/account_payment_partner/views/account_invoice_view.xml @@ -1,7 +1,7 @@ diff --git a/account_payment_partner/views/account_move_line.xml b/account_payment_partner/views/account_move_line.xml index 1abe8b5e149..60101811164 100644 --- a/account_payment_partner/views/account_move_line.xml +++ b/account_payment_partner/views/account_move_line.xml @@ -1,8 +1,7 @@ diff --git a/account_payment_partner/views/report_invoice.xml b/account_payment_partner/views/report_invoice.xml index 1838444d852..b2276768525 100644 --- a/account_payment_partner/views/report_invoice.xml +++ b/account_payment_partner/views/report_invoice.xml @@ -20,7 +20,7 @@ - +

diff --git a/account_payment_partner/views/res_partner_view.xml b/account_payment_partner/views/res_partner_view.xml index ad7ceeafe5a..1c7662232d1 100644 --- a/account_payment_partner/views/res_partner_view.xml +++ b/account_payment_partner/views/res_partner_view.xml @@ -1,7 +1,6 @@ From 077f2187410f5d4e65f00739211761c2d5b823c4 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Tue, 4 Dec 2018 23:56:16 +0100 Subject: [PATCH 031/196] [MIG] account_payment_partner: Adapt tests + code to latest version --- .../post-migrate.py | 0 .../models/account_invoice.py | 4 +- .../tests/test_account_payment_partner.py | 133 ++++++------------ 3 files changed, 47 insertions(+), 90 deletions(-) rename account_payment_partner/migrations/{10.0.1.2.0 => 11.0.1.3.0}/post-migrate.py (100%) diff --git a/account_payment_partner/migrations/10.0.1.2.0/post-migrate.py b/account_payment_partner/migrations/11.0.1.3.0/post-migrate.py similarity index 100% rename from account_payment_partner/migrations/10.0.1.2.0/post-migrate.py rename to account_payment_partner/migrations/11.0.1.3.0/post-migrate.py diff --git a/account_payment_partner/models/account_invoice.py b/account_payment_partner/models/account_invoice.py index 0fc72bb143b..791ea10ff89 100644 --- a/account_payment_partner/models/account_invoice.py +++ b/account_payment_partner/models/account_invoice.py @@ -44,7 +44,9 @@ def _onchange_partner_id(self): # No bank account assignation is done here as this is only # needed for printing purposes and it can conflict with # SEPA direct debit payments. Current report prints it. - self.payment_mode_id = self.partner_id.customer_payment_mode_id + self.payment_mode_id = self.with_context( + force_company=self.company_id.id, + ).partner_id.customer_payment_mode_id else: self.payment_mode_id = False if self.type == 'in_invoice': diff --git a/account_payment_partner/tests/test_account_payment_partner.py b/account_payment_partner/tests/test_account_payment_partner.py index 14ad3cb5995..3bdb459a1ca 100644 --- a/account_payment_partner/tests/test_account_payment_partner.py +++ b/account_payment_partner/tests/test_account_payment_partner.py @@ -47,6 +47,7 @@ def setUpClass(cls): # refs cls.manual_out = cls.env.ref( 'account.account_payment_method_manual_out') + cls.manual_out.bank_account_required = True cls.manual_in = cls.env.ref( 'account.account_payment_method_manual_in') @@ -77,6 +78,7 @@ def setUpClass(cls): 'name': 'Suppliers Bank 1', 'bank_account_link': 'variable', 'payment_method_id': cls.manual_out.id, + 'show_bank_account_from_journal': True, 'company_id': cls.company.id, 'fixed_journal_id': cls.journal_c1.id, 'variable_journal_ids': [(6, 0, [cls.journal_c1.id])] @@ -110,16 +112,17 @@ def setUpClass(cls): force_company=cls.company.id).create({ 'name': 'Test supplier', 'supplier_payment_mode_id': cls.supplier_payment_mode, - 'bank_ids': [ - (0, 0, { - 'acc_number': '5345345', - 'company_id': cls.company.id, - }), - (0, 0, { - 'acc_number': '3452342', - 'company_id': cls.company_2.id, - })] }) + cls.supplier_bank = cls.env['res.partner.bank'].create({ + 'acc_number': '5345345', + 'partner_id': cls.supplier.id, + 'company_id': cls.company.id, + }) + cls.supplier_bank_2 = cls.env['res.partner.bank'].create({ + 'acc_number': '3452342', + 'partner_id': cls.supplier.id, + 'company_id': cls.company_2.id, + }) cls.supplier.with_context( force_company=cls.company_2.id).supplier_payment_mode_id = \ cls.supplier_payment_mode_c2 @@ -142,38 +145,10 @@ def setUpClass(cls): 'type': 'bank', 'bank_account_id': cls.journal_bank.id, }) - mode_in = cls.env['account.payment.mode'].create({ - 'name': 'Payment Mode Inbound', - 'payment_method_id': - cls.env.ref('account.account_payment_method_manual_in').id, - 'bank_account_link': 'fixed', - 'fixed_journal_id': cls.journal.id, - }) - method_out = cls.env.ref('account.account_payment_method_manual_out') - method_out.bank_account_required = True - cls.mode_out = cls.env['account.payment.mode'].create({ - 'name': 'Payment Mode Outbound', - 'payment_method_id': method_out.id, - 'bank_account_link': 'fixed', - 'fixed_journal_id': cls.journal.id, - }) - cls.partner = cls.env['res.partner'].create({ - 'name': 'Test Partner', - 'customer': True, - 'customer_payment_mode_id': mode_in.id, - }) - cls.supplier = cls.env['res.partner'].create({ - 'name': 'Test Supplier', - 'supplier': True, - 'supplier_payment_mode_id': cls.mode_out.id, - }) - cls.supplier_bank = cls.env['res.partner.bank'].create({ - 'acc_number': 'GB18BARC20040131665123', - 'partner_id': cls.supplier.id, - }) cls.supplier_invoice = cls.env['account.invoice'].create({ 'partner_id': cls.supplier.id, 'type': 'in_invoice', + 'journal_id': cls.journal_c1.id, }) def _create_invoice(self): @@ -223,9 +198,6 @@ def test_out_invoice_onchange(self): invoice._onchange_partner_id() self.assertEquals(invoice.payment_mode_id, self.customer_payment_mode) - self.assertEquals( - invoice.partner_bank_id, - self.customer_payment_mode.fixed_journal_id.bank_account_id) invoice.company_id = self.company_2 invoice._onchange_partner_id() @@ -247,19 +219,13 @@ def test_in_invoice_onchange(self): invoice._onchange_partner_id() self.assertEquals(invoice.payment_mode_id, self.supplier_payment_mode) - bank = self.partner_bank_model.search( - [('acc_number', '=', '5345345')], limit=1) - self.assertEquals( - invoice.partner_bank_id, - bank) + self.assertEquals(invoice.partner_bank_id, self.supplier_bank) invoice.company_id = self.company_2 invoice._onchange_partner_id() self.assertEquals(invoice.payment_mode_id, self.supplier_payment_mode_c2) - bank = self.partner_bank_model.search( - [('acc_number', '=', '3452342')], limit=1) - self.assertEquals(invoice.partner_bank_id, bank) + self.assertEquals(invoice.partner_bank_id, self.supplier_bank_2) invoice.payment_mode_id = self.supplier_payment_mode invoice._onchange_payment_mode_id() @@ -359,12 +325,12 @@ def test_partner(self): def test_partner_onchange(self): customer_invoice = self.env['account.invoice'].create({ - 'partner_id': self.partner.id, + 'partner_id': self.customer.id, 'type': 'out_invoice', }) customer_invoice._onchange_partner_id() self.assertEqual(customer_invoice.payment_mode_id, - self.partner.customer_payment_mode_id) + self.customer_payment_mode) self.supplier_invoice._onchange_partner_id() self.assertEqual(self.supplier_invoice.partner_bank_id, @@ -378,50 +344,39 @@ def test_partner_onchange(self): invoice._onchange_partner_id() self.assertFalse(invoice.partner_bank_id) - def test_payment_mode_id_change(self): - self.supplier_invoice.payment_mode_id = self.mode_out.id - self.supplier_invoice.payment_mode_id_change() + def test_onchange_payment_mode_id(self): + mode = self.supplier_payment_mode + mode.payment_method_id.bank_account_required = True + self.supplier_invoice.partner_bank_id = self.supplier_bank.id + self.supplier_invoice.payment_mode_id = mode.id + self.supplier_invoice._onchange_payment_mode_id() self.assertEqual(self.supplier_invoice.partner_bank_id, self.supplier_bank) - self.mode_out.payment_method_id.bank_account_required = False - self.supplier_invoice.payment_mode_id = self.mode_out.id - self.supplier_invoice.payment_mode_id_change() + mode.payment_method_id.bank_account_required = False + self.supplier_invoice._onchange_payment_mode_id() self.assertFalse(self.supplier_invoice.partner_bank_id) self.supplier_invoice.payment_mode_id = False - self.supplier_invoice.payment_mode_id_change() + self.supplier_invoice._onchange_payment_mode_id() self.assertFalse(self.supplier_invoice.partner_bank_id) def test_print_report(self): - self.env['account.invoice.line'].create({ - 'invoice_id': self.supplier_invoice.id, - 'name': 'Product Text', - 'price_unit': 10.0, - 'account_id': self.env.ref('l10n_generic_coa.1_conf_o_income').id, - }) - self.supplier_invoice.action_invoice_open() - self.assertEqual( - self.supplier_invoice.move_id.line_ids[0].payment_mode_id, - self.supplier_invoice.payment_mode_id) - (res, _) = report.render_report( - self.env.cr, self.env.uid, - [self.supplier_invoice.id], 'account.report_invoice', {}) - self.assertRegexpMatches(res, self.supplier_bank.acc_number) + self.supplier_invoice.partner_bank_id = self.supplier_bank.id + report = self.env.ref('account.account_invoices') + res = str(report.render_qweb_html( + self.supplier_invoice.ids, report.report_name, + )[0]) + self.assertIn(self.supplier_bank.acc_number, res) + payment_mode = self.supplier_payment_mode + payment_mode.show_bank_account_from_journal = True + self.supplier_invoice.payment_mode_id = payment_mode.id self.supplier_invoice.partner_bank_id = False - self.supplier_invoice.payment_mode_id\ - .show_bank_account_from_journal = True - (res, _) = report.render_report( - self.env.cr, self.env.uid, - [self.supplier_invoice.id], 'account.report_invoice', {}) - self.assertRegexpMatches(res, self.journal_bank.acc_number) - payment_mode = self.supplier_invoice.payment_mode_id - self.supplier_invoice.payment_mode_id = False + res = str(report.render_qweb_html( + self.supplier_invoice.ids, report.report_name, + )[0]) + self.assertIn(self.journal_c1.bank_acc_number, res) payment_mode.bank_account_link = 'variable' - payment_mode.variable_journal_ids = [ - (6, 0, [self.journal.id])] - self.supplier_invoice.payment_mode_id = payment_mode.id - self.supplier_invoice.payment_mode_id_change() - (res, _) = report.render_report( - self.env.cr, self.env.uid, - [self.supplier_invoice.id], 'account.report_invoice', {}) - self.assertRegexpMatches( - res, self.journal_bank.acc_number) + payment_mode.variable_journal_ids = [(6, 0, self.journal.ids)] + res = str(report.render_qweb_html( + self.supplier_invoice.ids, report.report_name, + )[0]) + self.assertIn(self.journal_bank.acc_number, res) From 9c2a7b9924beff87d1aed18eb6cc9d2c17911290 Mon Sep 17 00:00:00 2001 From: Mourad Date: Tue, 2 Oct 2018 17:29:25 +0200 Subject: [PATCH 032/196] [MIG] account_payment_partner: migrate to 12.0 --- account_payment_partner/README.rst | 52 +++++------- account_payment_partner/__manifest__.py | 2 +- account_payment_partner/readme/CONFIGURE.rst | 1 + .../static/description/index.html | 80 ++++++++----------- .../views/account_move_line.xml | 4 +- 5 files changed, 58 insertions(+), 81 deletions(-) create mode 100644 account_payment_partner/readme/CONFIGURE.rst diff --git a/account_payment_partner/README.rst b/account_payment_partner/README.rst index 33edfef2566..d83a4c51b33 100644 --- a/account_payment_partner/README.rst +++ b/account_payment_partner/README.rst @@ -14,20 +14,18 @@ Account Payment Partner :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbank--payment-lightgray.png?logo=github - :target: https://github.com/OCA/bank-payment/tree/10.0/account_payment_partner + :target: https://github.com/OCA/bank-payment/tree/12.0/account_payment_partner :alt: OCA/bank-payment .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/bank-payment-10-0/bank-payment-10-0-account_payment_partner + :target: https://translation.odoo-community.org/projects/bank-payment-12-0/bank-payment-12-0-account_payment_partner :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/97/10.0 + :target: https://runbot.odoo-community.org/runbot/97/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| -[ This file must be max 2-3 paragraphs, and is required. ] - -This module adds severals fields : +This module adds severals fields: * the *Supplier Payment Mode* and *Customer Payment Mode* on Partners, @@ -53,34 +51,26 @@ word about that), so that's the reason behind the several options. .. contents:: :local: +Configuration +============= + +There is nothing to configure. + Usage ===== -[ This file must be present and contains the usage instructions - for end-users. As all other rst files included in the README, - it MUST NOT contain reStructuredText sections - only body text (paragraphs, lists, tables, etc). Should you need - a more elaborate structure to explain the addon, please create a - Sphinx documentation (which may include this file as a "quick start" - section). ] - You are able to add a payment mode directly on a partner. -This payment mode is automatically associated to the invoice related to the partner. This default value could be change in a draft invoice. -When you create an payment order, only invoices related to chosen payment mode are displayed. -Invoices without any payment mode are displayed to. -Changelog -========= +This payment mode is automatically associated to the invoice related to the +partner. This default value could be changed in a draft invoice. + +When you create a payment order, only invoices related to chosen payment mode +are displayed. -[ The change log. The goal of this file is to help readers - understand changes between version. The primary audience is - end users and integrators. Purely technical changes such as - code refactoring must not be mentioned here. +Invoices without any payment mode are displayed too. - This file may contain ONE level of section titles, underlined - with the ~ (tilde) character. Other section markers are - forbidden and will likely break the structure of the README.rst - or other documents where this fragment is included. ] +Changelog +========= 10.0.1.2.0 (2018-05-24) ~~~~~~~~~~~~~~~~~~~~~~~ @@ -94,7 +84,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -119,8 +109,8 @@ Contributors * Angel Moya * `Tecnativa `_: - * Pedro M. Baeza - * Carlos Dauden + * Pedro M. Baeza + * Carlos Dauden Maintainers ~~~~~~~~~~~ @@ -135,6 +125,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/bank-payment `_ project on GitHub. +This module is part of the `OCA/bank-payment `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_payment_partner/__manifest__.py b/account_payment_partner/__manifest__.py index 44d90fa7904..5644036d84f 100644 --- a/account_payment_partner/__manifest__.py +++ b/account_payment_partner/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Account Payment Partner', - 'version': '11.0.1.3.0', + 'version': '12.0.1.0.0', 'category': 'Banking addons', 'license': 'AGPL-3', 'summary': 'Adds payment mode on partners and invoices', diff --git a/account_payment_partner/readme/CONFIGURE.rst b/account_payment_partner/readme/CONFIGURE.rst new file mode 100644 index 00000000000..d088e17bc40 --- /dev/null +++ b/account_payment_partner/readme/CONFIGURE.rst @@ -0,0 +1 @@ +There is nothing to configure. \ No newline at end of file diff --git a/account_payment_partner/static/description/index.html b/account_payment_partner/static/description/index.html index 641f3296e7d..b36e11b426f 100644 --- a/account_payment_partner/static/description/index.html +++ b/account_payment_partner/static/description/index.html @@ -367,9 +367,8 @@

Account Payment Partner

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

-

[ This file must be max 2-3 paragraphs, and is required. ]

-

This module adds severals fields :

+

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

+

This module adds severals fields:

  • the Supplier Payment Mode and Customer Payment Mode on Partners,
  • the Payment Mode on Invoices.
    • @@ -387,51 +386,38 @@

    Account Payment Partner

    Table of contents

    +
    +

    Configuration

    +

    There is nothing to configure.

    +
    -

    Usage

    -
    -
    [ This file must be present and contains the usage instructions
    -
    for end-users. As all other rst files included in the README, -it MUST NOT contain reStructuredText sections -only body text (paragraphs, lists, tables, etc). Should you need -a more elaborate structure to explain the addon, please create a -Sphinx documentation (which may include this file as a “quick start” -section). ]
    -
    -

    You are able to add a payment mode directly on a partner. -This payment mode is automatically associated to the invoice related to the partner. This default value could be change in a draft invoice. -When you create an payment order, only invoices related to chosen payment mode are displayed. -Invoices without any payment mode are displayed to.

    +

    Usage

    +

    You are able to add a payment mode directly on a partner.

    +

    This payment mode is automatically associated to the invoice related to the +partner. This default value could be changed in a draft invoice.

    +

    When you create a payment order, only invoices related to chosen payment mode +are displayed.

    +

    Invoices without any payment mode are displayed too.

    -

    Changelog

    -
    -
    [ The change log. The goal of this file is to help readers
    -

    understand changes between version. The primary audience is -end users and integrators. Purely technical changes such as -code refactoring must not be mentioned here.

    -

    This file may contain ONE level of section titles, underlined -with the ~ (tilde) character. Other section markers are -forbidden and will likely break the structure of the README.rst -or other documents where this fragment is included. ]

    -
    -
    +

    Changelog

    -

    10.0.1.2.0 (2018-05-24)

    +

    10.0.1.2.0 (2018-05-24)

    -

    Bug Tracker

    +

    Bug Tracker

    Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

    +feedback.

    Do not contact contributors directly about support or help with technical issues.

    -

    Credits

    +

    Credits

    -

    Authors

    +

    Authors

    • Akretion
    • Tecnativa
    -

    Contributors

    +

    Contributors

    -

    Maintainers

    +

    Maintainers

    This module is maintained by the OCA.

    Odoo Community Association

    OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

    -

    This module is part of the OCA/bank-payment project on GitHub.

    +

    This module is part of the OCA/bank-payment project on GitHub.

    You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

    diff --git a/account_payment_partner/views/account_move_line.xml b/account_payment_partner/views/account_move_line.xml index 60101811164..fe2a916f296 100644 --- a/account_payment_partner/views/account_move_line.xml +++ b/account_payment_partner/views/account_move_line.xml @@ -13,11 +13,11 @@ account.move.line - + - + From 9f571359b8473d270d6ce08e1804df67402ca21d Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 13 Dec 2018 14:03:03 +0100 Subject: [PATCH 033/196] [MIG] account_payment_partner: Fix tests for new version --- .../migrations/11.0.1.3.0/post-migrate.py | 12 --------- .../tests/test_account_payment_partner.py | 27 ++++++------------- 2 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 account_payment_partner/migrations/11.0.1.3.0/post-migrate.py diff --git a/account_payment_partner/migrations/11.0.1.3.0/post-migrate.py b/account_payment_partner/migrations/11.0.1.3.0/post-migrate.py deleted file mode 100644 index e63be71402e..00000000000 --- a/account_payment_partner/migrations/11.0.1.3.0/post-migrate.py +++ /dev/null @@ -1,12 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2018 Carlos Dauden - Tecnativa -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). - - -def migrate(cr, version): - """Update database from previous versions, after updating module.""" - cr.execute( - "UPDATE account_payment_mode " - "SET show_bank_account_from_journal = true " - "WHERE bank_account_link = 'fixed'" - ) diff --git a/account_payment_partner/tests/test_account_payment_partner.py b/account_payment_partner/tests/test_account_payment_partner.py index 3bdb459a1ca..abd2349deb9 100644 --- a/account_payment_partner/tests/test_account_payment_partner.py +++ b/account_payment_partner/tests/test_account_payment_partner.py @@ -33,16 +33,10 @@ def setUpClass(cls): else: raise ValidationError( _("No Chart of Account Template has been defined !")) - cls.wizard = cls.env['wizard.multi.charts.accounts'].create({ - 'company_id': cls.company_2.id, - 'chart_template_id': cls.chart.id, - 'sale_tax_id': False, - 'purchase_tax_id': False, - 'code_digits': 6, - 'currency_id': cls.env.ref('base.EUR').id, - 'transfer_account_id': cls.chart.transfer_account_id.id, - }) - cls.wizard.execute() + old_company = cls.env.user.company_id + cls.env.user.company_id = cls.company_2.id + cls.chart.try_loading_for_current_company() + cls.env.user.company_id = old_company.id # refs cls.manual_out = cls.env.ref( @@ -295,6 +289,7 @@ def test_payment_mode_constrains_02(self): def test_invoice_refund(self): invoice = self._create_invoice() + invoice.partner_bank_id = False invoice.action_invoice_open() # Lets create a refund invoice for invoice_1. # I refund the invoice Using Refund Button. @@ -362,21 +357,15 @@ def test_onchange_payment_mode_id(self): def test_print_report(self): self.supplier_invoice.partner_bank_id = self.supplier_bank.id report = self.env.ref('account.account_invoices') - res = str(report.render_qweb_html( - self.supplier_invoice.ids, report.report_name, - )[0]) + res = str(report.render_qweb_html(self.supplier_invoice.ids)[0]) self.assertIn(self.supplier_bank.acc_number, res) payment_mode = self.supplier_payment_mode payment_mode.show_bank_account_from_journal = True self.supplier_invoice.payment_mode_id = payment_mode.id self.supplier_invoice.partner_bank_id = False - res = str(report.render_qweb_html( - self.supplier_invoice.ids, report.report_name, - )[0]) + res = str(report.render_qweb_html(self.supplier_invoice.ids)[0]) self.assertIn(self.journal_c1.bank_acc_number, res) payment_mode.bank_account_link = 'variable' payment_mode.variable_journal_ids = [(6, 0, self.journal.ids)] - res = str(report.render_qweb_html( - self.supplier_invoice.ids, report.report_name, - )[0]) + res = str(report.render_qweb_html(self.supplier_invoice.ids)[0]) self.assertIn(self.journal_bank.acc_number, res) From 0cd35ca6bf21331403b6ddb8fce120de04afc185 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 13 Dec 2018 13:31:25 +0000 Subject: [PATCH 034/196] [UPD] Update account_payment_partner.pot --- .../i18n/account_payment_partner.pot | 96 +++++++++++++++---- 1 file changed, 76 insertions(+), 20 deletions(-) diff --git a/account_payment_partner/i18n/account_payment_partner.pot b/account_payment_partner/i18n/account_payment_partner.pot index 12f3f19b26e..852e7f33177 100644 --- a/account_payment_partner/i18n/account_payment_partner.pot +++ b/account_payment_partner/i18n/account_payment_partner.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -14,36 +14,70 @@ msgstr "" "Plural-Forms: \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 "Bank Account:" 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 "Payment Mode:" 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 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" @@ -54,6 +88,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 @@ -61,9 +105,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 "" @@ -73,42 +117,54 @@ 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 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 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 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 Payment Mode, already assigned to another Company." 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 this Payment Mode, already assigned to another Company." msgstr "" From 12747f12272a7f9c8f039a505125b965abdfcafe Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Fri, 14 Dec 2018 11:21:33 +0100 Subject: [PATCH 035/196] [MIG] account_banking_pain_base: Migration to 12.0 * Standard migration procedure * README by fragments * Fixed tests * Change * Fix related no readonly in account_banking_pain_base * Override default partner bank account check on account_payment_partner * Convert Python date to string --- account_payment_partner/models/account_invoice.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/account_payment_partner/models/account_invoice.py b/account_payment_partner/models/account_invoice.py index 791ea10ff89..95622bcb4d5 100644 --- a/account_payment_partner/models/account_invoice.py +++ b/account_payment_partner/models/account_invoice.py @@ -117,6 +117,14 @@ def _check_payment_mode_company_constrains(self): _("The company of the invoice %s does not match " "with that of the payment mode") % rec.name) + @api.constrains('partner_id', 'partner_bank_id') + def validate_partner_bank_id(self): + """Inhibit the validation of the bank account by default, as core + rules are not the expected one for the bank-payment suite. + """ + if self.env.context.get('use_old_partner_bank_id_check'): + super().validate_partner_bank_id() + def partner_banks_to_show(self): self.ensure_one() if self.partner_bank_id: From 9b40619521dceae80d254e3bef81f4673f9fd5d8 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 29 Dec 2018 11:22:08 +0000 Subject: [PATCH 036/196] Update translation files Updated by Update PO files to match POT (msgmerge) hook in Weblate. --- .../i18n/account_payment_partner.pot | 4 + account_payment_partner/i18n/ca.po | 101 ++++++++++++--- account_payment_partner/i18n/da_DK.po | 101 ++++++++++++--- account_payment_partner/i18n/de.po | 102 ++++++++++++--- account_payment_partner/i18n/es.po | 118 ++++++++++-------- account_payment_partner/i18n/fr.po | 102 ++++++++++++--- account_payment_partner/i18n/hr.po | 102 ++++++++++++--- account_payment_partner/i18n/nb_NO.po | 102 ++++++++++++--- account_payment_partner/i18n/nl.po | 102 ++++++++++++--- account_payment_partner/i18n/pt_BR.po | 101 ++++++++++++--- account_payment_partner/i18n/sl.po | 101 ++++++++++++--- 11 files changed, 816 insertions(+), 220 deletions(-) diff --git a/account_payment_partner/i18n/account_payment_partner.pot b/account_payment_partner/i18n/account_payment_partner.pot index 852e7f33177..2fc36123e67 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 49c190d6c24..eeda8328e42 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 "Bank Account:" 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 "Payment Mode:" msgstr "Mode de pagament:" #. 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 4828a7c8caf..08672ced76c 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 "Bank Account:" 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 "Payment Mode:" 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 90e0f89bc63..43223c8e29e 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 "Bank Account:" msgstr "Bankkonto:" #. 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 "Payment Mode:" msgstr "Zahlungsmethode:" #. 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 f3014301069..19313b61096 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 "Bank Account:" msgstr "Cuenta bancaria:" #. 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 "Payment Mode:" msgstr "Modo de pago:" #. 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" - -#. 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" +#: 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.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 c4ab4aaa2c5..9757e6acd30 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 "Bank Account:" msgstr "Compte bancaire:" #. 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 "Payment Mode:" msgstr "Mode de paiement :" #. 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 189a4b6da94..06df5021ea2 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 "Bank Account:" 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 "Payment Mode:" 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 33d7e9e738e..1928800cdc0 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 "Bank Account:" 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 "Payment Mode:" 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 de30033a107..180106b7626 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 "Bank Account:" msgstr "Bankrekening:" #. 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 "Payment Mode:" msgstr "Betaalmode:" #. 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 d2f047a74f4..da386181749 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 "Bank Account:" 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 "Payment Mode:" 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 d2ea03235ef..dd371f252f4 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 "Bank Account:" 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 "Payment Mode:" 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 " From 2daea351d1618e612a697ce1322cdd69c4144576 Mon Sep 17 00:00:00 2001 From: Jaume Planas Date: Fri, 15 Mar 2019 10:51:19 +0000 Subject: [PATCH 037/196] Translated using Weblate (Catalan) Currently translated at 10.0% (3 of 30 strings) Translation: bank-payment-12.0/bank-payment-12.0-account_payment_partner Translate-URL: https://translation.odoo-community.org/projects/bank-payment-12-0/bank-payment-12-0-account_payment_partner/ca/ --- account_payment_partner/i18n/ca.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/account_payment_partner/i18n/ca.po b/account_payment_partner/i18n/ca.po index eeda8328e42..1eafcae96f2 100644 --- a/account_payment_partner/i18n/ca.po +++ b/account_payment_partner/i18n/ca.po @@ -9,14 +9,15 @@ msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "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" +"PO-Revision-Date: 2019-03-15 12:53+0000\n" +"Last-Translator: Jaume Planas \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" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.4\n" #. module: account_payment_partner #: model_terms:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form @@ -31,7 +32,7 @@ msgstr "" #. module: account_payment_partner #: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode msgid "Bank Account:" -msgstr "" +msgstr "Compte bancari:" #. module: account_payment_partner #: model_terms:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode From ff3e802614e5ec575e7538e23e30abc5f4bdad3a Mon Sep 17 00:00:00 2001 From: altoch Date: Sun, 27 Jan 2019 13:44:16 +0100 Subject: [PATCH 038/196] Update invoice_supplier_form view Set proper context to partner_bank_id field so on bank account number creation it's set the correct owner --- account_payment_partner/views/account_invoice_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/account_payment_partner/views/account_invoice_view.xml b/account_payment_partner/views/account_invoice_view.xml index f76fac182b5..024aacb335a 100644 --- a/account_payment_partner/views/account_invoice_view.xml +++ b/account_payment_partner/views/account_invoice_view.xml @@ -54,6 +54,7 @@ '|',('company_id', '=', company_id),('company_id', '=', False)] 0 {'invisible': [('bank_account_required', '=', False)], 'required': [('bank_account_required', '=', True)]} + {'default_partner_id':commercial_partner_id} From 9a083ea5db0a047eaad74941493147cd9df9604a Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Tue, 7 May 2019 11:25:35 +0200 Subject: [PATCH 039/196] Add indexes on account payment models The fields where the indexes are added are used in searches in account_payment_order, which becomes really slow when a database have many lines. --- account_payment_partner/models/account_move_line.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/account_payment_partner/models/account_move_line.py b/account_payment_partner/models/account_move_line.py index 4bfe0ff7087..1a8e78bd926 100644 --- a/account_payment_partner/models/account_move_line.py +++ b/account_payment_partner/models/account_move_line.py @@ -11,5 +11,6 @@ class AccountMoveLine(models.Model): 'account.payment.mode', string='Payment Mode', domain="[('company_id', '=', company_id)]", - ondelete='restrict' + ondelete='restrict', + index=True, ) From 7c534e777281f2b94e66e43a06a2a9e7f346f37a Mon Sep 17 00:00:00 2001 From: Raf Ven Date: Mon, 15 Jul 2019 15:41:04 +0200 Subject: [PATCH 040/196] [FIX] test_invoice_refund The test checks on empty bank account but with Odoo commit https://github.com/odoo/odoo/commit/d5688e6ca08c0732f192207b9bb584bf7b672e90#diff-f3712147f4b25231caa371bd83265dbe the company bank account gets defaulted when not specified --- account_payment_partner/README.rst | 5 ++++- account_payment_partner/readme/CONTRIBUTORS.rst | 3 +++ account_payment_partner/static/description/index.html | 8 ++++++-- .../tests/test_account_payment_partner.py | 3 ++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/account_payment_partner/README.rst b/account_payment_partner/README.rst index d83a4c51b33..cfd6e5dd072 100644 --- a/account_payment_partner/README.rst +++ b/account_payment_partner/README.rst @@ -20,7 +20,7 @@ Account Payment Partner :target: https://translation.odoo-community.org/projects/bank-payment-12-0/bank-payment-12-0-account_payment_partner :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/97/12.0 + :target: https://runbot.odoo-community.org/runbot/173/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -111,6 +111,9 @@ Contributors * Pedro M. Baeza * Carlos Dauden +* `DynApps `_: + + * Raf Ven Maintainers ~~~~~~~~~~~ diff --git a/account_payment_partner/readme/CONTRIBUTORS.rst b/account_payment_partner/readme/CONTRIBUTORS.rst index df652cc3417..6389a89ccae 100644 --- a/account_payment_partner/readme/CONTRIBUTORS.rst +++ b/account_payment_partner/readme/CONTRIBUTORS.rst @@ -9,3 +9,6 @@ * Pedro M. Baeza * Carlos Dauden +* `DynApps `_: + + * Raf Ven diff --git a/account_payment_partner/static/description/index.html b/account_payment_partner/static/description/index.html index b36e11b426f..1f15d881a9a 100644 --- a/account_payment_partner/static/description/index.html +++ b/account_payment_partner/static/description/index.html @@ -3,7 +3,7 @@ - + Account Payment Partner + + +
    +

    Account Payment Mode

    + + +

    Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

    +

    This module adds a new object account.payment.mode, that is used to better +classify and route incoming/outgoing payment orders with the banks.

    +

    Table of contents

    + +
    +

    Configuration

    +

    To configure this module, you need to go to the menu +Invoicing/Accounting > Configuration > Management > Payment Modes.

    +
    +
    +

    Usage

    +

    This module doesn’t add any feature, but it is used by several other modules.

    +
    +
    +

    Bug Tracker

    +

    Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

    +

    Do not contact contributors directly about support or help with technical issues.

    +
    +
    +

    Credits

    +
    +

    Authors

    +
      +
    • Akretion
      • +
    +
    +
    +

    Contributors

    + +
    +
    +

    Maintainers

    +

    This module is maintained by the OCA.

    +Odoo Community Association +

    OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

    +

    This module is part of the OCA/bank-payment project on GitHub.

    +

    You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

    +
    +
    +
    + + diff --git a/account_payment_mode/tests/__init__.py b/account_payment_mode/tests/__init__.py index b0f89817338..6c4ef2b5dbc 100644 --- a/account_payment_mode/tests/__init__.py +++ b/account_payment_mode/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2017 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from . import test_account_payment_mode diff --git a/account_payment_mode/tests/test_account_payment_mode.py b/account_payment_mode/tests/test_account_payment_mode.py index 24ef5823d0f..a0ec515ed7c 100644 --- a/account_payment_mode/tests/test_account_payment_mode.py +++ b/account_payment_mode/tests/test_account_payment_mode.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2016 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). From ce3871fbc8eef6dd7654307b7aacf4cc19afece4 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 13 Dec 2018 11:48:59 +0000 Subject: [PATCH 134/196] [UPD] Update account_payment_mode.pot --- account_payment_mode/README.rst | 2 +- .../i18n/account_payment_mode.pot | 136 ++++++++------- account_payment_mode/i18n/am.po | 142 ++++++++++------ account_payment_mode/i18n/ca.po | 142 ++++++++++------ account_payment_mode/i18n/da_DK.po | 142 ++++++++++------ account_payment_mode/i18n/de.po | 150 ++++++++++------- account_payment_mode/i18n/el_GR.po | 142 ++++++++++------ account_payment_mode/i18n/es.po | 158 +++++++++++------- account_payment_mode/i18n/es_ES.po | 142 ++++++++++------ account_payment_mode/i18n/fi.po | 142 ++++++++++------ account_payment_mode/i18n/fr.po | 145 ++++++++++------ account_payment_mode/i18n/gl.po | 142 ++++++++++------ account_payment_mode/i18n/hr.po | 142 ++++++++++------ account_payment_mode/i18n/it.po | 142 ++++++++++------ account_payment_mode/i18n/nb_NO.po | 142 ++++++++++------ account_payment_mode/i18n/nl.po | 150 ++++++++++------- account_payment_mode/i18n/pt.po | 142 ++++++++++------ account_payment_mode/i18n/pt_BR.po | 150 ++++++++++------- account_payment_mode/i18n/pt_PT.po | 142 ++++++++++------ account_payment_mode/i18n/sl.po | 150 ++++++++++------- account_payment_mode/i18n/tr.po | 142 ++++++++++------ .../static/description/index.html | 4 +- 22 files changed, 1778 insertions(+), 1113 deletions(-) diff --git a/account_payment_mode/README.rst b/account_payment_mode/README.rst index 4f3ddc6829c..f1453869923 100644 --- a/account_payment_mode/README.rst +++ b/account_payment_mode/README.rst @@ -20,7 +20,7 @@ Account Payment Mode :target: https://translation.odoo-community.org/projects/bank-payment-12-0/bank-payment-12-0-account_payment_mode :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/97/12.0 + :target: https://runbot.odoo-community.org/runbot/173/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| diff --git a/account_payment_mode/i18n/account_payment_mode.pot b/account_payment_mode/i18n/account_payment_mode.pot index 647aa0e19b5..82a00d4d84b 100644 --- a/account_payment_mode/i18n/account_payment_mode.pot +++ b/account_payment_mode/i18n/account_payment_mode.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -19,49 +19,53 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "" @@ -86,7 +90,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "" @@ -96,29 +100,39 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "For payment modes that are always attached to the same bank account of your company (such as wire transfer from customers or SEPA direct debit from suppliers), select 'Fixed'. For payment modes that are not always attached to the same bank account (such as SEPA Direct debit for customers, wire transfer to suppliers), you should select 'Variable', which means that you will select the bank account on the payment order. If your company only has one bank account, you should always select 'Fixed'." msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -138,79 +152,88 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo,you are suggested to reconcile the transaction with the batch deposit. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "On the payment mode '%s', the bank account link is 'Fixed' but the fixed bank journal is not set" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "On the payment mode '%s', the payment method is '%s' (it is in fact a debit method), but this debit method is not part of the debit methods of the fixed bank journal '%s'" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "On the payment mode '%s', the payment method is '%s', but this payment method is not part of the payment methods of the fixed bank journal '%s'" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -218,12 +241,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "" @@ -231,57 +254,58 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "The company of the journal '%s' does not match with the company of the payment mode '%s' where it is being used as Fixed Bank Journal." msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "The company of the journal '%s' does not match with the company of the payment mode '%s' where it is being used in the Allowed Bank Journals." msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "The company of the payment mode '%s', does not match with the company of journal '%s'." msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "The company of the payment mode '%s', does not match with the one of the Allowed Bank Journals." msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "This code is used in the code of the Odoo module that handles this payment method. Therefore, if you change it, the generation of the payment file may fail." msgstr "" diff --git a/account_payment_mode/i18n/am.po b/account_payment_mode/i18n/am.po index d95acb0e84a..4e827ef7ada 100644 --- a/account_payment_mode/i18n/am.po +++ b/account_payment_mode/i18n/am.po @@ -24,51 +24,55 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Creado por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Creado en" @@ -93,7 +97,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "" @@ -103,12 +107,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -120,19 +134,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -152,43 +166,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Última actualización por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Última actualización en" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -196,7 +232,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -205,7 +241,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -213,25 +249,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -239,12 +270,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "" @@ -252,33 +283,33 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -286,7 +317,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -294,7 +325,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -302,7 +333,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -310,7 +341,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " diff --git a/account_payment_mode/i18n/ca.po b/account_payment_mode/i18n/ca.po index c9f1bc01c09..488eeadfffb 100644 --- a/account_payment_mode/i18n/ca.po +++ b/account_payment_mode/i18n/ca.po @@ -24,51 +24,55 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Creat per" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Creat el" @@ -93,7 +97,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "" @@ -103,12 +107,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -120,19 +134,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -152,43 +166,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Darrera Actualització per" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Darrera Actualització el" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -196,7 +232,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -205,7 +241,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -213,25 +249,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -239,12 +270,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "Mode de pagament" @@ -252,33 +283,33 @@ msgstr "Mode de pagament" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -286,7 +317,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -294,7 +325,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -302,7 +333,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -310,7 +341,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " diff --git a/account_payment_mode/i18n/da_DK.po b/account_payment_mode/i18n/da_DK.po index ccb56859125..ddaf91c500c 100644 --- a/account_payment_mode/i18n/da_DK.po +++ b/account_payment_mode/i18n/da_DK.po @@ -25,51 +25,55 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "Firma" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "" @@ -94,7 +98,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "" @@ -104,12 +108,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -121,19 +135,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -153,43 +167,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -197,7 +233,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -206,7 +242,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -214,25 +250,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -240,12 +271,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "Betalingsform" @@ -253,33 +284,33 @@ msgstr "Betalingsform" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -287,7 +318,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -295,7 +326,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -303,7 +334,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -311,7 +342,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " diff --git a/account_payment_mode/i18n/de.po b/account_payment_mode/i18n/de.po index d8bd41e3806..aab29e152fe 100644 --- a/account_payment_mode/i18n/de.po +++ b/account_payment_mode/i18n/de.po @@ -25,7 +25,12 @@ msgstr "" "Eine Zahlungsmethode der gleichen Art mit diesem Code existiert bereits" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__bank_account_required msgid "" "Activate this option if this payment method requires you to know the bank " "account number of your customer or supplier." @@ -34,44 +39,43 @@ msgstr "" "des Kunden oder Lieferanten bekannt sein muss." #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "Aktiv" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "Erlaubte Banken Logbuch" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "Bankkonto erforderlich" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "Bankkontoart" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" -msgstr "Bankkonto" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" +msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "Unternehmen" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Erstellt von" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Erstellt am:" @@ -96,7 +100,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "Lastschriften der Zulieferer der Société Générale" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "Anzeigename" @@ -106,12 +110,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -123,19 +137,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "Gruppiere nach" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "Eingehend" @@ -155,43 +169,65 @@ msgid "Journal" msgstr "Logbuch" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "Zuletzt geändert am" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Zuletzt aktualisiert von" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Zuletzt aktualisiert am" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "Verbindung zum Bankkonto" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "Name" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "Name oder Code" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "Notiz" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -199,7 +235,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -208,7 +244,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -216,25 +252,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "Ausgehend" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "Partner" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "Zahlungsmethode" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "Zahlungsmethodencode" @@ -242,12 +273,12 @@ msgstr "Zahlungsmethodencode" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "Zahlungsmethoden" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "Zahlungsmodus" @@ -255,33 +286,33 @@ msgstr "Zahlungsmodus" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "Zahlungsmodi" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "Zahlungsart" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "Durchsuche Zahlungsmethoden" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "Durchsuche Zahlungsmodi" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -289,7 +320,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -297,7 +328,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -305,7 +336,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -313,7 +344,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " @@ -324,3 +356,9 @@ msgstr "" #: selection:account.payment.mode,bank_account_link:0 msgid "Variable" msgstr "Variable" + +#~ msgid "Bank Accounts" +#~ msgstr "Bankkonto" + +#~ msgid "Partner" +#~ msgstr "Partner" diff --git a/account_payment_mode/i18n/el_GR.po b/account_payment_mode/i18n/el_GR.po index 0630b59cf36..8c8fbac6c43 100644 --- a/account_payment_mode/i18n/el_GR.po +++ b/account_payment_mode/i18n/el_GR.po @@ -25,51 +25,55 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Δημιουργήθηκε από " #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Δημιουργήθηκε στις" @@ -94,7 +98,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "" @@ -104,12 +108,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -121,19 +135,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "Κωδικός" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -153,43 +167,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Τελευταία ενημέρωση από" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Τελευταία ενημέρωση στις" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -197,7 +233,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -206,7 +242,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -214,25 +250,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -240,12 +271,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "" @@ -253,33 +284,33 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -287,7 +318,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -295,7 +326,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -303,7 +334,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -311,7 +342,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " diff --git a/account_payment_mode/i18n/es.po b/account_payment_mode/i18n/es.po index 25928483c5a..5617f6f9d23 100644 --- a/account_payment_mode/i18n/es.po +++ b/account_payment_mode/i18n/es.po @@ -25,7 +25,12 @@ msgid "A payment method of the same type already exists with this code" msgstr "Un método de pago del mismo tipo ya existe con este código" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__bank_account_required msgid "" "Activate this option if this payment method requires you to know the bank " "account number of your customer or supplier." @@ -34,44 +39,43 @@ msgstr "" "de cuenta bancaria de tu cliente o proveedor." #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "Activo" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "Diarios de banco permitidos" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "Cuenta bancaria requerida" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "Tipo de cuenta bancaria" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" -msgstr "Cuentas bancarias" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" +msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "Compañía" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Creado por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Creado en" @@ -96,7 +100,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "Adeudo directo de proveedores de Société Générale" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "Nombre mostrado" @@ -106,12 +110,22 @@ msgid "Fixed" msgstr "Fijo" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "Diario de banco fijo" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -131,19 +145,19 @@ msgstr "" "'Fijo'." #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "Agrupar por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "Entrante" @@ -163,43 +177,65 @@ msgid "Journal" msgstr "Diario" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "Última modificación en" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Última actualización por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Última actualización en" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "Enlazado a la cuenta bancaria" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "Nombre" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "Nombre o código" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "Nota" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -209,7 +245,7 @@ msgstr "" "cuenta bancaria fija no está establecida" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -221,7 +257,7 @@ msgstr "" "del diario bancario fijo '%s'" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -231,25 +267,20 @@ msgstr "" "no es parte de los métodos de pago del diario bancario fijo '%s'" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "Saliente" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "Empresa" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "Método de pago" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "Código del método de pago" @@ -257,12 +288,12 @@ msgstr "Código del método de pago" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "Métodos de pago" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "Modo de pago" @@ -270,53 +301,53 @@ msgstr "Modo de pago" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "Modos de pago" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "Tipo de pago" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "Modos de pago" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "Buscar métodos de pago" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "Buscar modos de pago" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " "payment mode '%s' where it is being used as Fixed Bank Journal." msgstr "" -"La compañía del diario %s no corresponde con la compañía del modo de pago '%" -"s' que se usa con el diario fijo de banco." +"La compañía del diario %s no corresponde con la compañía del modo de pago " +"'%s' que se usa con el diario fijo de banco." #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " "payment mode '%s' where it is being used in the Allowed Bank Journals." msgstr "" -"La compañía del diario %s no corresponde con la compañía del modo de pago '%" -"s' que se usa con los diarios permitidos de banco." +"La compañía del diario %s no corresponde con la compañía del modo de pago " +"'%s' que se usa con los diarios permitidos de banco." #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -326,7 +357,7 @@ msgstr "" "'%s'." #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -336,7 +367,8 @@ msgstr "" "diarios de banco permitidos." #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " @@ -350,3 +382,9 @@ msgstr "" #: selection:account.payment.mode,bank_account_link:0 msgid "Variable" msgstr "Variable" + +#~ msgid "Bank Accounts" +#~ msgstr "Cuentas bancarias" + +#~ msgid "Partner" +#~ msgstr "Empresa" diff --git a/account_payment_mode/i18n/es_ES.po b/account_payment_mode/i18n/es_ES.po index ae23e19dd5a..62ce8508dfd 100644 --- a/account_payment_mode/i18n/es_ES.po +++ b/account_payment_mode/i18n/es_ES.po @@ -25,51 +25,55 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Creado por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Creado en" @@ -94,7 +98,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "" @@ -104,12 +108,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -121,19 +135,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -153,43 +167,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Última actualización por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Última actualización en" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -197,7 +233,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -206,7 +242,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -214,25 +250,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -240,12 +271,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "" @@ -253,33 +284,33 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -287,7 +318,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -295,7 +326,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -303,7 +334,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -311,7 +342,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " diff --git a/account_payment_mode/i18n/fi.po b/account_payment_mode/i18n/fi.po index 1611ad14bcc..b5c2f10060d 100644 --- a/account_payment_mode/i18n/fi.po +++ b/account_payment_mode/i18n/fi.po @@ -25,51 +25,55 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Luonut" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Luotu" @@ -94,7 +98,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "Nimi" @@ -104,12 +108,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -121,19 +135,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -153,43 +167,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "Viimeksi muokattu" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Viimeksi päivittänyt" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Viimeksi päivitetty" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -197,7 +233,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -206,7 +242,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -214,25 +250,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -240,12 +271,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "" @@ -253,33 +284,33 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -287,7 +318,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -295,7 +326,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -303,7 +334,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -311,7 +342,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " diff --git a/account_payment_mode/i18n/fr.po b/account_payment_mode/i18n/fr.po index 542a0caf3d7..0f1c24eb26c 100644 --- a/account_payment_mode/i18n/fr.po +++ b/account_payment_mode/i18n/fr.po @@ -25,7 +25,12 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__bank_account_required msgid "" "Activate this option if this payment method requires you to know the bank " "account number of your customer or supplier." @@ -34,44 +39,43 @@ msgstr "" "numéro de compte bancaire de votre client ou fournisseur." #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "Compte bancaire requis" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Créée par" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Créée le" @@ -96,7 +100,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "Nom à afficher" @@ -106,12 +110,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -123,19 +137,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "Regrouper par" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -155,43 +169,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "Dernière modification le" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Dernière modification par" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Modifié le" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -199,7 +235,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -208,7 +244,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -216,25 +252,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "Partenaire" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -242,12 +273,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "Methodes de règlement" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "Mode de paiement" @@ -255,33 +286,33 @@ msgstr "Mode de paiement" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "Mode de paiement" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -289,7 +320,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -297,7 +328,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -305,7 +336,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -313,7 +344,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " @@ -324,3 +356,6 @@ msgstr "" #: selection:account.payment.mode,bank_account_link:0 msgid "Variable" msgstr "" + +#~ msgid "Partner" +#~ msgstr "Partenaire" diff --git a/account_payment_mode/i18n/gl.po b/account_payment_mode/i18n/gl.po index 8efa9ee0cd6..80ddb86aa81 100644 --- a/account_payment_mode/i18n/gl.po +++ b/account_payment_mode/i18n/gl.po @@ -24,51 +24,55 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Creado por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Creado en" @@ -93,7 +97,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "" @@ -103,12 +107,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -120,19 +134,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -152,43 +166,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "ültima actualización por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Última actualización en" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -196,7 +232,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -205,7 +241,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -213,25 +249,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -239,12 +270,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "" @@ -252,33 +283,33 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -286,7 +317,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -294,7 +325,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -302,7 +333,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -310,7 +341,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " diff --git a/account_payment_mode/i18n/hr.po b/account_payment_mode/i18n/hr.po index abf0b90b0cc..a7066a81cf8 100644 --- a/account_payment_mode/i18n/hr.po +++ b/account_payment_mode/i18n/hr.po @@ -25,51 +25,55 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "Bankovni račun je obavezan" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Kreirao" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Kreirano" @@ -94,7 +98,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "Naziv" @@ -104,12 +108,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -121,19 +135,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -153,43 +167,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -197,7 +233,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -206,7 +242,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -214,25 +250,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -240,12 +271,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "Metode plaćanja" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "" @@ -253,34 +284,34 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "Modeli plaćanja" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids #, fuzzy msgid "Payment modes" msgstr "Modeli plaćanja" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -288,7 +319,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -296,7 +327,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -304,7 +335,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -312,7 +343,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " diff --git a/account_payment_mode/i18n/it.po b/account_payment_mode/i18n/it.po index a225a5d5367..e7905f91beb 100644 --- a/account_payment_mode/i18n/it.po +++ b/account_payment_mode/i18n/it.po @@ -24,51 +24,55 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Creato da" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Creato il" @@ -93,7 +97,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "Nome da visualizzare" @@ -103,12 +107,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -120,19 +134,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -152,43 +166,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "Ultima modifica il" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Ultimo aggiornamento di" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Ultimo aggiornamento il" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -196,7 +232,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -205,7 +241,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -213,25 +249,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -239,12 +270,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "" @@ -252,33 +283,33 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -286,7 +317,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -294,7 +325,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -302,7 +333,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -310,7 +341,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " diff --git a/account_payment_mode/i18n/nb_NO.po b/account_payment_mode/i18n/nb_NO.po index 34d9bd374b3..ef64562d3ac 100644 --- a/account_payment_mode/i18n/nb_NO.po +++ b/account_payment_mode/i18n/nb_NO.po @@ -25,51 +25,55 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "Bankkonto påkrevd" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "Firma" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Laget av" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Laget den" @@ -94,7 +98,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "Vis navn" @@ -104,12 +108,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -121,19 +135,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "Innkommende" @@ -153,43 +167,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "Sist modifisert den." #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Sist oppdatert av" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Sist oppdatert den" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "Lenke til bankkonto" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -197,7 +233,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -206,7 +242,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -214,25 +250,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "Betalingsmetode" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -240,12 +271,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "" @@ -253,34 +284,34 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "Betalingstype" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids #, fuzzy msgid "Payment modes" msgstr "Betalingsmetode" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -288,7 +319,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -296,7 +327,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -304,7 +335,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -312,7 +343,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " diff --git a/account_payment_mode/i18n/nl.po b/account_payment_mode/i18n/nl.po index 277f9eeb475..90f818ff704 100644 --- a/account_payment_mode/i18n/nl.po +++ b/account_payment_mode/i18n/nl.po @@ -24,7 +24,12 @@ msgid "A payment method of the same type already exists with this code" msgstr "Een betaalwijze met dezelfde naam bestaat al met deze code." #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__bank_account_required msgid "" "Activate this option if this payment method requires you to know the bank " "account number of your customer or supplier." @@ -33,44 +38,43 @@ msgstr "" "van uw klant of leverancier kent." #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "Actief" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "Toegestane bankrekeningen" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "Bankrekening verplicht" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "Soort bankrekening" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" -msgstr "Bankrekeningen" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" +msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "Bedrijf" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Aangemaakt door" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Aangemaakt op" @@ -95,7 +99,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "Incasso van leveranciers van Société Générale" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "Weergave naam" @@ -105,12 +109,22 @@ msgid "Fixed" msgstr "Vast" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "Vaste bankrekening" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -122,19 +136,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "Groepeer op" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "Inkomend" @@ -154,43 +168,65 @@ msgid "Journal" msgstr "Dagboek" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "Laatst bijgewerkt op" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Laatst bijgewerkt door" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Laatst bijgewerkt op" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "Koppeling naar bankrekening" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "Naam" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "Naam of code" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "Opmerking" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -200,7 +236,7 @@ msgstr "" "maar het bankboek is niet ingesteld." #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -212,7 +248,7 @@ msgstr "" "'%s'" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -223,25 +259,20 @@ msgstr "" "'%s'" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "UItgaand" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "Relatie" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "Betaalwijze" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "Code betaalwijze" @@ -249,12 +280,12 @@ msgstr "Code betaalwijze" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "Betaalwijzes" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "Betaalmode" @@ -262,33 +293,33 @@ msgstr "Betaalmode" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "Betaalmode" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "Betaalwijze" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "Zoek betaalwijzes" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "Zoek betaalmode" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -296,7 +327,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -304,7 +335,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -312,7 +343,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -320,7 +351,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " @@ -331,3 +363,9 @@ msgstr "" #: selection:account.payment.mode,bank_account_link:0 msgid "Variable" msgstr "Variabel" + +#~ msgid "Bank Accounts" +#~ msgstr "Bankrekeningen" + +#~ msgid "Partner" +#~ msgstr "Relatie" diff --git a/account_payment_mode/i18n/pt.po b/account_payment_mode/i18n/pt.po index 262c344e6af..e4700b6bbd7 100644 --- a/account_payment_mode/i18n/pt.po +++ b/account_payment_mode/i18n/pt.po @@ -24,51 +24,55 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Criado por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Criado em" @@ -93,7 +97,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "" @@ -103,12 +107,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -120,19 +134,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -152,43 +166,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Atualizado pela última vez por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Atualizado pela última vez em" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -196,7 +232,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -205,7 +241,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -213,25 +249,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -239,12 +270,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "" @@ -252,33 +283,33 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -286,7 +317,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -294,7 +325,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -302,7 +333,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -310,7 +341,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " diff --git a/account_payment_mode/i18n/pt_BR.po b/account_payment_mode/i18n/pt_BR.po index 7fe5d9e2e36..b6c4d22de38 100644 --- a/account_payment_mode/i18n/pt_BR.po +++ b/account_payment_mode/i18n/pt_BR.po @@ -25,51 +25,55 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" -msgstr "Contas bancárias" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" +msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "Empresa" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Criado por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Criado em" @@ -94,7 +98,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "" @@ -104,12 +108,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -121,19 +135,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "Agrupar por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -153,43 +167,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Última Atualização por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Última Atualização em" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -197,7 +233,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -206,7 +242,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -214,25 +250,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "Parceiro" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -240,12 +271,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "Modo de pagamento" @@ -253,33 +284,33 @@ msgstr "Modo de pagamento" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "Tipo de pagamento" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -287,7 +318,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -295,7 +326,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -303,7 +334,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -311,7 +342,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " @@ -322,3 +354,9 @@ msgstr "" #: selection:account.payment.mode,bank_account_link:0 msgid "Variable" msgstr "" + +#~ msgid "Bank Accounts" +#~ msgstr "Contas bancárias" + +#~ msgid "Partner" +#~ msgstr "Parceiro" diff --git a/account_payment_mode/i18n/pt_PT.po b/account_payment_mode/i18n/pt_PT.po index 47e3a485027..0923e5058ea 100644 --- a/account_payment_mode/i18n/pt_PT.po +++ b/account_payment_mode/i18n/pt_PT.po @@ -25,51 +25,55 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Criado por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Criado em" @@ -94,7 +98,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "" @@ -104,12 +108,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -121,19 +135,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -153,43 +167,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Atualizado pela última vez por" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Atualizado pela última vez em" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -197,7 +233,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -206,7 +242,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -214,25 +250,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -240,12 +271,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "" @@ -253,33 +284,33 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -287,7 +318,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -295,7 +326,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -303,7 +334,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -311,7 +342,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " diff --git a/account_payment_mode/i18n/sl.po b/account_payment_mode/i18n/sl.po index 038a1f25bfe..2f89f687eec 100644 --- a/account_payment_mode/i18n/sl.po +++ b/account_payment_mode/i18n/sl.po @@ -25,51 +25,55 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" -msgstr "Bančni računi" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" +msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "Družba" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Ustvaril" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Ustvarjeno" @@ -94,7 +98,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "Prikazni naziv" @@ -104,12 +108,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -121,19 +135,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "Zfruži po" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -153,43 +167,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "Zadnjič spremenjeno" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Zadnji posodobil" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Zadnjič posodobljeno" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -197,7 +233,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -206,7 +242,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -214,25 +250,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "Partner" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -240,12 +271,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "Metoda plačila" @@ -253,33 +284,33 @@ msgstr "Metoda plačila" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "Tip plačila" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -287,7 +318,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -295,7 +326,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -303,7 +334,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -311,7 +342,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " @@ -322,3 +354,9 @@ msgstr "" #: selection:account.payment.mode,bank_account_link:0 msgid "Variable" msgstr "" + +#~ msgid "Bank Accounts" +#~ msgstr "Bančni računi" + +#~ msgid "Partner" +#~ msgstr "Partner" diff --git a/account_payment_mode/i18n/tr.po b/account_payment_mode/i18n/tr.po index 261b5407898..7e5c3d0f6d3 100644 --- a/account_payment_mode/i18n/tr.po +++ b/account_payment_mode/i18n/tr.po @@ -24,51 +24,55 @@ msgid "A payment method of the same type already exists with this code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__company_partner_id +msgid "Account Holder" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__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_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_active -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__active +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__active msgid "Active" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_variable_journal_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__variable_journal_ids msgid "Allowed Bank Journals" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_bank_account_required +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__bank_account_required msgid "Bank Account Required" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_form -#: model:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.view_partner_bank_tree msgid "Bank Account Type" msgstr "" #. module: account_payment_mode -#: model:ir.model,name:account_payment_mode.model_res_partner_bank -msgid "Bank Accounts" +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__code +msgid "Code (Do Not Modify)" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_company_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__company_id msgid "Company" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_uid msgid "Created by" msgstr "Oluşturan" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_create_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__create_date msgid "Created on" msgstr "Oluşturuldu" @@ -93,7 +97,7 @@ msgid "Direct Debit of suppliers from Société Générale" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_display_name +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__display_name msgid "Display Name" msgstr "" @@ -103,12 +107,22 @@ msgid "Fixed" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_fixed_journal_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__fixed_journal_id msgid "Fixed Bank Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "For Incoming Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "For Outgoing Payments" +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__bank_account_link msgid "" "For payment modes that are always attached to the same bank account of your " "company (such as wire transfer from customers or SEPA direct debit from " @@ -120,19 +134,19 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Group By" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_id +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__id msgid "ID" msgstr "ID" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Inbound" msgstr "" @@ -152,43 +166,65 @@ msgid "Journal" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode___last_update +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode____last_update msgid "Last Modified on" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_uid +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_uid msgid "Last Updated by" msgstr "Son güncelleyen" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_write_date +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__write_date msgid "Last Updated on" msgstr "Son güncelleme" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_bank_account_link +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__bank_account_link msgid "Link to Bank Account" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_name +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__inbound_payment_method_ids +msgid "" +"Manual: Get paid by cash, check or any other method outside of Odoo.\n" +"Electronic: Get paid automatically through a payment acquirer by requesting " +"a transaction on a card saved by the customer when buying or subscribing " +"online (payment token).\n" +"Batch Deposit: Encase several customer checks at once by generating a batch " +"deposit to submit to your bank. When encoding the bank statement in Odoo,you " +"are suggested to reconcile the transaction with the batch deposit. Enable " +"this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,help:account_payment_mode.field_account_journal__outbound_payment_method_ids +msgid "" +"Manual:Pay bill by cash or any other method outside of Odoo.\n" +"Check:Pay bill by check and print it from Odoo.\n" +"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit " +"to your bank. Enable this option from the settings." +msgstr "" + +#. module: account_payment_mode +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__name msgid "Name" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Name or Code" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_note -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__note +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Note" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:73 +#: code:addons/account_payment_mode/models/account_payment_mode.py:70 #, python-format msgid "" "On the payment mode '%s', the bank account link is 'Fixed' but the fixed " @@ -196,7 +232,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:96 +#: code:addons/account_payment_mode/models/account_payment_mode.py:93 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s' (it is in fact a debit " @@ -205,7 +241,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:83 +#: code:addons/account_payment_mode/models/account_payment_mode.py:80 #, python-format msgid "" "On the payment mode '%s', the payment method is '%s', but this payment " @@ -213,25 +249,20 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Outbound" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_journal_company_partner_id -msgid "Partner" -msgstr "" - -#. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_id -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_id +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Payment Method" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_method_code msgid "Payment Method Code" msgstr "" @@ -239,12 +270,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_method_action #: model:ir.model,name:account_payment_mode.model_account_payment_method #: model:ir.ui.menu,name:account_payment_mode.account_payment_method_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_tree msgid "Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_form msgid "Payment Mode" msgstr "" @@ -252,33 +283,33 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment_mode.account_payment_mode_action #: model:ir.model,name:account_payment_mode.model_account_payment_mode #: model:ir.ui.menu,name:account_payment_mode.account_payment_mode_menu -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_tree msgid "Payment Modes" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode_payment_type -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_mode__payment_type +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Payment Type" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method_payment_mode_ids +#: model:ir.model.fields,field_description:account_payment_mode.field_account_payment_method__payment_mode_ids msgid "Payment modes" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_method_search msgid "Search Payment Methods" msgstr "" #. module: account_payment_mode -#: model:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search +#: model_terms:ir.ui.view,arch_db:account_payment_mode.account_payment_mode_search msgid "Search Payment Modes" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:37 +#: code:addons/account_payment_mode/models/account_journal.py:36 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -286,7 +317,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_journal.py:46 +#: code:addons/account_payment_mode/models/account_journal.py:45 #, python-format msgid "" "The company of the journal '%s' does not match with the company of the " @@ -294,7 +325,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:111 +#: code:addons/account_payment_mode/models/account_payment_mode.py:108 #, python-format msgid "" "The company of the payment mode '%s', does not match with the company of " @@ -302,7 +333,7 @@ msgid "" msgstr "" #. module: account_payment_mode -#: code:addons/account_payment_mode/models/account_payment_mode.py:121 +#: code:addons/account_payment_mode/models/account_payment_mode.py:118 #, python-format msgid "" "The company of the payment mode '%s', does not match with the one of the " @@ -310,7 +341,8 @@ msgid "" msgstr "" #. module: account_payment_mode -#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode_payment_method_code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_method__code +#: model:ir.model.fields,help:account_payment_mode.field_account_payment_mode__payment_method_code msgid "" "This code is used in the code of the Odoo module that handles this payment " "method. Therefore, if you change it, the generation of the payment file may " diff --git a/account_payment_mode/static/description/index.html b/account_payment_mode/static/description/index.html index 1dff95f51df..c5dd9139930 100644 --- a/account_payment_mode/static/description/index.html +++ b/account_payment_mode/static/description/index.html @@ -3,7 +3,7 @@ - + Account Payment Mode -
    -

    Account Payment Mode

    +
    + + +Odoo Community Association + +
    +

    Account Payment Mode

    -

    Mature License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runboat

    +

    Mature License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runboat

    This module adds a new object account.payment.mode, that is used to better classify and route incoming/outgoing payment orders with the -banks.

    +banks. This module adds several fields:

    +
      +
    • the Supplier Payment Mode and Customer Payment Mode on Partners,
      • +
    • the Payment Mode on Invoices.
      • +
    • the Show bank account on Payment Mode.
      • +
    • the # of digits for customer bank account on Payment Mode.
      • +
    • the Bank account from journals on Payment Mode.
      • +
    • the Payment mode on Invoices Analysis.
      • +
    +

    On a Payment Order, in the wizard Select Invoices to Pay, the invoices +will be filtered per Payment Mode.

    +

    Allows to print in the invoice to which account number the payment (via +SEPA direct debit) is going to be charged so the customer knows that +information, but there are some customers that don’t want that everyone +looking at the invoice sees the full account number (and even GDPR can +say a word about that), so that’s the reason behind the several options.

    Table of contents

    -

    Configuration

    +

    Configuration

    To configure this module, you need to go to the menu Invoicing/Accounting > Configuration > Management > Payment Modes.

    -

    Usage

    -

    This module doesn’t add any feature, but it is used by several other -modules.

    +

    Usage

    +

    This module provides the foundation for managing payment modes and +integrates them directly with partners and invoices.

    +

    You are able to add a payment mode directly on a partner.

    +

    This payment mode is automatically associated to the invoice related to +the partner. This default value could be changed in a draft invoice.

    +

    When you create a payment order, only invoices related to chosen payment +mode are displayed.

    +

    Invoices without any payment mode are displayed too.

    +
    +
    +

    Changelog

    +
    +

    10.0.1.2.0 (2018-05-24)

    +
      +
    • [IMP] Add options to show partner bank account in invoice report +(#458)
      • +
    +
    -

    Bug Tracker

    +

    Bug Tracker

    Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us to smash it by providing a detailed and welcomed -feedback.

    +feedback.

    Do not contact contributors directly about support or help with technical issues.

    -

    Credits

    +

    Credits

    -

    Authors

    +

    Authors

    • Akretion
      • +
    • Tecnativa
    -

    Contributors

    +

    Contributors

    -

    Maintainers

    +

    Maintainers

    This module is maintained by the OCA.

    Odoo Community Association @@ -433,10 +490,11 @@

    Maintainers

    OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

    -

    This module is part of the OCA/bank-payment project on GitHub.

    +

    This module is part of the OCA/bank-payment project on GitHub.

    You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

    +
    diff --git a/account_payment_mode/tests/__init__.py b/account_payment_mode/tests/__init__.py index a0637883a32..b3f8eb1ceac 100644 --- a/account_payment_mode/tests/__init__.py +++ b/account_payment_mode/tests/__init__.py @@ -1,2 +1,2 @@ -# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from . import test_account_payment_mode +from . import test_account_payment_partner diff --git a/account_payment_partner/tests/test_account_payment_partner.py b/account_payment_mode/tests/test_account_payment_partner.py similarity index 99% rename from account_payment_partner/tests/test_account_payment_partner.py rename to account_payment_mode/tests/test_account_payment_partner.py index 6db7ed4e898..76270559355 100644 --- a/account_payment_partner/tests/test_account_payment_partner.py +++ b/account_payment_mode/tests/test_account_payment_partner.py @@ -2,7 +2,7 @@ # Copyright 2021 Tecnativa - Víctor Martínez # License AGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from odoo import Command, _, fields +from odoo import Command, fields from odoo.exceptions import UserError, ValidationError from odoo.tests import Form, tagged @@ -26,7 +26,9 @@ def setUpClass(cls): cls.company.country_id ) if not chart: - raise ValidationError(_("No Chart of Account Template has been defined !")) + raise ValidationError( + cls.env._("No Chart of Account Template has been defined !") + ) cls.env.user.company_ids = [(4, cls.company_2.id)] cls.env.ref("base.user_admin").company_ids = [(4, cls.company_2.id)] cls.env["account.chart.template"].try_loading( diff --git a/account_payment_partner/views/account_move_line.xml b/account_payment_mode/views/account_move_line.xml similarity index 100% rename from account_payment_partner/views/account_move_line.xml rename to account_payment_mode/views/account_move_line.xml diff --git a/account_payment_partner/views/account_move_view.xml b/account_payment_mode/views/account_move_view.xml similarity index 100% rename from account_payment_partner/views/account_move_view.xml rename to account_payment_mode/views/account_move_view.xml diff --git a/account_payment_mode/views/account_payment_method.xml b/account_payment_mode/views/account_payment_method.xml index 5657bd4b66e..c51888e63b7 100644 --- a/account_payment_mode/views/account_payment_method.xml +++ b/account_payment_mode/views/account_payment_method.xml @@ -56,7 +56,7 @@ here. I hate the objects that don't have a view... --> string="Outbound" domain="[('payment_type', '=', 'outbound')]" /> - + diff --git a/account_payment_mode/views/account_payment_mode.xml b/account_payment_mode/views/account_payment_mode.xml index 90bc5fe3a6c..8bcec1913b0 100644 --- a/account_payment_mode/views/account_payment_mode.xml +++ b/account_payment_mode/views/account_payment_mode.xml @@ -27,6 +27,7 @@ invisible="bank_account_link != 'fixed'" required="bank_account_link == 'fixed'" /> + + + + + + @@ -71,7 +84,7 @@ string="Outbound" domain="[('payment_type', '=', 'outbound')]" /> - + diff --git a/account_payment_partner/views/report_invoice.xml b/account_payment_mode/views/report_invoice.xml similarity index 100% rename from account_payment_partner/views/report_invoice.xml rename to account_payment_mode/views/report_invoice.xml diff --git a/account_payment_partner/views/res_partner_view.xml b/account_payment_mode/views/res_partner_view.xml similarity index 89% rename from account_payment_partner/views/res_partner_view.xml rename to account_payment_mode/views/res_partner_view.xml index 1b16f54d9b2..2d794b8a803 100644 --- a/account_payment_partner/views/res_partner_view.xml +++ b/account_payment_mode/views/res_partner_view.xml @@ -24,7 +24,7 @@ account_payment_partner.group_show_account_payment_method + >account_payment_mode.group_show_account_payment_method account_payment_partner.group_show_account_payment_method + >account_payment_mode.group_show_account_payment_method diff --git a/account_payment_partner/__init__.py b/account_payment_partner/__init__.py deleted file mode 100644 index 570623a1e22..00000000000 --- a/account_payment_partner/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from .hooks import pre_init_hook -from . import models -from . import reports diff --git a/account_payment_partner/__manifest__.py b/account_payment_partner/__manifest__.py deleted file mode 100644 index c3fe82ba79e..00000000000 --- a/account_payment_partner/__manifest__.py +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2014 Akretion - Alexis de Lattre -# Copyright 2014 Tecnativa - Pedro M. Baeza -# Copyright 2018 Tecnativa - Carlos Dauden -# Copyright 2021 Tecnativa - Víctor Martínez -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -{ - "name": "Account Payment Partner", - "version": "18.0.1.0.1", - "category": "Banking addons", - "license": "AGPL-3", - "summary": "Adds payment mode on partners and invoices", - "author": "Akretion, Tecnativa, Odoo Community Association (OCA)", - "website": "https://github.com/OCA/bank-payment", - "development_status": "Mature", - "depends": ["account_payment_mode"], - "data": [ - "security/account_payment_partner_security.xml", - "views/res_partner_view.xml", - "views/account_move_view.xml", - "views/account_move_line.xml", - "views/account_payment_mode.xml", - "views/report_invoice.xml", - "reports/account_invoice_report_view.xml", - ], - "demo": ["demo/partner_demo.xml"], - "installable": True, - "pre_init_hook": "pre_init_hook", -} diff --git a/account_payment_partner/models/__init__.py b/account_payment_partner/models/__init__.py deleted file mode 100644 index be3f8c8fc5f..00000000000 --- a/account_payment_partner/models/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import account_move, account_move_line, account_payment_mode, res_partner diff --git a/account_payment_partner/models/account_payment_mode.py b/account_payment_partner/models/account_payment_mode.py deleted file mode 100644 index c547c368517..00000000000 --- a/account_payment_partner/models/account_payment_mode.py +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 2017 ForgeFlow S.L. -# Copyright 2018 Tecnativa - Carlos Dauden -# Copyright 2021 Tecnativa - Víctor Martínez -# License AGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). - -from odoo import _, api, fields, models -from odoo.exceptions import ValidationError - - -class AccountPaymentMode(models.Model): - _inherit = "account.payment.mode" - - show_bank_account = fields.Selection( - selection=[ - ("full", "Full"), - ("first", "First n chars"), - ("last", "Last n chars"), - ("no", "No"), - ], - default="full", - help="Show in invoices partial or full bank account number", - ) - show_bank_account_from_journal = fields.Boolean(string="Bank account from journals") - show_bank_account_chars = fields.Integer( - string="# of digits for customer bank account" - ) - refund_payment_mode_id = fields.Many2one( - comodel_name="account.payment.mode", - domain="[('payment_type', '!=', payment_type)]", - string="Payment mode for refunds", - help="This payment mode will be used when doing " - "refunds coming from the current payment mode.", - ) - - @api.constrains("company_id") - def account_invoice_company_constrains(self): - for mode in self: - if ( - self.env["account.move"] - .sudo() - .search( - [ - ("payment_mode_id", "=", mode.id), - ("company_id", "!=", mode.company_id.id), - ], - limit=1, - ) - ): - raise ValidationError( - _( - "You cannot change the Company. There exists " - "at least one Journal Entry with this Payment Mode, " - "already assigned to another Company." - ) - ) - - @api.constrains("company_id") - def account_move_line_company_constrains(self): - for mode in self: - if ( - self.env["account.move.line"] - .sudo() - .search( - [ - ("payment_mode_id", "=", mode.id), - ("company_id", "!=", mode.company_id.id), - ], - limit=1, - ) - ): - raise ValidationError( - _( - "You cannot change the Company. There exists " - "at least one Journal Item with this Payment Mode, " - "already assigned to another Company." - ) - ) diff --git a/account_payment_partner/readme/CONTRIBUTORS.md b/account_payment_partner/readme/CONTRIBUTORS.md deleted file mode 100644 index e9fae678755..00000000000 --- a/account_payment_partner/readme/CONTRIBUTORS.md +++ /dev/null @@ -1,15 +0,0 @@ -- Alexis de Lattre \<\> -- Raphaël Valyi -- Stefan Rijnhart (Therp) -- Alexandre Fayolle -- Stéphane Bidoul \<\> -- Danimar Ribeiro -- Angel Moya \<\> -- [Tecnativa](https://www.tecnativa.com): - - Pedro M. Baeza - - Carlos Dauden - - Víctor Martínez -- [DynApps](https://www.dynapps.be): - - Raf Ven \<\> -- Marçal Isern \<\> -- Miquel Alzanillas \<\> diff --git a/account_payment_partner/readme/DESCRIPTION.md b/account_payment_partner/readme/DESCRIPTION.md deleted file mode 100644 index 987c74fa0d8..00000000000 --- a/account_payment_partner/readme/DESCRIPTION.md +++ /dev/null @@ -1,17 +0,0 @@ -This module adds several fields: - -- the *Supplier Payment Mode* and *Customer Payment Mode* on Partners, -- the *Payment Mode* on Invoices. -- the *Show bank account* on Payment Mode. -- the *\# of digits for customer bank account* on Payment Mode. -- the *Bank account from journals* on Payment Mode. -- the *Payment mode* on Invoices Analysis. - -On a Payment Order, in the wizard *Select Invoices to Pay*, the invoices -will be filtered per Payment Mode. - -Allows to print in the invoice to which account number the payment (via -SEPA direct debit) is going to be charged so the customer knows that -information, but there are some customers that don't want that everyone -looking at the invoice sees the full account number (and even GDPR can -say a word about that), so that's the reason behind the several options. diff --git a/account_payment_partner/readme/USAGE.md b/account_payment_partner/readme/USAGE.md deleted file mode 100644 index 5568d2c8a51..00000000000 --- a/account_payment_partner/readme/USAGE.md +++ /dev/null @@ -1,9 +0,0 @@ -You are able to add a payment mode directly on a partner. - -This payment mode is automatically associated to the invoice related to -the partner. This default value could be changed in a draft invoice. - -When you create a payment order, only invoices related to chosen payment -mode are displayed. - -Invoices without any payment mode are displayed too. diff --git a/account_payment_partner/tests/__init__.py b/account_payment_partner/tests/__init__.py deleted file mode 100644 index 3449d9e90db..00000000000 --- a/account_payment_partner/tests/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import test_account_payment_partner diff --git a/account_payment_partner/views/account_payment_mode.xml b/account_payment_partner/views/account_payment_mode.xml deleted file mode 100644 index 8a507f01f07..00000000000 --- a/account_payment_partner/views/account_payment_mode.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - account.payment.mode - - - - - - - - - - - - - - - - -