From ad18161c319e88a8da73bb5e626bb6cefe8102f9 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Sat, 13 Jan 2024 15:47:46 +0100
Subject: [PATCH] updates for Tryton 6.0

---
 tests/test_report.py     | 3 ++-
 view/evaluation_list.xml | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/test_report.py b/tests/test_report.py
index 17aaaa6..38018e9 100644
--- a/tests/test_report.py
+++ b/tests/test_report.py
@@ -10,6 +10,7 @@ from trytond.pool import Pool
 from trytond.transaction import Transaction
 from trytond.exceptions import UserError
 from trytond.i18n import gettext
+from trytond.modules.cashbook_investment.tests.test_module import \
     CashbookInvestmentTestCase
 from trytond.modules.cashbook_report.templates import (
     cashbook_types, category_types, booktype_types, currency_types)
@@ -523,7 +524,7 @@ class ReportTestCase(CashbookInvestmentTestCase):
             self.assertRaisesRegex(
                 UserError,
                 'The value "types" for field "Data type 2" in ' +
-                '"Evaluation 1" of "Evaluation" is not one of the ' +
+                '"Evaluation" is not one of the ' +
                 'allowed options.',
                 Evaluation.write,
                 *[
diff --git a/view/evaluation_list.xml b/view/evaluation_list.xml
index c1fed1d..aab0e12 100644
--- a/view/evaluation_list.xml
+++ b/view/evaluation_list.xml
@@ -5,10 +5,10 @@ full copyright notices and license terms. -->
 <tree keyword_open="1" sequence="sequence">
     <field name="name"/>
     <field name="dtype1"/>
-    <field name="dtype2" optional="0"/>
-    <field name="dtype3" optional="1"/>
-    <field name="dtype4" optional="1"/>
-    <field name="dtype5" optional="1"/>
+    <field name="dtype2"/>
+    <field name="dtype3"/>
+    <field name="dtype4"/>
+    <field name="dtype5"/>
     <field name="chart"/>
     <field name="legend"/>
     <field name="maincolor"/>