![\"Odoo\"](\"/web/static/img/odoo_logo_dark.svg\"){kind=logo}
\n"
+" ![\"Odoo\"](\"/web/static/img/logo_inverse_white_206px.png\"){kind=logo}
\n"
" \n"
+" \n"
" Terms & Conditions: {baseurl}
" + self.assertEqual(invoice.narration, expected_en) + + # Switch to fr_FR + self.partner_a.lang = 'fr_FR' + + # Check the narration is in French + expected_fr = f"Conditions générales : {baseurl}
" + self.assertEqual(invoice.narration, expected_fr) + def test_multiple_currency_change(self): """ Test amount currency and balance are correctly recomputed when switching currency multiple times diff --git a/addons/account/tests/test_account_move_out_refund.py b/addons/account/tests/test_account_move_out_refund.py index 7680b1e6e4316..8e777e0c74e0e 100644 --- a/addons/account/tests/test_account_move_out_refund.py +++ b/addons/account/tests/test_account_move_out_refund.py @@ -590,6 +590,8 @@ def test_out_refund_line_onchange_cash_rounding_1(self): }) def test_out_refund_line_onchange_currency_1(self): + self.other_currency.rounding = 0.001 + move_form = Form(self.invoice) move_form.currency_id = self.other_currency move_form.save() diff --git a/addons/account/tests/test_account_move_payments_widget.py b/addons/account/tests/test_account_move_payments_widget.py index c1b932cda173c..e434ef0b169a6 100644 --- a/addons/account/tests/test_account_move_payments_widget.py +++ b/addons/account/tests/test_account_move_payments_widget.py @@ -16,7 +16,7 @@ def setUpClass(cls): cls.curr_1 = cls.company_data['currency'] cls.curr_2 = cls.setup_other_currency('EUR') - cls.curr_3 = cls.setup_other_currency('CAD', rates=[('2016-01-01', 6.0), ('2017-01-01', 4.0)]) + cls.curr_3 = cls.setup_other_currency('CAD', rates=[('2015-12-31', 6.0), ('2016-12-31', 4.0)]) cls.payment_2016_curr_1 = cls.env['account.move'].create({ 'date': '2016-01-01', diff --git a/addons/account/tests/test_account_move_reconcile.py b/addons/account/tests/test_account_move_reconcile.py index cb415fb07505b..68a663542c46f 100644 --- a/addons/account/tests/test_account_move_reconcile.py +++ b/addons/account/tests/test_account_move_reconcile.py @@ -35,8 +35,8 @@ def setUpClass(cls): # ==== Multi-currency setup ==== cls.other_currency = cls.setup_other_currency('EUR', rounding=0.001) - cls.other_currency_2 = cls.setup_other_currency('CAD', rates=[('2016-01-01', 6.0), ('2017-01-01', 4.0)]) - cls.other_currency_3 = cls.setup_other_currency('XAF', rates=[('2016-01-01', 0.0001), ('2017-01-01', 0.00001)]) + cls.other_currency_2 = cls.setup_other_currency('CAD', rates=[('2015-12-31', 6.0), ('2016-12-31', 4.0)]) + cls.other_currency_3 = cls.setup_other_currency('XAF', rates=[('2015-12-31', 0.0001), ('2016-12-31', 0.00001)]) # ==== Cash Basis Taxes setup ==== @@ -1122,6 +1122,7 @@ def test_reconcile_exchange_difference_on_partial_one_credit_foreign_currency_cr def test_reconcile_one_foreign_currency_fallback_company_currency(self): comp_curr = self.company_data['currency'] foreign_curr = self.other_currency_3 + foreign_curr.rounding = 0.001 # to be able to check the amounts up to the 3rd digit line_1 = self.create_line_for_reconciliation(-10.0, -10.0, comp_curr, '2017-01-01') line_2 = self.create_line_for_reconciliation(1000000.0, 100.0, foreign_curr, '2017-01-01') @@ -1852,7 +1853,7 @@ def test_reconcile_foreign_currency_rounding_issue(self): 'symbol': '🍞', 'rounding': 0.01, 'rate_ids': [ - Command.create({'name': '2019-06-01', 'rate': 0.052972554919}), + Command.create({'name': '2019-05-31', 'rate': 0.052972554919}), ], }) @@ -1949,7 +1950,7 @@ def test_reconcile_partial_exchange_rounding_issue(self): 'symbol': '🍞', 'rounding': 0.01, 'rate_ids': [ - Command.create({'name': '2019-06-01', 'rate': 0.052972554919}), + Command.create({'name': '2019-05-31', 'rate': 0.052972554919}), ], }) @@ -2023,7 +2024,7 @@ def test_full_reconcile_foreign_currency_rounding_difference_credit_larger(self) 'symbol': '🍞', 'rounding': 0.01, 'rate_ids': [ - Command.create({'name': '2019-06-01', 'rate': 0.648587}), + Command.create({'name': '2019-05-31', 'rate': 0.648587}), ], }) @@ -2084,7 +2085,7 @@ def test_full_reconcile_foreign_currency_rounding_difference_debit_larger(self): 'symbol': '🍞', 'rounding': 0.01, 'rate_ids': [ - Command.create({'name': '2019-06-01', 'rate': 0.648587}), + Command.create({'name': '2019-05-31', 'rate': 0.648587}), ], }) @@ -2142,11 +2143,11 @@ def test_reconcile_special_mexican_workflow_1(self): 'symbol': '🍣', 'rounding': 0.01, 'rate_ids': [ - Command.create({'name': '2019-09-24', 'rate': 0.050800000000}), - Command.create({'name': '2019-06-28', 'rate': 0.052235000000}), - Command.create({'name': '2019-06-24', 'rate': 0.052686000000}), - Command.create({'name': '2019-06-20', 'rate': 0.052353000000}), - Command.create({'name': '2019-06-12', 'rate': 0.052072000000}), + Command.create({'name': '2019-09-23', 'rate': 0.050800000000}), + Command.create({'name': '2019-06-27', 'rate': 0.052235000000}), + Command.create({'name': '2019-06-23', 'rate': 0.052686000000}), + Command.create({'name': '2019-06-19', 'rate': 0.052353000000}), + Command.create({'name': '2019-06-11', 'rate': 0.052072000000}), ], }) @@ -2443,11 +2444,11 @@ def test_reconcile_special_mexican_workflow_2(self): 'symbol': '🍣', 'rounding': 0.01, 'rate_ids': [ - Command.create({'name': '2019-09-24', 'rate': 0.050800000000}), - Command.create({'name': '2019-06-28', 'rate': 0.052235000000}), - Command.create({'name': '2019-06-24', 'rate': 0.052686000000}), - Command.create({'name': '2019-06-20', 'rate': 0.052353000000}), - Command.create({'name': '2019-06-12', 'rate': 0.052072000000}), + Command.create({'name': '2019-09-23', 'rate': 0.050800000000}), + Command.create({'name': '2019-06-27', 'rate': 0.052235000000}), + Command.create({'name': '2019-06-23', 'rate': 0.052686000000}), + Command.create({'name': '2019-06-19', 'rate': 0.052353000000}), + Command.create({'name': '2019-06-11', 'rate': 0.052072000000}), ], }) @@ -2815,7 +2816,7 @@ def test_migration_to_new_reconciliation_multiple_currencies_fix_residual_with_w ]) def test_reconcile_rounding_issue(self): - currency = self.setup_other_currency('CHF', rates=[('2016-01-01', 1 / 1.5289), ('2017-01-01', 1 / 1.5289)]) + currency = self.setup_other_currency('CHF', rates=[('2015-12-31', 1 / 1.5289), ('2016-12-31', 1 / 1.5289)]) # Create an invoice 26.45 XXX = 40.43 USD invoice = self.env['account.move'].create({ @@ -3787,7 +3788,7 @@ def test_reconcile_cash_basis_exchange_difference_transfer_account_check_entries account is not a reconcile one. ''' self.env.company.tax_exigibility = True - currency_id = self.setup_other_currency('CHF', rates=[('2016-01-01', 0.5), ('2017-01-01', 0.66666666666666)]).id + currency_id = self.setup_other_currency('CHF', rates=[('2015-12-31', 0.5), ('2016-12-31', 0.66666666666666)]).id # Rate 2/1 in 2016. caba_inv = self.env['account.move'].with_context(skip_invoice_sync=True).create({ @@ -3862,7 +3863,7 @@ def test_reconcile_cash_basis_exchange_difference_transfer_account_check_entries account is not a reconcile one. ''' self.env.company.tax_exigibility = True - currency_id = self.setup_other_currency('CHF', rates=[('2016-01-01', 0.5), ('2017-01-01', 0.66666666666666)]).id + currency_id = self.setup_other_currency('CHF', rates=[('2015-12-31', 0.5), ('2016-12-31', 0.66666666666666)]).id # Rate 2/1 in 2016. caba_inv = self.env['account.move'].with_context(skip_invoice_sync=True).create({ @@ -4043,7 +4044,7 @@ def test_reconcile_cash_basis_exchange_difference_transfer_account_check_entries def test_reconcile_cash_basis_refund_multicurrency(self): self.env.company.tax_exigibility = True - currency = self.setup_other_currency('CHF', rates=[('2016-01-01', 0.5), ('2017-01-01', 0.33333333333333333)]) + currency = self.setup_other_currency('CHF', rates=[('2015-12-31', 0.5), ('2016-12-31', 0.33333333333333333)]) invoice = self.env['account.move'].create({ 'move_type': 'out_invoice', diff --git a/addons/account/tests/test_account_payment_register.py b/addons/account/tests/test_account_payment_register.py index 47ecc7b700541..0916e7336e44a 100644 --- a/addons/account/tests/test_account_payment_register.py +++ b/addons/account/tests/test_account_payment_register.py @@ -26,7 +26,7 @@ def setUpClass(cls): cls.current_year = fields.Date.today().year cls.other_currency = cls.setup_other_currency('EUR') - cls.other_currency_2 = cls.setup_other_currency('CAD', rates=[('2016-01-01', 3.0), ('2017-01-01', 0.01)]) + cls.other_currency_2 = cls.setup_other_currency('CAD', rates=[('2015-12-31', 3.0), ('2016-12-31', 0.01)]) cls.payment_debit_account_id = cls.copy_account(cls.inbound_payment_method_line.payment_account_id) cls.payment_credit_account_id = cls.copy_account(cls.outbound_payment_method_line.payment_account_id) diff --git a/addons/account/tests/test_account_to_check.py b/addons/account/tests/test_account_to_check.py index e1f83fe0ac21d..a391bbc8b4f28 100644 --- a/addons/account/tests/test_account_to_check.py +++ b/addons/account/tests/test_account_to_check.py @@ -18,47 +18,117 @@ def setUpClass(cls): cls.bank_journal = cls.env['account.journal'].search([('type', '=', 'bank'), ('company_id', '=', cls.company.id)], limit=1) def test_try_check_move_with_invoicing_user(self): - if 'accountant' not in self.env["ir.module.module"]._installed(): - self.skipTest('accountant is not installed') - invoice = self._create_invoice(checked=True) + invoice = self._create_invoice(review_state='todo') invoice.action_post() - with self.assertRaisesRegex(ValidationError, 'Validated entries can only be changed by your accountant.'): + with self.assertRaisesRegex(ValidationError, 'This entry has already been reviewed.'): invoice.with_user(self.simple_accountman).button_draft() invoice.button_draft() self.assertEqual(invoice.state, 'draft') invoice.action_post() - invoice.checked = False + self.assertEqual(invoice.review_state, 'reviewed') + invoice.review_state = 'todo' invoice.with_user(self.simple_accountman).button_draft() self.assertEqual(invoice.state, 'draft') + def test_sales_change_invoice_from_accountant(self): + invoice = self._create_invoice() + invoice.action_post() + with self.assertRaisesRegex(ValidationError, 'This entry has already been reviewed.'): + invoice.with_user(self.simple_accountman).button_draft() + + def test_sales_modify_draft_reviewed(self): + invoice = self._create_invoice(review_state='reviewed') + invoice.with_user(self.simple_accountman).invoice_date = '2017-01-01' + self.assertEqual(invoice.review_state, 'todo') + def test_post_move_auto_check(self): - if 'accountant' not in self.env["ir.module.module"]._installed(): - self.skipTest('accountant is not installed') invoice_admin = self._create_invoice() invoice_admin.action_post() - # As the user has admin right, the move should be auto checked - self.assertTrue(invoice_admin.checked) + # As the user has admin right, the move doesn't need to be checked + self.assertFalse(invoice_admin.review_state) invoice_invoicing = self._create_invoice(user_id=self.simple_accountman.id) invoice_invoicing.with_user(self.simple_accountman).action_post() # As the user has only invoicing right, the move shouldn't be checked - self.assertFalse(invoice_invoicing.checked) + self.assertEqual(invoice_invoicing.review_state, 'todo') + + def test_post_move_auto_check_with_auto_post_at_date_accountant(self): + invoice = self._create_invoice(date=fields.Date.today()) + invoice.auto_post = 'at_date' + self.assertFalse(invoice.review_state) + with freeze_time(invoice.date + relativedelta(days=1)), self.enter_registry_test_mode(): + self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger() + self.assertFalse(invoice.review_state) + + def test_post_move_auto_check_with_auto_post_at_date_sales(self): + invoice = self._create_invoice(date=fields.Date.today()) + invoice.with_user(self.simple_accountman).auto_post = 'at_date' + self.assertEqual(invoice.review_state, 'todo') + with freeze_time(invoice.date + relativedelta(days=1)), self.enter_registry_test_mode(): + self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger() + self.assertEqual(invoice.review_state, 'todo') + + def test_post_move_auto_check_with_auto_post_at_date_sales_prereviewed(self): + invoice = self._create_invoice(date=fields.Date.today()) + invoice.with_user(self.simple_accountman).auto_post = 'at_date' + self.assertEqual(invoice.review_state, 'todo') + invoice.review_state = 'reviewed' + with freeze_time(invoice.date + relativedelta(days=1)), self.enter_registry_test_mode(): + self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger() + self.assertEqual(invoice.review_state, 'reviewed') + + def test_post_move_auto_check_with_auto_post_monthly_accountant(self): + invoice = self._create_invoice(date=fields.Date.today()) + invoice.auto_post = 'monthly' + self.assertFalse(invoice.review_state) + with freeze_time(invoice.date + relativedelta(days=1)), self.enter_registry_test_mode(): + self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger() + self.assertFalse(invoice.review_state) + last_recurring = self.env['account.move'].search([('auto_post_origin_id', '=', invoice.id)], limit=1, order='date desc') + self.assertFalse(last_recurring.review_state) + + def test_post_move_auto_check_with_auto_post_monthly_sales(self): + invoice = self._create_invoice(date=fields.Date.today()) + invoice.with_user(self.simple_accountman).auto_post = 'monthly' + self.assertEqual(invoice.review_state, 'todo') + with freeze_time(invoice.date + relativedelta(days=1)), self.enter_registry_test_mode(): + self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger() + self.assertEqual(invoice.review_state, 'todo') + last_recurring = self.env['account.move'].search([('auto_post_origin_id', '=', invoice.id)], limit=1, order='date desc') + self.assertEqual(last_recurring.review_state, 'todo') + + def test_post_move_auto_check_with_auto_post_monthly_sales_prereviewed(self): + invoice = self._create_invoice(date=fields.Date.today()) + invoice.with_user(self.simple_accountman).auto_post = 'monthly' + self.assertEqual(invoice.review_state, 'todo') + invoice.review_state = 'reviewed' + with freeze_time(invoice.date + relativedelta(days=1)), self.enter_registry_test_mode(): + self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger() + self.assertEqual(invoice.review_state, 'reviewed') + last_recurring = self.env['account.move'].search([('auto_post_origin_id', '=', invoice.id)], limit=1, order='date desc') + self.assertEqual(last_recurring.review_state, 'reviewed') - def test_post_move_auto_check_with_auto_post(self): - if 'accountant' not in self.env["ir.module.module"]._installed(): - self.skipTest('accountant is not installed') - invoice = self._create_invoice(auto_post='at_date', date=fields.Date.today()) - self.assertFalse(invoice.checked) + def test_post_move_auto_check_with_auto_post_monthly_sales_postreviewed(self): + invoice = self._create_invoice(date=fields.Date.today()) + invoice.with_user(self.simple_accountman).auto_post = 'monthly' + self.assertEqual(invoice.review_state, 'todo') with freeze_time(invoice.date + relativedelta(days=1)), self.enter_registry_test_mode(): self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger() - self.assertTrue(invoice.checked) + invoice.review_state = 'reviewed' + last_recurring = self.env['account.move'].search([('auto_post_origin_id', '=', invoice.id)], limit=1, order='date desc') + self.assertEqual(last_recurring.review_state, 'todo') + last_recurring.review_state = 'reviewed' + with freeze_time(invoice.date + relativedelta(days=1, months=1)), self.enter_registry_test_mode(): + self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger() + last_recurring = self.env['account.move'].search([('auto_post_origin_id', '=', invoice.id)], limit=1, order='date desc') + self.assertEqual(last_recurring.review_state, 'reviewed') def test_create_statement_line_auto_check(self): + if 'account_accountant' not in self.env["ir.module.module"]._installed(): + self.skipTest('account_accountant is not installed') # required for `_try_auto_reconcile_statement_lines` """Test if a user changes the reconciliation on a st_line, it marks the bank move as 'To Review'""" - if 'accountant' not in self.env["ir.module.module"]._installed(): - self.skipTest('accountant is not installed') payment = self.env['account.payment'].create({ 'payment_type': 'inbound', 'payment_method_id': self.env.ref('account.account_payment_method_manual_in').id, @@ -76,6 +146,6 @@ def test_create_statement_line_auto_check(self): 'amount': -100, }]) bank_line_1._try_auto_reconcile_statement_lines() - self.assertTrue(bank_line_1.move_id.checked) + self.assertFalse(bank_line_1.move_id.review_state) with self.assertRaisesRegex(ValidationError, 'Validated entries can only be changed by your accountant.'): bank_line_1.with_user(self.simple_accountman).delete_reconciled_line(payment.move_id.line_ids[0].id) diff --git a/addons/account/tests/test_audit_trail.py b/addons/account/tests/test_audit_trail.py index f1e163d610b6e..9b56cf10eb475 100644 --- a/addons/account/tests/test_audit_trail.py +++ b/addons/account/tests/test_audit_trail.py @@ -45,6 +45,28 @@ def assertTrail(self, trail, expected): for message, expected_needle in zip(trail, expected[::-1]): self.assertIn(expected_needle, message.account_audit_log_preview) + def test_can_reset_deferred_invoice(self): + customer = self.env['res.partner'].create({'name': 'Rob Odoo'}) + invoice = self.env['account.move'].create({ + 'invoice_date': '2025-09-01', + 'invoice_date_due': '2025-09-01', + 'invoice_line_ids': [ + (0, 0, {'name': 'Line1', + 'price_unit': 100.0, + 'deferred_start_date': '2025-09-01', + 'deferred_end_date': '2025-12-31', + } + ), + ], + 'move_type': 'out_invoice', + 'name': 'INVOICE_00001', + 'partner_id': customer.id, + }) + + for i in range(4): + invoice.action_post() + invoice.button_draft() + def test_can_unlink_draft(self): self.env.company.restrictive_audit_trail = True self.move.unlink() @@ -86,11 +108,11 @@ def test_content(self): self.assertTrail(self.get_trail(self.move), messages) self.move.action_post() - messages.append("Updated\nFalse ⇨ True (Reviewed)\nFalse ⇨ MISC/2021/04/0001 (Number)\nDraft ⇨ Posted (Status)") + messages.append("Updated\nFalse ⇨ MISC/2021/04/0001 (Number)\nDraft ⇨ Posted (Status)") self.assertTrail(self.get_trail(self.move), messages) self.move.button_draft() - messages.append("Updated\nTrue ⇨ False (Reviewed)\nPosted ⇨ Draft (Status)") + messages.append("Updated\nPosted ⇨ Draft (Status)") self.assertTrail(self.get_trail(self.move), messages) self.move.name = "nawak" diff --git a/addons/account/tests/test_duplicate_res_partner_bank.py b/addons/account/tests/test_duplicate_res_partner_bank.py index 08cbfe0420df6..598b459f112d5 100644 --- a/addons/account/tests/test_duplicate_res_partner_bank.py +++ b/addons/account/tests/test_duplicate_res_partner_bank.py @@ -1,11 +1,10 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo.tests import tagged, Form +from odoo.tests import Form from odoo.addons.base.tests.common import SavepointCaseWithUserDemo -@tagged('at_install', '-post_install') # LEGACY at_install class TestDuplicatePartnerBank(SavepointCaseWithUserDemo): @classmethod @@ -52,3 +51,7 @@ def test_remove_bank_account_from_partner(self): partner_form.bank_ids.remove(0) self.assertEqual(len(partner.bank_ids), 0) + + def test_duplicate_acc_number_inactive_bank_account(self): + self.partner_bank_b.active = False + self.assertFalse(self.partner_bank_a.duplicate_bank_partner_ids) diff --git a/addons/account/tests/test_invoice_taxes.py b/addons/account/tests/test_invoice_taxes.py index e6716ad62350c..52721f10963c3 100644 --- a/addons/account/tests/test_invoice_taxes.py +++ b/addons/account/tests/test_invoice_taxes.py @@ -626,7 +626,7 @@ def test_tax_calculation_foreign_currency_large_quantity(self): 2.82 | 20000 | 21% not incl ''' self.env['res.currency.rate'].create({ - 'name': '2018-01-01', + 'name': '2017-12-31', 'rate': 1.1726, 'currency_id': self.other_currency.id, 'company_id': self.env.company.id, @@ -655,7 +655,7 @@ def test_tax_calculation_foreign_currency_large_quantity(self): def test_ensure_no_unbalanced_entry(self): ''' Ensure to not create an unbalanced journal entry when saving. ''' self.env['res.currency.rate'].create({ - 'name': '2018-01-01', + 'name': '2017-12-31', 'rate': 0.654065014, 'currency_id': self.other_currency.id, 'company_id': self.env.company.id, @@ -676,7 +676,7 @@ def test_ensure_no_unbalanced_entry(self): @freeze_time('2018-01-01') def test_tax_calculation_multi_currency(self): self.env['res.currency.rate'].create({ - 'name': '2018-01-01', + 'name': '2017-12-31', 'rate': 0.273748, 'currency_id': self.other_currency.id, 'company_id': self.env.company.id, diff --git a/addons/account/tests/test_kpi_provider.py b/addons/account/tests/test_kpi_provider.py index 924367e6d8284..fd229d7120431 100644 --- a/addons/account/tests/test_kpi_provider.py +++ b/addons/account/tests/test_kpi_provider.py @@ -70,12 +70,12 @@ def test_kpi_summary_reports_posted_but_to_check_moves(self): 'move_type': 'out_invoice', }) move.action_post() - move.checked = False + move.review_state = 'todo' self.assertCountEqual(self.env['kpi.provider'].get_account_kpi_summary(), [ {'id': 'account_journal_type.sale', 'name': 'Sales', 'type': 'integer', 'value': 1}, ]) - move.button_set_checked() + move.set_moves_checked() self.assertCountEqual(self.env['kpi.provider'].get_account_kpi_summary(), []) def test_kpi_summary_reports_unreconciled_bank_statements(self): diff --git a/addons/account/views/account_journal_dashboard_view.xml b/addons/account/views/account_journal_dashboard_view.xml index fd1b8b9adbe8f..772c31ad587e5 100644 --- a/addons/account/views/account_journal_dashboard_view.xml +++ b/addons/account/views/account_journal_dashboard_view.xml @@ -257,7 +257,7 @@