From 58fea9ee995fba60173040f623970379426d6ea8 Mon Sep 17 00:00:00 2001 From: Sergio Incaser Date: Fri, 1 Apr 2016 12:37:34 +0200 Subject: [PATCH 01/11] [FIX][8.0] account_banking_mandate: Add creditor identifier field to report mandate. [FIX][8.0] account_banking_mandate: Translate. --- .../i18n/account_banking_mandate.pot | 569 ------------------ account_banking_mandate/i18n/es.po | 186 ++++-- .../reports/account_banking_mandate_view.xml | 1 + 3 files changed, 137 insertions(+), 619 deletions(-) delete mode 100644 account_banking_mandate/i18n/account_banking_mandate.pot diff --git a/account_banking_mandate/i18n/account_banking_mandate.pot b/account_banking_mandate/i18n/account_banking_mandate.pot deleted file mode 100644 index 912fcd667..000000000 --- a/account_banking_mandate/i18n/account_banking_mandate.pot +++ /dev/null @@ -1,569 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * account_banking_mandate -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-18 08:15+0000\n" -"PO-Revision-Date: 2015-06-18 10:18+0100\n" -"Last-Translator: Sergio Teruel \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: \n" -"X-Generator: Poedit 1.5.4\n" - -#. module: account_banking_mandate -#: model:ir.actions.act_window,help:account_banking_mandate.mandate_action -msgid "" -"

\n" -" Click to create a new Banking Mandate.\n" -"

\n" -" A Banking Mandate is a document signed by your customer that gives " -"you the autorization to do one or several operations on his bank account.\n" -"

\n" -" " -msgstr "" - -#. module: account_banking_mandate -#: sql_constraint:account.banking.mandate:0 -msgid "A Mandate with the same reference already exists for this company !" -msgstr "" - -#. module: account_banking_mandate -#: model:ir.model,name:account_banking_mandate.model_account_banking_mandate -msgid "A generic banking mandate" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"As part of your rights, you are entitled to a refund from your bank under " -"the terms and conditions of your agreement with your bank.\n" -" A refund must be claimed within 8 weeks starting " -"from the date on which your account was debited." -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "BIC:" -msgstr "" - -#. module: account_banking_mandate -#: view:account.banking.mandate:account_banking_mandate.view_mandate_form -msgid "Back to Draft" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,partner_bank_id:0 -msgid "Bank Account" -msgstr "" - -#. module: account_banking_mandate -#: model:ir.model,name:account_banking_mandate.model_res_partner_bank -msgid "Bank Accounts" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Bank name:" -msgstr "" - -#. module: account_banking_mandate -#: view:account.banking.mandate:account_banking_mandate.view_mandate_form -#: view:account.banking.mandate:account_banking_mandate.view_mandate_tree -msgid "Banking Mandate" -msgstr "" - -#. module: account_banking_mandate -#: model:mail.message.subtype,description:account_banking_mandate.mandate_cancel -msgid "Banking Mandate Cancelled" -msgstr "" - -#. module: account_banking_mandate -#: model:mail.message.subtype,description:account_banking_mandate.mandate_valid -msgid "Banking Mandate Validated" -msgstr "" - -#. module: account_banking_mandate -#: model:mail.message.subtype,description:account_banking_mandate.mandate_expired -msgid "Banking Mandate has Expired" -msgstr "" - -#. module: account_banking_mandate -#: model:ir.actions.act_window,name:account_banking_mandate.mandate_action -msgid "Banking Mandates" -msgstr "" - -#. module: account_banking_mandate -#: help:res.partner.bank,mandate_ids:0 -msgid "" -"Banking mandates represents an authorization that the bank account owner " -"gives to a company for a specific operation" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "By signing this mandate form, you authorise (A)" -msgstr "" - -#. module: account_banking_mandate -#: view:account.banking.mandate:account_banking_mandate.view_mandate_form -msgid "Cancel" -msgstr "" - -#. module: account_banking_mandate -#: view:account.banking.mandate:account_banking_mandate.view_mandate_search -msgid "Cancelled" -msgstr "" - -#. module: account_banking_mandate -#: code:addons/account_banking_mandate/models/account_banking_mandate.py:110 -#, python-format -msgid "" -"Cannot validate the mandate '%s' because it is not attached to a bank " -"account." -msgstr "" - -#. module: account_banking_mandate -#: code:addons/account_banking_mandate/models/account_banking_mandate.py:106 -#, python-format -msgid "Cannot validate the mandate '%s' without a date of signature." -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,company_id:0 -msgid "Company" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,create_uid:0 -msgid "Created by" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,create_date:0 -msgid "Created on" -msgstr "" - -#. module: account_banking_mandate -#: view:payment.order:account_banking_mandate.view_mandate_payment_order_form -msgid "DD Mandate" -msgstr "" - -#. module: account_banking_mandate -#: view:res.partner:account_banking_mandate.mandate_partner_form -#: view:res.partner.bank:account_banking_mandate.mandate_partner_bank_tree -msgid "DD Mandates" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,signature_date:0 -msgid "Date of Signature of the Mandate" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,last_debit_date:0 -msgid "Date of the Last Debit" -msgstr "" - -#. module: account_banking_mandate -#: help:account.banking.mandate,message_last_post:0 -msgid "Date of the last message posted on the record." -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Debtor identification code:" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Description of contract." -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"Details regarding the underlying relationship between the Creditor and the " -"Debtor - for information purposes only." -msgstr "" - -#. module: account_banking_mandate -#: field:account.invoice,mandate_id:0 field:payment.line,mandate_id:0 -msgid "Direct Debit Mandate" -msgstr "" - -#. module: account_banking_mandate -#: view:res.partner.bank:account_banking_mandate.mandate_partner_bank_form -#: field:res.partner.bank,mandate_ids:0 -msgid "Direct Debit Mandates" -msgstr "" - -#. module: account_banking_mandate -#: view:account.banking.mandate:account_banking_mandate.view_mandate_search -msgid "Draft" -msgstr "" - -#. module: account_banking_mandate -#: view:account.banking.mandate:account_banking_mandate.view_mandate_search -msgid "Expired" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,message_follower_ids:0 -msgid "Followers" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"For business users: write any code number here which you wish to have quoted " -"by your bank." -msgstr "" - -#. module: account_banking_mandate -#: view:account.banking.mandate:account_banking_mandate.view_mandate_search -msgid "Group By" -msgstr "" - -#. module: account_banking_mandate -#: help:account.banking.mandate,message_summary:0 -msgid "" -"Holds the Chatter summary (number of messages, ...). This summary is " -"directly in html format in order to be inserted in kanban views." -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "IBAN:" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,id:0 -msgid "ID" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Identification code of the Creditor Reference Party." -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Identification code of the Debtor Reference Party." -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Identification number of the underlying contract." -msgstr "" - -#. module: account_banking_mandate -#: help:account.banking.mandate,message_unread:0 -msgid "If checked new messages require your attention." -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "If you are paying on your own behalf, leave blank." -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "In respect of the contract:" -msgstr "" - -#. module: account_banking_mandate -#: model:ir.model,name:account_banking_mandate.model_account_invoice -msgid "Invoice" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,message_is_follower:0 -msgid "Is a Follower" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,message_last_post:0 -msgid "Last Message Date" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,write_uid:0 -msgid "Last Updated by" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,write_date:0 -msgid "Last Updated on" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"Location and sign: _______________________, at ______ from ____________ from" -msgstr "" - -#. module: account_banking_mandate -#: model:ir.actions.report.xml,name:account_banking_mandate.report_account_banking_mandate -msgid "Mandate" -msgstr "" - -#. module: account_banking_mandate -#: model:mail.message.subtype,name:account_banking_mandate.mandate_cancel -msgid "Mandate Cancelled" -msgstr "" - -#. module: account_banking_mandate -#: model:mail.message.subtype,name:account_banking_mandate.mandate_expired -msgid "Mandate Expired" -msgstr "" - -#. module: account_banking_mandate -#: model:mail.message.subtype,name:account_banking_mandate.mandate_valid -msgid "Mandate Validated" -msgstr "" - -#. module: account_banking_mandate -#: code:addons/account_banking_mandate/models/account_banking_mandate.py:152 -#, python-format -msgid "Mandate should be in cancel state" -msgstr "" - -#. module: account_banking_mandate -#: code:addons/account_banking_mandate/models/account_banking_mandate.py:140 -#, python-format -msgid "Mandate should be in draft or valid state" -msgstr "" - -#. module: account_banking_mandate -#: code:addons/account_banking_mandate/models/account_banking_mandate.py:131 -#, python-format -msgid "Mandate should be in draft state" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,message_ids:0 -msgid "Messages" -msgstr "" - -#. module: account_banking_mandate -#: help:account.banking.mandate,message_ids:0 -msgid "Messages and communication history" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"Name of the Creditor Reference Party: Creditor must complete this section if " -"collecting payment on behalf of another party." -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"Name of the Debtor Reference Party: If you are making a payment in respect " -"of an arrangement between" -msgstr "" - -#. module: account_banking_mandate -#: help:account.banking.mandate,state:0 -msgid "" -"Only valid mandates can be used in a payment line. A cancelled mandate is a " -"mandate that has been cancelled by the customer." -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,partner_id:0 -msgid "Partner" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Party on whose behalf the creditor collects the payment:" -msgstr "" - -#. module: account_banking_mandate -#: model:ir.model,name:account_banking_mandate.model_payment_line -msgid "Payment Line" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Payment type:" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Person on whose behalf payment is made:" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Policyholder Service / Debtor:" -msgstr "" - -#. module: account_banking_mandate -#: view:account.banking.mandate:account_banking_mandate.view_mandate_tree -msgid "Reference" -msgstr "" - -#. module: account_banking_mandate -#: view:account.banking.mandate:account_banking_mandate.view_mandate_search -msgid "Reference or Partner" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Reference:" -msgstr "" - -#. module: account_banking_mandate -#: view:account.banking.mandate:account_banking_mandate.view_mandate_form -#: field:account.banking.mandate,payment_line_ids:0 -msgid "Related Payment Lines" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "SEPA BUSINESS-TO-BUSINESS DIRECT DEBIT MANDATE" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "SEPA DIRECT DEBIT MANDATE" -msgstr "" - -#. module: account_banking_mandate -#: model:ir.ui.menu,name:account_banking_mandate.mandate_menu -msgid "SEPA Direct Debit Mandates" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,scan:0 -msgid "Scan of the Mandate" -msgstr "" - -#. module: account_banking_mandate -#: view:account.banking.mandate:account_banking_mandate.view_mandate_search -msgid "Search Banking Mandates" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Service Provider / Creditor:" -msgstr "" - -#. module: account_banking_mandate -#: view:account.banking.mandate:account_banking_mandate.view_mandate_search -#: view:account.banking.mandate:account_banking_mandate.view_mandate_tree -msgid "Signature Date" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,state:0 -msgid "Status" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,message_summary:0 -msgid "Summary" -msgstr "" - -#. module: account_banking_mandate -#: code:addons/account_banking_mandate/models/account_banking_mandate.py:92 -#, python-format -msgid "The date of signature of mandate '%s' is in the future !" -msgstr "" - -#. module: account_banking_mandate -#: code:addons/account_banking_mandate/models/account_banking_mandate.py:97 -#, python-format -msgid "" -"The mandate '%s' can't have a date of last debit before the date of " -"signature." -msgstr "" - -#. module: account_banking_mandate -#: code:addons/account_banking_mandate/models/payment_line.py:68 -#, python-format -msgid "" -"The payment line with reference '%s' has the bank account '%s' which is not " -"attached to the mandate '%s' (this mandate is attached to the bank account " -"'%s')." -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"This mandate is only intended for business-to-business transactions. You are " -"not entitled to a refund from your bank after your account has been debited, " -"but you are entitled to request your bank not to debit your account up until " -"the day on which the payment is due.\n" -" Please complete all the fields marked *." -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,unique_mandate_reference:0 -msgid "Unique Mandate Reference" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,message_unread:0 -msgid "Unread Messages" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "VAT:" -msgstr "" - -#. module: account_banking_mandate -#: view:account.banking.mandate:account_banking_mandate.view_mandate_search -msgid "Valid" -msgstr "" - -#. module: account_banking_mandate -#: view:account.banking.mandate:account_banking_mandate.view_mandate_form -msgid "Validate" -msgstr "" - -#. module: account_banking_mandate -#: field:account.banking.mandate,website_message_ids:0 -msgid "Website Messages" -msgstr "" - -#. module: account_banking_mandate -#: help:account.banking.mandate,website_message_ids:0 -msgid "Website communication history" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Write any code number here which you wish to have quoted by your bank." -msgstr "" - -#. module: account_banking_mandate -#: view:account.banking.mandate:account_banking_mandate.view_mandate_form -msgid "" -"You should set a mandate back to draft only if you cancelled it by mistake. " -"Do you want to continue?" -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"and another person (e.g. where you are paying the other person's bill) " -"please write the other person's name here." -msgstr "" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"to send instructions to your bank to debit your account and (B) your bank to " -"debit your account in accordance with the instructions from" -msgstr "" diff --git a/account_banking_mandate/i18n/es.po b/account_banking_mandate/i18n/es.po index 6db65dec8..00f582b8d 100644 --- a/account_banking_mandate/i18n/es.po +++ b/account_banking_mandate/i18n/es.po @@ -1,19 +1,20 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_banking_mandate +# * account_banking_mandate # msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-16 07:21+0000\n" -"PO-Revision-Date: 2016-02-16 07:21+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2016-04-01 10:32+0000\n" +"PO-Revision-Date: 2016-04-01 12:33+0100\n" +"Last-Translator: Sergio Teruel \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" +"Language: es_ES\n" #. module: account_banking_mandate #: view:website:account_banking_mandate.account_banking_mandate_document @@ -22,16 +23,20 @@ msgstr "/ BIC:" #. module: account_banking_mandate #: model:ir.actions.act_window,help:account_banking_mandate.mandate_action -msgid "

\n" +msgid "" +"

\n" " Click to create a new Banking Mandate.\n" "

\n" -" A Banking Mandate is a document signed by your customer that gives you the autorization to do one or several operations on his bank account.\n" +" A Banking Mandate is a document signed by your customer that gives " +"you the autorization to do one or several operations on his bank account.\n" "

\n" " " -msgstr "

\n" +msgstr "" +"

\n" " Pulse para crear un nuevo mandato bancario.\n" "

\n" -" Un mandato bancario es un documento firmado por su cliente que le da la autorización para hacer una o varias operaciones en su cuenta bancaria.\n" +" Un mandato bancario es un documento firmado por su cliente que le da " +"la autorización para hacer una o varias operaciones en su cuenta bancaria.\n" "

\n" " " @@ -47,10 +52,16 @@ msgstr "Un mandato bancario genérico" #. module: account_banking_mandate #: view:website:account_banking_mandate.account_banking_mandate_document -msgid "As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank.\n" -" A refund must be claimed within 8 weeks starting from the date on which your account was debited." -msgstr "Como parte de sus derechos, el deudor está legitimado al reembolso por su entidad en los términos y condiciones del contrato suscrito con la misma..\n" -" La solicitud de reembolso deberá efectuarse dentro de las ocho semanas que siguen a la fecha de adeudo en cuenta." +msgid "" +"As part of your rights, you are entitled to a refund from your bank under " +"the terms and conditions of your agreement with your bank.\n" +" A refund must be claimed within 8 weeks starting " +"from the date on which your account was debited." +msgstr "" +"Como parte de sus derechos, el deudor está legitimado al reembolso por su " +"entidad en los términos y condiciones del contrato suscrito con la misma..\n" +" La solicitud de reembolso deberá efectuarse dentro " +"de las ocho semanas que siguen a la fecha de adeudo en cuenta." #. module: account_banking_mandate #: view:account.banking.mandate:account_banking_mandate.view_mandate_form @@ -105,13 +116,18 @@ msgstr "Mandatos bancarios" #. module: account_banking_mandate #: help:res.partner.bank,mandate_ids:0 -msgid "Banking mandates represents an authorization that the bank account owner gives to a company for a specific operation" -msgstr "Los mandatos bancarios representan una autorización que el propietario de la cuenta bancaria da a la compañía para un operación específica" +msgid "" +"Banking mandates represents an authorization that the bank account owner " +"gives to a company for a specific operation" +msgstr "" +"Los mandatos bancarios representan una autorización que el propietario de la " +"cuenta bancaria da a la compañía para un operación específica" #. module: account_banking_mandate #: view:website:account_banking_mandate.account_banking_mandate_document msgid "By signing this mandate form, you authorise (A)" -msgstr "Mediante la firma de esta orden de domiciliación, el deudor autoriza a (A) " +msgstr "" +"Mediante la firma de esta orden de domiciliación, el deudor autoriza a (A) " #. module: account_banking_mandate #: view:account.banking.mandate:account_banking_mandate.view_mandate_form @@ -126,8 +142,12 @@ msgstr "Cancelado" #. module: account_banking_mandate #: code:addons/account_banking_mandate/models/account_banking_mandate.py:93 #, python-format -msgid "Cannot validate the mandate '%s' because it is not attached to a bank account." -msgstr "No se puede validar el mandato '%s' porque no tiene ninguna cuenta bancaria asociada." +msgid "" +"Cannot validate the mandate '%s' because it is not attached to a bank " +"account." +msgstr "" +"No se puede validar el mandato '%s' porque no tiene ninguna cuenta bancaria " +"asociada." #. module: account_banking_mandate #: code:addons/account_banking_mandate/models/account_banking_mandate.py:89 @@ -183,12 +203,15 @@ msgstr "Descripción del contrato." #. module: account_banking_mandate #: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Details regarding the underlying relationship between the Creditor and the Debtor - for information purposes only." -msgstr "Información sobre la relación subyacente entre el acreedor y el deudor - a título meramente informativo." +msgid "" +"Details regarding the underlying relationship between the Creditor and the " +"Debtor - for information purposes only." +msgstr "" +"Información sobre la relación subyacente entre el acreedor y el deudor - a " +"título meramente informativo." #. module: account_banking_mandate -#: field:account.invoice,mandate_id:0 -#: field:payment.line,mandate_id:0 +#: field:account.invoice,mandate_id:0 field:payment.line,mandate_id:0 msgid "Direct Debit Mandate" msgstr "Mandato de adeudo directo" @@ -215,8 +238,12 @@ msgstr "Seguidores" #. module: account_banking_mandate #: view:website:account_banking_mandate.account_banking_mandate_document -msgid "For business users: write any code number here which you wish to have quoted by your bank." -msgstr "Para usuarios empresas: Indique en este espacio cualquier número de código con el que desea que su entidad financiera le identifique." +msgid "" +"For business users: write any code number here which you wish to have quoted " +"by your bank." +msgstr "" +"Para usuarios empresas: Indique en este espacio cualquier número de código " +"con el que desea que su entidad financiera le identifique." #. module: account_banking_mandate #: view:account.banking.mandate:account_banking_mandate.view_mandate_search @@ -225,8 +252,12 @@ msgstr "Agrupar por" #. module: account_banking_mandate #: help:account.banking.mandate,message_summary:0 -msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views." -msgstr "Contiene el resumen del chatter (nº de mensajes, ...). Este resumen está directamente en formato html para ser insertado en vistas kanban." +msgid "" +"Holds the Chatter summary (number of messages, ...). This summary is " +"directly in html format in order to be inserted in kanban views." +msgstr "" +"Contiene el resumen del chatter (nº de mensajes, ...). Este resumen está " +"directamente en formato html para ser insertado en vistas kanban." #. module: account_banking_mandate #: view:website:account_banking_mandate.account_banking_mandate_document @@ -253,6 +284,11 @@ msgstr "Código de identificación de la parte de referencia del deudor" msgid "Identification number of the underlying contract." msgstr "Número de identificación del contrato subyacente" +#. module: account_banking_mandate +#: view:website:account_banking_mandate.account_banking_mandate_document +msgid "Identifier:" +msgstr "Identificador:" + #. module: account_banking_mandate #: help:account.banking.mandate,message_unread:0 msgid "If checked new messages require your attention." @@ -261,7 +297,9 @@ msgstr "Si está marcado, hay nuevos mensajes que requieren su atención" #. module: account_banking_mandate #: view:website:account_banking_mandate.account_banking_mandate_document msgid "If you are paying on your own behalf, leave blank." -msgstr "Si realiza el pago en su propio nombre e interés, deje este espacio en blanco." +msgstr "" +"Si realiza el pago en su propio nombre e interés, deje este espacio en " +"blanco." #. module: account_banking_mandate #: view:website:account_banking_mandate.account_banking_mandate_document @@ -295,8 +333,11 @@ msgstr "Última actualización en" #. module: account_banking_mandate #: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Location and sign: _______________________, at ______ from ____________ from" -msgstr "Lugar y fecha de la firma: _______________________, a ______ de ____________ de" +msgid "" +"Location and sign: _______________________, at ______ from ____________ from" +msgstr "" +"Lugar y fecha de la firma: _______________________, a ______ de ____________ " +"de" #. module: account_banking_mandate #: view:bank.payment.line:account_banking_mandate.bank_payment_line_tree @@ -350,18 +391,30 @@ msgstr "Mensajes e historial de comunicación" #. module: account_banking_mandate #: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Name of the Creditor Reference Party: Creditor must complete this section if collecting payment on behalf of another party." -msgstr "Nombre de la parte de referencia del acreedor: el acreedor debe rellenar esta sección si realiza el cobro a favor de un tercero." +msgid "" +"Name of the Creditor Reference Party: Creditor must complete this section if " +"collecting payment on behalf of another party." +msgstr "" +"Nombre de la parte de referencia del acreedor: el acreedor debe rellenar " +"esta sección si realiza el cobro a favor de un tercero." #. module: account_banking_mandate #: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Name of the Debtor Reference Party: If you are making a payment in respect of an arrangement between" -msgstr "Nombre de la parte de referencia del deudor: Si realiza un pago como consecuencia de un acuerdo entre" +msgid "" +"Name of the Debtor Reference Party: If you are making a payment in respect " +"of an arrangement between" +msgstr "" +"Nombre de la parte de referencia del deudor: Si realiza un pago como " +"consecuencia de un acuerdo entre" #. module: account_banking_mandate #: help:account.banking.mandate,state:0 -msgid "Only valid mandates can be used in a payment line. A cancelled mandate is a mandate that has been cancelled by the customer." -msgstr "Sólo se pueden usar mandatos validados en una línea de pago. Un mandato cancelado en un mandato que ha sido invalidado por el cliente." +msgid "" +"Only valid mandates can be used in a payment line. A cancelled mandate is a " +"mandate that has been cancelled by the customer." +msgstr "" +"Sólo se pueden usar mandatos validados en una línea de pago. Un mandato " +"cancelado en un mandato que ha sido invalidado por el cliente." #. module: account_banking_mandate #: field:account.banking.mandate,partner_id:0 @@ -469,20 +522,40 @@ msgstr "La fecha de firma del mandato '%s' no puede ser superior a la actual" #. module: account_banking_mandate #: code:addons/account_banking_mandate/models/account_banking_mandate.py:80 #, python-format -msgid "The mandate '%s' can't have a date of last debit before the date of signature." -msgstr "El mandato '%s' no puede tener una fecha de último cobro antes de la fecha de firma." +msgid "" +"The mandate '%s' can't have a date of last debit before the date of " +"signature." +msgstr "" +"El mandato '%s' no puede tener una fecha de último cobro antes de la fecha " +"de firma." #. module: account_banking_mandate #: code:addons/account_banking_mandate/models/payment_line.py:51 #, python-format -msgid "The payment line with reference '%s' has the bank account '%s' which is not attached to the mandate '%s' (this mandate is attached to the bank account '%s')." -msgstr "La línea de pago con referencia '%s' tiene la cuenta bancaria '%s', que no está puesta en el mandato '%s' (este mandato tiene como cuenta bancaria '%s')." +msgid "" +"The payment line with reference '%s' has the bank account '%s' which is not " +"attached to the mandate '%s' (this mandate is attached to the bank account " +"'%s')." +msgstr "" +"La línea de pago con referencia '%s' tiene la cuenta bancaria '%s', que no " +"está puesta en el mandato '%s' (este mandato tiene como cuenta bancaria " +"'%s')." #. module: account_banking_mandate #: view:website:account_banking_mandate.account_banking_mandate_document -msgid "This mandate is only intended for business-to-business transactions. You are not entitled to a refund from your bank after your account has been debited, but you are entitled to request your bank not to debit your account up until the day on which the payment is due.\n" +msgid "" +"This mandate is only intended for business-to-business transactions. You are " +"not entitled to a refund from your bank after your account has been debited, " +"but you are entitled to request your bank not to debit your account up until " +"the day on which the payment is due.\n" " Please complete all the fields marked *." -msgstr "Esta orden de domiciliación está prevista para operaciones exclusivamente entre empresas y/o autónomos. El deudor no tiene derecho a que su entidad le reembolse una vez que se haya realizado el cargo en cuenta, pero puede solicitar a su entidad que no efectúe el adeudo en la cuenta hasta la fecha debida. Podrá obtener información detallada del procedimiento en su entidad financiera\n" +msgstr "" +"Esta orden de domiciliación está prevista para operaciones exclusivamente " +"entre empresas y/o autónomos. El deudor no tiene derecho a que su entidad le " +"reembolse una vez que se haya realizado el cargo en cuenta, pero puede " +"solicitar a su entidad que no efectúe el adeudo en la cuenta hasta la fecha " +"debida. Podrá obtener información detallada del procedimiento en su entidad " +"financiera\n" " Por favor rellene todos los campos marcados con un *." #. module: account_banking_mandate @@ -513,20 +586,33 @@ msgstr "Validar" #. module: account_banking_mandate #: view:website:account_banking_mandate.account_banking_mandate_document msgid "Write any code number here which you wish to have quoted by your bank." -msgstr "Indique en este espacio cualquier número de código con el que desea que su entidad financiera le identifique." +msgstr "" +"Indique en este espacio cualquier número de código con el que desea que su " +"entidad financiera le identifique." #. module: account_banking_mandate #: view:account.banking.mandate:account_banking_mandate.view_mandate_form -msgid "You should set a mandate back to draft only if you cancelled it by mistake. Do you want to continue?" -msgstr "Debe establecer un mandato de vuelta a borrador sólo si lo cancelo por error. ¿Desea continuar?" +msgid "" +"You should set a mandate back to draft only if you cancelled it by mistake. " +"Do you want to continue?" +msgstr "" +"Debe establecer un mandato de vuelta a borrador sólo si lo cancelo por " +"error. ¿Desea continuar?" #. module: account_banking_mandate #: view:website:account_banking_mandate.account_banking_mandate_document -msgid "and another person (e.g. where you are paying the other person's bill) please write the other person's name here." -msgstr "y otra persona (por ejemplo, el pago de la factura de otra persona) indique el nombre de dicha persona en este espacio." +msgid "" +"and another person (e.g. where you are paying the other person's bill) " +"please write the other person's name here." +msgstr "" +"y otra persona (por ejemplo, el pago de la factura de otra persona) indique " +"el nombre de dicha persona en este espacio." #. module: account_banking_mandate #: view:website:account_banking_mandate.account_banking_mandate_document -msgid "to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from" -msgstr "a enviar órdenes a la entidad del deudor para adeudar su cuenta y (B) a la entidad para efectuar los adeudos en su cuenta siguiendo las instrucciones de" - +msgid "" +"to send instructions to your bank to debit your account and (B) your bank to " +"debit your account in accordance with the instructions from" +msgstr "" +"a enviar órdenes a la entidad del deudor para adeudar su cuenta y (B) a la " +"entidad para efectuar los adeudos en su cuenta siguiendo las instrucciones de" diff --git a/account_banking_mandate/reports/account_banking_mandate_view.xml b/account_banking_mandate/reports/account_banking_mandate_view.xml index 49fa21a21..5a8847fe9 100644 --- a/account_banking_mandate/reports/account_banking_mandate_view.xml +++ b/account_banking_mandate/reports/account_banking_mandate_view.xml @@ -21,6 +21,7 @@ Service Provider / Creditor:
+ Identifier:

VAT: Date: Fri, 1 Apr 2016 15:15:19 +0200 Subject: [PATCH 02/11] [FIX][8.0] account_banking_mandate: Slipt basic mandate and sepa. --- account_banking_mandate/__openerp__.py | 3 --- account_banking_mandate/models/account_banking_mandate.py | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/account_banking_mandate/__openerp__.py b/account_banking_mandate/__openerp__.py index 36d7de2dc..991d617d9 100644 --- a/account_banking_mandate/__openerp__.py +++ b/account_banking_mandate/__openerp__.py @@ -25,11 +25,8 @@ 'views/res_partner_bank_view.xml', 'views/bank_payment_line_view.xml', 'data/mandate_reference_sequence.xml', - 'data/report_paperformat.xml', 'security/mandate_security.xml', 'security/ir.model.access.csv', - 'reports/account_banking_mandate_view.xml', - 'reports/account_banking_mandate.xml', ], 'demo': [], 'test': ['test/banking_mandate.yml'], diff --git a/account_banking_mandate/models/account_banking_mandate.py b/account_banking_mandate/models/account_banking_mandate.py index 92cd40d56..be82831b5 100644 --- a/account_banking_mandate/models/account_banking_mandate.py +++ b/account_banking_mandate/models/account_banking_mandate.py @@ -35,6 +35,11 @@ class AccountBankingMandate(models.Model): ('expired', 'Expired'), ('cancel', 'Cancelled')] + @api.model + def _get_mandate_format(self): + return [('basic', _('Basic Mandate'))] + + format = fields.Selection('_get_mandate_format', string='Mandate Format') partner_bank_id = fields.Many2one( comodel_name='res.partner.bank', string='Bank Account', track_visibility='onchange') From 9a911256b8f360540b3abc34b909951b22edf4f3 Mon Sep 17 00:00:00 2001 From: Sergio Incaser Date: Fri, 1 Apr 2016 15:16:29 +0200 Subject: [PATCH 03/11] [IMP][8.0] sepa_direct_debit_mandate: Split basic and sepa mandate --- account_banking_mandate/i18n/es.po | 388 ++++++++---------- .../models/account_banking_mandate.py | 10 +- .../reports/account_banking_mandate.xml | 20 - .../reports/account_banking_mandate_view.xml | 147 ------- .../views/account_banking_mandate_view.xml | 4 +- .../__openerp__.py | 3 + .../data/report_paperformat.xml | 0 .../demo/sepa_direct_debit_demo.xml | 2 + .../models/account_banking_mandate.py | 16 + .../reports/sepa_direct_debit_mandate.xml | 21 + .../views/account_banking_mandate_view.xml | 8 +- .../report_sepa_direct_debit_mandate.xml | 120 ++++++ 12 files changed, 351 insertions(+), 388 deletions(-) delete mode 100644 account_banking_mandate/reports/account_banking_mandate.xml delete mode 100644 account_banking_mandate/reports/account_banking_mandate_view.xml rename {account_banking_mandate => account_banking_sepa_direct_debit}/data/report_paperformat.xml (100%) create mode 100644 account_banking_sepa_direct_debit/reports/sepa_direct_debit_mandate.xml create mode 100644 account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml diff --git a/account_banking_mandate/i18n/es.po b/account_banking_mandate/i18n/es.po index 00f582b8d..c69519c8d 100644 --- a/account_banking_mandate/i18n/es.po +++ b/account_banking_mandate/i18n/es.po @@ -6,20 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-01 10:32+0000\n" -"PO-Revision-Date: 2016-04-01 12:33+0100\n" -"Last-Translator: Sergio Teruel \n" +"POT-Creation-Date: 2016-04-05 20:09+0000\n" +"PO-Revision-Date: 2016-04-05 22:12+0100\n" +"Last-Translator: Sergio Teruel \n" "Language-Team: \n" +"Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.4\n" -"Language: es_ES\n" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "/ BIC:" -msgstr "/ BIC:" #. module: account_banking_mandate #: model:ir.actions.act_window,help:account_banking_mandate.mandate_action @@ -50,19 +45,6 @@ msgstr "Ya existe un mandato con la misma referencia para esta compañía" msgid "A generic banking mandate" msgstr "Un mandato bancario genérico" -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"As part of your rights, you are entitled to a refund from your bank under " -"the terms and conditions of your agreement with your bank.\n" -" A refund must be claimed within 8 weeks starting " -"from the date on which your account was debited." -msgstr "" -"Como parte de sus derechos, el deudor está legitimado al reembolso por su " -"entidad en los términos y condiciones del contrato suscrito con la misma..\n" -" La solicitud de reembolso deberá efectuarse dentro " -"de las ocho semanas que siguen a la fecha de adeudo en cuenta." - #. module: account_banking_mandate #: view:account.banking.mandate:account_banking_mandate.view_mandate_form msgid "Back to Draft" @@ -83,11 +65,6 @@ msgstr "Cuentas de banco" msgid "Bank Payment Lines" msgstr "Líneas de pago bancario" -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Bank name:" -msgstr "Banco:" - #. module: account_banking_mandate #: view:account.banking.mandate:account_banking_mandate.view_mandate_form #: view:account.banking.mandate:account_banking_mandate.view_mandate_tree @@ -124,10 +101,11 @@ msgstr "" "cuenta bancaria da a la compañía para un operación específica" #. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "By signing this mandate form, you authorise (A)" -msgstr "" -"Mediante la firma de esta orden de domiciliación, el deudor autoriza a (A) " +#: selection:account.banking.mandate,format:0 +#: code:addons/account_banking_mandate/models/account_banking_mandate.py:39 +#, python-format +msgid "Basic Mandate" +msgstr "Mandato básico" #. module: account_banking_mandate #: view:account.banking.mandate:account_banking_mandate.view_mandate_form @@ -140,7 +118,7 @@ msgid "Cancelled" msgstr "Cancelado" #. module: account_banking_mandate -#: code:addons/account_banking_mandate/models/account_banking_mandate.py:93 +#: code:addons/account_banking_mandate/models/account_banking_mandate.py:98 #, python-format msgid "" "Cannot validate the mandate '%s' because it is not attached to a bank " @@ -150,7 +128,7 @@ msgstr "" "asociada." #. module: account_banking_mandate -#: code:addons/account_banking_mandate/models/account_banking_mandate.py:89 +#: code:addons/account_banking_mandate/models/account_banking_mandate.py:94 #, python-format msgid "Cannot validate the mandate '%s' without a date of signature." msgstr "No se puede validar el mandato '%s' sin una fecha de firma." @@ -191,25 +169,6 @@ msgstr "Fecha del último cobro" msgid "Date of the last message posted on the record." msgstr "Fecha del último mensaje publicado en el registro." -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Debtor identification code:" -msgstr "Código del deudor:" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Description of contract." -msgstr "Descripción del contrato." - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"Details regarding the underlying relationship between the Creditor and the " -"Debtor - for information purposes only." -msgstr "" -"Información sobre la relación subyacente entre el acreedor y el deudor - a " -"título meramente informativo." - #. module: account_banking_mandate #: field:account.invoice,mandate_id:0 field:payment.line,mandate_id:0 msgid "Direct Debit Mandate" @@ -237,13 +196,10 @@ msgid "Followers" msgstr "Seguidores" #. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"For business users: write any code number here which you wish to have quoted " -"by your bank." -msgstr "" -"Para usuarios empresas: Indique en este espacio cualquier número de código " -"con el que desea que su entidad financiera le identifique." +#: view:account.banking.mandate:account_banking_mandate.view_mandate_form +#: view:account.banking.mandate:account_banking_mandate.view_mandate_tree +msgid "Format" +msgstr "Formato" #. module: account_banking_mandate #: view:account.banking.mandate:account_banking_mandate.view_mandate_search @@ -259,53 +215,16 @@ msgstr "" "Contiene el resumen del chatter (nº de mensajes, ...). Este resumen está " "directamente en formato html para ser insertado en vistas kanban." -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "IBAN:" -msgstr "IBAN:" - #. module: account_banking_mandate #: field:account.banking.mandate,id:0 msgid "ID" msgstr "ID" -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Identification code of the Creditor Reference Party." -msgstr "Código de identificación de la parte de referencia del acreedor" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Identification code of the Debtor Reference Party." -msgstr "Código de identificación de la parte de referencia del deudor" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Identification number of the underlying contract." -msgstr "Número de identificación del contrato subyacente" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Identifier:" -msgstr "Identificador:" - #. module: account_banking_mandate #: help:account.banking.mandate,message_unread:0 msgid "If checked new messages require your attention." msgstr "Si está marcado, hay nuevos mensajes que requieren su atención" -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "If you are paying on your own behalf, leave blank." -msgstr "" -"Si realiza el pago en su propio nombre e interés, deje este espacio en " -"blanco." - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "In respect of the contract:" -msgstr "Respecto al contrato:" - #. module: account_banking_mandate #: model:ir.model,name:account_banking_mandate.model_account_invoice msgid "Invoice" @@ -331,17 +250,8 @@ msgstr "Última actualización por" msgid "Last Updated on" msgstr "Última actualización en" -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"Location and sign: _______________________, at ______ from ____________ from" -msgstr "" -"Lugar y fecha de la firma: _______________________, a ______ de ____________ " -"de" - #. module: account_banking_mandate #: view:bank.payment.line:account_banking_mandate.bank_payment_line_tree -#: model:ir.actions.report.xml,name:account_banking_mandate.report_account_banking_mandate #: view:payment.order:account_banking_mandate.view_mandate_payment_order_form msgid "Mandate" msgstr "Mandato SEPA" @@ -356,25 +266,30 @@ msgstr "Mandato cancelado" msgid "Mandate Expired" msgstr "Mandato expirado" +#. module: account_banking_mandate +#: field:account.banking.mandate,format:0 +msgid "Mandate Format" +msgstr "Formato del mandato" + #. module: account_banking_mandate #: model:mail.message.subtype,name:account_banking_mandate.mandate_valid msgid "Mandate Validated" msgstr "Mandato validado" #. module: account_banking_mandate -#: code:addons/account_banking_mandate/models/account_banking_mandate.py:135 +#: code:addons/account_banking_mandate/models/account_banking_mandate.py:140 #, python-format msgid "Mandate should be in cancel state" msgstr "El mandato debe estar en estado cancelado" #. module: account_banking_mandate -#: code:addons/account_banking_mandate/models/account_banking_mandate.py:123 +#: code:addons/account_banking_mandate/models/account_banking_mandate.py:128 #, python-format msgid "Mandate should be in draft or valid state" msgstr "El mandato debe estar en estado borrador o validado" #. module: account_banking_mandate -#: code:addons/account_banking_mandate/models/account_banking_mandate.py:114 +#: code:addons/account_banking_mandate/models/account_banking_mandate.py:119 #, python-format msgid "Mandate should be in draft state" msgstr "El mandato debe estar en estado borrador" @@ -389,24 +304,6 @@ msgstr "Mensajes" msgid "Messages and communication history" msgstr "Mensajes e historial de comunicación" -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"Name of the Creditor Reference Party: Creditor must complete this section if " -"collecting payment on behalf of another party." -msgstr "" -"Nombre de la parte de referencia del acreedor: el acreedor debe rellenar " -"esta sección si realiza el cobro a favor de un tercero." - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"Name of the Debtor Reference Party: If you are making a payment in respect " -"of an arrangement between" -msgstr "" -"Nombre de la parte de referencia del deudor: Si realiza un pago como " -"consecuencia de un acuerdo entre" - #. module: account_banking_mandate #: help:account.banking.mandate,state:0 msgid "" @@ -421,31 +318,11 @@ msgstr "" msgid "Partner" msgstr "Empresa" -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Party on whose behalf the creditor collects the payment:" -msgstr "Parte en cuyo favor el acreedor realiza el cobro:" - #. module: account_banking_mandate #: model:ir.model,name:account_banking_mandate.model_payment_line msgid "Payment Line" msgstr "Línea de pago" -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Payment type:" -msgstr "Tipo de pago" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Person on whose behalf payment is made:" -msgstr "Persona en cuyo nombre se realiza el pago:" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Policyholder Service / Debtor:" -msgstr "Tomador del servicio / Deudor:" - #. module: account_banking_mandate #: view:account.banking.mandate:account_banking_mandate.view_mandate_tree msgid "Reference" @@ -456,27 +333,12 @@ msgstr "Referencia" msgid "Reference or Partner" msgstr "Referencia o cliente" -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Reference:" -msgstr "Referencia:" - #. module: account_banking_mandate #: view:account.banking.mandate:account_banking_mandate.view_mandate_form #: field:account.banking.mandate,payment_line_ids:0 msgid "Related Payment Lines" msgstr "Líneas de pago relacionadas" -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "SEPA BUSINESS-TO-BUSINESS DIRECT DEBIT MANDATE" -msgstr "Orden de domiciliación de adeudo directo SEPA B2B" - -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "SEPA DIRECT DEBIT MANDATE" -msgstr "Orden de domiciliación de adeudo directo SEPA" - #. module: account_banking_mandate #: model:ir.ui.menu,name:account_banking_mandate.mandate_menu msgid "SEPA Direct Debit Mandates" @@ -493,9 +355,9 @@ msgid "Search Banking Mandates" msgstr "Buscar mandatos bancarios" #. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Service Provider / Creditor:" -msgstr "Entidad prestadora del servicio / Acreedor:" +#: selection:account.banking.mandate,format:0 +msgid "Sepa Mandate" +msgstr "Mandato SEPA" #. module: account_banking_mandate #: view:account.banking.mandate:account_banking_mandate.view_mandate_search @@ -514,13 +376,13 @@ msgid "Summary" msgstr "Resumen" #. module: account_banking_mandate -#: code:addons/account_banking_mandate/models/account_banking_mandate.py:75 +#: code:addons/account_banking_mandate/models/account_banking_mandate.py:80 #, python-format msgid "The date of signature of mandate '%s' is in the future !" msgstr "La fecha de firma del mandato '%s' no puede ser superior a la actual" #. module: account_banking_mandate -#: code:addons/account_banking_mandate/models/account_banking_mandate.py:80 +#: code:addons/account_banking_mandate/models/account_banking_mandate.py:85 #, python-format msgid "" "The mandate '%s' can't have a date of last debit before the date of " @@ -541,23 +403,6 @@ msgstr "" "está puesta en el mandato '%s' (este mandato tiene como cuenta bancaria " "'%s')." -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"This mandate is only intended for business-to-business transactions. You are " -"not entitled to a refund from your bank after your account has been debited, " -"but you are entitled to request your bank not to debit your account up until " -"the day on which the payment is due.\n" -" Please complete all the fields marked *." -msgstr "" -"Esta orden de domiciliación está prevista para operaciones exclusivamente " -"entre empresas y/o autónomos. El deudor no tiene derecho a que su entidad le " -"reembolse una vez que se haya realizado el cargo en cuenta, pero puede " -"solicitar a su entidad que no efectúe el adeudo en la cuenta hasta la fecha " -"debida. Podrá obtener información detallada del procedimiento en su entidad " -"financiera\n" -" Por favor rellene todos los campos marcados con un *." - #. module: account_banking_mandate #: field:account.banking.mandate,unique_mandate_reference:0 msgid "Unique Mandate Reference" @@ -568,11 +413,6 @@ msgstr "Referencia única del mandato" msgid "Unread Messages" msgstr "Mensajes sin leer" -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "VAT:" -msgstr "NIF:" - #. module: account_banking_mandate #: view:account.banking.mandate:account_banking_mandate.view_mandate_search msgid "Valid" @@ -583,13 +423,6 @@ msgstr "Válido" msgid "Validate" msgstr "Validar" -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "Write any code number here which you wish to have quoted by your bank." -msgstr "" -"Indique en este espacio cualquier número de código con el que desea que su " -"entidad financiera le identifique." - #. module: account_banking_mandate #: view:account.banking.mandate:account_banking_mandate.view_mandate_form msgid "" @@ -599,20 +432,153 @@ msgstr "" "Debe establecer un mandato de vuelta a borrador sólo si lo cancelo por " "error. ¿Desea continuar?" -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"and another person (e.g. where you are paying the other person's bill) " -"please write the other person's name here." -msgstr "" -"y otra persona (por ejemplo, el pago de la factura de otra persona) indique " -"el nombre de dicha persona en este espacio." +#~ msgid "/ BIC:" +#~ msgstr "/ BIC:" -#. module: account_banking_mandate -#: view:website:account_banking_mandate.account_banking_mandate_document -msgid "" -"to send instructions to your bank to debit your account and (B) your bank to " -"debit your account in accordance with the instructions from" -msgstr "" -"a enviar órdenes a la entidad del deudor para adeudar su cuenta y (B) a la " -"entidad para efectuar los adeudos en su cuenta siguiendo las instrucciones de" +#~ msgid "" +#~ "As part of your rights, you are entitled to a refund from your bank under " +#~ "the terms and conditions of your agreement with your bank.\n" +#~ " A refund must be claimed within 8 weeks starting " +#~ "from the date on which your account was debited." +#~ msgstr "" +#~ "Como parte de sus derechos, el deudor está legitimado al reembolso por su " +#~ "entidad en los términos y condiciones del contrato suscrito con la " +#~ "misma..\n" +#~ " La solicitud de reembolso deberá efectuarse " +#~ "dentro de las ocho semanas que siguen a la fecha de adeudo en cuenta." + +#~ msgid "Bank name:" +#~ msgstr "Banco:" + +#~ msgid "By signing this mandate form, you authorise (A)" +#~ msgstr "" +#~ "Mediante la firma de esta orden de domiciliación, el deudor autoriza a " +#~ "(A) " + +#~ msgid "Debtor identification code:" +#~ msgstr "Código del deudor:" + +#~ msgid "Description of contract." +#~ msgstr "Descripción del contrato." + +#~ msgid "" +#~ "Details regarding the underlying relationship between the Creditor and " +#~ "the Debtor - for information purposes only." +#~ msgstr "" +#~ "Información sobre la relación subyacente entre el acreedor y el deudor - " +#~ "a título meramente informativo." + +#~ msgid "" +#~ "For business users: write any code number here which you wish to have " +#~ "quoted by your bank." +#~ msgstr "" +#~ "Para usuarios empresas: Indique en este espacio cualquier número de " +#~ "código con el que desea que su entidad financiera le identifique." + +#~ msgid "IBAN:" +#~ msgstr "IBAN:" + +#~ msgid "Identification code of the Creditor Reference Party." +#~ msgstr "Código de identificación de la parte de referencia del acreedor" + +#~ msgid "Identification code of the Debtor Reference Party." +#~ msgstr "Código de identificación de la parte de referencia del deudor" + +#~ msgid "Identification number of the underlying contract." +#~ msgstr "Número de identificación del contrato subyacente" + +#~ msgid "Identifier:" +#~ msgstr "Identificador:" + +#~ msgid "If you are paying on your own behalf, leave blank." +#~ msgstr "" +#~ "Si realiza el pago en su propio nombre e interés, deje este espacio en " +#~ "blanco." + +#~ msgid "In respect of the contract:" +#~ msgstr "Respecto al contrato:" + +#~ msgid "" +#~ "Location and sign: _______________________, at ______ from ____________ " +#~ "from" +#~ msgstr "" +#~ "Lugar y fecha de la firma: _______________________, a ______ de " +#~ "____________ de" + +#~ msgid "" +#~ "Name of the Creditor Reference Party: Creditor must complete this section " +#~ "if collecting payment on behalf of another party." +#~ msgstr "" +#~ "Nombre de la parte de referencia del acreedor: el acreedor debe rellenar " +#~ "esta sección si realiza el cobro a favor de un tercero." + +#~ msgid "" +#~ "Name of the Debtor Reference Party: If you are making a payment in " +#~ "respect of an arrangement between" +#~ msgstr "" +#~ "Nombre de la parte de referencia del deudor: Si realiza un pago como " +#~ "consecuencia de un acuerdo entre" + +#~ msgid "Party on whose behalf the creditor collects the payment:" +#~ msgstr "Parte en cuyo favor el acreedor realiza el cobro:" + +#~ msgid "Payment type:" +#~ msgstr "Tipo de pago" + +#~ msgid "Person on whose behalf payment is made:" +#~ msgstr "Persona en cuyo nombre se realiza el pago:" + +#~ msgid "Policyholder Service / Debtor:" +#~ msgstr "Tomador del servicio / Deudor:" + +#~ msgid "Reference:" +#~ msgstr "Referencia:" + +#~ msgid "SEPA BUSINESS-TO-BUSINESS DIRECT DEBIT MANDATE" +#~ msgstr "Orden de domiciliación de adeudo directo SEPA B2B" + +#~ msgid "SEPA DIRECT DEBIT MANDATE" +#~ msgstr "Orden de domiciliación de adeudo directo SEPA" + +#~ msgid "Service Provider / Creditor:" +#~ msgstr "Entidad prestadora del servicio / Acreedor:" + +#~ msgid "" +#~ "This mandate is only intended for business-to-business transactions. You " +#~ "are not entitled to a refund from your bank after your account has been " +#~ "debited, but you are entitled to request your bank not to debit your " +#~ "account up until the day on which the payment is due.\n" +#~ " Please complete all the fields marked *." +#~ msgstr "" +#~ "Esta orden de domiciliación está prevista para operaciones exclusivamente " +#~ "entre empresas y/o autónomos. El deudor no tiene derecho a que su entidad " +#~ "le reembolse una vez que se haya realizado el cargo en cuenta, pero puede " +#~ "solicitar a su entidad que no efectúe el adeudo en la cuenta hasta la " +#~ "fecha debida. Podrá obtener información detallada del procedimiento en su " +#~ "entidad financiera\n" +#~ " Por favor rellene todos los campos marcados con " +#~ "un *." + +#~ msgid "VAT:" +#~ msgstr "NIF:" + +#~ msgid "" +#~ "Write any code number here which you wish to have quoted by your bank." +#~ msgstr "" +#~ "Indique en este espacio cualquier número de código con el que desea que " +#~ "su entidad financiera le identifique." + +#~ msgid "" +#~ "and another person (e.g. where you are paying the other person's bill) " +#~ "please write the other person's name here." +#~ msgstr "" +#~ "y otra persona (por ejemplo, el pago de la factura de otra persona) " +#~ "indique el nombre de dicha persona en este espacio." + +#~ msgid "" +#~ "to send instructions to your bank to debit your account and (B) your bank " +#~ "to debit your account in accordance with the instructions from" +#~ msgstr "" +#~ "a enviar órdenes a la entidad del deudor para adeudar su cuenta y (B) a " +#~ "la entidad para efectuar los adeudos en su cuenta siguiendo las " +#~ "instrucciones de" diff --git a/account_banking_mandate/models/account_banking_mandate.py b/account_banking_mandate/models/account_banking_mandate.py index be82831b5..5156d7de2 100644 --- a/account_banking_mandate/models/account_banking_mandate.py +++ b/account_banking_mandate/models/account_banking_mandate.py @@ -35,11 +35,11 @@ class AccountBankingMandate(models.Model): ('expired', 'Expired'), ('cancel', 'Cancelled')] - @api.model - def _get_mandate_format(self): - return [('basic', _('Basic Mandate'))] - - format = fields.Selection('_get_mandate_format', string='Mandate Format') + format = fields.Selection( + [('basic', _('Basic Mandate'))], + default='basic', + string='Mandate Format', + ) partner_bank_id = fields.Many2one( comodel_name='res.partner.bank', string='Bank Account', track_visibility='onchange') diff --git a/account_banking_mandate/reports/account_banking_mandate.xml b/account_banking_mandate/reports/account_banking_mandate.xml deleted file mode 100644 index 913da0bd3..000000000 --- a/account_banking_mandate/reports/account_banking_mandate.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - diff --git a/account_banking_mandate/reports/account_banking_mandate_view.xml b/account_banking_mandate/reports/account_banking_mandate_view.xml deleted file mode 100644 index 5a8847fe9..000000000 --- a/account_banking_mandate/reports/account_banking_mandate_view.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - diff --git a/account_banking_mandate/views/account_banking_mandate_view.xml b/account_banking_mandate/views/account_banking_mandate_view.xml index 2c66bd06c..f91c35bd3 100644 --- a/account_banking_mandate/views/account_banking_mandate_view.xml +++ b/account_banking_mandate/views/account_banking_mandate_view.xml @@ -12,7 +12,7 @@ view.mandate.form account.banking.mandate -
+
+ + diff --git a/account_banking_sepa_direct_debit/__openerp__.py b/account_banking_sepa_direct_debit/__openerp__.py index c7922127f..ef4bc856c 100644 --- a/account_banking_sepa_direct_debit/__openerp__.py +++ b/account_banking_sepa_direct_debit/__openerp__.py @@ -27,6 +27,9 @@ 'wizard/export_sdd_view.xml', 'data/mandate_expire_cron.xml', 'data/payment_type_sdd.xml', + 'data/report_paperformat.xml', + 'reports/sepa_direct_debit_mandate.xml', + 'views/report_sepa_direct_debit_mandate.xml', 'security/original_mandate_required_security.xml', ], 'demo': ['demo/sepa_direct_debit_demo.xml'], diff --git a/account_banking_mandate/data/report_paperformat.xml b/account_banking_sepa_direct_debit/data/report_paperformat.xml similarity index 100% rename from account_banking_mandate/data/report_paperformat.xml rename to account_banking_sepa_direct_debit/data/report_paperformat.xml diff --git a/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml b/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml index 07b347f6c..bcbeb7fb8 100644 --- a/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml +++ b/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml @@ -19,6 +19,7 @@ + sepa recurrent first 2014-02-01 @@ -27,6 +28,7 @@ + sepa recurrent first diff --git a/account_banking_sepa_direct_debit/models/account_banking_mandate.py b/account_banking_sepa_direct_debit/models/account_banking_mandate.py index a2e9668f8..4219cee81 100644 --- a/account_banking_sepa_direct_debit/models/account_banking_mandate.py +++ b/account_banking_sepa_direct_debit/models/account_banking_mandate.py @@ -31,6 +31,10 @@ class AccountBankingMandate(models.Model): } } + format = fields.Selection( + selection_add=[('sepa', _('Sepa Mandate'))], + default='sepa', + ) type = fields.Selection([('recurrent', 'Recurrent'), ('oneoff', 'One-Off')], string='Type of Mandate', required=True, @@ -91,6 +95,18 @@ class AccountBankingMandate(models.Model): "recurrent mandate '%s' which is not marked as 'Migrated to " "SEPA'.") % self.unique_mandate_reference) + @api.model + def _get_mandate_format(self): + res = super(AccountBankingMandate, self)._get_mandate_format() + res.append(('sepa', _('Sepa Mandate'))) + return res + + + @api.model + def _default_mandate_format(self): + res = super(AccountBankingMandate, self).default_mandate_format() + return 'sepa' + @api.one @api.onchange('partner_bank_id') def mandate_partner_bank_change(self): diff --git a/account_banking_sepa_direct_debit/reports/sepa_direct_debit_mandate.xml b/account_banking_sepa_direct_debit/reports/sepa_direct_debit_mandate.xml new file mode 100644 index 000000000..1d6a9daa2 --- /dev/null +++ b/account_banking_sepa_direct_debit/reports/sepa_direct_debit_mandate.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + diff --git a/account_banking_sepa_direct_debit/views/account_banking_mandate_view.xml b/account_banking_sepa_direct_debit/views/account_banking_mandate_view.xml index 366edfaf8..0728c8616 100644 --- a/account_banking_sepa_direct_debit/views/account_banking_mandate_view.xml +++ b/account_banking_sepa_direct_debit/views/account_banking_mandate_view.xml @@ -17,9 +17,10 @@ - - - + + + @@ -124,6 +125,5 @@ Sequence Type set to Final - diff --git a/account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml b/account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml new file mode 100644 index 000000000..7d5b312c3 --- /dev/null +++ b/account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml @@ -0,0 +1,120 @@ + + + + + + + + + + From aa93ed24c553099581aa92494f02476d6b30c043 Mon Sep 17 00:00:00 2001 From: sergio-incaser Date: Tue, 5 Apr 2016 23:11:50 +0200 Subject: [PATCH 04/11] [IMP][8.0] account_banking_sepa_direct_debit: Use api.multi instead --- account_banking_sepa_direct_debit/README.rst | 1 + .../models/account_banking_mandate.py | 108 ++++++++---------- .../models/payment_mode.py | 15 +-- .../models/res_company.py | 15 +-- .../views/account_banking_mandate_view.xml | 9 +- .../report_sepa_direct_debit_mandate.xml | 4 +- 6 files changed, 75 insertions(+), 77 deletions(-) diff --git a/account_banking_sepa_direct_debit/README.rst b/account_banking_sepa_direct_debit/README.rst index 10eb9754d..04d40f4c3 100644 --- a/account_banking_sepa_direct_debit/README.rst +++ b/account_banking_sepa_direct_debit/README.rst @@ -71,6 +71,7 @@ Contributors * Raphaël Valyi * Sandy Carter * Antonio Espinosa +* Sergio Teruel Maintainer diff --git a/account_banking_sepa_direct_debit/models/account_banking_mandate.py b/account_banking_sepa_direct_debit/models/account_banking_mandate.py index 4219cee81..f3ac6d38d 100644 --- a/account_banking_sepa_direct_debit/models/account_banking_mandate.py +++ b/account_banking_sepa_direct_debit/models/account_banking_mandate.py @@ -37,7 +37,7 @@ class AccountBankingMandate(models.Model): ) type = fields.Selection([('recurrent', 'Recurrent'), ('oneoff', 'One-Off')], - string='Type of Mandate', required=True, + string='Type of Mandate', track_visibility='always') recurrent_sequence_type = fields.Selection( [('first', 'First'), @@ -63,69 +63,61 @@ class AccountBankingMandate(models.Model): "Direct Debit file.") scheme = fields.Selection([('CORE', 'Basic (CORE)'), ('B2B', 'Enterprise (B2B)')], - string='Scheme', required=True, default="CORE") + string='Scheme', default="CORE") unique_mandate_reference = fields.Char(size=35) # cf ISO 20022 - @api.one + @api.multi @api.constrains('type', 'recurrent_sequence_type') def _check_recurring_type(self): - if (self.type == 'recurrent' and - not self.recurrent_sequence_type): - raise exceptions.Warning( - _("The recurrent mandate '%s' must have a sequence type.") - % self.unique_mandate_reference) - - @api.one - @api.constrains('type', 'recurrent_sequence_type', 'sepa_migrated') - def _check_migrated_to_sepa(self): - if (self.type == 'recurrent' and not self.sepa_migrated and - self.recurrent_sequence_type != 'first'): - raise exceptions.Warning( - _("The recurrent mandate '%s' which is not marked as " - "'Migrated to SEPA' must have its recurrent sequence type " - "set to 'First'.") % self.unique_mandate_reference) - - @api.one - @api.constrains('type', 'original_mandate_identification', 'sepa_migrated') - def _check_original_mandate_identification(self): - if (self.type == 'recurrent' and not self.sepa_migrated and - not self.original_mandate_identification): - raise exceptions.Warning( - _("You must set the 'Original Mandate Identification' on the " - "recurrent mandate '%s' which is not marked as 'Migrated to " - "SEPA'.") % self.unique_mandate_reference) - - @api.model - def _get_mandate_format(self): - res = super(AccountBankingMandate, self)._get_mandate_format() - res.append(('sepa', _('Sepa Mandate'))) - return res - - - @api.model - def _default_mandate_format(self): - res = super(AccountBankingMandate, self).default_mandate_format() - return 'sepa' - - @api.one - @api.onchange('partner_bank_id') - def mandate_partner_bank_change(self): - super(AccountBankingMandate, self).mandate_partner_bank_change() - res = {} - if (self.state == 'valid' and - self.partner_bank_id and - self.type == 'recurrent' and - self.recurrent_sequence_type != 'first'): - self.recurrent_sequence_type = 'first' - res['warning'] = { - 'title': _('Mandate update'), - 'message': _("As you changed the bank account attached to " - "this mandate, the 'Sequence Type' has been set " - "back to 'First'."), - } - return res + for mandate in self: + if (mandate.type == 'recurrent' and + not mandate.recurrent_sequence_type): + raise exceptions.Warning( + _("The recurrent mandate '%s' must have a sequence type.") + % mandate.unique_mandate_reference) @api.multi + @api.constrains('type', 'recurrent_sequence_type', 'sepa_migrated') + def _check_migrated_to_sepa(self): + for mandate in self: + if (mandate.type == 'recurrent' and not mandate.sepa_migrated and + mandate.recurrent_sequence_type != 'first'): + raise exceptions.Warning( + _("The recurrent mandate '%s' which is not marked as " + "'Migrated to SEPA' must have its recurrent sequence type " + "set to 'First'.") % mandate.unique_mandate_reference) + + @api.multi + @api.constrains('type', 'original_mandate_identification', 'sepa_migrated') + def _check_original_mandate_identification(self): + for mandate in self: + if (mandate.type == 'recurrent' and not mandate.sepa_migrated and + not mandate.original_mandate_identification): + raise exceptions.Warning( + _("You must set the 'Original Mandate Identification' on the " + "recurrent mandate '%s' which is not marked as 'Migrated to " + "SEPA'.") % mandate.unique_mandate_reference) + + @api.multi + @api.onchange('partner_bank_id') + def mandate_partner_bank_change(self): + for mandate in self: + super(AccountBankingMandate, self).mandate_partner_bank_change() + res = {} + if (mandate.state == 'valid' and + mandate.partner_bank_id and + mandate.type == 'recurrent' and + mandate.recurrent_sequence_type != 'first'): + mandate.recurrent_sequence_type = 'first' + res['warning'] = { + 'title': _('Mandate update'), + 'message': _("As you changed the bank account attached to " + "this mandate, the 'Sequence Type' has been set " + "back to 'First'."), + } + return res + + @api.model def _sdd_mandate_set_state_to_expired(self): logger.info('Searching for SDD Mandates that must be set to Expired') expire_limit_date = datetime.today() + \ diff --git a/account_banking_sepa_direct_debit/models/payment_mode.py b/account_banking_sepa_direct_debit/models/payment_mode.py index 9753ac319..f3c1ac1b6 100644 --- a/account_banking_sepa_direct_debit/models/payment_mode.py +++ b/account_banking_sepa_direct_debit/models/payment_mode.py @@ -31,12 +31,13 @@ class PaymentMode(models.Model): res = 'sepa_direct_debit' return res - @api.one + @api.multi @api.constrains('sepa_creditor_identifier') def _check_sepa_creditor_identifier(self): - if self.sepa_creditor_identifier: - if not is_sepa_creditor_identifier_valid( - self.sepa_creditor_identifier): - raise exceptions.Warning( - _('Error'), - _("Invalid SEPA Creditor Identifier.")) + for payment_mode in self: + if payment_mode.sepa_creditor_identifier: + if not is_sepa_creditor_identifier_valid( + payment_mode.sepa_creditor_identifier): + raise exceptions.Warning( + _('Error'), + _("Invalid SEPA Creditor Identifier.")) diff --git a/account_banking_sepa_direct_debit/models/res_company.py b/account_banking_sepa_direct_debit/models/res_company.py index 8b76a9678..c57dc8b04 100644 --- a/account_banking_sepa_direct_debit/models/res_company.py +++ b/account_banking_sepa_direct_debit/models/res_company.py @@ -21,12 +21,13 @@ class ResCompany(models.Model): original_creditor_identifier = fields.Char( string='Original Creditor Identifier', size=70) - @api.one + @api.multi @api.constrains('sepa_creditor_identifier') def _check_sepa_creditor_identifier(self): - if self.sepa_creditor_identifier: - if not is_sepa_creditor_identifier_valid( - self.sepa_creditor_identifier): - raise exceptions.Warning( - _('Error'), - _("Invalid SEPA Creditor Identifier.")) + for company in self: + if company.sepa_creditor_identifier: + if not is_sepa_creditor_identifier_valid( + company.sepa_creditor_identifier): + raise exceptions.Warning( + _('Error'), + _("Invalid SEPA Creditor Identifier.")) diff --git a/account_banking_sepa_direct_debit/views/account_banking_mandate_view.xml b/account_banking_sepa_direct_debit/views/account_banking_mandate_view.xml index 0728c8616..667cedb54 100644 --- a/account_banking_sepa_direct_debit/views/account_banking_mandate_view.xml +++ b/account_banking_sepa_direct_debit/views/account_banking_mandate_view.xml @@ -17,10 +17,13 @@ - + - + attrs="{'invisible': ['|', ('type', '=', 'oneoff'), ('format', '!=', 'sepa')], + 'required': [('type', '=', 'recurrent')]}"/> + diff --git a/account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml b/account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml index 7d5b312c3..42705e28a 100644 --- a/account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml +++ b/account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml @@ -46,9 +46,9 @@
-

By signing this mandate form, you authorise (A) +

By signing this mandate form, you authorise (A) to send instructions to your bank to debit your account and (B) your bank to - debit your account in accordance with the instructions from . + debit your account in accordance with the instructions from .

From 5ea5adf33a8f7c4f3a14a98aefab0829490c2fa0 Mon Sep 17 00:00:00 2001 From: sergio-incaser Date: Tue, 5 Apr 2016 23:23:48 +0200 Subject: [PATCH 05/11] [IMP][8.0] account_banking_mandate: Use api.multi instead --- .../models/account_banking_mandate.py | 54 ++++++++++--------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/account_banking_mandate/models/account_banking_mandate.py b/account_banking_mandate/models/account_banking_mandate.py index 5156d7de2..8e4ea65d0 100644 --- a/account_banking_mandate/models/account_banking_mandate.py +++ b/account_banking_mandate/models/account_banking_mandate.py @@ -71,33 +71,38 @@ class AccountBankingMandate(models.Model): 'unique(unique_mandate_reference, company_id)', 'A Mandate with the same reference already exists for this company !')] - @api.one + @api.multi @api.constrains('signature_date', 'last_debit_date') def _check_dates(self): - if (self.signature_date and - self.signature_date > fields.Date.context_today(self)): - raise exceptions.Warning( - _("The date of signature of mandate '%s' is in the future !") - % self.unique_mandate_reference) - if (self.signature_date and self.last_debit_date and - self.signature_date > self.last_debit_date): - raise exceptions.Warning( - _("The mandate '%s' can't have a date of last debit before " - "the date of signature.") % self.unique_mandate_reference) + for mandate in self: + if (mandate.signature_date and + mandate.signature_date > fields.Date.context_today( + mandate)): + raise exceptions.Warning( + _("The date of signature of mandate '%s' " + "is in the future !") + % mandate.unique_mandate_reference) + if (mandate.signature_date and mandate.last_debit_date and + mandate.signature_date > mandate.last_debit_date): + raise exceptions.Warning( + _("The mandate '%s' can't have a date of last debit " + "before the date of signature." + ) % mandate.unique_mandate_reference) - @api.one + @api.multi @api.constrains('state', 'partner_bank_id') def _check_valid_state(self): - if self.state == 'valid': - if not self.signature_date: - raise exceptions.Warning( - _("Cannot validate the mandate '%s' without a date of " - "signature.") % self.unique_mandate_reference) - if not self.partner_bank_id: - raise exceptions.Warning( - _("Cannot validate the mandate '%s' because it is not " - "attached to a bank account.") % - self.unique_mandate_reference) + for mandate in self: + if mandate.state == 'valid': + if not mandate.signature_date: + raise exceptions.Warning( + _("Cannot validate the mandate '%s' without a date of " + "signature.") % mandate.unique_mandate_reference) + if not mandate.partner_bank_id: + raise exceptions.Warning( + _("Cannot validate the mandate '%s' because it is not " + "attached to a bank account.") % + mandate.unique_mandate_reference) @api.model def create(self, vals=None): @@ -106,10 +111,11 @@ class AccountBankingMandate(models.Model): self.env['ir.sequence'].next_by_code('account.banking.mandate') return super(AccountBankingMandate, self).create(vals) - @api.one + @api.multi @api.onchange('partner_bank_id') def mandate_partner_bank_change(self): - self.partner_id = self.partner_bank_id.partner_id + for mandate in self: + mandate.partner_id = mandate.partner_bank_id.partner_id @api.multi def validate(self): From 94d1b4c46eb8034566964cca1d44d96a870b1b25 Mon Sep 17 00:00:00 2001 From: Sergio Incaser Date: Wed, 6 Apr 2016 09:12:55 +0200 Subject: [PATCH 06/11] [IMP][8.0] sepa_direct_debit_mandate: Migration script --- account_banking_sepa_direct_debit/__openerp__.py | 2 +- .../migrations/8.0.0.5/post-migration.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 account_banking_sepa_direct_debit/migrations/8.0.0.5/post-migration.py diff --git a/account_banking_sepa_direct_debit/__openerp__.py b/account_banking_sepa_direct_debit/__openerp__.py index ef4bc856c..798db0176 100644 --- a/account_banking_sepa_direct_debit/__openerp__.py +++ b/account_banking_sepa_direct_debit/__openerp__.py @@ -7,7 +7,7 @@ { 'name': 'Account Banking SEPA Direct Debit', 'summary': 'Create SEPA files for Direct Debit', - 'version': '8.0.0.4.0', + 'version': '8.0.0.5.0', 'license': 'AGPL-3', 'author': "Akretion, " "Serv. Tecnol. Avanzados - Pedro M. Baeza, " diff --git a/account_banking_sepa_direct_debit/migrations/8.0.0.5/post-migration.py b/account_banking_sepa_direct_debit/migrations/8.0.0.5/post-migration.py new file mode 100644 index 000000000..958a1af7d --- /dev/null +++ b/account_banking_sepa_direct_debit/migrations/8.0.0.5/post-migration.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# © 2016 Sergio Teruel +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + + +def migrate(cr, version): + if not version: + return + + cr.execute(''' + UPDATE account_banking_mandate SET format='sepa' + ''') + return From 6451618527672327ce878a017a36162e9cc0c048 Mon Sep 17 00:00:00 2001 From: Sergio Incaser Date: Wed, 6 Apr 2016 09:13:43 +0200 Subject: [PATCH 07/11] [IMP][8.0] account_banking_mandate: Make format field required --- account_banking_mandate/models/account_banking_mandate.py | 1 + 1 file changed, 1 insertion(+) diff --git a/account_banking_mandate/models/account_banking_mandate.py b/account_banking_mandate/models/account_banking_mandate.py index 8e4ea65d0..b001b22c7 100644 --- a/account_banking_mandate/models/account_banking_mandate.py +++ b/account_banking_mandate/models/account_banking_mandate.py @@ -38,6 +38,7 @@ class AccountBankingMandate(models.Model): format = fields.Selection( [('basic', _('Basic Mandate'))], default='basic', + required=True, string='Mandate Format', ) partner_bank_id = fields.Many2one( From bf807e998b4ffb29ad267d2aaa8109da752e9776 Mon Sep 17 00:00:00 2001 From: Sergio Incaser Date: Wed, 6 Apr 2016 10:58:38 +0200 Subject: [PATCH 08/11] [IMP][8.0] account_banking_mandate: Pep8 fixes --- account_banking_mandate/models/account_banking_mandate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/account_banking_mandate/models/account_banking_mandate.py b/account_banking_mandate/models/account_banking_mandate.py index b001b22c7..835ad3104 100644 --- a/account_banking_mandate/models/account_banking_mandate.py +++ b/account_banking_mandate/models/account_banking_mandate.py @@ -77,14 +77,14 @@ class AccountBankingMandate(models.Model): def _check_dates(self): for mandate in self: if (mandate.signature_date and - mandate.signature_date > fields.Date.context_today( + mandate.signature_date > fields.Date.context_today( mandate)): raise exceptions.Warning( _("The date of signature of mandate '%s' " "is in the future !") % mandate.unique_mandate_reference) if (mandate.signature_date and mandate.last_debit_date and - mandate.signature_date > mandate.last_debit_date): + mandate.signature_date > mandate.last_debit_date): raise exceptions.Warning( _("The mandate '%s' can't have a date of last debit " "before the date of signature." From 2308ba94310993a5a5983b3d79913645ef52b008 Mon Sep 17 00:00:00 2001 From: Sergio Incaser Date: Wed, 6 Apr 2016 11:00:56 +0200 Subject: [PATCH 09/11] [IMP][8.0] account_banking_sepa_direct_debit: Pep8 fixes --- .../models/account_banking_mandate.py | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/account_banking_sepa_direct_debit/models/account_banking_mandate.py b/account_banking_sepa_direct_debit/models/account_banking_mandate.py index f3ac6d38d..ca2381204 100644 --- a/account_banking_sepa_direct_debit/models/account_banking_mandate.py +++ b/account_banking_sepa_direct_debit/models/account_banking_mandate.py @@ -81,11 +81,12 @@ class AccountBankingMandate(models.Model): def _check_migrated_to_sepa(self): for mandate in self: if (mandate.type == 'recurrent' and not mandate.sepa_migrated and - mandate.recurrent_sequence_type != 'first'): + mandate.recurrent_sequence_type != 'first'): raise exceptions.Warning( _("The recurrent mandate '%s' which is not marked as " - "'Migrated to SEPA' must have its recurrent sequence type " - "set to 'First'.") % mandate.unique_mandate_reference) + "'Migrated to SEPA' must have its recurrent sequence " + "type set to 'First'.") + % mandate.unique_mandate_reference) @api.multi @api.constrains('type', 'original_mandate_identification', 'sepa_migrated') @@ -94,9 +95,10 @@ class AccountBankingMandate(models.Model): if (mandate.type == 'recurrent' and not mandate.sepa_migrated and not mandate.original_mandate_identification): raise exceptions.Warning( - _("You must set the 'Original Mandate Identification' on the " - "recurrent mandate '%s' which is not marked as 'Migrated to " - "SEPA'.") % mandate.unique_mandate_reference) + _("You must set the 'Original Mandate Identification' on " + "the recurrent mandate '%s' which is not marked as " + "'Migrated to SEPA'.") + % mandate.unique_mandate_reference) @api.multi @api.onchange('partner_bank_id') @@ -111,9 +113,9 @@ class AccountBankingMandate(models.Model): mandate.recurrent_sequence_type = 'first' res['warning'] = { 'title': _('Mandate update'), - 'message': _("As you changed the bank account attached to " - "this mandate, the 'Sequence Type' has been set " - "back to 'First'."), + 'message': _("As you changed the bank account attached " + "to this mandate, the 'Sequence Type' has " + "been set back to 'First'."), } return res From ac3a727cd8935aeabefcebd8c18a9790270b5862 Mon Sep 17 00:00:00 2001 From: sergio-incaser Date: Wed, 6 Apr 2016 21:47:45 +0200 Subject: [PATCH 10/11] [FIX][8.0] account_banking_sepa_direct_debit: Fix translation --- account_banking_sepa_direct_debit/i18n/es.po | 375 ++++++++++++++++--- 1 file changed, 332 insertions(+), 43 deletions(-) diff --git a/account_banking_sepa_direct_debit/i18n/es.po b/account_banking_sepa_direct_debit/i18n/es.po index 1255410e6..ce10768cd 100644 --- a/account_banking_sepa_direct_debit/i18n/es.po +++ b/account_banking_sepa_direct_debit/i18n/es.po @@ -1,32 +1,38 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_banking_sepa_direct_debit +# * account_banking_sepa_direct_debit # msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-16 07:53+0000\n" -"PO-Revision-Date: 2016-02-16 07:53+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2016-04-05 20:32+0000\n" +"PO-Revision-Date: 2016-04-05 23:01+0100\n" +"Last-Translator: Sergio Teruel \n" "Language-Team: \n" +"Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" #. module: account_banking_sepa_direct_debit #: model:ir.actions.act_window,help:account_banking_sepa_direct_debit.mandate_action -msgid "

\n" +msgid "" +"

\n" " Click to create a new SEPA Direct Debit Mandate.\n" "

\n" -" A SEPA Direct Debit Mandate is a document signed by your customer that gives you the autorization to do one or several direct debits on his bank account.\n" +" A SEPA Direct Debit Mandate is a document signed by your customer " +"that gives you the autorization to do one or several direct debits on his " +"bank account.\n" "

\n" " " -msgstr "

\n" +msgstr "" +"

\n" " Pulse para crear un nuevo mandato bancario.\n" "

\n" -" Un mandato bancario es un documento firmado por su cliente que le da la autorización para hacer una o varias operaciones en su cuenta bancaria.\n" +" Un mandato bancario es un documento firmado por su cliente que le da " +"la autorización para hacer una o varias operaciones en su cuenta bancaria.\n" "

\n" " " @@ -36,10 +42,70 @@ msgid "A generic banking mandate" msgstr "Un mandato bancario genérico" #. module: account_banking_sepa_direct_debit -#: code:addons/account_banking_sepa_direct_debit/models/account_banking_mandate.py:106 +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "" +"ALL GAPS ARE MANDATORY. ONCE THIS MANDATE HAS BEEN SIGNED MUST BE SENT TO " +"CREDITOR FOR STORAGE." +msgstr "" +"TODOS LOS CAMPOS HAN DE SER CUMPLIMENTADOS OBLIGATORIAMENTE. UNA VEZ FIRMADA " +"ESTA ORDEN DE DOMICILIACIÓN DEBE SER ENVIADA AL ACREEDOR PARA SU CUSTODIA." + +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "" +"ALL GAPS ARE MANDATORY. ONCE THIS MANDATE HAS BEEN SIGNED MUST BE SENT TO " +"CREDITOR FOR STORAGE.\n" +" NEVERTHELESS, THE BANK OF DEBTOR REQUIRES DEBTOR’S " +"AUTHORIZATION BEFORE DEBITING B2B DIRECT DEBITS IN THE ACCOUNT.\n" +" THE DEBTOR WILL BE ABLE TO MANAGE THE MENTIONED " +"AUTHORIZATION THROUGH THE MEANS PROVIDED BY HIS BANK." +msgstr "" +"TODOS LOS CAMPOS HAN DE SER CUMPLIMENTADOS OBLIGATORIAMENTE. UNA VEZ FIRMADA " +"ESTA ORDEN DE DOMICILIACIÓN DEBE SER ENVIADA AL ACREEDOR PARA SU CUSTODIA.LA " +"ENTIDAD DE DEUDOR REQUIERE AUTORIZACIÓN DE ÉSTE PREVIA AL CARGO EN CUENTA DE " +"LOS ADEUDOS DIRECTOS B2B.EL DEUDOR PODRÁ GESTIONAR DICHA AUTORIZACIÓN CON " +"LOS MEDIOS QUE SU ENTIDAD PONGA A SU DISPOSICIÓN." + +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Account Number - IBAN:" +msgstr "Número de cuenta - IBAN:" + +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Address of the Debtor:" +msgstr "Dirección del deudor:" + +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Address:" +msgstr "Dirección:" + +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "" +"As part of your rights, you are entitled to a refund from\n" +" your bank under the terms and conditions of your " +"agreement\n" +" with your bank.\n" +" A refund must be claimed within 8 weeks starting " +"from the date on which your account was debited." +msgstr "" +"Como parte de sus derechos, el deudor está legitimado al reembolso por su " +"entidad en los términos y condiciones del contrato suscrito con la misma. La " +"solicitud de reembolso deberá efectuarse dentro de las ocho semanas que " +"siguen a la fecha de adeudo en cuenta. Puede obtener información adicional " +"sobre sus derechos en su entidad financiera." + +#. module: account_banking_sepa_direct_debit +#: code:addons/account_banking_sepa_direct_debit/models/account_banking_mandate.py:110 #, python-format -msgid "As you changed the bank account attached to this mandate, the 'Sequence Type' has been set back to 'First'." -msgstr "Puesto que ha cambiado la cuenta bancaria relacionada con este mandato, el 'Tipo de secuencia' se ha vuelto a 'Inicial'." +msgid "" +"As you changed the bank account attached to this mandate, the 'Sequence " +"Type' has been set back to 'First'." +msgstr "" +"Puesto que ha cambiado la cuenta bancaria relacionada con este mandato, el " +"'Tipo de secuencia' se ha vuelto a 'Inicial'." #. module: account_banking_sepa_direct_debit #: model:ir.model,name:account_banking_sepa_direct_debit.model_bank_payment_line @@ -66,6 +132,12 @@ msgstr "A cargo del acreedor" msgid "Borne by Debtor" msgstr "A cargo del deudor" +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "By signing this mandate form, you authorise (A)" +msgstr "" +"Mediante la firma de esta orden de domiciliación, el deudor autoriza (A) " + #. module: account_banking_sepa_direct_debit #: view:banking.export.sdd.wizard:account_banking_sepa_direct_debit.banking_export_sdd_wizard_view msgid "Cancel" @@ -81,6 +153,16 @@ msgstr "A cargo del portador" msgid "Companies" msgstr "Compañías" +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Country of the debtor:" +msgstr "País del deudor:" + +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Country:" +msgstr "País:" + #. module: account_banking_sepa_direct_debit #: selection:banking.export.sdd.wizard,state:0 msgid "Create" @@ -97,13 +179,53 @@ msgid "Created on" msgstr "Creado en" #. module: account_banking_sepa_direct_debit -#: help:res.company,sepa_creditor_identifier:0 -msgid "Enter the Creditor Identifier that has been attributed to your company to make SEPA Direct Debits. This identifier is composed of :\n" +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Creditor's Name:" +msgstr "Nombre del acreedor:" + +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Date - Location:" +msgstr "Fecha - Localidad:" + +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Debtor's Name:" +msgstr "Nombre del deudor:" + +#. module: account_banking_sepa_direct_debit +#: help:payment.mode,sepa_creditor_identifier:0 +msgid "" +"Enter the Creditor Identifier that has been attributed to your company to " +"make SEPA Direct Debits. If not defined, SEPA Creditor Identifier from " +"company will be used.\n" +"This identifier is composed of :\n" "- your country ISO code (2 letters)\n" "- a 2-digits checkum\n" "- a 3-letters business code\n" "- a country-specific identifier" -msgstr "Introduzca el identificador de acreedor que se le ha atribuido a su compañía para realizar adeudos directos SEPA. Su banco suele poseer esta información. Este identificador se compone de:\n" +msgstr "" +"Introduzca el identificador de acreedor que se le ha atribuido a su compañía " +"para realizar adeudos directos SEPA. Su banco suele poseer esta información. " +"Este identificador se compone de:\n" +"- el código ISO de 2 letras de su país\n" +"- dos dígitos de comprobación\n" +"- tres letras de código de negocio\n" +"- un identificador específico de país (en España, el NIF)" + +#. module: account_banking_sepa_direct_debit +#: help:res.company,sepa_creditor_identifier:0 +msgid "" +"Enter the Creditor Identifier that has been attributed to your company to " +"make SEPA Direct Debits. This identifier is composed of :\n" +"- your country ISO code (2 letters)\n" +"- a 2-digits checkum\n" +"- a 3-letters business code\n" +"- a country-specific identifier" +msgstr "" +"Introduzca el identificador de acreedor que se le ha atribuido a su compañía " +"para realizar adeudos directos SEPA. Su banco suele poseer esta información. " +"Este identificador se compone de:\n" "- el código ISO de 2 letras de su país\n" "- dos dígitos de comprobación\n" "- tres letras de código de negocio\n" @@ -115,7 +237,8 @@ msgid "Enterprise (B2B)" msgstr "Empresa (B2B)" #. module: account_banking_sepa_direct_debit -#: code:addons/account_banking_sepa_direct_debit/models/res_company.py:62 +#: code:addons/account_banking_sepa_direct_debit/models/payment_mode.py:41 +#: code:addons/account_banking_sepa_direct_debit/models/res_company.py:31 #, python-format msgid "Error" msgstr "Error" @@ -157,8 +280,23 @@ msgstr "Según el acuerdo de servicio" #. module: account_banking_sepa_direct_debit #: help:banking.export.sdd.wizard,charge_bearer:0 -msgid "Following service level : transaction charges are to be applied following the rules agreed in the service level and/or scheme (SEPA Core messages must use this). Shared : transaction charges on the creditor side are to be borne by the creditor, transaction charges on the debtor side are to be borne by the debtor. Borne by creditor : all transaction charges are to be borne by the creditor. Borne by debtor : all transaction charges are to be borne by the debtor." -msgstr "Según el acuerdo de servicio: los costes de la transacción se aplicarán siguiendo las reglas acordadas en el nivel de servicio y/o en el esquema (las remesas SEPA Core deben usar esta opción). Compartidos: los costes de la transacción en la parte del acreedor están a cargo del acreedor, y los costes de la transacción del lado del deudor estarán a cargo del deudor. A cargo del acreedor: todos los costes de la transacción estarán a cargo del acreedor. A cargo del deudor: Todos los costes de la transacción estarán a cargo del deudor." +msgid "" +"Following service level : transaction charges are to be applied following " +"the rules agreed in the service level and/or scheme (SEPA Core messages must " +"use this). Shared : transaction charges on the creditor side are to be borne " +"by the creditor, transaction charges on the debtor side are to be borne by " +"the debtor. Borne by creditor : all transaction charges are to be borne by " +"the creditor. Borne by debtor : all transaction charges are to be borne by " +"the debtor." +msgstr "" +"Según el acuerdo de servicio: los costes de la transacción se aplicarán " +"siguiendo las reglas acordadas en el nivel de servicio y/o en el esquema " +"(las remesas SEPA Core deben usar esta opción). Compartidos: los costes de " +"la transacción en la parte del acreedor están a cargo del acreedor, y los " +"costes de la transacción del lado del deudor estarán a cargo del deudor. A " +"cargo del acreedor: todos los costes de la transacción estarán a cargo del " +"acreedor. A cargo del deudor: Todos los costes de la transacción estarán a " +"cargo del deudor." #. module: account_banking_sepa_direct_debit #: view:banking.export.sdd.wizard:account_banking_sepa_direct_debit.banking_export_sdd_wizard_view @@ -170,18 +308,48 @@ msgstr "Generar" msgid "ID" msgstr "ID" +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Identifier:" +msgstr "Identificador:" + +#. module: account_banking_sepa_direct_debit +#: help:payment.mode,original_creditor_identifier:0 +msgid "If not defined, Original Creditor Identifier from company will be used." +msgstr "" + #. module: account_banking_sepa_direct_debit #: help:account.banking.mandate,sepa_migrated:0 -msgid "If this field is not active, the mandate section of the next direct debit file that include this mandate will contain the 'Original Mandate Identification' and the 'Original Creditor Scheme Identification'. This is required in a few countries (Belgium for instance), but not in all countries. If this is not required in your country, you should keep this field always active." -msgstr "Si este campo no está marcado, la sección 'mandato' del próximo archivo de adeudo directo que lo incluya contendrá el valor de los campos 'Identificación del mandato original' y 'Identificación del esquema original del acreedor'. Esto se requiere en algunos países (Bélgica por ejemplo), pero no en todos ellos. Si no es un requisito en su país, este campo siempre debe estar marcado." +msgid "" +"If this field is not active, the mandate section of the next direct debit " +"file that include this mandate will contain the 'Original Mandate " +"Identification' and the 'Original Creditor Scheme Identification'. This is " +"required in a few countries (Belgium for instance), but not in all " +"countries. If this is not required in your country, you should keep this " +"field always active." +msgstr "" +"Si este campo no está marcado, la sección 'mandato' del próximo archivo de " +"adeudo directo que lo incluya contendrá el valor de los campos " +"'Identificación del mandato original' y 'Identificación del esquema original " +"del acreedor'. Esto se requiere en algunos países (Bélgica por ejemplo), " +"pero no en todos ellos. Si no es un requisito en su país, este campo siempre " +"debe estar marcado." #. module: account_banking_sepa_direct_debit #: help:banking.export.sdd.wizard,batch_booking:0 -msgid "If true, the bank statement will display only one credit line for all the direct debits of the SEPA file ; if false, the bank statement will display one credit line per direct debit of the SEPA file." -msgstr "Si está marcado, el extracto bancario mostrará sólo una línea del haber para todos los adeudos directos del archivo SEPA; si no está marcado, entonces el extracto bancario mostrará una línea por cada adeudo directo del archivo SEPA." +msgid "" +"If true, the bank statement will display only one credit line for all the " +"direct debits of the SEPA file ; if false, the bank statement will display " +"one credit line per direct debit of the SEPA file." +msgstr "" +"Si está marcado, el extracto bancario mostrará sólo una línea del haber para " +"todos los adeudos directos del archivo SEPA; si no está marcado, entonces el " +"extracto bancario mostrará una línea por cada adeudo directo del archivo " +"SEPA." #. module: account_banking_sepa_direct_debit -#: code:addons/account_banking_sepa_direct_debit/models/res_company.py:63 +#: code:addons/account_banking_sepa_direct_debit/models/payment_mode.py:42 +#: code:addons/account_banking_sepa_direct_debit/models/res_company.py:32 #, python-format msgid "Invalid SEPA Creditor Identifier." msgstr "Identificador de acreedor SEPA no válido." @@ -197,7 +365,12 @@ msgid "Last Updated on" msgstr "Última actualización en" #. module: account_banking_sepa_direct_debit -#: code:addons/account_banking_sepa_direct_debit/models/account_banking_mandate.py:105 +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Mandate Reference:" +msgstr "Referencia del mandato:" + +#. module: account_banking_sepa_direct_debit +#: code:addons/account_banking_sepa_direct_debit/models/account_banking_mandate.py:109 #, python-format msgid "Mandate update" msgstr "Actualizacion de mandato" @@ -210,8 +383,12 @@ msgstr "Migrado a SEPA" #. module: account_banking_sepa_direct_debit #: code:addons/account_banking_sepa_direct_debit/wizard/export_sdd.py:159 #, python-format -msgid "Missing SEPA Direct Debit mandate on the bank payment line with partner '%s' (reference '%s')." -msgstr "Falta el mandato de adeudo directo SEPA en la linea de pago bancario con la empresa '%s' (referencia '%s')." +msgid "" +"Missing SEPA Direct Debit mandate on the bank payment line with partner " +"'%s' (reference '%s')." +msgstr "" +"Falta el mandato de adeudo directo SEPA en la linea de pago bancario con la " +"empresa '%s' (referencia '%s')." #. module: account_banking_sepa_direct_debit #: field:banking.export.sdd.wizard,nb_transactions:0 @@ -221,10 +398,12 @@ msgstr "Nº de transacciones" #. module: account_banking_sepa_direct_debit #: view:account.banking.mandate:account_banking_sepa_direct_debit.sdd_mandate_search #: selection:account.banking.mandate,type:0 +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document msgid "One-Off" msgstr "Único" #. module: account_banking_sepa_direct_debit +#: field:payment.mode,original_creditor_identifier:0 #: field:res.company,original_creditor_identifier:0 msgid "Original Creditor Identifier" msgstr "Identificador del acreedor original" @@ -239,6 +418,11 @@ msgstr "Identificación del mandato original" msgid "Original Mandate Required (SEPA)" msgstr "Mandato original requerido (SEPA)" +#. module: account_banking_sepa_direct_debit +#: model:ir.model,name:account_banking_sepa_direct_debit.model_payment_mode +msgid "Payment Mode" +msgstr "Modo de pago" + #. module: account_banking_sepa_direct_debit #: field:banking.export.sdd.wizard,payment_order_ids:0 msgid "Payment Orders" @@ -247,12 +431,24 @@ msgstr "Órdenes de pago" #. module: account_banking_sepa_direct_debit #: code:addons/account_banking_sepa_direct_debit/wizard/export_sdd.py:117 #, python-format -msgid "Payment Type Code '%s' is not supported. The only Payment Type Code supported for SEPA Direct Debit are 'pain.008.001.02', 'pain.008.001.03' and 'pain.008.001.04'." -msgstr "El código de tipo de pago '%s' no está soportado. Los únicos códigos de tipo de pago soportados para los adedudos directos SEPA son 'pain.008.001.02', 'pain.008.001.03' y 'pain.008.001.04'." +msgid "" +"Payment Type Code '%s' is not supported. The only Payment Type Code " +"supported for SEPA Direct Debit are 'pain.008.001.02', 'pain.008.001.03' and " +"'pain.008.001.04'." +msgstr "" +"El código de tipo de pago '%s' no está soportado. Los únicos códigos de tipo " +"de pago soportados para los adedudos directos SEPA son 'pain.008.001.02', " +"'pain.008.001.03' y 'pain.008.001.04'." + +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Postal Code - City - Town:" +msgstr "Código postal - Población - Provincia:" #. module: account_banking_sepa_direct_debit #: view:account.banking.mandate:account_banking_sepa_direct_debit.sdd_mandate_search #: selection:account.banking.mandate,type:0 +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document msgid "Recurrent" msgstr "Recurrente" @@ -268,6 +464,7 @@ msgid "SDD Mandates" msgstr "Mandatos SDD" #. module: account_banking_sepa_direct_debit +#: field:payment.mode,sepa_creditor_identifier:0 #: field:res.company,sepa_creditor_identifier:0 msgid "SEPA Creditor Identifier" msgstr "Identificador de acreedor SEPA" @@ -288,6 +485,23 @@ msgstr "Generación del archivo XML de adeudo directo SEPA" msgid "Scheme" msgstr "Esquema" +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Sepa Business-To-Business Direct debit Mandate" +msgstr "Orden de domiciliación de adeudo directo SEPA B2B" + +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Sepa Direct Debit Mandate" +msgstr "Mandatos de adeudos directos SEPA" + +#. module: account_banking_sepa_direct_debit +#: code:addons/account_banking_sepa_direct_debit/models/account_banking_mandate.py:35 +#: model:ir.actions.report.xml,name:account_banking_sepa_direct_debit.report_sepa_direct_debit_mandate +#, python-format +msgid "Sepa Mandate" +msgstr "Mandato SEPA" + #. module: account_banking_sepa_direct_debit #: view:account.banking.mandate:account_banking_sepa_direct_debit.sdd_mandate_search #: view:account.banking.mandate:account_banking_sepa_direct_debit.sdd_mandate_tree @@ -322,40 +536,91 @@ msgstr "Tipo de secuencia establecida a 'Recurrente'" msgid "Shared" msgstr "Compartidos" +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Signature of the debtor:" +msgstr "Firma del deudor:" + #. module: account_banking_sepa_direct_debit #: field:banking.export.sdd.wizard,state:0 msgid "State" msgstr "Estado" +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Swift BIC (up to 8 or 11 characteres):" +msgstr "Swift BIC (puede contener 8 u 11 posiciones):" + #. module: account_banking_sepa_direct_debit #: code:addons/account_banking_sepa_direct_debit/wizard/export_sdd.py:166 #, python-format -msgid "The SEPA Direct Debit mandate with reference '%s' for partner '%s' has expired." -msgstr "El mandato de adeudo directo SEPA con referencia '%s' para la empresa '%s' ha expirado." +msgid "" +"The SEPA Direct Debit mandate with reference '%s' for partner '%s' has " +"expired." +msgstr "" +"El mandato de adeudo directo SEPA con referencia '%s' para la empresa '%s' " +"ha expirado." #. module: account_banking_sepa_direct_debit #: code:addons/account_banking_sepa_direct_debit/wizard/export_sdd.py:174 #, python-format -msgid "The mandate with reference '%s' for partner '%s' has type set to 'One-Off' and it has a last debit date set to '%s', so we can't use it." -msgstr "El mandato con referencia '%s' para la empresa '%s' tipo como 'Único', ya tiene como fecha de último cobro '%s', por lo que no se puede usar." +msgid "" +"The mandate with reference '%s' for partner '%s' has type set to 'One-Off' " +"and it has a last debit date set to '%s', so we can't use it." +msgstr "" +"El mandato con referencia '%s' para la empresa '%s' tipo como 'Único', ya " +"tiene como fecha de último cobro '%s', por lo que no se puede usar." #. module: account_banking_sepa_direct_debit -#: code:addons/account_banking_sepa_direct_debit/models/account_banking_mandate.py:71 +#: code:addons/account_banking_sepa_direct_debit/models/account_banking_mandate.py:75 #, python-format msgid "The recurrent mandate '%s' must have a sequence type." msgstr "El mandato periódico '%s' debe tener un tipo de secuencia." #. module: account_banking_sepa_direct_debit -#: code:addons/account_banking_sepa_direct_debit/models/account_banking_mandate.py:80 +#: code:addons/account_banking_sepa_direct_debit/models/account_banking_mandate.py:84 #, python-format -msgid "The recurrent mandate '%s' which is not marked as 'Migrated to SEPA' must have its recurrent sequence type set to 'First'." -msgstr "El mandato periódico '%s', que no está marcado como 'Migrado a SEPA', debe establecer su tipo de secuencia a 'Inicial'." +msgid "" +"The recurrent mandate '%s' which is not marked as 'Migrated to SEPA' must " +"have its recurrent sequence type set to 'First'." +msgstr "" +"El mandato periódico '%s', que no está marcado como 'Migrado a SEPA', debe " +"establecer su tipo de secuencia a 'Inicial'." #. module: account_banking_sepa_direct_debit #: help:account.banking.mandate,recurrent_sequence_type:0 -msgid "This field is only used for Recurrent mandates, not for One-Off mandates." +msgid "" +"This field is only used for Recurrent mandates, not for One-Off mandates." msgstr "Este campo se utiliza sólo para mandatos periódicos, no para únicos." +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "" +"This mandate is only intended for business-to-business transactions.\n" +" You are not entitled to a refund from your bank " +"after your account has\n" +" been debited, but you are entitled to request your " +"bank\n" +" not to debit your account up until the day on which " +"the payment is due." +msgstr "" +"Esta orden de domiciliación está prevista para operaciones exclusivamente " +"entre empresas y/o autónomos. El deudor no tiene derecho a que su entidad le " +"reembolse una vez que se haya realizado el cargo en cuenta, pero puede " +"solicitar a su entidad que no efectúe el adeudo en la cuenta hasta la fecha " +"debida. Podrá obtener información detallada del procedimiento en su entidad " +"financiera." + +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "To be completed by the creditor" +msgstr "A cumplimentar por el acreedor" + +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "To be completed by the debtor" +msgstr "A cumplimentar por el deudor" + #. module: account_banking_sepa_direct_debit #: field:banking.export.sdd.wizard,total_amount:0 msgid "Total Amount" @@ -372,6 +637,11 @@ msgstr "Tipo" msgid "Type of Mandate" msgstr "Tipo de mandato" +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "Type of payment:" +msgstr "Tipo de pago" + #. module: account_banking_sepa_direct_debit #: view:banking.export.sdd.wizard:account_banking_sepa_direct_debit.banking_export_sdd_wizard_view msgid "Validate" @@ -379,12 +649,31 @@ msgstr "Validar" #. module: account_banking_sepa_direct_debit #: help:account.banking.mandate,original_mandate_identification:0 -msgid "When the field 'Migrated to SEPA' is not active, this field will be used as the Original Mandate Identification in the Direct Debit file." -msgstr "Cuando el campo 'Migrado a SEPA' no está marcado, este campo se usa como identificación del mandato original en el archivo de adeudo directo." +msgid "" +"When the field 'Migrated to SEPA' is not active, this field will be used as " +"the Original Mandate Identification in the Direct Debit file." +msgstr "" +"Cuando el campo 'Migrado a SEPA' no está marcado, este campo se usa como " +"identificación del mandato original en el archivo de adeudo directo." #. module: account_banking_sepa_direct_debit -#: code:addons/account_banking_sepa_direct_debit/models/account_banking_mandate.py:90 +#: code:addons/account_banking_sepa_direct_debit/models/account_banking_mandate.py:94 #, python-format -msgid "You must set the 'Original Mandate Identification' on the recurrent mandate '%s' which is not marked as 'Migrated to SEPA'." -msgstr "Debe establecer el campo 'Identificación de mandato original en el mandato periódico '%s', que no está marcado como 'Migrado a SEPA'." +msgid "" +"You must set the 'Original Mandate Identification' on the recurrent mandate " +"'%s' which is not marked as 'Migrated to SEPA'." +msgstr "" +"Debe establecer el campo 'Identificación de mandato original en el mandato " +"periódico '%s', que no está marcado como 'Migrado a SEPA'." +#. module: account_banking_sepa_direct_debit +#: view:website:account_banking_sepa_direct_debit.sepa_direct_debit_mandate_document +msgid "" +"to send instructions to your bank to debit your account and (B) your bank " +"to\n" +" debit your account in accordance with the " +"instructions from" +msgstr "" +"a enviar instrucciones a la entidad del deudor para adeudar su cuenta y (B) " +"a la entidad para efectuar los adeudos en su cuenta siguiendo las " +"instrucciones del acreedor " From d6bfa57fe2615c6d5a9d73c874c69711c394b01a Mon Sep 17 00:00:00 2001 From: Sergio Incaser Date: Thu, 7 Apr 2016 16:24:02 +0200 Subject: [PATCH 11/11] [IMP][8.0] account_banking_sepa_direct_debit: Report font size smallest --- .../views/report_sepa_direct_debit_mandate.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml b/account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml index 42705e28a..eb850815b 100644 --- a/account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml +++ b/account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml @@ -14,6 +14,9 @@ .panel-default{ border:2px solid; } + p{ + font-size: 8px; + }
@@ -27,7 +30,7 @@
- To be completed by the creditor + To be completed by the creditor
Mandate Reference:
Identifier:
@@ -44,7 +47,7 @@
-
+

By signing this mandate form, you authorise (A) to send instructions to your bank to debit your account and (B) your bank to @@ -52,7 +55,7 @@

-
+

This mandate is only intended for business-to-business transactions. @@ -71,7 +74,7 @@

- To be completed by the debtor + To be completed by the debtor
Debtor's Name:
Address of the Debtor:
@@ -98,7 +101,7 @@
-
+

ALL GAPS ARE MANDATORY. ONCE THIS MANDATE HAS BEEN SIGNED MUST BE SENT TO CREDITOR FOR STORAGE.

ALL GAPS ARE MANDATORY. ONCE THIS MANDATE HAS BEEN SIGNED MUST BE SENT TO CREDITOR FOR STORAGE. NEVERTHELESS, THE BANK OF DEBTOR REQUIRES DEBTOR’S AUTHORIZATION BEFORE DEBITING B2B DIRECT DEBITS IN THE ACCOUNT.