diff --git a/.docker_files/main/__manifest__.py b/.docker_files/main/__manifest__.py index 84e10da3..c5ef4885 100644 --- a/.docker_files/main/__manifest__.py +++ b/.docker_files/main/__manifest__.py @@ -11,7 +11,6 @@ "category": "Other", "summary": "Install all addons required for testing.", "depends": [ - "account_accountant", # Used for testing account_fr_ca_labels "l10n_generic_coa", # Used for testing addons "account_additional_group", "account_analytic_required_forbidden", @@ -20,6 +19,7 @@ "account_closing_journal", "account_closing_journal_mis_builder", "account_closing_wizard", + "account_financial_report", # Used for testing account_fr_ca_labels "account_fiscalyear_end_on_company", "account_fr_ca_labels", "account_invoice_constraint_chronology_forced", @@ -33,7 +33,7 @@ "account_payment_term_usage_purchase", "account_payment_term_usage_sale", "account_payment_widget_link", - "account_report_line_menu", + "account_reconciliation_widget", # Used for testing account_fr_ca_labels "account_report_trial_balance", "account_search_by_amount", "account_show_full_features", @@ -61,7 +61,7 @@ "old_accounts", "payment_list_not_sent", "payment_stripe_not_silenced", - "account_sale_invoice_date_required" + "account_sale_invoice_date_required", ], "installable": True, } diff --git a/.docker_files/odoo.conf b/.docker_files/odoo.conf index 4442a503..1c0f763e 100644 --- a/.docker_files/odoo.conf +++ b/.docker_files/odoo.conf @@ -50,7 +50,7 @@ test_report_directory = False translate_modules = ['all'] unaccent = False without_demo = False -workers = 2 +workers = 0 xmlrpc = True xmlrpc_interface = xmlrpc_port = 8069 diff --git a/Dockerfile b/Dockerfile index 83d3c81c..46aeb393 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,6 @@ COPY account_payment_term_usage /mnt/extra-addons/account_payment_term_usage COPY account_payment_term_usage_purchase /mnt/extra-addons/account_payment_term_usage_purchase COPY account_payment_term_usage_sale /mnt/extra-addons/account_payment_term_usage_sale COPY account_payment_widget_link /mnt/extra-addons/account_payment_widget_link -COPY account_report_line_menu /mnt/extra-addons/account_report_line_menu COPY account_report_trial_balance /mnt/extra-addons/account_report_trial_balance COPY account_sale_invoice_date_required /mnt/extra-addons/account_sale_invoice_date_required COPY account_search_by_amount /mnt/extra-addons/account_search_by_amount diff --git a/account_check_deposit_enhanced/__manifest__.py b/account_check_deposit_enhanced/__manifest__.py index ebf274db..e381351d 100644 --- a/account_check_deposit_enhanced/__manifest__.py +++ b/account_check_deposit_enhanced/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Account Check Deposit Enhanced", - "version": "1.0.0", + "version": "1.1.0", "category": "Accounting", "license": "AGPL-3", "summary": "Enhance check deposits", diff --git a/account_check_deposit_enhanced/models/account_check_deposit.py b/account_check_deposit_enhanced/models/account_check_deposit.py index ac93dd22..39593d1f 100644 --- a/account_check_deposit_enhanced/models/account_check_deposit.py +++ b/account_check_deposit_enhanced/models/account_check_deposit.py @@ -1,14 +1,15 @@ # © 2022 Numigi (tm) and all its contributors (https://bit.ly/numigiens) # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -from odoo import api, models +from odoo import models class AccountCheckDeposit(models.Model): _inherit = "account.check.deposit" - @api.model - def _prepare_counterpart_move_lines_vals(self, *args, **kwargs): - vals = super()._prepare_counterpart_move_lines_vals(*args, **kwargs) - vals["partner_id"] = self.company_id.partner_id.id + def _prepare_move_vals(self): + vals = super()._prepare_move_vals() + for line in vals["line_ids"]: + if 'debit' in line[2].keys(): + line[2]['partner_id'] = self.company_id.partner_id.id return vals diff --git a/account_check_deposit_enhanced/tests/test_account_check_deposit.py b/account_check_deposit_enhanced/tests/test_account_check_deposit.py index f1c43603..2531ffe0 100644 --- a/account_check_deposit_enhanced/tests/test_account_check_deposit.py +++ b/account_check_deposit_enhanced/tests/test_account_check_deposit.py @@ -68,9 +68,9 @@ def setUpClass(cls): } ) - def test_debit_move_line_has_company(self): + def test_deposit_line_ids_partner_id(self): self.deposit.validate_deposit() debit = self.deposit.line_ids.filtered(lambda l: l.debit) - assert debit.partner_id == self.env.user.company_id.partner_id + assert debit.partner_id == self.deposit.company_id.partner_id credit = self.deposit.line_ids.filtered(lambda l: l.credit) - assert credit.partner_id == self.partner + assert not credit.partner_id diff --git a/account_fr_ca_labels/tests/test_fr_translations.py b/account_fr_ca_labels/tests/test_fr_translations.py index 9be15cd0..eb05e42a 100644 --- a/account_fr_ca_labels/tests/test_fr_translations.py +++ b/account_fr_ca_labels/tests/test_fr_translations.py @@ -34,26 +34,6 @@ def test_translations_found_with_correct_term(self, data): assert self._find_translation(data[0], data[1]) -@ddt -class TestAgedBalance(TranslationCase): - - @data( - ('Aged Receivable', 'Balance agée clients'), - ('Aged Payable', 'Balance agée fournisseurs'), - ('Aged Partner Balances', 'Balances agées des tiers'), - ) - def test_no_translation_found_with_wrong_term(self, data): - assert not self._find_translation(data[0], data[1]) - - @data( - ('Aged Receivable', 'Âge des comptes clients'), - ('Aged Payable', 'Âge des comptes fournisseurs'), - ('Aged Partner Balances', 'Âge des comptes'), - ) - def test_translations_found_with_correct_term(self, data): - assert self._find_translation(data[0], data[1]) - - @ddt class TestReconciliation(TranslationCase): diff --git a/canada_bank_transfer/README.rst b/canada_bank_transfer/README.rst index b0a969ad..e1fed3f3 100644 --- a/canada_bank_transfer/README.rst +++ b/canada_bank_transfer/README.rst @@ -7,13 +7,11 @@ This module enables to generate credit transfer files for transactions between b Configuration ------------- -As member of `Accounting / Manager`, I go to the list view of accounting journals. - -.. image:: static/description/journal_list.png +As member of `Invoicing / Billing Administrator`, I go to the list view of journals (`Configuration / Journals`). I open the form view of my bank journal. -In the 'Advanced Settings' tab, I see a checkbox `EFT`. +In the `Payements Configuration` tab, I see a checkbox `EFT`. .. image:: static/description/journal_form_eft_checkbox.png @@ -28,6 +26,10 @@ User Short Name This is a short version of your company name. It must be composed of maximum 15 alphanumeric caracters. +User Long Name +~~~~~~~~~~~~~~~ +This is a long version of your company name. + User Number ~~~~~~~~~~~ This number is attributed by your bank to identify your company. @@ -67,23 +69,19 @@ Therefore, when generating a new EFT, this number will be used. Bank Account Configuration -------------------------- -Next, I go to the `Bank Account` tab. +Next, I go to the `Jounal Entries` tab. This tab contains the information related to my company's bank account. .. image:: static/description/journal_form_bank_account_tab.png -In the field `Bank Account`, I click on "Create and Edit". - -.. image:: static/description/journal_form_bank_account_field.png +In the field `Account Number`, I create a bank account. I fill my bank account number. It is composed from 7 to 12 digits. .. image:: static/description/bank_account_number.png -In the field `Bank`, I click on "Create and Edit". - -.. image:: static/description/bank_account_bank_field.png +In the field `Bank`, I create a bank. I fill the name of the bank and its institution number, then I click on `Save`. @@ -99,28 +97,26 @@ The configuration of my journal is now complete, I click on `Save`. Preparing the Payments ---------------------- -As member of `Accounting / Billing`, I go to `Accounting / Vendors / Payments`. +As member of `Invoicing / Billing`, I go to `Invoicing / Vendors / Payments`. Then I click on `Create`. - -.. image:: static/description/vendor_payment_list.png - I fill the partner and the payment amount. I check `EFT` as payment method. .. image:: static/description/payment_form.png I click on `Save`, then I click on `Confirm`. -.. image:: static/description/payment_form_confirm.png - The payment is now `Posted`. At this stage, it is ready to be selected for an EFT transfer. -.. image:: static/description/payment_form_posted.png +Since version 1.3.0 of this module: +A new filter `Not Sent` is added in payments. + +.. image:: static/description/payment_not_sent_filter.png Preparing the EFT ----------------- Once I have multiple EFT payments posted, I go back to the list of vendor payments. -I check both the `Posted` and `EFT` filters. +I check both the `Posted`, `Not Sent` and `EFT` filters. .. image:: static/description/vendor_payment_list_filtered.png @@ -130,8 +126,6 @@ I select my payments and click on `Generate EFT` in the action menu. A draft EFT is created. -.. image:: static/description/eft_draft.png - For each payment, I select the recipient bank account. If the bank account is not already defined for a given partner, I may create and edit a new one. @@ -152,20 +146,14 @@ The bank must have an institution number (3 digits). Once all the destination bank accounts are selected, I click on `Validate`. -.. image:: static/description/eft_validate.png - An error message appears. One of my bank accounts is not properly filled. .. image:: static/description/eft_validate_error.png I fix the account number, then I click again on `Validate`. -.. image:: static/description/eft_fixed_validate.png - The EFT is now `Ready`. -.. image:: static/description/eft_ready.png - EFT Approval ------------ The group `Approve EFT` allows to approve the EFT. @@ -173,31 +161,26 @@ This group is intended for the financial director or controller of your company. .. image:: static/description/eft_approval_group.png -As member of `Approve EFT`, I go to the EFT form view. - -.. image:: static/description/eft_list.png +As member of `Approve EFT`, I go to the EFT form view (`Invoicing / Vendors / EFT`). I verify that the payments are accurate. If any payment seems odd, I can click on the line and dilldown to the invoices. -Then I click on `Approve`. - -.. image:: static/description/eft_approve.png - -The `EFT` is now approved. +Then I click on `Approve`. The `EFT` is now approved. .. image:: static/description/eft_approved.png Restriction on Canceling Payment -------------------------------- -Once I have payment with EFT linked to it, and the payment is in the following state : `POSTED`, `SENT`, and `RECONCILED`, -I can not cancel the payment anymore. If I still try to cancel it, I get the following message: +Once I have payment with EFT linked to it, and the payment is in `POSTED` state, +I can not reste to draft the payment anymore. If I still try to cancel it, I get the following message: -.. image:: static/description/cancel_payment_usererror.png +.. image:: static/description/reset_to_draft_payment_usererror.png Generating The File ------------------- -The current step can be done by a member of the group `Accounting / Billing`. +The current step can be done by a member of the group `Invoicing / Billing`. +In the EFT form view, I click on `Generate File`: .. image:: static/description/eft_generate_file_button.png @@ -224,7 +207,7 @@ Otherwise, even if the file was accepted by your bank, some payments may be reje In such case, the module allows you to identify which payments were successfully transmitted to the recipient account and which were not. -As member of the group `Accounting / Billing`, I click on `Confirm Sending`. +As member of the group `Invoicing / Billing`, I click on `Confirm Sending`. .. image:: static/description/eft_confirm_sending.png @@ -240,11 +223,10 @@ Multiple changes were applied to the `EFT`. (1) The EFT is now `Done`. -(2) The 2 succeeding payments are at the status `Sent`. +(2) The 2 succeeding payments are the ckeckbox `Sent` checked. The payment dates were updated to match the EFT date. -(3) The failed payment is still at the status `Posted`. - This payment can be corrected later and selected into another EFT batch. +(3) The failed payment with checkbox `Sent` Unchecked can be corrected later and selected into another EFT batch. (4) A new button `Send Payment Notices` appears. This button allows to notice the recipients by email. diff --git a/canada_bank_transfer/__manifest__.py b/canada_bank_transfer/__manifest__.py index 34a09115..239a7f98 100644 --- a/canada_bank_transfer/__manifest__.py +++ b/canada_bank_transfer/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Canada Bank Transfer", - "version": "1.2.3", + "version": "1.3.0", "author": "Savoir-faire Linux,Numigi", "maintainer": "Numigi", "website": "https://bit.ly/numigi-com", diff --git a/canada_bank_transfer/i18n/fr.po b/canada_bank_transfer/i18n/fr.po index c211022a..1f42e3d5 100644 --- a/canada_bank_transfer/i18n/fr.po +++ b/canada_bank_transfer/i18n/fr.po @@ -4,18 +4,16 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0+e\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-10-13 18:33+0000\n" -"PO-Revision-Date: 2021-10-13 14:34-0400\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2024-11-22 23:45+0000\n" +"PO-Revision-Date: 2024-11-22 23:45+0000\n" +"Last-Translator: \n" "Language-Team: \n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: \n" "Plural-Forms: \n" -"X-Generator: Poedit 2.3\n" #. module: canada_bank_transfer #: model:mail.template,body_html:canada_bank_transfer.payment_notice_email_template @@ -24,8 +22,7 @@ msgid "" "Hello,\n" "\n" "

\n" -" a payment of ${object.amount} ${object.currency_id.name} has been " -"transfered to your bank account.\n" +" a payment of ${object.amount} ${object.currency_id.name} has been transfered to your bank account.\n" "

\n" "

\n" " Payment Reference: ${object.payment_reference}\n" @@ -36,32 +33,37 @@ msgstr "" "Bonjour,\n" "\n" "

\n" -" Un paiement de ${object.amount} ${object.currency_id.name} a été " -"transféré vers votre compte bancaire.\n" +" Un paiement de ${object.amount} ${object.currency_id.name} a été transféré vers votre compte bancaire.\n" "

\n" "

\n" " Référence du paiement: ${object.payment_reference}\n" "

" #. module: canada_bank_transfer -#: model:ir.model.fields,help:canada_bank_transfer.field_account_bank_statement_import_journal_creation__eft_user_long_name +#: code:addons/canada_bank_transfer/wizard/eft_confirmation.py:0 +#: code:addons/canada_bank_transfer/wizard/eft_confirmation.py:0 +#: code:addons/canada_bank_transfer/wizard/eft_confirmation.py:0 +#, python-format +msgid " - Deposit" +msgstr " - Dépôt" + +#. module: canada_bank_transfer #: model:ir.model.fields,help:canada_bank_transfer.field_account_journal__eft_user_long_name msgid "" "A long version of your company name. Must be composed of maximum 30 " "alphanumeric caracters." msgstr "" -"Une longue version du nom de votre compagnie. Doit être composé d'au plus 30 " -"caractères alphanumériques." +"Une longue version du nom de votre compagnie. Doit être composé d'au plus 30" +" caractères alphanumériques." #. module: canada_bank_transfer -#: model:ir.model.fields,help:canada_bank_transfer.field_account_bank_statement_import_journal_creation__eft_user_short_name #: model:ir.model.fields,help:canada_bank_transfer.field_account_journal__eft_user_short_name msgid "" "A short version of your company name. Must be composed of maximum 15 " "alphanumeric caracters." msgstr "" -"Une courte version du nom de votre compagnie. Doit être composé d'au plus 15 " -"caractères alphanumériques." +"Une courte version du nom de votre compagnie. Doit être composé d'au plus 15" +" caractères alphanumériques." #. module: canada_bank_transfer #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft__message_needaction @@ -69,17 +71,17 @@ msgid "Action Needed" msgstr "Action requise" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__207 msgid "Adjustment Pay" msgstr "Ajustement de paie" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__240 msgid "Annuity" msgstr "Rente" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__204 msgid "Anticipated Pay" msgstr "Paie anticipée" @@ -94,7 +96,7 @@ msgid "Approve EFT" msgstr "Approuver l'EFT" #. module: canada_bank_transfer -#: selection:account.eft,state:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_eft__state__approved msgid "Approved" msgstr "Approuvé" @@ -120,25 +122,25 @@ msgid "Cancel" msgstr "Annuler" #. module: canada_bank_transfer -#: selection:account.eft,state:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_eft__state__cancelled msgid "Cancelled" msgstr "Annulé" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__205 msgid "Commission Pay" msgstr "Paie de commission" -#. module: canada_bank_transfer -#: model:ir.model,name:canada_bank_transfer.model_res_company -msgid "Companies" -msgstr "Sociétés" - #. module: canada_bank_transfer #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft_confirmation_line__completed msgid "Completed" msgstr "Terminé" +#. module: canada_bank_transfer +#: model:ir.model,name:canada_bank_transfer.model_res_config_settings +msgid "Config Settings" +msgstr "Paramètres de config" + #. module: canada_bank_transfer #: model_terms:ir.ui.view,arch_db:canada_bank_transfer.eft_form msgid "Confirm Sending" @@ -169,40 +171,52 @@ msgstr "Créé le" msgid "Currency" msgstr "Devise" +#. module: canada_bank_transfer +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft__deposit_account_move_id +msgid "Deposit Account Move" +msgstr "Compte de dépôt" + #. module: canada_bank_transfer #: model_terms:ir.ui.view,arch_db:canada_bank_transfer.view_account_journal_form msgid "Destination" -msgstr "Destination" +msgstr "" #. module: canada_bank_transfer #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft__display_name #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft_confirmation_line__display_name #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft_confirmation_wizard__display_name +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_journal__display_name +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_move__display_name +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_payment__display_name +#: model:ir.model.fields,field_description:canada_bank_transfer.field_mail_compose_message__display_name +#: model:ir.model.fields,field_description:canada_bank_transfer.field_res_bank__display_name +#: model:ir.model.fields,field_description:canada_bank_transfer.field_res_config_settings__display_name +#: model:ir.model.fields,field_description:canada_bank_transfer.field_res_partner_bank__display_name msgid "Display Name" msgstr "Nom affiché" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__250 msgid "Dividend" msgstr "Dividende" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__251 msgid "Dividend, Ordinary Shares" msgstr "Dividende, actions ordinaires" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__252 msgid "Dividende, Preferred Shares" msgstr "Dividende, action prévilégiées" #. module: canada_bank_transfer -#: selection:account.eft,state:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_eft__state__done msgid "Done" msgstr "Terminé" #. module: canada_bank_transfer -#: selection:account.eft,state:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_eft__state__draft msgid "Draft" msgstr "Brouillon" @@ -213,6 +227,7 @@ msgstr "Brouillon" #: model:ir.model,name:canada_bank_transfer.model_account_eft #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_invoice_send__eft_id #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_payment__eft_ids +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_tour_upload_bill__eft_id #: model:ir.model.fields,field_description:canada_bank_transfer.field_mail_compose_message__eft_id #: model:ir.ui.menu,name:canada_bank_transfer.menu_action_eft_files #: model_terms:ir.ui.view,arch_db:canada_bank_transfer.payment_search_with_eft_filter @@ -220,7 +235,7 @@ msgstr "Brouillon" #: model_terms:ir.ui.view,arch_db:canada_bank_transfer.view_account_payment_form #: model_terms:ir.ui.view,arch_db:canada_bank_transfer.view_eft_filter msgid "EFT" -msgstr "EFT" +msgstr "" #. module: canada_bank_transfer #: model_terms:ir.ui.view,arch_db:canada_bank_transfer.transfer_confirmation_wizard_form @@ -238,7 +253,6 @@ msgid "EFT Confirmation Wizard" msgstr "Wizard de confirmation de l'EFT" #. module: canada_bank_transfer -#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_bank_statement_import_journal_creation__eft_destination #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_journal__eft_destination msgid "EFT Destination" msgstr "EFT Destination" @@ -253,31 +267,33 @@ msgstr "Fichier de transfert EFT" msgid "EFT Files" msgstr "Fichiers EFT" +#. module: canada_bank_transfer +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_journal__eft_sequence_id +msgid "EFT Sequence" +msgstr "" + #. module: canada_bank_transfer #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_payment__eft_transaction_type msgid "EFT Transaction Type" msgstr "EFT Type de transaction" #. module: canada_bank_transfer -#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_bank_statement_import_journal_creation__eft_user_long_name #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_journal__eft_user_long_name msgid "EFT User Long Name" msgstr "EFT Nom long de l'usager" #. module: canada_bank_transfer -#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_bank_statement_import_journal_creation__eft_user_number #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_journal__eft_user_number msgid "EFT User Number" msgstr "EFT Numéro d'usager" #. module: canada_bank_transfer -#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_bank_statement_import_journal_creation__eft_user_short_name #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_journal__eft_user_short_name msgid "EFT User Short Name" msgstr "EFT Nom court de l'usager" #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:226 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "EFT transfers support only payments below ten millions." msgstr "L'EFT ne supporte que les paiements en dessous de 10 millions." @@ -293,39 +309,43 @@ msgid "Eft Count" msgstr "Nombre d'EFT" #. module: canada_bank_transfer -#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_bank_statement_import_journal_creation__eft_enabled #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_journal__eft_enabled msgid "Eft Enabled" msgstr "EFT activé" +#. module: canada_bank_transfer +#: model_terms:ir.ui.view,arch_db:canada_bank_transfer.res_config_settings_view_form_inherit_canada_bank_transfer +msgid "Electronic Funds Transfers" +msgstr "Transferts de Fonds Électroniques" + #. module: canada_bank_transfer #: model:ir.model,name:canada_bank_transfer.model_mail_compose_message msgid "Email composition wizard" -msgstr "" +msgstr "Assistant de composition d'emails" #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:65 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "Expected a bank user number with 10 caracters. Got `{}`." msgstr "" "Un numéro d'usager de 10 caractères est attendu. La valeur obtenue est `{}`." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:81 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "Expected a currency name with 3 caracters. Got `{}`." msgstr "" "Un code de devise de 3 caractères est attendu. La valeur obtenue est `{}`." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:73 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "Expected a destination code with 5 digits. Got `{}`." msgstr "" "Un code de destination de 5 digits est attendu. La valeur obtenue est `{}`." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:218 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "Expected a transaction type with 3 caracters. Got `{}`." msgstr "" @@ -333,14 +353,14 @@ msgstr "" "est `{}`." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:143 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "Expected a transit number with 5 caracters. Got `{}`." msgstr "" "Le numéro de transit doit avoir 5 caractères. La valeur donnée est `{}`." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:188 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "Expected a user long name between 1 and 30 caracters. Got `{}`." msgstr "" @@ -348,7 +368,7 @@ msgstr "" "donnée est `{}`." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:175 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "Expected a user short name between 1 and 15 caracters. Got `{}`." msgstr "" @@ -356,15 +376,15 @@ msgstr "" "donnée est `{}`." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:53 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "Expected an EFT file number between 1 and 9999. Got `{}`." msgstr "" -"Le numéro de fichier EFT doit être entre 1 et 9999. La valeur donnée est `{}" -"`." +"Le numéro de fichier EFT doit être entre 1 et 9999. La valeur donnée est " +"`{}`." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:129 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "Expected an institution name with 3 caracters. Got `{}`." msgstr "" @@ -378,7 +398,7 @@ msgid "Failed Payments" msgstr "Paiements en échec" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__231 msgid "Federal Pension" msgstr "Pension fédérale" @@ -421,35 +441,37 @@ msgstr "Générer le fichier" #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft__id #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft_confirmation_line__id #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft_confirmation_wizard__id +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_journal__id +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_move__id +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_payment__id +#: model:ir.model.fields,field_description:canada_bank_transfer.field_mail_compose_message__id +#: model:ir.model.fields,field_description:canada_bank_transfer.field_res_bank__id +#: model:ir.model.fields,field_description:canada_bank_transfer.field_res_config_settings__id +#: model:ir.model.fields,field_description:canada_bank_transfer.field_res_partner_bank__id msgid "ID" -msgstr "ID" - -#. module: canada_bank_transfer -#: model:ir.model.fields,help:canada_bank_transfer.field_account_eft__message_unread -msgid "If checked new messages require your attention." -msgstr "Si coché, de nouveaux messages requièrent votre attention." +msgstr "" #. module: canada_bank_transfer #: model:ir.model.fields,help:canada_bank_transfer.field_account_eft__message_needaction +#: model:ir.model.fields,help:canada_bank_transfer.field_account_eft__message_unread msgid "If checked, new messages require your attention." msgstr "Si coché, de nouveaux messages requièrent votre attention." #. module: canada_bank_transfer #: model:ir.model.fields,help:canada_bank_transfer.field_account_eft__message_has_error +#: model:ir.model.fields,help:canada_bank_transfer.field_account_eft__message_has_sms_error msgid "If checked, some messages have a delivery error." msgstr "Si cochés, certains messages ont des erreurs de livraison." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/payment_validation.py:23 +#: code:addons/canada_bank_transfer/payment_validation.py:0 #, python-format msgid "" -"In order to generate the EFT all payments must have the same accounting " -"journal. Some payments selected have different journals:\n" +"In order to generate the EFT all payments must have the same accounting journal. Some payments selected have different journals:\n" "\n" "{}" msgstr "" -"Afin de générer l'EFT, tous les paiements doivent avoir le même journal " -"comptable. Les paiements sélectionnés ont différents journaux:\n" +"Afin de générer l'EFT, tous les paiements doivent avoir le même journal comptable. Les paiements sélectionnés ont différents journaux:\n" "\n" "{}" @@ -459,12 +481,12 @@ msgid "Institution Number" msgstr "Numéro d'institution" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__280 msgid "Interest" msgstr "Intérêt" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__260 msgid "Investment" msgstr "Investissement" @@ -475,6 +497,7 @@ msgstr "Est un paiement EFT" #. module: canada_bank_transfer #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_invoice_send__is_eft_payment_notice +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_tour_upload_bill__is_eft_payment_notice #: model:ir.model.fields,field_description:canada_bank_transfer.field_mail_compose_message__is_eft_payment_notice msgid "Is Eft Payment Notice" msgstr "Est un avis de paiement EFT" @@ -488,12 +511,24 @@ msgstr "Est un abonné" #: model:ir.model,name:canada_bank_transfer.model_account_journal #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft__journal_id msgid "Journal" -msgstr "Journal" +msgstr "" + +#. module: canada_bank_transfer +#: model:ir.model,name:canada_bank_transfer.model_account_move +msgid "Journal Entry" +msgstr "Pièce comptable" #. module: canada_bank_transfer #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft____last_update #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft_confirmation_line____last_update #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft_confirmation_wizard____last_update +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_journal____last_update +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_move____last_update +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_payment____last_update +#: model:ir.model.fields,field_description:canada_bank_transfer.field_mail_compose_message____last_update +#: model:ir.model.fields,field_description:canada_bank_transfer.field_res_bank____last_update +#: model:ir.model.fields,field_description:canada_bank_transfer.field_res_config_settings____last_update +#: model:ir.model.fields,field_description:canada_bank_transfer.field_res_partner_bank____last_update msgid "Last Modified on" msgstr "Dernière Modification le" @@ -517,7 +552,7 @@ msgid "Line" msgstr "Ligne" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__281 msgid "Lottery Payment" msgstr "Paiement de lotterie" @@ -537,12 +572,12 @@ msgid "Messages" msgstr "Messages" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__450 msgid "Miscellaneous Payment" msgstr "Paiement divers" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__261 msgid "Mutual Fund" msgstr "Fond mutuel" @@ -553,10 +588,15 @@ msgid "Name" msgstr "Nom" #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/eft.py:94 +#: code:addons/canada_bank_transfer/models/account_eft.py:0 #, python-format msgid "New EFT" -msgstr "Nouvel EFT" +msgstr "Nouveau EFT" + +#. module: canada_bank_transfer +#: model_terms:ir.ui.view,arch_db:canada_bank_transfer.payment_search_with_eft_filter +msgid "Not Sent" +msgstr "Non envoyé" #. module: canada_bank_transfer #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft__message_needaction_counter @@ -565,7 +605,7 @@ msgstr "Nombre d'actions" #. module: canada_bank_transfer #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft__message_has_error_counter -msgid "Number of error" +msgid "Number of errors" msgstr "Nombre d'erreurs" #. module: canada_bank_transfer @@ -584,9 +624,9 @@ msgid "Number of unread messages" msgstr "Nombre de messages non lus" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__203 msgid "Overtime Pay" -msgstr "Paie de temps supplémentaire" +msgstr "" #. module: canada_bank_transfer #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft_confirmation_line__partner_id @@ -620,7 +660,7 @@ msgid "Payment Transfered To Your Bank Account" msgstr "Paiement transféré vers votre compte bancaire" #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/wizard/payment_notice_email.py:18 +#: code:addons/canada_bank_transfer/wizard/payment_notice_email.py:0 #, python-format msgid "Payment notices sent." msgstr "Avis de paiement envoyés." @@ -633,37 +673,37 @@ msgid "Payments" msgstr "Paiements" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__200 msgid "Payroll Deposit List" msgstr "Liste de dépôt de paie" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__230 msgid "Pension" msgstr "Pension" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__206 msgid "Premium Pay" msgstr "Payement de prime" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__233 msgid "Private Pension" -msgstr "Pension privée" +msgstr "" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__232 msgid "Provincial Pension" -msgstr "Pension provinciale" +msgstr "Pension privée" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__274 msgid "RDP Contribution" msgstr "Contribution REEI" #. module: canada_bank_transfer -#: selection:account.eft,state:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_eft__state__ready msgid "Ready" msgstr "Prêt" @@ -673,27 +713,38 @@ msgid "Recipient Bank Account" msgstr "Compte bancaire du destinataire" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__266 msgid "Registered Education Savings Plans Contribution" msgstr "Contribution REEE" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__271 msgid "Registered Savings Plans" -msgstr "Contribution régime d’épargne retraite" +msgstr "Fonds de revenu de retraite" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__272 msgid "Retirement Savings Plans" -msgstr "Fonds de revenu de retraite" +msgstr "Envoyer les avis de paiement" + +#. module: canada_bank_transfer +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft__message_has_sms_error +msgid "SMS Delivery error" +msgstr "" #. module: canada_bank_transfer #: model_terms:ir.ui.view,arch_db:canada_bank_transfer.eft_form msgid "Send Payment Notices" msgstr "Envoyer les avis de paiement" +#. module: canada_bank_transfer +#: model_terms:ir.ui.view,arch_db:canada_bank_transfer.eft_form +msgid "Sent" +msgstr "Envoyé" + #. module: canada_bank_transfer #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft__sequence +#: model_terms:ir.ui.view,arch_db:canada_bank_transfer.view_account_journal_form msgid "Sequence" msgstr "Séquence" @@ -703,12 +754,12 @@ msgid "Set To Draft" msgstr "Mettre à brouillon" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__201 msgid "Special Payroll Deposit List" msgstr "Liste de paye spéciale" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__265 msgid "Spouse Retirement Plan" msgstr "Régime au profit du Conjoint" @@ -718,12 +769,11 @@ msgid "State" msgstr "État" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__273 msgid "Tax-Free Savings Account" -msgstr "Compte d’épargne libre d’impôt" +msgstr "Compte d'épargne libre d'impôt" #. module: canada_bank_transfer -#: model:ir.model.fields,help:canada_bank_transfer.field_account_bank_statement_import_journal_creation__eft_destination #: model:ir.model.fields,help:canada_bank_transfer.field_account_journal__eft_destination msgid "" "Technical value of 5 digits used in the EFT file. It indicates the data " @@ -731,202 +781,197 @@ msgid "" "bank and the location of your company." msgstr "" "Valeur technique de 5 digits utilisé dans le fichier EFT. Il indique le " -"centre de traitement de données qui traitera vos transfers. La valeur dépend " -"de votre banque et l'emplacement de votre compagnie." +"centre de traitement de données qui traitera vos transfers. La valeur dépend" +" de votre banque et l'emplacement de votre compagnie." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/payment_validation.py:43 +#: code:addons/canada_bank_transfer/payment_validation.py:0 #, python-format msgid "" -"The EFT can not be generated because no bank account is selected on the " -"following payments:\n" +"The EFT can not be generated because no bank account is selected on the following payments:\n" "\n" "{}" msgstr "" -"Le fichier de transfert EFT ne peut être généré car aucun compte bancaire " -"n'est sélectionné sur les paiements suivants:\n" +"Le fichier de transfert EFT ne peut être généré car aucun compte bancaire n'est sélectionné sur les paiements suivants:\n" "\n" "{}" #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/payment_validation.py:55 +#: code:addons/canada_bank_transfer/payment_validation.py:0 #, python-format msgid "" -"The EFT can not be generated because no bank is selected on the following " -"bank accounts:\n" +"The EFT can not be generated because no bank is selected on the following bank accounts:\n" "\n" "{}" msgstr "" -"Le fichier de transfert EFT ne peut être généré car la banque n'est pas " -"renseignée sur les comptes bancaires suivants:\n" +"Le fichier de transfert EFT ne peut être généré car la banque n'est pas renseignée sur les comptes bancaires suivants:\n" "\n" "{}" #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/payment_validation.py:91 +#: code:addons/canada_bank_transfer/payment_validation.py:0 #, python-format msgid "" -"The EFT can not be generated because the following bank accounts have a " -"number with non-digit caracters:\n" +"The EFT can not be generated because the following bank accounts have a number with non-digit caracters:\n" "\n" "{}" msgstr "" -"Le fichier de transfert EFT ne peut être généré car les comptes bancaires " -"suivants on un numéro de compte avec caractères autres que des chiffres:\n" +"Le fichier de transfert EFT ne peut être généré car les comptes bancaires suivants on un numéro de compte avec caractères autres que des chiffres:\n" "\n" "{}" #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/payment_validation.py:111 +#: code:addons/canada_bank_transfer/payment_validation.py:0 #, python-format msgid "" -"The EFT can not be generated because the following bank accounts have less " -"than 7 digits:\n" +"The EFT can not be generated because the following bank accounts have less than 7 digits:\n" "\n" "{}" msgstr "" -"Le fichier de transfert EFT ne peut être généré car les comptes bancaires " -"suivant ont moins de 7 digits:\n" +"Le fichier de transfert EFT ne peut être généré car les comptes bancaires suivant ont moins de 7 digits:\n" "\n" "{}" #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/payment_validation.py:101 +#: code:addons/canada_bank_transfer/payment_validation.py:0 #, python-format msgid "" -"The EFT can not be generated because the following bank accounts have more " -"than 12 digits:\n" +"The EFT can not be generated because the following bank accounts have more than 12 digits:\n" "\n" "{}" msgstr "" -"Le fichier de transfert EFT ne peut être généré car les comptes bancaires " -"suivant ont plus de 12 digits:\n" +"Le fichier de transfert EFT ne peut être généré car les comptes bancaires suivant ont plus de 12 digits:\n" "\n" "{}" #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/payment_validation.py:79 +#: code:addons/canada_bank_transfer/payment_validation.py:0 #, python-format msgid "" -"The EFT can not be generated because the institution number is missing on " -"the following banks:\n" +"The EFT can not be generated because the institution number is missing on the following banks:\n" "\n" "{}" msgstr "" -"Le fichier de transfert EFT ne peut être généré car le numéro d'institution " -"est manquante sur les banques suivantes:\n" +"Le fichier de transfert EFT ne peut être généré car le numéro d'institution est manquante sur les banques suivantes:\n" "\n" "{}" #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/payment_validation.py:67 +#: code:addons/canada_bank_transfer/payment_validation.py:0 #, python-format msgid "" -"The EFT can not be generated because the transit number is missing on the " -"following bank accounts:\n" +"The EFT can not be generated because the transit number is missing on the following bank accounts:\n" "\n" "{}" msgstr "" -"Le fichier de transfert EFT ne peut être généré car le numéro de numéro de " -"transit est manquant sur les comptes bancaires suivants:\n" +"Le fichier de transfert EFT ne peut être généré car le numéro de numéro de transit est manquant sur les comptes bancaires suivants:\n" "\n" "{}" #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:163 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "The account number `{}` must contain between 7 and 12 digits." msgstr "Le numéro de compte `{}` doit contenir entre 7 et 12 digits." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:157 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "The account number `{}` must contain only digits." msgstr "Le numéro de compte `{}` doit contenir seulement des digits." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:251 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "The bank account is missing on the journal {}." msgstr "Le compte bancaire est manquant sur le journal {}." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:257 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "The destination bank account is missing on the payment {}." msgstr "Le compte bancaire de destination est manquant sur le payment {}." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/payment_validation.py:34 +#: code:addons/canada_bank_transfer/payment_validation.py:0 #, python-format msgid "" -"The following payments can not be used to generate an EFT because they are " -"not at the `posted` state:\n" +"The following payments can not be used to generate an EFT because they are already sent:\n" "\n" "{}" msgstr "" -"Les paiements suivants ne peuvent pas être utilisés dans un EFT car leur " -"état n'est pas `comptabilisé`:\n" +"Les paiements suivants ne peuvent pas être utilisés pour générer un EFT car ils sont déjà envoyés :\n" "\n" "{}" #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/payment_validation.py:13 +#: code:addons/canada_bank_transfer/payment_validation.py:0 #, python-format msgid "" -"The following payments can not be used to generate an EFT because they do " -"not have the `EFT` payment method selected:\n" +"The following payments can not be used to generate an EFT because they are not at the `posted` state:\n" "\n" "{}" msgstr "" -"Les paiements suivants ne peuvent pas être utilisés dans un EFT car ils " -"n'ont pas la méthode de paiement `EFT` sélectionnée:\n" +"Les paiements suivants ne peuvent pas être utilisés dans un EFT car leur état n'est pas `comptabilisé`:\n" "\n" "{}" #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:135 +#: code:addons/canada_bank_transfer/payment_validation.py:0 +#, python-format +msgid "" +"The following payments can not be used to generate an EFT because they do not have the `EFT` payment method selected:\n" +"\n" +"{}" +msgstr "" +"Les paiements suivants ne peuvent pas être utilisés dans un EFT car ils n'ont pas la méthode de paiement `EFT` sélectionnée:\n" +"\n" +"{}" + +#. module: canada_bank_transfer +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "The institution number `{}` must contain only digits." msgstr "Le numéro d'institution `{}` doit contenir seulement des digits." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/models.py:20 +#: code:addons/canada_bank_transfer/models/res_bank.py:0 #, python-format msgid "The institution number must contain 3 digits. Got `{}`." -msgstr "" -"Le numéro d'institution doit contenir 3 digits. La valeur obtenue est `{}`." +msgstr "Le numéro d'établissement doit contenir 3 chiffres. La valeur obtenue est `{}`." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/eft.py:114 +#: model:ir.model.fields,help:canada_bank_transfer.field_account_eft_confirmation_line__currency_id +msgid "The payment's currency." +msgstr "La devise du paiement." + +#. module: canada_bank_transfer +#: code:addons/canada_bank_transfer/models/account_eft.py:0 #, python-format -msgid "The sequence number of an EFT must strictly be an integer. Got {value}." -msgstr "" -"Le numéro de séquence d'un EFT doit strictement être un entier. La valeur " -"suivante a été obtenue: {value}." +msgid "" +"The sequence number of an EFT must strictly be an integer. Got {value}." +msgstr "Le numéro de séquence d'un EFT doit être strictement un entier. La valeur obtenue est {value}." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:213 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "The transaction type must have 3 digits. Got `{}`." msgstr "" "Le type de transaction doit contenir 3 digits. La valeur obtenue est `{}`." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/generate_eft.py:149 +#: code:addons/canada_bank_transfer/generate_eft.py:0 #, python-format msgid "The transit number `{}` must contain only digits." msgstr "Le numéro de transit `{}` doit contenir seulement des digits." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/models.py:36 +#: code:addons/canada_bank_transfer/models/res_partner_bank.py:0 #, python-format msgid "The transit number must contain 5 digits. Got `{}`." -msgstr "" -"Le numéro de transit doit contenir 5 digits. La valeur obtenue est `{}`." +msgstr "Le numéro de transit doit contenir 5 chiffres. La valeur obtenue est `{}`." #. module: canada_bank_transfer -#: model:ir.model.fields,help:canada_bank_transfer.field_account_bank_statement_import_journal_creation__eft_user_number #: model:ir.model.fields,help:canada_bank_transfer.field_account_journal__eft_user_number msgid "" "This number is attributed by your bank to identify your company. It is " @@ -939,10 +984,14 @@ msgstr "" #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft__total #: model_terms:ir.ui.view,arch_db:canada_bank_transfer.eft_form msgid "Total" -msgstr "Total" +msgstr "" + +#. module: canada_bank_transfer +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_journal__transit_account +msgid "Transit Account" +msgstr "Compte de transit" #. module: canada_bank_transfer -#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_bank_statement_import_journal_creation__canada_transit #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_journal__canada_transit #: model:ir.model.fields,field_description:canada_bank_transfer.field_account_setup_bank_manual_config__canada_transit #: model:ir.model.fields,field_description:canada_bank_transfer.field_res_partner_bank__canada_transit @@ -966,6 +1015,14 @@ msgstr "Messages non lus" msgid "Unread Messages Counter" msgstr "Nombre de messages non lus" +#. module: canada_bank_transfer +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft__use_transit_account +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_journal__use_transit_account +#: model:ir.model.fields,field_description:canada_bank_transfer.field_res_config_settings__use_transit_account +#: model_terms:ir.ui.view,arch_db:canada_bank_transfer.res_config_settings_view_form_inherit_canada_bank_transfer +msgid "Use a transit Account" +msgstr "Utiliser un compte de transit" + #. module: canada_bank_transfer #: model_terms:ir.ui.view,arch_db:canada_bank_transfer.view_account_journal_form msgid "User Long Name" @@ -982,9 +1039,9 @@ msgid "User Short Name" msgstr "Nom court de l'usager" #. module: canada_bank_transfer -#: selection:account.payment,eft_transaction_type:0 +#: model:ir.model.fields.selection,name:canada_bank_transfer.selection__account_payment__eft_transaction_type__202 msgid "Vacation Pay" -msgstr "Paie de vacance" +msgstr "Paie de vacances" #. module: canada_bank_transfer #: model_terms:ir.ui.view,arch_db:canada_bank_transfer.eft_form @@ -1002,48 +1059,34 @@ msgstr "Messages du site web" msgid "Website communication history" msgstr "Historique de communication site web" -#. module: canada_bank_transfer -#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft_confirmation_line__wizard_id -msgid "Wizard" -msgstr "" - -#. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/eft.py:130 -#, python-format -msgid "You may not delete an EFT that is not draft." -msgstr "" -"Vous ne pouvez pas supprimer un transfert EFT qui n'est pas à l'état " -"Brouillon." - #. module: canada_bank_transfer #: model_terms:ir.ui.view,arch_db:canada_bank_transfer.res_config_settings_view_form_inherit_canada_bank_transfer -msgid "Electronic Funds Transfers" -msgstr "Transferts de Fonds Électroniques" - -#. module: canada_bank_transfer -#: model_terms:ir.ui.view,arch_db:canada_bank_transfer.res_config_settings_view_form_inherit_canada_bank_transfer -msgid "When activated, Payments are affected on a transit Account.\n" +msgid "" +"When activated, Payments are affected on a transit Account.\n" "
\n" " When validating the EFT,Transit Account Moves are reversed to be affected on the Bank\n" " Account." -msgstr "Pour la méthode de paiement EFT,les paiements validés sont comptabilisés sur un compte de transit.\n" +msgstr "" +"Pour la méthode de paiement EFT,les paiements validés sont comptabilisés sur un compte de transit.\n" "
\n" " La validation de l’EFT renverse les écritures sur le compte de transit et affecte la balance sur le compte de banque." #. module: canada_bank_transfer -#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_journal__transit_account -msgid "Transit Account" -msgstr "Compte de transit" +#: model:ir.model.fields,field_description:canada_bank_transfer.field_account_eft_confirmation_line__wizard_id +msgid "Wizard" +msgstr "" -#~ msgid "" -#~ "The sequence number of the EFT must be filled before generating the " -#~ "transfer file." -#~ msgstr "" -#~ "Le numéro de séquence d'un EFT doit être rempli avant de générer le " -#~ "fichier de transfert." +#. module: canada_bank_transfer +#: code:addons/canada_bank_transfer/models/account_payment.py:0 +#, python-format +msgid "" +"You cannot reset to draft a payment linked to an Electronic Funds Transfer." +msgstr "" +"Vous ne pouvez pas mettre à brouillon un paiement associé à un Transfert de Fonds " +"Électronique." #. module: canada_bank_transfer -#: code:addons/canada_bank_transfer/models/account_payment.py:69 +#: code:addons/canada_bank_transfer/models/account_eft.py:0 #, python-format -msgid "You cannot cancel a payment linked to an Electronic Funds Transfer." -msgstr "Vous ne pouvez pas annuler un paiement associé à un Transfert de Fonds Électronique." +msgid "You may not delete an EFT that is not draft." +msgstr "Vous ne pouvez pas supprimer un EFT qui n’est pas un brouillon." diff --git a/canada_bank_transfer/models/account_payment.py b/canada_bank_transfer/models/account_payment.py index f233e2ab..c3ca06da 100644 --- a/canada_bank_transfer/models/account_payment.py +++ b/canada_bank_transfer/models/account_payment.py @@ -51,7 +51,8 @@ def _compute_is_eft_payment(self): def action_draft(self): for payment in self: - if payment.eft_ids and payment.state in ['posted', 'sent', 'reconciled']: + if payment.eft_ids and payment.state == 'posted': raise UserError( - _('You cannot cancel a payment linked to an Electronic Funds Transfer.')) + _("You cannot reset to draft a payment linked to " + "an Electronic Funds Transfer.")) super().action_draft() diff --git a/canada_bank_transfer/static/description/bank_account_bank_field.png b/canada_bank_transfer/static/description/bank_account_bank_field.png deleted file mode 100644 index 4a73d71f..00000000 Binary files a/canada_bank_transfer/static/description/bank_account_bank_field.png and /dev/null differ diff --git a/canada_bank_transfer/static/description/bank_account_number.png b/canada_bank_transfer/static/description/bank_account_number.png index 50321834..0aeaa689 100644 Binary files a/canada_bank_transfer/static/description/bank_account_number.png and b/canada_bank_transfer/static/description/bank_account_number.png differ diff --git a/canada_bank_transfer/static/description/bank_account_transit.png b/canada_bank_transfer/static/description/bank_account_transit.png index 5f93a23d..99ec57b6 100644 Binary files a/canada_bank_transfer/static/description/bank_account_transit.png and b/canada_bank_transfer/static/description/bank_account_transit.png differ diff --git a/canada_bank_transfer/static/description/bank_fields.png b/canada_bank_transfer/static/description/bank_fields.png index 919ca072..1d5af6d8 100644 Binary files a/canada_bank_transfer/static/description/bank_fields.png and b/canada_bank_transfer/static/description/bank_fields.png differ diff --git a/canada_bank_transfer/static/description/cancel_payment_usererror.png b/canada_bank_transfer/static/description/cancel_payment_usererror.png deleted file mode 100644 index 7e2c9f73..00000000 Binary files a/canada_bank_transfer/static/description/cancel_payment_usererror.png and /dev/null differ diff --git a/canada_bank_transfer/static/description/eft_approval_group.png b/canada_bank_transfer/static/description/eft_approval_group.png index 59dd38eb..08c97d8f 100644 Binary files a/canada_bank_transfer/static/description/eft_approval_group.png and b/canada_bank_transfer/static/description/eft_approval_group.png differ diff --git a/canada_bank_transfer/static/description/eft_approve.png b/canada_bank_transfer/static/description/eft_approve.png deleted file mode 100644 index 2ec4491a..00000000 Binary files a/canada_bank_transfer/static/description/eft_approve.png and /dev/null differ diff --git a/canada_bank_transfer/static/description/eft_approved.png b/canada_bank_transfer/static/description/eft_approved.png index d5027677..e4a5fa51 100644 Binary files a/canada_bank_transfer/static/description/eft_approved.png and b/canada_bank_transfer/static/description/eft_approved.png differ diff --git a/canada_bank_transfer/static/description/eft_bank_account_field.png b/canada_bank_transfer/static/description/eft_bank_account_field.png index f4c235e3..f391b666 100644 Binary files a/canada_bank_transfer/static/description/eft_bank_account_field.png and b/canada_bank_transfer/static/description/eft_bank_account_field.png differ diff --git a/canada_bank_transfer/static/description/eft_confirm_sending.png b/canada_bank_transfer/static/description/eft_confirm_sending.png index 6546a6cf..8d1dc621 100644 Binary files a/canada_bank_transfer/static/description/eft_confirm_sending.png and b/canada_bank_transfer/static/description/eft_confirm_sending.png differ diff --git a/canada_bank_transfer/static/description/eft_confirmation.png b/canada_bank_transfer/static/description/eft_confirmation.png index 416e3738..bae65e0f 100644 Binary files a/canada_bank_transfer/static/description/eft_confirmation.png and b/canada_bank_transfer/static/description/eft_confirmation.png differ diff --git a/canada_bank_transfer/static/description/eft_done.png b/canada_bank_transfer/static/description/eft_done.png index 15f6519c..0eb1c321 100644 Binary files a/canada_bank_transfer/static/description/eft_done.png and b/canada_bank_transfer/static/description/eft_done.png differ diff --git a/canada_bank_transfer/static/description/eft_draft.png b/canada_bank_transfer/static/description/eft_draft.png deleted file mode 100644 index 5dcf09df..00000000 Binary files a/canada_bank_transfer/static/description/eft_draft.png and /dev/null differ diff --git a/canada_bank_transfer/static/description/eft_file_generated.png b/canada_bank_transfer/static/description/eft_file_generated.png index 3027e796..1fdf6c43 100644 Binary files a/canada_bank_transfer/static/description/eft_file_generated.png and b/canada_bank_transfer/static/description/eft_file_generated.png differ diff --git a/canada_bank_transfer/static/description/eft_file_open.png b/canada_bank_transfer/static/description/eft_file_open.png index 82e0caed..23253b84 100644 Binary files a/canada_bank_transfer/static/description/eft_file_open.png and b/canada_bank_transfer/static/description/eft_file_open.png differ diff --git a/canada_bank_transfer/static/description/eft_fixed_validate.png b/canada_bank_transfer/static/description/eft_fixed_validate.png deleted file mode 100644 index c62aea40..00000000 Binary files a/canada_bank_transfer/static/description/eft_fixed_validate.png and /dev/null differ diff --git a/canada_bank_transfer/static/description/eft_generate_file_button.png b/canada_bank_transfer/static/description/eft_generate_file_button.png index d5027677..848b25b1 100644 Binary files a/canada_bank_transfer/static/description/eft_generate_file_button.png and b/canada_bank_transfer/static/description/eft_generate_file_button.png differ diff --git a/canada_bank_transfer/static/description/eft_list.png b/canada_bank_transfer/static/description/eft_list.png deleted file mode 100644 index c4d83b8d..00000000 Binary files a/canada_bank_transfer/static/description/eft_list.png and /dev/null differ diff --git a/canada_bank_transfer/static/description/eft_payment_notices_sent.png b/canada_bank_transfer/static/description/eft_payment_notices_sent.png index 76e926b6..2add4726 100644 Binary files a/canada_bank_transfer/static/description/eft_payment_notices_sent.png and b/canada_bank_transfer/static/description/eft_payment_notices_sent.png differ diff --git a/canada_bank_transfer/static/description/eft_ready.png b/canada_bank_transfer/static/description/eft_ready.png deleted file mode 100644 index 1bb6857f..00000000 Binary files a/canada_bank_transfer/static/description/eft_ready.png and /dev/null differ diff --git a/canada_bank_transfer/static/description/eft_send_payment_notices.png b/canada_bank_transfer/static/description/eft_send_payment_notices.png index 1c93dbee..8c33d040 100644 Binary files a/canada_bank_transfer/static/description/eft_send_payment_notices.png and b/canada_bank_transfer/static/description/eft_send_payment_notices.png differ diff --git a/canada_bank_transfer/static/description/eft_sequence_form.png b/canada_bank_transfer/static/description/eft_sequence_form.png index 83630a8e..08ef4d13 100644 Binary files a/canada_bank_transfer/static/description/eft_sequence_form.png and b/canada_bank_transfer/static/description/eft_sequence_form.png differ diff --git a/canada_bank_transfer/static/description/eft_validate.png b/canada_bank_transfer/static/description/eft_validate.png deleted file mode 100644 index 2e5332d8..00000000 Binary files a/canada_bank_transfer/static/description/eft_validate.png and /dev/null differ diff --git a/canada_bank_transfer/static/description/eft_validate_error.png b/canada_bank_transfer/static/description/eft_validate_error.png index bd760585..5f4e60a3 100644 Binary files a/canada_bank_transfer/static/description/eft_validate_error.png and b/canada_bank_transfer/static/description/eft_validate_error.png differ diff --git a/canada_bank_transfer/static/description/eft_with_file_sequence_number.png b/canada_bank_transfer/static/description/eft_with_file_sequence_number.png index 9a9dfbed..5eee9981 100644 Binary files a/canada_bank_transfer/static/description/eft_with_file_sequence_number.png and b/canada_bank_transfer/static/description/eft_with_file_sequence_number.png differ diff --git a/canada_bank_transfer/static/description/journal_form.png b/canada_bank_transfer/static/description/journal_form.png deleted file mode 100644 index 1419ba33..00000000 Binary files a/canada_bank_transfer/static/description/journal_form.png and /dev/null differ diff --git a/canada_bank_transfer/static/description/journal_form_bank_account_field.png b/canada_bank_transfer/static/description/journal_form_bank_account_field.png deleted file mode 100644 index 6fbd2530..00000000 Binary files a/canada_bank_transfer/static/description/journal_form_bank_account_field.png and /dev/null differ diff --git a/canada_bank_transfer/static/description/journal_form_bank_account_tab.png b/canada_bank_transfer/static/description/journal_form_bank_account_tab.png index b54410bf..53165843 100644 Binary files a/canada_bank_transfer/static/description/journal_form_bank_account_tab.png and b/canada_bank_transfer/static/description/journal_form_bank_account_tab.png differ diff --git a/canada_bank_transfer/static/description/journal_form_eft_checkbox.png b/canada_bank_transfer/static/description/journal_form_eft_checkbox.png index cbb3b1b3..608fb3df 100644 Binary files a/canada_bank_transfer/static/description/journal_form_eft_checkbox.png and b/canada_bank_transfer/static/description/journal_form_eft_checkbox.png differ diff --git a/canada_bank_transfer/static/description/journal_form_eft_fields.png b/canada_bank_transfer/static/description/journal_form_eft_fields.png index 88c4de70..04eb92da 100644 Binary files a/canada_bank_transfer/static/description/journal_form_eft_fields.png and b/canada_bank_transfer/static/description/journal_form_eft_fields.png differ diff --git a/canada_bank_transfer/static/description/journal_form_eft_fields_filled.png b/canada_bank_transfer/static/description/journal_form_eft_fields_filled.png index a18b949e..2c7a9b6c 100644 Binary files a/canada_bank_transfer/static/description/journal_form_eft_fields_filled.png and b/canada_bank_transfer/static/description/journal_form_eft_fields_filled.png differ diff --git a/canada_bank_transfer/static/description/journal_form_save.png b/canada_bank_transfer/static/description/journal_form_save.png index 19802d6d..dde59b23 100644 Binary files a/canada_bank_transfer/static/description/journal_form_save.png and b/canada_bank_transfer/static/description/journal_form_save.png differ diff --git a/canada_bank_transfer/static/description/journal_list.png b/canada_bank_transfer/static/description/journal_list.png deleted file mode 100644 index d2c0f6db..00000000 Binary files a/canada_bank_transfer/static/description/journal_list.png and /dev/null differ diff --git a/canada_bank_transfer/static/description/partner_bank_account_form.png b/canada_bank_transfer/static/description/partner_bank_account_form.png index f551454a..43bd5785 100644 Binary files a/canada_bank_transfer/static/description/partner_bank_account_form.png and b/canada_bank_transfer/static/description/partner_bank_account_form.png differ diff --git a/canada_bank_transfer/static/description/partner_bank_form.png b/canada_bank_transfer/static/description/partner_bank_form.png index e3e02db6..9c8edb46 100644 Binary files a/canada_bank_transfer/static/description/partner_bank_form.png and b/canada_bank_transfer/static/description/partner_bank_form.png differ diff --git a/canada_bank_transfer/static/description/payment_form.png b/canada_bank_transfer/static/description/payment_form.png index 170d5919..6107040f 100644 Binary files a/canada_bank_transfer/static/description/payment_form.png and b/canada_bank_transfer/static/description/payment_form.png differ diff --git a/canada_bank_transfer/static/description/payment_form_confirm.png b/canada_bank_transfer/static/description/payment_form_confirm.png deleted file mode 100644 index e31d3141..00000000 Binary files a/canada_bank_transfer/static/description/payment_form_confirm.png and /dev/null differ diff --git a/canada_bank_transfer/static/description/payment_form_posted.png b/canada_bank_transfer/static/description/payment_form_posted.png deleted file mode 100644 index 9bc3a2e6..00000000 Binary files a/canada_bank_transfer/static/description/payment_form_posted.png and /dev/null differ diff --git a/canada_bank_transfer/static/description/payment_not_sent_filter.png b/canada_bank_transfer/static/description/payment_not_sent_filter.png new file mode 100644 index 00000000..74c46817 Binary files /dev/null and b/canada_bank_transfer/static/description/payment_not_sent_filter.png differ diff --git a/canada_bank_transfer/static/description/reset_to_draft_payment_usererror.png b/canada_bank_transfer/static/description/reset_to_draft_payment_usererror.png new file mode 100644 index 00000000..80704580 Binary files /dev/null and b/canada_bank_transfer/static/description/reset_to_draft_payment_usererror.png differ diff --git a/canada_bank_transfer/static/description/vendor_payment_list.png b/canada_bank_transfer/static/description/vendor_payment_list.png deleted file mode 100644 index 9f18c836..00000000 Binary files a/canada_bank_transfer/static/description/vendor_payment_list.png and /dev/null differ diff --git a/canada_bank_transfer/static/description/vendor_payment_list_filtered.png b/canada_bank_transfer/static/description/vendor_payment_list_filtered.png index 3693a3f7..3ca89668 100644 Binary files a/canada_bank_transfer/static/description/vendor_payment_list_filtered.png and b/canada_bank_transfer/static/description/vendor_payment_list_filtered.png differ diff --git a/canada_bank_transfer/static/description/vendor_payment_list_generate_eft.png b/canada_bank_transfer/static/description/vendor_payment_list_generate_eft.png index d5e06d3d..cfac7bac 100644 Binary files a/canada_bank_transfer/static/description/vendor_payment_list_generate_eft.png and b/canada_bank_transfer/static/description/vendor_payment_list_generate_eft.png differ diff --git a/canada_bank_transfer/views/eft.xml b/canada_bank_transfer/views/eft.xml index ea603dee..4011f08a 100644 --- a/canada_bank_transfer/views/eft.xml +++ b/canada_bank_transfer/views/eft.xml @@ -12,7 +12,7 @@