Merge commit '3efe2c8d769e0ca69a82dd128658cccb27977736' of github.com…

…:senaite/senaite.ast into fix-smaller-decimals

docs/changelog.rst

@@ -4,6 +4,8 @@ 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)
 - #36 Fix user can edit ast built-in services after upgrades

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
 
 

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)