From 9b30cf43ab910a5d5453929d10cb9ecd15ba0c85 Mon Sep 17 00:00:00 2001 From: Thomas Binsfeld Date: Fri, 25 Jan 2019 16:25:30 +0100 Subject: [PATCH] [MIG] Account Check Deposit to 12.0 --- account_check_deposit/README.rst | 10 +- account_check_deposit/__init__.py | 2 - account_check_deposit/__manifest__.py | 18 +- account_check_deposit/data/sequence.xml | 2 +- .../i18n/account_check_deposit.pot | 133 +++++----- account_check_deposit/i18n/fr.po | 132 +++++----- .../models/res_config_settings.py | 2 + account_check_deposit/report/report.xml | 22 +- .../report/report_checkdeposit.xml | 14 +- .../security/check_deposit_security.xml | 22 +- .../static/description/index.html | 6 +- .../tests/test_check_deposit.py | 1 - .../views/account_deposit_view.xml | 243 +++++++++--------- 13 files changed, 299 insertions(+), 308 deletions(-) diff --git a/account_check_deposit/README.rst b/account_check_deposit/README.rst index 56fa1f015..a98e3a2b9 100644 --- a/account_check_deposit/README.rst +++ b/account_check_deposit/README.rst @@ -14,13 +14,13 @@ Account Check Deposit :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--tools-lightgray.png?logo=github - :target: https://github.com/OCA/account-financial-tools/tree/11.0/account_check_deposit + :target: https://github.com/OCA/account-financial-tools/tree/12.0/account_check_deposit :alt: OCA/account-financial-tools .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/account-financial-tools-11-0/account-financial-tools-11-0-account_check_deposit + :target: https://translation.odoo-community.org/projects/account-financial-tools-12-0/account-financial-tools-12-0-account_check_deposit :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/92/11.0 + :target: https://runbot.odoo-community.org/runbot/92/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -82,7 +82,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -122,6 +122,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/account-financial-tools `_ project on GitHub. +This module is part of the `OCA/account-financial-tools `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_check_deposit/__init__.py b/account_check_deposit/__init__.py index cde864bae..0650744f6 100644 --- a/account_check_deposit/__init__.py +++ b/account_check_deposit/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import models diff --git a/account_check_deposit/__manifest__.py b/account_check_deposit/__manifest__.py index 8c5dc9dbb..1a645e2c1 100644 --- a/account_check_deposit/__manifest__.py +++ b/account_check_deposit/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2012-2016 Akretion (http://www.akretion.com/) # @author: Benoît GUILLOT # @author: Chafique DELLI @@ -8,25 +7,26 @@ { 'name': 'Account Check Deposit', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Accounting', 'license': 'AGPL-3', 'summary': 'Manage deposit of checks to the bank', - 'author': "Akretion," - "Tecnativa," - "Odoo Community Association (OCA)", - 'website': 'http://github.com/OCA/account-financial-tools', + 'author': "Odoo Community Association (OCA)," + "Akretion," + "Tecnativa", + 'website': 'https://github.com/OCA/account-financial-tools/tree/12.0/' + 'account_check_deposit', 'depends': [ - 'account_invoicing', + 'account', ], 'development_status': 'Mature', 'data': [ + 'security/ir.model.access.csv', + 'security/check_deposit_security.xml', 'data/sequence.xml', 'views/account_deposit_view.xml', 'views/account_move_line_view.xml', 'views/res_config_settings_views.xml', - 'security/ir.model.access.csv', - 'security/check_deposit_security.xml', 'report/report.xml', 'report/report_checkdeposit.xml', ], diff --git a/account_check_deposit/data/sequence.xml b/account_check_deposit/data/sequence.xml index d299ca661..836181b86 100644 --- a/account_check_deposit/data/sequence.xml +++ b/account_check_deposit/data/sequence.xml @@ -1,6 +1,6 @@ diff --git a/account_check_deposit/i18n/account_check_deposit.pot b/account_check_deposit/i18n/account_check_deposit.pot index 1d6a7b863..50882aede 100644 --- a/account_check_deposit/i18n/account_check_deposit.pot +++ b/account_check_deposit/i18n/account_check_deposit.pot @@ -4,8 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-01-28 10:25+0000\n" +"PO-Revision-Date: 2019-01-28 10:25+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -14,27 +16,27 @@ msgstr "" "Plural-Forms: \n" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Bank Account Number to Credit:" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Check Currency:" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Number of checks:" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Total:" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Transfer Date:" msgstr "" @@ -44,36 +46,36 @@ msgid "Account Check Deposit" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Amount" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form +#: model_terms:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form msgid "Back to Draft" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_bank_journal_id -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__bank_journal_id +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search #: selection:res.company,check_deposit_offsetting_account:0 msgid "Bank Account" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Bank:" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Beneficiary:" msgstr "" #. module: account_check_deposit #: model:ir.actions.report,name:account_check_deposit.report_account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_move_line_check_deposit_id -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form +#: model:ir.model.fields,field_description:account_check_deposit.field_account_move_line__check_deposit_id +#: model_terms:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form msgid "Check Deposit" msgstr "" @@ -91,42 +93,35 @@ msgid "Check Deposit - Ref. Check %s" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_res_company_check_deposit_offsetting_account -#: model:ir.model.fields,field_description:account_check_deposit.field_res_config_settings_check_deposit_offsetting_account +#: model:ir.model.fields,field_description:account_check_deposit.field_res_company__check_deposit_offsetting_account +#: model:ir.model.fields,field_description:account_check_deposit.field_res_config_settings__check_deposit_offsetting_account msgid "Check Deposit Offsetting Account" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Check Deposit n°" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.res_config_settings_view_form +#: model_terms:ir.ui.view,arch_db:account_check_deposit.res_config_settings_view_form msgid "Check Deposits" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_check_payment_ids -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__check_payment_ids +#: model_terms:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form msgid "Check Payments" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search msgid "Checks Deposit" msgstr "" -#. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search -msgid "Checks Deposit Search" -msgstr "" - #. module: account_check_deposit #: model:ir.actions.act_window,name:account_check_deposit.action_check_deposit_tree #: model:ir.ui.menu,name:account_check_deposit.menu_check_deposit_tree -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_tree msgid "Checks Deposits" msgstr "" @@ -136,92 +131,97 @@ msgid "Companies" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_company_id +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__company_id msgid "Company" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_create_uid +#: model:ir.model,name:account_check_deposit.model_res_config_settings +msgid "Config Settings" +msgstr "" + +#. module: account_check_deposit +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__create_uid msgid "Created by" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_create_date +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__create_date msgid "Created on" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_currency_id -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__currency_id +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search msgid "Currency" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_currency_none_same_company_id +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__currency_none_same_company_id msgid "Currency (False if same as company)" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Date" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Debtor" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_journal_default_account_id +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__journal_default_account_id msgid "Default Debit Account of the Journal" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_deposit_date -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__deposit_date +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search msgid "Deposit Date" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_display_name +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__display_name msgid "Display Name" msgstr "" #. module: account_check_deposit #: selection:account.check.deposit,state:0 -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search msgid "Done" msgstr "" #. module: account_check_deposit #: selection:account.check.deposit,state:0 -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search msgid "Draft" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search msgid "Group By" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_id +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__id msgid "ID" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,help:account_check_deposit.field_account_check_deposit_journal_default_account_id +#: model:ir.model.fields,help:account_check_deposit.field_account_check_deposit__journal_default_account_id msgid "It acts as a default account for debit amount" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_journal_id -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__journal_id +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search msgid "Journal" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_move_id +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__move_id msgid "Journal Entry" msgstr "" @@ -231,27 +231,27 @@ msgid "Journal Item" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit___last_update +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit____last_update msgid "Last Modified on" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_write_uid +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__write_uid msgid "Last Updated by" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_write_date +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__write_date msgid "Last Updated on" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_line_ids +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__line_ids msgid "Lines" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "List of checks:" msgstr "" @@ -268,27 +268,27 @@ msgid "Missing 'Default Debit Account' on bank journal '%s'" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_name +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__name msgid "Name" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_check_count +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__check_count msgid "Number of Checks" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_is_reconcile +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__is_reconcile msgid "Reconcile" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Reference" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_state +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__state msgid "Status" msgstr "" @@ -306,17 +306,17 @@ msgid "The deposit '%s' is in valid state, so you must cancel it before deleting msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_total_amount +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__total_amount msgid "Total Amount" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form +#: model_terms:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form msgid "Total Credit" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form +#: model_terms:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form msgid "Total Debit" msgstr "" @@ -326,13 +326,13 @@ msgid "Transfer Account" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_res_company_check_deposit_transfer_account_id -#: model:ir.model.fields,field_description:account_check_deposit.field_res_config_settings_check_deposit_transfer_account_id +#: model:ir.model.fields,field_description:account_check_deposit.field_res_company__check_deposit_transfer_account_id +#: model:ir.model.fields,field_description:account_check_deposit.field_res_config_settings__check_deposit_transfer_account_id msgid "Transfer Account for Check Deposits" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form +#: model_terms:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form msgid "Validate" msgstr "" @@ -342,8 +342,3 @@ msgstr "" msgid "You must configure the 'Check Deposit Offsetting Account' on the Accounting Settings page" msgstr "" -#. module: account_check_deposit -#: model:ir.model,name:account_check_deposit.model_res_config_settings -msgid "res.config.settings" -msgstr "" - diff --git a/account_check_deposit/i18n/fr.po b/account_check_deposit/i18n/fr.po index 11746b701..46c3d6c76 100644 --- a/account_check_deposit/i18n/fr.po +++ b/account_check_deposit/i18n/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-25 11:46+0000\n" +"POT-Creation-Date: 2019-01-28 10:25+0000\n" "PO-Revision-Date: 2018-01-25 11:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" @@ -19,27 +19,27 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Bank Account Number to Credit:" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Check Currency:" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Number of checks:" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Total:" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Transfer Date:" msgstr "" @@ -49,36 +49,36 @@ msgid "Account Check Deposit" msgstr "Compte Remise de Chèque" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Amount" msgstr "Montant" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form +#: model_terms:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form msgid "Back to Draft" msgstr "Remettre en brouillon" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_bank_journal_id -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__bank_journal_id +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search #: selection:res.company,check_deposit_offsetting_account:0 msgid "Bank Account" msgstr "Compte bancaire" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Bank:" msgstr "Banque :" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Beneficiary:" msgstr "Bénéficiaire :" #. module: account_check_deposit #: model:ir.actions.report,name:account_check_deposit.report_account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_move_line_check_deposit_id -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form +#: model:ir.model.fields,field_description:account_check_deposit.field_account_move_line__check_deposit_id +#: model_terms:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form msgid "Check Deposit" msgstr "Remise de chèque" @@ -96,43 +96,36 @@ msgid "Check Deposit - Ref. Check %s" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_res_company_check_deposit_offsetting_account -#: model:ir.model.fields,field_description:account_check_deposit.field_res_config_settings_check_deposit_offsetting_account +#: model:ir.model.fields,field_description:account_check_deposit.field_res_company__check_deposit_offsetting_account +#: model:ir.model.fields,field_description:account_check_deposit.field_res_config_settings__check_deposit_offsetting_account msgid "Check Deposit Offsetting Account" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Check Deposit n°" msgstr "Remise de chèque n°" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.res_config_settings_view_form +#: model_terms:ir.ui.view,arch_db:account_check_deposit.res_config_settings_view_form #, fuzzy msgid "Check Deposits" msgstr "Remises de chèques" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_check_payment_ids -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__check_payment_ids +#: model_terms:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form msgid "Check Payments" msgstr "Paiements par Chèque" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search msgid "Checks Deposit" msgstr "Remise de Chèques" -#. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search -msgid "Checks Deposit Search" -msgstr "Rechercher une Remise de Chèques" - #. module: account_check_deposit #: model:ir.actions.act_window,name:account_check_deposit.action_check_deposit_tree #: model:ir.ui.menu,name:account_check_deposit.menu_check_deposit_tree -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_tree msgid "Checks Deposits" msgstr "Remises de chèques" @@ -142,92 +135,97 @@ msgid "Companies" msgstr "Sociétés" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_company_id +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__company_id msgid "Company" msgstr "Société" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_create_uid +#: model:ir.model,name:account_check_deposit.model_res_config_settings +msgid "Config Settings" +msgstr "" + +#. module: account_check_deposit +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__create_uid msgid "Created by" msgstr "Créer par" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_create_date +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__create_date msgid "Created on" msgstr "Créer le" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_currency_id -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__currency_id +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search msgid "Currency" msgstr "Devise" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_currency_none_same_company_id +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__currency_none_same_company_id msgid "Currency (False if same as company)" msgstr "Devise (False s'il s'agit de la même que la société)" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Date" msgstr "Date" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Debtor" msgstr "Débiteur" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_journal_default_account_id +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__journal_default_account_id msgid "Default Debit Account of the Journal" msgstr "Compte de débit par défaut du journal" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_deposit_date -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__deposit_date +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search msgid "Deposit Date" msgstr "Date du Versement" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_display_name +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__display_name msgid "Display Name" msgstr "Nom à afficher" #. module: account_check_deposit #: selection:account.check.deposit,state:0 -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search msgid "Done" msgstr "Terminé" #. module: account_check_deposit #: selection:account.check.deposit,state:0 -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search msgid "Draft" msgstr "Brouillon" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search msgid "Group By" msgstr "Grouper par" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_id +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__id msgid "ID" msgstr "ID" #. module: account_check_deposit -#: model:ir.model.fields,help:account_check_deposit.field_account_check_deposit_journal_default_account_id +#: model:ir.model.fields,help:account_check_deposit.field_account_check_deposit__journal_default_account_id msgid "It acts as a default account for debit amount" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_journal_id -#: model:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__journal_id +#: model_terms:ir.ui.view,arch_db:account_check_deposit.view_check_deposit_search msgid "Journal" msgstr "Journal" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_move_id +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__move_id msgid "Journal Entry" msgstr "Pièce comptable" @@ -237,27 +235,27 @@ msgid "Journal Item" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit___last_update +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit____last_update msgid "Last Modified on" msgstr "Dernière modification le" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_write_uid +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__write_uid msgid "Last Updated by" msgstr "Mis à jour par" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_write_date +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__write_date msgid "Last Updated on" msgstr "Mis à jour le" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_line_ids +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__line_ids msgid "Lines" msgstr "Lignes" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "List of checks:" msgstr "Liste des chèques :" @@ -274,27 +272,27 @@ msgid "Missing 'Default Debit Account' on bank journal '%s'" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_name +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__name msgid "Name" msgstr "Nom" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_check_count +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__check_count msgid "Number of Checks" msgstr "Nombre de chèques :" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_is_reconcile +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__is_reconcile msgid "Reconcile" msgstr "Lettrer" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit +#: model_terms:ir.ui.view,arch_db:account_check_deposit.report_checkdeposit msgid "Reference" msgstr "Référence" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_state +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__state msgid "Status" msgstr "État" @@ -319,17 +317,17 @@ msgstr "" "supprimer." #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit_total_amount +#: model:ir.model.fields,field_description:account_check_deposit.field_account_check_deposit__total_amount msgid "Total Amount" msgstr "Montant total" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form +#: model_terms:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form msgid "Total Credit" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form +#: model_terms:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form msgid "Total Debit" msgstr "" @@ -339,13 +337,13 @@ msgid "Transfer Account" msgstr "" #. module: account_check_deposit -#: model:ir.model.fields,field_description:account_check_deposit.field_res_company_check_deposit_transfer_account_id -#: model:ir.model.fields,field_description:account_check_deposit.field_res_config_settings_check_deposit_transfer_account_id +#: model:ir.model.fields,field_description:account_check_deposit.field_res_company__check_deposit_transfer_account_id +#: model:ir.model.fields,field_description:account_check_deposit.field_res_config_settings__check_deposit_transfer_account_id msgid "Transfer Account for Check Deposits" msgstr "" #. module: account_check_deposit -#: model:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form +#: model_terms:ir.ui.view,arch_db:account_check_deposit.account_check_deposit_view_form msgid "Validate" msgstr "Valider" @@ -357,7 +355,5 @@ msgid "" "Settings page" msgstr "" -#. module: account_check_deposit -#: model:ir.model,name:account_check_deposit.model_res_config_settings -msgid "res.config.settings" -msgstr "" +#~ msgid "Checks Deposit Search" +#~ msgstr "Rechercher une Remise de Chèques" diff --git a/account_check_deposit/models/res_config_settings.py b/account_check_deposit/models/res_config_settings.py index dd434c841..330805c8b 100644 --- a/account_check_deposit/models/res_config_settings.py +++ b/account_check_deposit/models/res_config_settings.py @@ -9,8 +9,10 @@ class ResConfigSettings(models.TransientModel): _inherit = 'res.config.settings' check_deposit_offsetting_account = fields.Selection( + readonly=False, related='company_id.check_deposit_offsetting_account', ) check_deposit_transfer_account_id = fields.Many2one( related='company_id.check_deposit_transfer_account_id', + readonly=False, ) diff --git a/account_check_deposit/report/report.xml b/account_check_deposit/report/report.xml index 961c835a2..d5f52d33f 100644 --- a/account_check_deposit/report/report.xml +++ b/account_check_deposit/report/report.xml @@ -1,21 +1,19 @@ - - + - - - + diff --git a/account_check_deposit/report/report_checkdeposit.xml b/account_check_deposit/report/report_checkdeposit.xml index 68809535d..9a7cc7da2 100644 --- a/account_check_deposit/report/report_checkdeposit.xml +++ b/account_check_deposit/report/report_checkdeposit.xml @@ -1,19 +1,18 @@ - - + - - + diff --git a/account_check_deposit/security/check_deposit_security.xml b/account_check_deposit/security/check_deposit_security.xml index 0f362cbf5..dce4c8111 100644 --- a/account_check_deposit/security/check_deposit_security.xml +++ b/account_check_deposit/security/check_deposit_security.xml @@ -1,20 +1,18 @@ - - + - - Check Deposit multi-company - - - ['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])] - + + Check Deposit multi-company + + + ['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])] + - - + diff --git a/account_check_deposit/static/description/index.html b/account_check_deposit/static/description/index.html index 8c47087ff..af745d340 100644 --- a/account_check_deposit/static/description/index.html +++ b/account_check_deposit/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Mature License: AGPL-3 OCA/account-financial-tools Translate me on Weblate Try me on Runbot

