From a1f86ef25fae437f18c5f5ceb0f17aed77c9e6ee Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Thu, 25 Jul 2024 23:00:19 +0200 Subject: [PATCH 1/4] Fixed import Compatibility with https://github.com/senaite/senaite.core/pull/2595 --- src/senaite/ast/datamanagers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/senaite/ast/datamanagers.py b/src/senaite/ast/datamanagers.py index 3571c64..7ff9e8d 100644 --- a/src/senaite/ast/datamanagers.py +++ b/src/senaite/ast/datamanagers.py @@ -27,7 +27,7 @@ from senaite.ast.utils import get_ast_siblings from senaite.ast.utils import is_ast_analysis from senaite.ast.utils import is_interim_editable -from senaite.core.datamanagers.analysis import RoutineAnalysisDataManager +from senaite.core.datamanagers import RoutineAnalysisDataManager from zope.component import adapter From 82f975b9211b8f458926567ac55c9dd3cdf06fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jordi=20Puiggen=C3=A9?= Date: Mon, 29 Jul 2024 12:04:53 +0200 Subject: [PATCH 2/4] Changelog --- docs/changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index b341443..193f549 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -4,6 +4,7 @@ Changelog 1.2.0 (unreleased) ------------------ +- #38 Compatibility with core#2595 (Move ARAnalysesField logic to data manager) - #37 Compatibility with core#2567 (AnalysisCategory to DX) - #37 Compatibility with core#2471 (Department to DX) - #36 Fix user can edit ast built-in services after upgrades From 7383870aa530539686d514923838b73fdcadca94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jordi=20Puiggen=C3=A9?= Date: Sun, 4 Aug 2024 10:45:52 +0200 Subject: [PATCH 3/4] Compatibility with core#2584 --- src/senaite/ast/tests/doctests/AST.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/senaite/ast/tests/doctests/AST.rst b/src/senaite/ast/tests/doctests/AST.rst index e4206c9..b3f4c74 100644 --- a/src/senaite/ast/tests/doctests/AST.rst +++ b/src/senaite/ast/tests/doctests/AST.rst @@ -42,7 +42,7 @@ We need to create some basic objects for the test: >>> setRoles(portal, TEST_USER_ID, ['LabManager',]) >>> client = api.create(portal.clients, "Client", Name="Happy Hills", ClientID="HH", MemberDiscountApplies=True) >>> contact = api.create(client, "Contact", Firstname="Rita", Lastname="Mohale") - >>> sampletype = api.create(setup.bika_sampletypes, "SampleType", title="Blood", Prefix="B") + >>> sampletype = api.create(portal.setup.sampletypes, "SampleType", title="Blood", Prefix="B") >>> labcontact = api.create(setup.bika_labcontacts, "LabContact", Firstname="Lab", Lastname="Manager") >>> department = api.create(portal.setup.departments, "Department", title="Microbiology", Manager=labcontact) >>> category = api.create(portal.setup.analysiscategories, "AnalysisCategory", title="Microbiology", Department=department) From 3efe2c8d769e0ca69a82dd128658cccb27977736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jordi=20Puiggen=C3=A9?= Date: Sun, 4 Aug 2024 10:47:41 +0200 Subject: [PATCH 4/4] Changelog --- docs/changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 193f549..2e48f6c 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -4,6 +4,7 @@ Changelog 1.2.0 (unreleased) ------------------ +- #39 Compatibility with core#2584 (SampleType to DX) - #38 Compatibility with core#2595 (Move ARAnalysesField logic to data manager) - #37 Compatibility with core#2567 (AnalysisCategory to DX) - #37 Compatibility with core#2471 (Department to DX)