From 468ca93e071dac67e60cfbd60fa93be3e07ed045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 26 Dec 2022 15:08:29 +0100
Subject: [PATCH] Use match pattern to find journal

Closes #11884
---
 modules/account/CHANGELOG                 |  1 +
 modules/account/journal.py                | 13 +++++++--
 modules/account/view/journal_form.xml     | 10 +++++--
 modules/account/view/journal_tree.xml     |  2 +-
 modules/account_invoice/invoice.py        | 35 ++++++++++++++---------
 modules/account_invoice_defer/account.py  | 34 +++++++++++++++-------
 modules/purchase/purchase.py              | 15 ++--------
 modules/sale/sale.py                      |  2 +-
 modules/sale_subscription/subscription.py |  2 +-
 9 files changed, 70 insertions(+), 44 deletions(-)

diff --git a/modules/account/CHANGELOG b/modules/account/CHANGELOG
index ecee852834..5c03eea08f 100644
--- a/modules/account/CHANGELOG
+++ b/modules/account/CHANGELOG
@@ -1,3 +1,4 @@
+* Use match pattern to find journal
 * Display general ledger information on account form
 
 Version 6.6.0 - 2022-10-31
diff --git a/modules/account/journal.py b/modules/account/journal.py
index e4c0bf541a..99f54dfb28 100644
--- a/modules/account/journal.py
+++ b/modules/account/journal.py
@@ -7,7 +7,8 @@ from sql.aggregate import Sum
 from trytond import backend
 from trytond.i18n import gettext
 from trytond.model import (
-    DeactivableMixin, ModelSQL, ModelView, Unique, Workflow, fields)
+    DeactivableMixin, MatchMixin, ModelSQL, ModelView, Unique, Workflow,
+    fields, sequence_ordered)
 from trytond.model.exceptions import AccessError
 from trytond.modules.company.model import (
     CompanyMultiValueMixin, CompanyValueMixin)
@@ -25,7 +26,9 @@ STATES = {
 
 
 class Journal(
-        DeactivableMixin, ModelSQL, ModelView, CompanyMultiValueMixin):
+        DeactivableMixin, MatchMixin,
+        sequence_ordered('matching_sequence', "Matching Sequence"),
+        ModelSQL, ModelView, CompanyMultiValueMixin):
     'Journal'
     __name__ = 'account.journal'
     name = fields.Char('Name', size=None, required=True, translate=True)
@@ -153,6 +156,12 @@ class Journal(
                     debit - credit)
         return result
 
+    @classmethod
+    def find(cls, pattern):
+        for journal in cls.search([]):
+            if journal.match(pattern):
+                return journal
+
     @classmethod
     def write(cls, *args):
         pool = Pool()
diff --git a/modules/account/view/journal_form.xml b/modules/account/view/journal_form.xml
index ecb117609e..0b36caccd6 100644
--- a/modules/account/view/journal_form.xml
+++ b/modules/account/view/journal_form.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<form col="6">
+<form>
     <label name="name"/>
     <field name="name"/>
-    <label name="code"/>
-    <field name="code"/>
     <label name="active"/>
     <field name="active" xexpand="0" width="100"/>
+
+    <label name="code"/>
+    <field name="code"/>
+    <label name="matching_sequence"/>
+    <field name="matching_sequence"/>
+
     <label name="type"/>
     <field name="type"/>
     <label name="sequence"/>
diff --git a/modules/account/view/journal_tree.xml b/modules/account/view/journal_tree.xml
index 6ba968cc75..37436cd6c1 100644
--- a/modules/account/view/journal_tree.xml
+++ b/modules/account/view/journal_tree.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<tree>
+<tree sequence="matching_sequence">
     <field name="code"/>
     <field name="name" expand="1"/>
     <field name="type"/>
diff --git a/modules/account_invoice/invoice.py b/modules/account_invoice/invoice.py
index 082d654228..d3f4f4603c 100644
--- a/modules/account_invoice/invoice.py
+++ b/modules/account_invoice/invoice.py
@@ -127,7 +127,11 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
     currency_date = fields.Function(fields.Date('Currency Date'),
         'on_change_with_currency_date')
     journal = fields.Many2One(
-        'account.journal', 'Journal', required=True, states=_states,
+        'account.journal', 'Journal',
+        states={
+            'readonly': _states['readonly'],
+            'required': Eval('state') != 'draft',
+            },
         context={
             'company': Eval('company', -1),
             }, depends={'company'})
@@ -429,6 +433,9 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
         # Migration from 5.8: drop foreign key for sequence
         table.drop_fk('sequence')
 
+        # Migration from 6.6: drop not null on journal
+        table.not_null_action('journal', 'remove')
+
     @classmethod
     def order_number(cls, tables):
         table, _ = tables[None]
@@ -470,19 +477,6 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
                     account = self.party.account_payable_used
         return account.id if account else None
 
-    @fields.depends('type')
-    def on_change_type(self):
-        Journal = Pool().get('account.journal')
-        journal_type = {
-            'out': 'revenue',
-            'in': 'expense',
-            }.get(self.type or 'out', 'revenue')
-        journals = Journal.search([
-                ('type', '=', journal_type),
-                ], limit=1)
-        if journals:
-            self.journal, = journals
-
     @classmethod
     def _journal_types(cls, invoice_type):
         if invoice_type == 'out':
@@ -490,6 +484,19 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
         else:
             return ['expense']
 
+    @fields.depends('type')
+    def on_change_with_journal(self, pattern=None):
+        pool = Pool()
+        Journal = pool.get('account.journal')
+        pattern = pattern.copy() if pattern is not None else {}
+        pattern.setdefault('type', {
+                'out': 'revenue',
+                'in': 'expense',
+                }.get(self.type))
+        journal = Journal.find(pattern)
+        if journal:
+            return journal.id
+
     @classmethod
     def order_accounting_date(cls, tables):
         table, _ = tables[None]
diff --git a/modules/account_invoice_defer/account.py b/modules/account_invoice_defer/account.py
index 678b5a7c79..6273c0fe83 100644
--- a/modules/account_invoice_defer/account.py
+++ b/modules/account_invoice_defer/account.py
@@ -72,8 +72,11 @@ class InvoiceDeferred(Workflow, ModelSQL, ModelView):
             ], "Type", required=True,
         states=_states)
     journal = fields.Many2One(
-        'account.journal', "Journal", required=True,
-        states=_states,
+        'account.journal', "Journal",
+        states={
+            'readonly': _states['readonly'],
+            'required': Eval('state') != 'draft',
+            },
         context={
             'company': Eval('company', -1),
             },
@@ -146,6 +149,14 @@ class InvoiceDeferred(Workflow, ModelSQL, ModelView):
                     },
                 })
 
+    @classmethod
+    def __register__(cls, module_name):
+        table_h = cls.__table_handler__(module_name)
+        super().__register__(module_name)
+
+        # Migration from 6.6: drop not null on journal
+        table_h.not_null_action('journal', 'remove')
+
     @classmethod
     def _journal_types(cls, type):
         if type == 'out':
@@ -154,14 +165,17 @@ class InvoiceDeferred(Workflow, ModelSQL, ModelView):
             return ['expense']
 
     @fields.depends('type')
-    def on_change_type(self):
-        Journal = self.__class__.journal.get_target()
-        journal_types = self.__class__._journal_types(self.type)
-        journals = Journal.search([
-                ('type', 'in', journal_types),
-                ], limit=1)
-        if journals:
-            self.journal, = journals
+    def on_change_with_journal(self, pattern=None):
+        pool = Pool()
+        Journal = pool.get('account.journal')
+        pattern = pattern.copy() if pattern is not None else {}
+        pattern.setdefault('type', {
+                'out': 'revenue',
+                'in': 'expense',
+                }.get(self.type))
+        journal = Journal.find(pattern)
+        if journal:
+            return journal.id
 
     @fields.depends('invoice_line', 'start_date', 'company')
     def on_change_invoice_line(self):
diff --git a/modules/purchase/purchase.py b/modules/purchase/purchase.py
index 4b23ba0888..24c211c6dc 100644
--- a/modules/purchase/purchase.py
+++ b/modules/purchase/purchase.py
@@ -770,28 +770,19 @@ class Purchase(
     def _get_invoice_purchase(self):
         'Return invoice'
         pool = Pool()
-        Journal = pool.get('account.journal')
         Invoice = pool.get('account.invoice')
-
-        journals = Journal.search([
-                ('type', '=', 'expense'),
-                ], limit=1)
-        if journals:
-            journal, = journals
-        else:
-            journal = None
         party = self.invoice_party or self.party
-
-        return Invoice(
+        invoice = Invoice(
             company=self.company,
             type='in',
-            journal=journal,
             party=party,
             invoice_address=self.invoice_address,
             currency=self.currency,
             account=party.account_payable_used,
             payment_term=self.payment_term,
             )
+        invoice.journal = invoice.on_change_with_journal()
+        return invoice
 
     def create_invoice(self):
         'Create an invoice for the purchase and return it'
diff --git a/modules/sale/sale.py b/modules/sale/sale.py
index 3b3943d022..15748e3f29 100644
--- a/modules/sale/sale.py
+++ b/modules/sale/sale.py
@@ -831,7 +831,7 @@ class Sale(
             currency=self.currency,
             account=party.account_receivable_used,
             )
-        invoice.on_change_type()
+        invoice.journal = invoice.on_change_with_journal()
         invoice.payment_term = self.payment_term
         return invoice
 
diff --git a/modules/sale_subscription/subscription.py b/modules/sale_subscription/subscription.py
index ac37970b87..cf00b52af7 100644
--- a/modules/sale_subscription/subscription.py
+++ b/modules/sale_subscription/subscription.py
@@ -467,7 +467,7 @@ class Subscription(Workflow, ModelSQL, ModelView):
             account=party.account_receivable_used,
             )
         invoice.invoice_date = self.next_invoice_date
-        invoice.on_change_type()
+        invoice.journal = invoice.on_change_with_journal()
         invoice.payment_term = self.payment_term
         return invoice