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/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_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/gitoo.yml b/gitoo.yml index 5b05143c..af348f2e 100644 --- a/gitoo.yml +++ b/gitoo.yml @@ -1,6 +1,3 @@ -- url: https://{{GIT_TOKEN}}@github.com/Numigi/odoo-enterprise - branch: "14.0" - - url: https://github.com/Numigi/odoo-base-addons branch: "14.0" @@ -9,6 +6,16 @@ includes: - partner_affiliate_extended +- url: https://github.com/OCA/account-financial-reporting + branch: "14.0" + includes: + - account_financial_report + +- url: https://github.com/OCA/account-reconcile + branch: "14.0" + includes: + - account_reconciliation_widget + - url: https://github.com/OCA/mis-builder branch: "14.0" includes: