audrius/account-financial-tools
1
0
Fork 0
mirror of https://github.com/OCA/account-financial-tools.git synced 2025-02-02 12:47:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #1862 into 14.0

Browse Source 
Signed-off-by moylop260
This commit is contained in:
OCA-git-bot
2024-04-23 01:24:56 +00:00
parent 4cc8ff5ecd 44f3ade3f4
commit bb25266196
6 changed files with 82 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_move_name_sequence/README.rst
View File

@@ -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

1
account_move_name_sequence/__manifest__.py
View File

@@ -19,6 +19,7 @@
],
"demo": [
"demo/ir_sequence_demo.xml",
"demo/account_journal_demo.xml",
],
"data": [
"views/account_journal.xml",

19
account_move_name_sequence/demo/account_journal_demo.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="journal_sale_std_demo" model="account.journal">
<field name="name">Standard Sale Journal Demo</field>
<field name="code">SSJD</field>
<field name="type">sale</field>
<field name="refund_sequence">True</field>
<field name="company_id" ref="base.main_company" />
<field name="sequence_id" ref="seq_sale_std_demo" />
</record>
<record id="journal_cash_std_demo" model="account.journal">
<field name="name">Standard Cash Journal Demo</field>
<field name="code">SCJD</field>
<field name="type">cash</field>
<field name="refund_sequence">True</field>
<field name="company_id" ref="base.main_company" />
<field name="sequence_id" ref="seq_cash_std_demo" />
</record>
</odoo>

16
account_move_name_sequence/demo/ir_sequence_demo.xml
View File

@@ -1,11 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="ir_sequence_demo" model="ir.sequence">
<field name="name">Standard Sequence Demo</field>
<field name="prefix">demo/%(range_year)s/</field>
<record id="seq_sale_std_demo" model="ir.sequence">
<field name="name">Standard Sale Sequence Demo</field>
<field name="prefix">SSS_demo/%(range_year)s/</field>
<field name="use_date_range" eval="True" />
<field name="number_next">1</field>
<field name="number_increment">1</field>
<field name="company_id" ref="base.main_company" />
<field name="implementation">standard</field>
</record>
<record id="seq_cash_std_demo" model="ir.sequence">
<field name="name">Standard Cash Sequence Demo</field>
<field name="prefix">SCS_demo/%(range_year)s/</field>
<field name="use_date_range" eval="True" />
<field name="number_next">1</field>
<field name="number_increment">1</field>
<field name="company_id" ref="base.main_company" />
<field name="implementation">standard</field>
</record>
</odoo>

3
account_move_name_sequence/static/description/index.html
View File

@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
@@ -366,7 +367,7 @@ ul.auto-toc {
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:7bacdeb105b7d0fe0f8a379d75569ba691ec1fecd4b0400ad7e0623d8fcd5e85
!! source digest: sha256:05033a46eac93732c8a86b64d9cc9f1da3cccc3287bfa0fafef832d3a62702bf
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-financial-tools/tree/14.0/account_move_name_sequence"><img alt="OCA/account-financial-tools" src="https://img.shields.io/badge/github-OCA%2Faccount--financial--tools-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-financial-tools-14-0/account-financial-tools-14-0-account_move_name_sequence"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-financial-tools&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>In Odoo version 13.0 and previous versions, the number of journal entries was generated from a sequence configured on the journal.</p>

55
account_move_name_sequence/tests/test_sequence_concurrency.py
View File

@@ -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):