+

Mature License: AGPL-3 OCA/account-financial-tools Translate me on Weblate Try me on Runbot

This module allows you to easily manage check deposits : you can select all the checks you received and create a global deposit for the selected checks. This module supports multi-currency ; each deposit has a currency and all the @@ -429,7 +429,7 @@ deposit at the bank. Eventually, validate the deposit and print the report

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

+feedback.

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

@@ -464,7 +464,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

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

-

This module is part of the OCA/account-financial-tools project on GitHub.

+

This module is part of the OCA/account-financial-tools project on GitHub.

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

diff --git a/account_check_deposit/tests/test_check_deposit.py b/account_check_deposit/tests/test_check_deposit.py index 7deef7f4a..92a918107 100644 --- a/account_check_deposit/tests/test_check_deposit.py +++ b/account_check_deposit/tests/test_check_deposit.py @@ -123,7 +123,6 @@ class TestPayment(AccountingTestCase): """ Returns an open invoice """ invoice = self.invoice_model.create({ 'partner_id': self.partner_agrolait.id, - 'reference_type': 'none', 'currency_id': currency_id, 'name': type == 'out_invoice' and 'invoice to client' or 'invoice to supplier', diff --git a/account_check_deposit/views/account_deposit_view.xml b/account_check_deposit/views/account_deposit_view.xml index 0851568ee..53a2b3d68 100644 --- a/account_check_deposit/views/account_deposit_view.xml +++ b/account_check_deposit/views/account_deposit_view.xml @@ -9,130 +9,137 @@ - - account.check.deposit - -
-
-
- + + account.check.deposit + + +
+
+ +
+
+ + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - account.check.deposit.tree - account.check.deposit - - - - - - - - - - - - - - - - - - account.check.deposit.search - account.check.deposit - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
+ + + - - Checks Deposits - account.check.deposit - tree,form - + + account.check.deposit.tree + account.check.deposit + + + + + + + + + + + + + + + - + + account.check.deposit.search + account.check.deposit + + + + + + + + + + + + + + + + + Checks Deposits + account.check.deposit + tree,form + + +