From 8994bc25e188f673f34f6d972d3c4033bb812777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernanda=20Hern=C3=A1ndez?= Date: Wed, 30 Nov 2022 00:03:58 +0000 Subject: [PATCH 1/9] [FIX] account_move_name_sequence: call flush before to post the moves --- account_move_name_sequence/models/account_move.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/account_move_name_sequence/models/account_move.py b/account_move_name_sequence/models/account_move.py index b6756fce4..4d6d27f89 100644 --- a/account_move_name_sequence/models/account_move.py +++ b/account_move_name_sequence/models/account_move.py @@ -83,3 +83,7 @@ class AccountMove(models.Model): if not self.quick_edit_mode: self.name = "/" self._compute_name_by_sequence() + + def _post(self, soft=True): + self.flush() + return super()._post(soft=soft) From a1c7502046eca2de7cbcf13a7fa97d283b15ddde Mon Sep 17 00:00:00 2001 From: payen000 Date: Tue, 9 Aug 2022 19:47:19 +0000 Subject: [PATCH 2/9] [REF] account_move_name_sequence: Added concurrency tests related to sequence A demo ir_sequence record with 'standard' implementation was assigned to the payment journal so that no concurrency errors arise from using 'no gap' sequences when attempting to create multiple payments. --- account_move_name_sequence/__manifest__.py | 3 + .../demo/ir_sequence_demo.xml | 11 + account_move_name_sequence/tests/__init__.py | 1 + .../tests/test_sequence_concurrency.py | 322 ++++++++++++++++++ 4 files changed, 337 insertions(+) create mode 100644 account_move_name_sequence/demo/ir_sequence_demo.xml create mode 100644 account_move_name_sequence/tests/test_sequence_concurrency.py diff --git a/account_move_name_sequence/__manifest__.py b/account_move_name_sequence/__manifest__.py index 18cc46660..b9b39f39e 100644 --- a/account_move_name_sequence/__manifest__.py +++ b/account_move_name_sequence/__manifest__.py @@ -17,6 +17,9 @@ "depends": [ "account", ], + "demo": [ + "demo/ir_sequence_demo.xml", + ], "data": [ "views/account_journal.xml", "views/account_move.xml", diff --git a/account_move_name_sequence/demo/ir_sequence_demo.xml b/account_move_name_sequence/demo/ir_sequence_demo.xml new file mode 100644 index 000000000..34f9c5f56 --- /dev/null +++ b/account_move_name_sequence/demo/ir_sequence_demo.xml @@ -0,0 +1,11 @@ + + + + Standard Sequence Demo + demo/%(range_year)s/ + + 1 + 1 + + + diff --git a/account_move_name_sequence/tests/__init__.py b/account_move_name_sequence/tests/__init__.py index 5de02aafc..5510ca286 100644 --- a/account_move_name_sequence/tests/__init__.py +++ b/account_move_name_sequence/tests/__init__.py @@ -1 +1,2 @@ from . import test_account_move_name_seq +from . import test_sequence_concurrency diff --git a/account_move_name_sequence/tests/test_sequence_concurrency.py b/account_move_name_sequence/tests/test_sequence_concurrency.py new file mode 100644 index 000000000..7f7c7cc45 --- /dev/null +++ b/account_move_name_sequence/tests/test_sequence_concurrency.py @@ -0,0 +1,322 @@ +import logging +import threading +import time + +import psycopg2 + +import odoo +from odoo import SUPERUSER_ID, api, fields, tools +from odoo.tests import tagged +from odoo.tests.common import Form, TransactionCase + +_logger = logging.getLogger(__name__) + + +class ThreadRaiseJoin(threading.Thread): + """Custom Thread Class to raise the exception to main thread in the join""" + + def run(self, *args, **kwargs): + self.exc = None + try: + return super().run(*args, **kwargs) + except BaseException as e: + self.exc = e + + def join(self, *args, **kwargs): + super().join(*args, **kwargs) + # raise exception in the join + # to raise it in the main thread + if self.exc: + raise self.exc + + +@tagged("post_install", "-at_install", "test_move_sequence") +class TestSequenceConcurrency(TransactionCase): + def setUp(self): + super().setUp() + self.product = self.env.ref("product.product_delivery_01") + self.partner = self.env.ref("base.res_partner_12") + self.date = fields.Date.to_date("1985-04-14") + + def _new_cr(self): + return self.env.registry.cursor() + + def _create_invoice_form(self, env, post=True): + 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.invoice_date = self.date + + with invoice_form.invoice_line_ids.new() as line_form: + line_form.product_id = self.product + line_form.price_unit = 100.0 + line_form.tax_ids.clear() + invoice = invoice_form.save() + if post: + invoice.action_post() + return invoice + + def _create_payment_form(self, env, ir_sequence_standard=False): + with Form( + env["account.payment"].with_context( + default_payment_type="inbound", + default_partner_type="customer", + default_move_journal_types=("bank", "cash"), + ) + ) as payment_form: + payment_form.partner_id = env.ref("base.res_partner_12") + payment_form.amount = 100 + payment_form.date = self.date + + 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.action_post() + return payment + + def _clean_moves(self, move_ids, payment=None): + """Delete moves created after finish unittest using + self.addCleanup( + self._clean_moves, self.env, (invoices | payments.mapped('move_id')).ids + )""" + with self._new_cr() as cr: + env = api.Environment(cr, SUPERUSER_ID, {}) + moves = env["account.move"].browse(move_ids) + moves.button_draft() + moves = moves.with_context(force_delete=True) + moves.unlink() + # TODO: Delete payment and journal + env.cr.commit() + + def _create_invoice_payment( + self, deadlock_timeout, payment_first=False, ir_sequence_standard=False + ): + with odoo.api.Environment.manage(): + odoo.registry(self.env.cr.dbname) + with self._new_cr() as cr, cr.savepoint(): + env = api.Environment(cr, SUPERUSER_ID, {}) + cr_pid = cr.connection.get_backend_pid() + # Avoid waiting for a long time and it needs to be less than deadlock + cr.execute( + "SET LOCAL statement_timeout = '%ss'", (deadlock_timeout + 10,) + ) + if payment_first: + _logger.info("Creating payment cr %s", cr_pid) + self._create_payment_form( + env, ir_sequence_standard=ir_sequence_standard + ) + _logger.info("Creating invoice cr %s", cr_pid) + self._create_invoice_form(env) + else: + _logger.info("Creating invoice cr %s", cr_pid) + self._create_invoice_form(env) + _logger.info("Creating payment cr %s", cr_pid) + self._create_payment_form( + env, ir_sequence_standard=ir_sequence_standard + ) + # sleep in order to avoid release the locks too faster + # It could be many methods called after creating these + # kind of records e.g. reconcile + _logger.info("Finishing waiting %s" % (deadlock_timeout + 12)) + time.sleep(deadlock_timeout + 12) + + def test_sequence_concurrency_10_draft_invoices(self): + """Creating 2 DRAFT invoices not should 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) + self.addCleanup(self._clean_moves, invoice.ids) + env0.cr.commit() + with env1.cr.savepoint(), env2.cr.savepoint(): + invoice1 = self._create_invoice_form(env1, post=False) + self.assertEqual(invoice1.state, "draft") + invoice2 = self._create_invoice_form(env2, post=False) + self.assertEqual(invoice2.state, "draft") + + def test_sequence_concurrency_20_editing_last_invoice(self): + """Edit last invoice and create a new invoice + should not raises errors""" + with self._new_cr() as cr0, self._new_cr() as cr1: + env0 = api.Environment(cr0, SUPERUSER_ID, {}) + env1 = api.Environment(cr1, SUPERUSER_ID, {}) + for cr in [cr0, cr1]: + # 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) + + self.addCleanup(self._clean_moves, invoice.ids) + env0.cr.commit() + with env0.cr.savepoint(), env1.cr.savepoint(): + # Edit something in "last move" + invoice.write({"write_uid": env0.uid}) + invoice.flush() + self._create_invoice_form(env1) + + def test_sequence_concurrency_30_editing_last_payment(self): + """Edit last payment and create a new payment + should not raises errors""" + with self._new_cr() as cr0, self._new_cr() as cr1: + env0 = api.Environment(cr0, SUPERUSER_ID, {}) + env1 = api.Environment(cr1, SUPERUSER_ID, {}) + for cr in [cr0, cr1]: + # 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 + payment = self._create_payment_form(env0) + payment_move = payment.move_id + self.addCleanup(self._clean_moves, payment_move.ids) + env0.cr.commit() + with env0.cr.savepoint(), env1.cr.savepoint(): + # Edit something in "last move" + payment_move.write({"write_uid": env0.uid}) + payment_move.flush() + self._create_payment_form(env1) + + @tools.mute_logger("odoo.sql_db") + def test_sequence_concurrency_40_reconciling_last_invoice(self): + """Reconcile last invoice and create a new one + should not raises errors""" + with self._new_cr() as cr0, self._new_cr() as cr1: + env0 = api.Environment(cr0, SUPERUSER_ID, {}) + env1 = api.Environment(cr1, SUPERUSER_ID, {}) + for cr in [cr0, cr1]: + # 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) + payment = self._create_payment_form(env0) + payment_move = payment.move_id + self.addCleanup(self._clean_moves, invoice.ids + payment_move.ids) + env0.cr.commit() + lines2reconcile = ( + (payment_move | invoice) + .mapped("line_ids") + .filtered(lambda l: l.account_id.internal_type == "receivable") + ) + with env0.cr.savepoint(), env1.cr.savepoint(): + # Reconciling "last move" + # reconcile a payment with many invoices spend a lot so it could + # lock records too many time + lines2reconcile.reconcile() + # Many pieces of code call flush directly + lines2reconcile.flush() + self._create_invoice_form(env1) + + def test_sequence_concurrency_50_reconciling_last_payment(self): + """Reconcile last payment and create a new one + should not raises errors""" + with self._new_cr() as cr0, self._new_cr() as cr1: + env0 = api.Environment(cr0, SUPERUSER_ID, {}) + env1 = api.Environment(cr1, SUPERUSER_ID, {}) + for cr in [cr0, cr1]: + # 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) + payment = self._create_payment_form(env0) + payment_move = payment.move_id + self.addCleanup(self._clean_moves, invoice.ids + payment_move.ids) + env0.cr.commit() + lines2reconcile = ( + (payment_move | invoice) + .mapped("line_ids") + .filtered(lambda l: l.account_id.internal_type == "receivable") + ) + with env0.cr.savepoint(), env1.cr.savepoint(): + # Reconciling "last move" + # reconcile a payment with many invoices spend a lot so it could + # lock records too many time + lines2reconcile.reconcile() + # Many pieces of code call flush directly + lines2reconcile.flush() + self._create_payment_form(env1) + + def test_sequence_concurrency_90_payments(self): + """Creating concurrent payments 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 + payment = self._create_payment_form(env0, ir_sequence_standard=True) + payment_move_ids = payment.move_id.ids + 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) + + @tools.mute_logger("odoo.sql_db") + def test_sequence_concurrency_95_pay2inv_inv2pay(self): + """Creating concurrent payment then invoice and invoice then payment + should not raises errors + It raises deadlock sometimes""" + with self._new_cr() as cr0: + env0 = api.Environment(cr0, SUPERUSER_ID, {}) + + # Create "last move" to lock + invoice = self._create_invoice_form(env0) + + # Create "last move" to lock + payment = self._create_payment_form(env0) + payment_move_ids = payment.move_id.ids + self.addCleanup(self._clean_moves, invoice.ids + payment_move_ids) + env0.cr.commit() + env0.cr.execute( + "SELECT setting FROM pg_settings WHERE name = 'deadlock_timeout'" + ) + deadlock_timeout = int(env0.cr.fetchone()[0]) # ms + # You could not have permission to set this parameter + # psycopg2.errors.InsufficientPrivilege + self.assertTrue( + deadlock_timeout, + "You need to configure PG parameter deadlock_timeout='1s'", + ) + deadlock_timeout = int(deadlock_timeout / 1000) # s + try: + t_pay_inv = ThreadRaiseJoin( + target=self._create_invoice_payment, + args=(deadlock_timeout, True, True), + name="Thread payment invoice", + ) + t_inv_pay = ThreadRaiseJoin( + target=self._create_invoice_payment, + args=(deadlock_timeout, False, True), + name="Thread invoice payment", + ) + t_pay_inv.start() + t_inv_pay.start() + # the thread could raise the error before to wait for it so disable coverage + t_pay_inv.join(timeout=deadlock_timeout + 15) # pragma: no cover + t_inv_pay.join(timeout=deadlock_timeout + 15) # pragma: no cover + except psycopg2.OperationalError as e: + if e.pgcode in [ + psycopg2.errorcodes.SERIALIZATION_FAILURE, + psycopg2.errorcodes.LOCK_NOT_AVAILABLE, + ]: # pragma: no cover + # Concurrency error is expected but not deadlock so ok + pass + elif ( + e.pgcode == psycopg2.errorcodes.DEADLOCK_DETECTED + ): # pragma: no cover + self.assertFalse(True, "Deadlock detected.") + else: # pragma: no cover + raise From c62c1b4205493bcb8447f842a5e73687a9245e05 Mon Sep 17 00:00:00 2001 From: Pierre Verkest Date: Mon, 27 Mar 2023 11:36:24 +0200 Subject: [PATCH 3/9] [FIX] account_move_name_sequence: avoid fallback on odoo sequence name In case an alias is configured to fecth email to generate account entries. the new_message method directly call the _compute_name on account move which call the legacy code provide by account odoo module which should be avoid here. To reproduce: * configure an alias on your purchase journal * send an email to that alias * the invoice is draft with a number to mitigate this behavior the suggested patch overwritte the former method '_compute_name' and call the new implemented method '_compute_name_by_sequence'. --- .../models/account_move.py | 7 ++ account_move_name_sequence/tests/__init__.py | 1 + .../test_account_incoming_supplier_invoice.py | 87 +++++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 account_move_name_sequence/tests/test_account_incoming_supplier_invoice.py diff --git a/account_move_name_sequence/models/account_move.py b/account_move_name_sequence/models/account_move.py index 4d6d27f89..9f692dd9a 100644 --- a/account_move_name_sequence/models/account_move.py +++ b/account_move_name_sequence/models/account_move.py @@ -87,3 +87,10 @@ class AccountMove(models.Model): def _post(self, soft=True): self.flush() return super()._post(soft=soft) + + def _compute_name(self): + """Overwrite account module method in order to + avoid side effect if legacy code call it directly + like when creating entry from email. + """ + return self._compute_name_by_sequence() diff --git a/account_move_name_sequence/tests/__init__.py b/account_move_name_sequence/tests/__init__.py index 5510ca286..7f2d011b8 100644 --- a/account_move_name_sequence/tests/__init__.py +++ b/account_move_name_sequence/tests/__init__.py @@ -1,2 +1,3 @@ from . import test_account_move_name_seq from . import test_sequence_concurrency +from . import test_account_incoming_supplier_invoice diff --git a/account_move_name_sequence/tests/test_account_incoming_supplier_invoice.py b/account_move_name_sequence/tests/test_account_incoming_supplier_invoice.py new file mode 100644 index 000000000..139969ab2 --- /dev/null +++ b/account_move_name_sequence/tests/test_account_incoming_supplier_invoice.py @@ -0,0 +1,87 @@ +import json + +from odoo.tests import tagged + +from odoo.addons.account.tests.common import AccountTestInvoicingCommon + + +@tagged("post_install", "-at_install") +class TestAccountIncomingSupplierInvoice(AccountTestInvoicingCommon): + """Testing creating account move fetching mail.alias""" + + @classmethod + def setUpClass(cls, chart_template_ref=None): + super().setUpClass(chart_template_ref=chart_template_ref) + + cls.env["ir.config_parameter"].sudo().set_param( + "mail.catchall.domain", "test-company.odoo.com" + ) + + cls.internal_user = cls.env["res.users"].create( + { + "name": "Internal User", + "login": "internal.user@test.odoo.com", + "email": "internal.user@test.odoo.com", + } + ) + + cls.supplier_partner = cls.env["res.partner"].create( + { + "name": "Your Supplier", + "email": "supplier@other.company.com", + "supplier_rank": 10, + } + ) + + cls.journal = cls.company_data["default_journal_purchase"] + + journal_alias = cls.env["mail.alias"].create( + { + "alias_name": "test-bill", + "alias_model_id": cls.env.ref("account.model_account_move").id, + "alias_defaults": json.dumps( + { + "move_type": "in_invoice", + "company_id": cls.env.user.company_id.id, + "journal_id": cls.journal.id, + } + ), + } + ) + cls.journal.write({"alias_id": journal_alias.id}) + + def test_supplier_invoice_mailed_from_supplier(self): + """this test is mainly inspired from + addons.account.tests.test_account_incoming_supplier_invoice + python module but we make sure account move is draft without + name + """ + message_parsed = { + "message_id": "message-id-dead-beef", + "subject": "Incoming bill", + "from": "%s <%s>" + % (self.supplier_partner.name, self.supplier_partner.email), + "to": "%s@%s" + % (self.journal.alias_id.alias_name, self.journal.alias_id.alias_domain), + "body": "You know, that thing that you bought.", + "attachments": [b"Hello, invoice"], + } + + invoice = self.env["account.move"].message_new( + message_parsed, {"move_type": "in_invoice", "journal_id": self.journal.id} + ) + + message_ids = invoice.message_ids + self.assertEqual( + len(message_ids), 1, "Only one message should be posted in the chatter" + ) + self.assertEqual( + message_ids.body, + "

Vendor Bill Created

", + "Only the invoice creation should be posted", + ) + + following_partners = invoice.message_follower_ids.mapped("partner_id") + self.assertEqual(following_partners, self.env.user.partner_id) + self.assertEqual(invoice.state, "draft") + self.assertEqual(invoice.name, "/") From 237db23038d5d55cb76d4d56681b09ee37be0aa4 Mon Sep 17 00:00:00 2001 From: Matjaz Mozetic Date: Thu, 30 Mar 2023 10:08:53 +0000 Subject: [PATCH 4/9] Added translation using Weblate (Slovenian) --- account_move_name_sequence/i18n/sl.po | 156 ++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 account_move_name_sequence/i18n/sl.po diff --git a/account_move_name_sequence/i18n/sl.po b/account_move_name_sequence/i18n/sl.po new file mode 100644 index 000000000..a215b199c --- /dev/null +++ b/account_move_name_sequence/i18n/sl.po @@ -0,0 +1,156 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_name_sequence +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2023-03-30 12:22+0000\n" +"Last-Translator: Matjaz Mozetic \n" +"Language-Team: none\n" +"Language: sl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3;\n" +"X-Generator: Weblate 4.14.1\n" + +#. module: account_move_name_sequence +#: model:ir.model.constraint,message:account_move_name_sequence.constraint_account_move_name_state_diagonal +msgid "" +"A move can not be posted with name \"/\" or empty value\n" +"Check the journal sequence, please" +msgstr "" +"Temeljnice ni mogoče knjižiti z nazivom \"/\" ali prazno vrednostjo\n" +"Prosimo, da preverite zaporedje v dnevniku" + +#. module: account_move_name_sequence +#: model:ir.model.fields,help:account_move_name_sequence.field_account_journal__refund_sequence +msgid "" +"Check this box if you don't want to share the same sequence for invoices and" +" credit notes made from this journal" +msgstr "" +"Označite, če želite v tem dnevniku uporabljati isto zaporedje za račune in " +"dobropise" + +#. module: account_move_name_sequence +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_journal__refund_sequence_id +msgid "Credit Note Entry Sequence" +msgstr "Zaporedje za dobropise" + +#. module: account_move_name_sequence +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_journal__refund_sequence +msgid "Dedicated Credit Note Sequence" +msgstr "Ločeno zaporedje za dobropise" + +#. module: account_move_name_sequence +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_journal__display_name +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_move__display_name +#: model:ir.model.fields,field_description:account_move_name_sequence.field_ir_sequence__display_name +msgid "Display Name" +msgstr "Prikazani naziv" + +#. module: account_move_name_sequence +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_journal__sequence_id +msgid "Entry Sequence" +msgstr "Zaporedje vnosa" + +#. module: account_move_name_sequence +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_bank_statement_line__highest_name +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_move__highest_name +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_payment__highest_name +msgid "Highest Name" +msgstr "Najvišji naziv" + +#. module: account_move_name_sequence +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_journal__id +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_move__id +#: model:ir.model.fields,field_description:account_move_name_sequence.field_ir_sequence__id +msgid "ID" +msgstr "ID" + +#. module: account_move_name_sequence +#: model:ir.model,name:account_move_name_sequence.model_account_journal +msgid "Journal" +msgstr "Dnevnik" + +#. module: account_move_name_sequence +#: model:ir.model,name:account_move_name_sequence.model_account_move +msgid "Journal Entry" +msgstr "Dnevniški vnos" + +#. module: account_move_name_sequence +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_journal____last_update +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_move____last_update +#: model:ir.model.fields,field_description:account_move_name_sequence.field_ir_sequence____last_update +msgid "Last Modified on" +msgstr "Zadnjič spremenjeno" + +#. module: account_move_name_sequence +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_bank_statement_line__name +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_move__name +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_payment__name +msgid "Number" +msgstr "Številka" + +#. module: account_move_name_sequence +#: code:addons/account_move_name_sequence/models/account_journal.py:0 +#, python-format +msgid "" +"On journal '%s', the same sequence is used as Entry Sequence and Credit Note" +" Entry Sequence." +msgstr "V dnevniku '%s' se uporablja isto zaporedje za vnose in dobropise." + +#. module: account_move_name_sequence +#: code:addons/account_move_name_sequence/models/account_journal.py:0 +#, python-format +msgid "Refund" +msgstr "Povračilo" + +#. module: account_move_name_sequence +#: code:addons/account_move_name_sequence/models/account_journal.py:0 +#: model:ir.model,name:account_move_name_sequence.model_ir_sequence +#, python-format +msgid "Sequence" +msgstr "Zaporedje" + +#. module: account_move_name_sequence +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_bank_statement_line__sequence_number +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_move__sequence_number +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_payment__sequence_number +msgid "Sequence Number" +msgstr "Številka zaporedja" + +#. module: account_move_name_sequence +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_bank_statement_line__sequence_prefix +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_move__sequence_prefix +#: model:ir.model.fields,field_description:account_move_name_sequence.field_account_payment__sequence_prefix +msgid "Sequence Prefix" +msgstr "Predpona zaporedja" + +#. module: account_move_name_sequence +#: code:addons/account_move_name_sequence/models/account_journal.py:0 +#, python-format +msgid "" +"The company is not set on sequence '%s' configured as credit note sequence " +"of journal '%s'." +msgstr "Pri zaporedju '%s' za dobropise v dnevniku '%s' ni nastavljena družba." + +#. module: account_move_name_sequence +#: code:addons/account_move_name_sequence/models/account_journal.py:0 +#, python-format +msgid "The company is not set on sequence '%s' configured on journal '%s'." +msgstr "Pri zaporedju '%s' nastavljenem v dnevniku '%s' ni nastavljena družba." + +#. module: account_move_name_sequence +#: model:ir.model.fields,help:account_move_name_sequence.field_account_journal__refund_sequence_id +msgid "" +"This sequence will be used to generate the journal entry number for refunds." +msgstr "To zaporedje bo v rabi za knjigovodske vnose dobropisov." + +#. module: account_move_name_sequence +#: model:ir.model.fields,help:account_move_name_sequence.field_account_journal__sequence_id +msgid "This sequence will be used to generate the journal entry number." +msgstr "To zaporedje bo v rabi za knjigovodske vnose dobropisov." From 727721d7a2854e703027e49ba7e80b4bf6b2ae20 Mon Sep 17 00:00:00 2001 From: "Moises Lopez - https://www.vauxoo.com/" Date: Sun, 7 Apr 2024 19:30:57 -0600 Subject: [PATCH 5/9] [IMP] account_move_name_sequence: pre-commit auto fixes --- .../tests/test_sequence_concurrency.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/account_move_name_sequence/tests/test_sequence_concurrency.py b/account_move_name_sequence/tests/test_sequence_concurrency.py index 7f7c7cc45..4dcd56fe7 100644 --- a/account_move_name_sequence/tests/test_sequence_concurrency.py +++ b/account_move_name_sequence/tests/test_sequence_concurrency.py @@ -23,11 +23,12 @@ class ThreadRaiseJoin(threading.Thread): self.exc = e def join(self, *args, **kwargs): - super().join(*args, **kwargs) + res = super().join(*args, **kwargs) # raise exception in the join # to raise it in the main thread if self.exc: raise self.exc + return res @tagged("post_install", "-at_install", "test_move_sequence") @@ -99,9 +100,7 @@ class TestSequenceConcurrency(TransactionCase): env = api.Environment(cr, SUPERUSER_ID, {}) cr_pid = cr.connection.get_backend_pid() # Avoid waiting for a long time and it needs to be less than deadlock - cr.execute( - "SET LOCAL statement_timeout = '%ss'", (deadlock_timeout + 10,) - ) + cr.execute("SET LOCAL statement_timeout = '%ss'", (deadlock_timeout + 10,)) if payment_first: _logger.info("Creating payment cr %s", cr_pid) self._create_payment_form( From 37cb577553ed3834808a938321eb89ac215d8684 Mon Sep 17 00:00:00 2001 From: "Moises Lopez - https://www.vauxoo.com/" Date: Sun, 7 Apr 2024 19:37:46 -0600 Subject: [PATCH 6/9] [FW] account_move_name_sequence: Forward-Port of 14.0 to 15.0 --- .../tests/test_sequence_concurrency.py | 55 ++++++++++--------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/account_move_name_sequence/tests/test_sequence_concurrency.py b/account_move_name_sequence/tests/test_sequence_concurrency.py index 4dcd56fe7..e59556335 100644 --- a/account_move_name_sequence/tests/test_sequence_concurrency.py +++ b/account_move_name_sequence/tests/test_sequence_concurrency.py @@ -24,6 +24,9 @@ class ThreadRaiseJoin(threading.Thread): def join(self, *args, **kwargs): res = super().join(*args, **kwargs) + # Wait for the thread finishes + while self.is_alive(): + pass # raise exception in the join # to raise it in the main thread if self.exc: @@ -94,32 +97,31 @@ class TestSequenceConcurrency(TransactionCase): def _create_invoice_payment( self, deadlock_timeout, payment_first=False, ir_sequence_standard=False ): - with odoo.api.Environment.manage(): - odoo.registry(self.env.cr.dbname) - with self._new_cr() as cr, cr.savepoint(): - env = api.Environment(cr, SUPERUSER_ID, {}) - cr_pid = cr.connection.get_backend_pid() - # Avoid waiting for a long time and it needs to be less than deadlock - cr.execute("SET LOCAL statement_timeout = '%ss'", (deadlock_timeout + 10,)) - if payment_first: - _logger.info("Creating payment cr %s", cr_pid) - self._create_payment_form( - env, ir_sequence_standard=ir_sequence_standard - ) - _logger.info("Creating invoice cr %s", cr_pid) - self._create_invoice_form(env) - else: - _logger.info("Creating invoice cr %s", cr_pid) - self._create_invoice_form(env) - _logger.info("Creating payment cr %s", cr_pid) - self._create_payment_form( - env, ir_sequence_standard=ir_sequence_standard - ) - # sleep in order to avoid release the locks too faster - # It could be many methods called after creating these - # kind of records e.g. reconcile - _logger.info("Finishing waiting %s" % (deadlock_timeout + 12)) - time.sleep(deadlock_timeout + 12) + odoo.registry(self.env.cr.dbname) + with self._new_cr() as cr, cr.savepoint(): + env = api.Environment(cr, SUPERUSER_ID, {}) + cr_pid = cr.connection.get_backend_pid() + # Avoid waiting for a long time and it needs to be less than deadlock + cr.execute("SET LOCAL statement_timeout = '%ss'", (deadlock_timeout + 10,)) + if payment_first: + _logger.info("Creating payment cr %s", cr_pid) + self._create_payment_form( + env, ir_sequence_standard=ir_sequence_standard + ) + _logger.info("Creating invoice cr %s", cr_pid) + self._create_invoice_form(env) + else: + _logger.info("Creating invoice cr %s", cr_pid) + self._create_invoice_form(env) + _logger.info("Creating payment cr %s", cr_pid) + self._create_payment_form( + env, ir_sequence_standard=ir_sequence_standard + ) + # sleep in order to avoid release the locks too faster + # It could be many methods called after creating these + # kind of records e.g. reconcile + _logger.info("Finishing waiting %s" % (deadlock_timeout + 12)) + time.sleep(deadlock_timeout + 12) def test_sequence_concurrency_10_draft_invoices(self): """Creating 2 DRAFT invoices not should raises errors""" @@ -290,6 +292,7 @@ class TestSequenceConcurrency(TransactionCase): "You need to configure PG parameter deadlock_timeout='1s'", ) deadlock_timeout = int(deadlock_timeout / 1000) # s + try: t_pay_inv = ThreadRaiseJoin( target=self._create_invoice_payment, From 7f0e28eeccd7aa6349b34fd8d6b289203763572e Mon Sep 17 00:00:00 2001 From: "Moises Lopez - https://www.vauxoo.com/" Date: Wed, 17 Apr 2024 11:15:39 -0600 Subject: [PATCH 7/9] [IMP] account_move_name_sequence: pre-commit auto fixes --- account_move_name_sequence/README.rst | 2 +- account_move_name_sequence/static/description/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/account_move_name_sequence/README.rst b/account_move_name_sequence/README.rst index b7248d54d..6d2981781 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:d7661994cfb1a81502f402c60acbeb24e96554dde36737ecf41617bdde4c9ebd + !! source digest: sha256:25a0d51a6a54b550b3362629caef66405ec523c1b717dfc9d742a2f35a926950 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/account_move_name_sequence/static/description/index.html b/account_move_name_sequence/static/description/index.html index 3ff9e9306..679ed23b8 100644 --- a/account_move_name_sequence/static/description/index.html +++ b/account_move_name_sequence/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:d7661994cfb1a81502f402c60acbeb24e96554dde36737ecf41617bdde4c9ebd +!! source digest: sha256:25a0d51a6a54b550b3362629caef66405ec523c1b717dfc9d742a2f35a926950 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/account-financial-tools Translate me on Weblate Try me on Runboat

In Odoo version 13.0 and previous versions, the number of journal entries was generated from a sequence configured on the journal.

From e1eef83bbde2bca7a8fdb33026512c195a122f54 Mon Sep 17 00:00:00 2001 From: "Moises Lopez - https://www.vauxoo.com/" Date: Wed, 17 Apr 2024 17:35:54 +0000 Subject: [PATCH 8/9] [FW] account_move_name_sequence: Forward-Port of 15.0 to 16.0 --- account_move_name_sequence/models/account_move.py | 2 +- .../tests/test_sequence_concurrency.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/account_move_name_sequence/models/account_move.py b/account_move_name_sequence/models/account_move.py index 9f692dd9a..205cdb466 100644 --- a/account_move_name_sequence/models/account_move.py +++ b/account_move_name_sequence/models/account_move.py @@ -85,7 +85,7 @@ class AccountMove(models.Model): self._compute_name_by_sequence() def _post(self, soft=True): - self.flush() + self.flush_recordset() return super()._post(soft=soft) def _compute_name(self): diff --git a/account_move_name_sequence/tests/test_sequence_concurrency.py b/account_move_name_sequence/tests/test_sequence_concurrency.py index e59556335..482b1aa8e 100644 --- a/account_move_name_sequence/tests/test_sequence_concurrency.py +++ b/account_move_name_sequence/tests/test_sequence_concurrency.py @@ -161,7 +161,7 @@ class TestSequenceConcurrency(TransactionCase): with env0.cr.savepoint(), env1.cr.savepoint(): # Edit something in "last move" invoice.write({"write_uid": env0.uid}) - invoice.flush() + env0.flush_all() self._create_invoice_form(env1) def test_sequence_concurrency_30_editing_last_payment(self): @@ -182,7 +182,7 @@ class TestSequenceConcurrency(TransactionCase): with env0.cr.savepoint(), env1.cr.savepoint(): # Edit something in "last move" payment_move.write({"write_uid": env0.uid}) - payment_move.flush() + env0.flush_all() self._create_payment_form(env1) @tools.mute_logger("odoo.sql_db") @@ -205,7 +205,7 @@ class TestSequenceConcurrency(TransactionCase): lines2reconcile = ( (payment_move | invoice) .mapped("line_ids") - .filtered(lambda l: l.account_id.internal_type == "receivable") + .filtered(lambda l: l.account_id.account_type == "asset_receivable") ) with env0.cr.savepoint(), env1.cr.savepoint(): # Reconciling "last move" @@ -213,7 +213,7 @@ class TestSequenceConcurrency(TransactionCase): # lock records too many time lines2reconcile.reconcile() # Many pieces of code call flush directly - lines2reconcile.flush() + env0.flush_all() self._create_invoice_form(env1) def test_sequence_concurrency_50_reconciling_last_payment(self): @@ -235,7 +235,7 @@ class TestSequenceConcurrency(TransactionCase): lines2reconcile = ( (payment_move | invoice) .mapped("line_ids") - .filtered(lambda l: l.account_id.internal_type == "receivable") + .filtered(lambda l: l.account_id.account_type == "asset_receivable") ) with env0.cr.savepoint(), env1.cr.savepoint(): # Reconciling "last move" @@ -243,7 +243,7 @@ class TestSequenceConcurrency(TransactionCase): # lock records too many time lines2reconcile.reconcile() # Many pieces of code call flush directly - lines2reconcile.flush() + env0.flush_all() self._create_payment_form(env1) def test_sequence_concurrency_90_payments(self): From b3342c20b357794467bc315c45aefb5e0c7183a5 Mon Sep 17 00:00:00 2001 From: "Moises Lopez - https://www.vauxoo.com/" Date: Wed, 17 Apr 2024 17:50:53 +0000 Subject: [PATCH 9/9] [REF] CI: Add rebels modules using copier --- .copier-answers.yml | 6 +++++- .github/workflows/test.yml | 11 +++++++++-- .gitignore | 1 + .pre-commit-config.yaml | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 692c7e68c..8928e008d 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,7 +1,8 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.17.2 +_commit: v1.20 _src_path: gh:oca/oca-addons-repo-template ci: GitHub +convert_readme_fragments_to_markdown: false generate_requirements_txt: true github_check_license: true github_ci_extra_env: {} @@ -16,8 +17,11 @@ org_name: Odoo Community Association (OCA) org_slug: OCA rebel_module_groups: - account_journal_restrict_mode +- account_move_name_sequence repo_description: 'TODO: add repo description.' repo_name: account-financial-tools repo_slug: account-financial-tools repo_website: https://github.com/OCA/account-financial-tools +use_pyproject_toml: false +use_ruff: false diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8396d5024..031dc51de 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,10 +43,17 @@ jobs: name: test with OCB makepot: "true" - container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest - exclude: "account_journal_restrict_mode" + include: "account_move_name_sequence" name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest - exclude: "account_journal_restrict_mode" + include: "account_move_name_sequence" + name: test with OCB + makepot: "true" + - container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest + exclude: "account_journal_restrict_mode,account_move_name_sequence" + name: test with Odoo + - container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest + exclude: "account_journal_restrict_mode,account_move_name_sequence" name: test with OCB makepot: "true" services: diff --git a/.gitignore b/.gitignore index 9c283fd41..0090721f5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ __pycache__/ *.py[cod] /.venv /.pytest_cache +/.ruff_cache # C extensions *.so diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 808b75f05..7f41e2878 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,6 +14,8 @@ exclude: | ^docs/_templates/.*\.html$| # Don't bother non-technical authors with formatting issues in docs readme/.*\.(rst|md)$| + # Ignore build and dist directories in addons + /build/|/dist/| # You don't usually want a bot to modify your legal texts (LICENSE.*|COPYING.*) default_language_version: @@ -35,7 +37,7 @@ repos: language: fail files: '[a-zA-Z0-9_]*/i18n/en\.po$' - repo: https://github.com/oca/maintainer-tools - rev: 969238e47c07d0c40573acff81d170f63245d738 + rev: 9a170331575a265c092ee6b24b845ec508e8ef75 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons @@ -48,6 +50,7 @@ repos: - --org-name=OCA - --repo-name=account-financial-tools - --if-source-changed + - --keep-source-digest - repo: https://github.com/OCA/odoo-pre-commit-hooks rev: v0.0.25 hooks: