diff --git a/account_move_name_sequence/README.rst b/account_move_name_sequence/README.rst
index 33a3279ba..db9d98fe5 100644
--- a/account_move_name_sequence/README.rst
+++ b/account_move_name_sequence/README.rst
@@ -7,7 +7,7 @@ Account Move Number Sequence
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- !! source digest: sha256:7bacdeb105b7d0fe0f8a379d75569ba691ec1fecd4b0400ad7e0623d8fcd5e85
+ !! source digest: sha256:05033a46eac93732c8a86b64d9cc9f1da3cccc3287bfa0fafef832d3a62702bf
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/account_move_name_sequence/__manifest__.py b/account_move_name_sequence/__manifest__.py
index f1f325353..0d2dc350c 100644
--- a/account_move_name_sequence/__manifest__.py
+++ b/account_move_name_sequence/__manifest__.py
@@ -19,6 +19,7 @@
],
"demo": [
"demo/ir_sequence_demo.xml",
+ "demo/account_journal_demo.xml",
],
"data": [
"views/account_journal.xml",
diff --git a/account_move_name_sequence/demo/account_journal_demo.xml b/account_move_name_sequence/demo/account_journal_demo.xml
new file mode 100644
index 000000000..de295c0c0
--- /dev/null
+++ b/account_move_name_sequence/demo/account_journal_demo.xml
@@ -0,0 +1,19 @@
+
+
In Odoo version 13.0 and previous versions, the number of journal entries was generated from a sequence configured on the journal.
diff --git a/account_move_name_sequence/tests/test_sequence_concurrency.py b/account_move_name_sequence/tests/test_sequence_concurrency.py index 2c90cd699..26c7ea8d3 100644 --- a/account_move_name_sequence/tests/test_sequence_concurrency.py +++ b/account_move_name_sequence/tests/test_sequence_concurrency.py @@ -36,15 +36,27 @@ class TestSequenceConcurrency(TransactionCase): super().setUp() self.product = self.env.ref("product.product_delivery_01") self.partner = self.env.ref("base.res_partner_12") + self.partner2 = self.env.ref("base.res_partner_1") self.date = fields.Date.to_date("1985-04-14") + self.journal_sale_std = self.env.ref( + "account_move_name_sequence.journal_sale_std_demo" + ) + self.journal_cash_std = self.env.ref( + "account_move_name_sequence.journal_cash_std_demo" + ) def _new_cr(self): return self.env.registry.cursor() - def _create_invoice_form(self, env, post=True): + def _create_invoice_form( + self, env, post=True, partner=None, ir_sequence_standard=False + ): + if partner is None: + # Use another partner to bypass "increase_rank" lock error + partner = self.partner ctx = {"default_move_type": "out_invoice"} with Form(env["account.move"].with_context(**ctx)) as invoice_form: - invoice_form.partner_id = self.partner + invoice_form.partner_id = partner invoice_form.invoice_date = self.date with invoice_form.invoice_line_ids.new() as line_form: @@ -52,6 +64,8 @@ class TestSequenceConcurrency(TransactionCase): line_form.price_unit = 100.0 line_form.tax_ids.clear() invoice = invoice_form.save() + if ir_sequence_standard: + invoice.journal_id = self.journal_sale_std if post: invoice.action_post() return invoice @@ -70,9 +84,7 @@ class TestSequenceConcurrency(TransactionCase): payment = payment_form.save() if ir_sequence_standard: - payment.move_id.journal_id.sequence_id = self.env.ref( - "account_move_name_sequence.ir_sequence_demo" - ) + payment.move_id.journal_id = self.journal_cash_std payment.action_post() return payment @@ -108,10 +120,14 @@ class TestSequenceConcurrency(TransactionCase): env, ir_sequence_standard=ir_sequence_standard ) _logger.info("Creating invoice cr %s", cr_pid) - self._create_invoice_form(env) + self._create_invoice_form( + env, ir_sequence_standard=ir_sequence_standard + ) else: _logger.info("Creating invoice cr %s", cr_pid) - self._create_invoice_form(env) + self._create_invoice_form( + env, ir_sequence_standard=ir_sequence_standard + ) _logger.info("Creating payment cr %s", cr_pid) self._create_payment_form( env, ir_sequence_standard=ir_sequence_standard @@ -261,8 +277,29 @@ class TestSequenceConcurrency(TransactionCase): self.addCleanup(self._clean_moves, payment_move_ids) env0.cr.commit() with env1.cr.savepoint(), env2.cr.savepoint(): - self._create_payment_form(env1) - self._create_payment_form(env2) + self._create_payment_form(env1, ir_sequence_standard=True) + self._create_payment_form(env2, ir_sequence_standard=True) + + def test_sequence_concurrency_92_invoices(self): + """Creating concurrent invoices should not raises errors""" + with self._new_cr() as cr0, self._new_cr() as cr1, self._new_cr() as cr2: + env0 = api.Environment(cr0, SUPERUSER_ID, {}) + env1 = api.Environment(cr1, SUPERUSER_ID, {}) + env2 = api.Environment(cr2, SUPERUSER_ID, {}) + for cr in [cr0, cr1, cr2]: + # Set 10s timeout in order to avoid waiting for release locks a long time + cr.execute("SET LOCAL statement_timeout = '10s'") + + # Create "last move" to lock + invoice = self._create_invoice_form(env0, ir_sequence_standard=True) + self.addCleanup(self._clean_moves, invoice.ids) + env0.cr.commit() + with env1.cr.savepoint(), env2.cr.savepoint(): + self._create_invoice_form(env1, ir_sequence_standard=True) + # Using another partner to bypass "increase_rank" lock error + self._create_invoice_form( + env2, partner=self.partner2, ir_sequence_standard=True + ) @tools.mute_logger("odoo.sql_db") def test_sequence_concurrency_95_pay2inv_inv2pay(self):