Merge branch '2.x' into i2418-2

CHANGES.rst

@@ -5,6 +5,7 @@ Changelog
 ------------------
 
 - #2424 Fix sample in "registered" after creation when user cannot receive
+- #2422 Fix Maximum number of Iterations Exceeded when no catalogs set for AT type
 - #2421 Fix hanging sampletype listing view in setup
 - #2420 Fix page reload in multi results classic view
 - #2419 Check permission when automatic sample reception is enabled

src/bika/lims/api/__init__.py

@@ -1135,7 +1135,7 @@ def get_catalogs_for(brain_or_object, default=PORTAL_CATALOG):
             # AT content type
             # => Looup via archetype_tool
             archetype_tool = get_tool("archetype_tool")
-            catalogs = archetype_tool.catalog_map.get(portal_type)
+            catalogs = archetype_tool.catalog_map.get(portal_type) or []
         else:
             # DX content type
             # => resolve the `_catalogs` attribute from the class

src/bika/lims/content/analysisrequest.py

@@ -502,7 +502,7 @@
                 default="Expected Sampling Date"
             ),
             description=_(
-                "label_sample_samplingdate",
+                "description_sample_samplingdate",
                 default="The date when the sample will be taken"
             ),
             size=20,

src/senaite/core/locales/af/LC_MESSAGES/plone.po

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2023-10-22 12:24+0000\n"
+"POT-Creation-Date: 2023-11-14 14:36+0000\n"
 "PO-Revision-Date: 2018-06-01 18:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Afrikaans (https://app.transifex.com/senaite/teams/87045/af/)\n"

src/senaite/core/locales/af/LC_MESSAGES/senaite.core.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2023-10-22 12:24+0000\n"
+"POT-Creation-Date: 2023-11-14 14:36+0000\n"
 "PO-Revision-Date: 2018-06-01 18:44+0000\n"
 "Last-Translator: Jordi Puiggené <[email protected]>, 2022\n"
 "Language-Team: Afrikaans (https://app.transifex.com/senaite/teams/87045/af/)\n"
@@ -200,7 +200,7 @@ msgstr "Akkreditasie Verwysing"
 msgid "Accreditation page header"
 msgstr "Akkreditasie bladsy hoof"
 
-#: bika/lims/browser/analyses/view.py:1525
+#: bika/lims/browser/analyses/view.py:1522
 #: bika/lims/browser/analysisrequest/manage_analyses.py:259
 #: bika/lims/browser/referencesample.py:358
 msgid "Accredited"
@@ -542,7 +542,7 @@ msgstr "Wys toe"
 msgid "Assigned"
 msgstr "Toegeken"
 
-#: bika/lims/browser/analyses/view.py:1514
+#: bika/lims/browser/analyses/view.py:1511
 msgid "Assigned to: ${worksheet_id}"
 msgstr "Toegewys aan: ${worksheet_id}"
 
@@ -595,7 +595,7 @@ msgstr ""
 msgid "Attachment added to the current sample"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1272
+#: bika/lims/browser/analyses/view.py:1269
 #: bika/lims/browser/analysisrequest/manage_analyses.py:262
 #: bika/lims/browser/referencesample.py:361
 msgid "Attachment required"
@@ -882,11 +882,11 @@ msgstr "Kalibrasies"
 msgid "Calibrator"
 msgstr "Kalibreerder"
 
-#: bika/lims/browser/analyses/view.py:1462
+#: bika/lims/browser/analyses/view.py:1459
 msgid "Can verify, but submitted by current user"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1486
+#: bika/lims/browser/analyses/view.py:1483
 msgid "Can verify, but was already verified by current user"
 msgstr ""
 
@@ -914,15 +914,15 @@ msgstr "Kan berekening nie deaktiveer nie, want dit word deur die volgende diens
 msgid "Cannot send email for ${sample_id}: ${error}"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1492
+#: bika/lims/browser/analyses/view.py:1489
 msgid "Cannot verify, last verified by current user"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1468
+#: bika/lims/browser/analyses/view.py:1465
 msgid "Cannot verify, submitted by current user"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1477
+#: bika/lims/browser/analyses/view.py:1474
 msgid "Cannot verify, was verified by current user"
 msgstr ""
 
@@ -3142,7 +3142,7 @@ msgstr "Bestuurder E-pos"
 msgid "Manager Phone"
 msgstr "Bestuurder Foon"
 
-#: bika/lims/browser/analyses/view.py:1047
+#: bika/lims/browser/analyses/view.py:1057
 msgid "Manual"
 msgstr "Handmatig"
 
@@ -3351,7 +3351,7 @@ msgstr ""
 msgid "Multi Verification type"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1434
+#: bika/lims/browser/analyses/view.py:1431
 msgid "Multi-verification required"
 msgstr ""
 
@@ -4415,15 +4415,15 @@ msgstr ""
 msgid "Result files folders"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1375
+#: bika/lims/browser/analyses/view.py:1372
 msgid "Result in shoulder range"
 msgstr "Resultaat in skouer gebied"
 
-#: bika/lims/browser/analyses/view.py:1372
+#: bika/lims/browser/analyses/view.py:1369
 msgid "Result out of range"
 msgstr "Resultaat buite toegelate bereik"
 
-#: bika/lims/browser/analyses/view.py:1394
+#: bika/lims/browser/analyses/view.py:1391
 msgid "Result range is different from Specification: {}"
 msgstr ""
 
@@ -4608,8 +4608,8 @@ msgid "Sample Point"
 msgstr "Monster Punt"
 
 #: bika/lims/controlpanel/bika_samplepoints.py:64
-#: bika/lims/controlpanel/bika_sampletypes.py:103
 #: bika/lims/profiles/default/types/Client.xml
+#: bika/lims/profiles/default/types/SamplePoints.xml
 msgid "Sample Points"
 msgstr "Monster Punte"
 
@@ -5278,7 +5278,7 @@ msgstr "Handig In"
 msgid "Submit a valid Open XML (.XLSX) file containing setup records to continue."
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1419
+#: bika/lims/browser/analyses/view.py:1416
 msgid "Submitted and verified by the same user: {}"
 msgstr ""
 
@@ -6779,6 +6779,11 @@ msgstr ""
 msgid "description_sample_sampletype"
 msgstr ""
 
+#. Default: "The date when the sample will be taken"
+#: bika/lims/content/analysisrequest.py:504
+msgid "description_sample_samplingdate"
+msgstr ""
+
 #. Default: "Deviation between the sample and how it was sampled"
 #: bika/lims/content/analysisrequest.py:864
 msgid "description_sample_samplingdeviation"
@@ -6899,7 +6904,7 @@ msgstr ""
 msgid "hours"
 msgstr ""
 
-#: bika/lims/controlpanel/bika_sampletypes.py:147
+#: bika/lims/controlpanel/bika_sampletypes.py:144
 msgid "hours: {} minutes: {} days: {}"
 msgstr ""
 
@@ -7471,7 +7476,7 @@ msgstr "tot"
 msgid "updated every 2 hours"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1436
+#: bika/lims/browser/analyses/view.py:1433
 msgid "verification(s) pending"
 msgstr ""
 

src/senaite/core/locales/ar/LC_MESSAGES/plone.po

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2023-10-22 12:24+0000\n"
+"POT-Creation-Date: 2023-11-14 14:36+0000\n"
 "PO-Revision-Date: 2018-06-01 18:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic (https://app.transifex.com/senaite/teams/87045/ar/)\n"

src/senaite/core/locales/ar/LC_MESSAGES/senaite.core.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2023-10-22 12:24+0000\n"
+"POT-Creation-Date: 2023-11-14 14:36+0000\n"
 "PO-Revision-Date: 2018-06-01 18:44+0000\n"
 "Last-Translator: Jordi Puiggené <[email protected]>, 2022\n"
 "Language-Team: Arabic (https://app.transifex.com/senaite/teams/87045/ar/)\n"
@@ -199,7 +199,7 @@ msgstr ""
 msgid "Accreditation page header"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1525
+#: bika/lims/browser/analyses/view.py:1522
 #: bika/lims/browser/analysisrequest/manage_analyses.py:259
 #: bika/lims/browser/referencesample.py:358
 msgid "Accredited"
@@ -541,7 +541,7 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1514
+#: bika/lims/browser/analyses/view.py:1511
 msgid "Assigned to: ${worksheet_id}"
 msgstr ""
 
@@ -594,7 +594,7 @@ msgstr ""
 msgid "Attachment added to the current sample"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1272
+#: bika/lims/browser/analyses/view.py:1269
 #: bika/lims/browser/analysisrequest/manage_analyses.py:262
 #: bika/lims/browser/referencesample.py:361
 msgid "Attachment required"
@@ -881,11 +881,11 @@ msgstr ""
 msgid "Calibrator"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1462
+#: bika/lims/browser/analyses/view.py:1459
 msgid "Can verify, but submitted by current user"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1486
+#: bika/lims/browser/analyses/view.py:1483
 msgid "Can verify, but was already verified by current user"
 msgstr ""
 
@@ -913,15 +913,15 @@ msgstr ""
 msgid "Cannot send email for ${sample_id}: ${error}"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1492
+#: bika/lims/browser/analyses/view.py:1489
 msgid "Cannot verify, last verified by current user"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1468
+#: bika/lims/browser/analyses/view.py:1465
 msgid "Cannot verify, submitted by current user"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1477
+#: bika/lims/browser/analyses/view.py:1474
 msgid "Cannot verify, was verified by current user"
 msgstr ""
 
@@ -3141,7 +3141,7 @@ msgstr ""
 msgid "Manager Phone"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1047
+#: bika/lims/browser/analyses/view.py:1057
 msgid "Manual"
 msgstr ""
 
@@ -3350,7 +3350,7 @@ msgstr ""
 msgid "Multi Verification type"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1434
+#: bika/lims/browser/analyses/view.py:1431
 msgid "Multi-verification required"
 msgstr ""
 
@@ -4414,15 +4414,15 @@ msgstr ""
 msgid "Result files folders"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1375
+#: bika/lims/browser/analyses/view.py:1372
 msgid "Result in shoulder range"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1372
+#: bika/lims/browser/analyses/view.py:1369
 msgid "Result out of range"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1394
+#: bika/lims/browser/analyses/view.py:1391
 msgid "Result range is different from Specification: {}"
 msgstr ""
 
@@ -4607,8 +4607,8 @@ msgid "Sample Point"
 msgstr ""
 
 #: bika/lims/controlpanel/bika_samplepoints.py:64
-#: bika/lims/controlpanel/bika_sampletypes.py:103
 #: bika/lims/profiles/default/types/Client.xml
+#: bika/lims/profiles/default/types/SamplePoints.xml
 msgid "Sample Points"
 msgstr ""
 
@@ -5277,7 +5277,7 @@ msgstr ""
 msgid "Submit a valid Open XML (.XLSX) file containing setup records to continue."
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1419
+#: bika/lims/browser/analyses/view.py:1416
 msgid "Submitted and verified by the same user: {}"
 msgstr ""
 
@@ -6778,6 +6778,11 @@ msgstr ""
 msgid "description_sample_sampletype"
 msgstr ""
 
+#. Default: "The date when the sample will be taken"
+#: bika/lims/content/analysisrequest.py:504
+msgid "description_sample_samplingdate"
+msgstr ""
+
 #. Default: "Deviation between the sample and how it was sampled"
 #: bika/lims/content/analysisrequest.py:864
 msgid "description_sample_samplingdeviation"
@@ -6898,7 +6903,7 @@ msgstr ""
 msgid "hours"
 msgstr ""
 
-#: bika/lims/controlpanel/bika_sampletypes.py:147
+#: bika/lims/controlpanel/bika_sampletypes.py:144
 msgid "hours: {} minutes: {} days: {}"
 msgstr ""
 
@@ -7470,7 +7475,7 @@ msgstr "حتى"
 msgid "updated every 2 hours"
 msgstr ""
 
-#: bika/lims/browser/analyses/view.py:1436
+#: bika/lims/browser/analyses/view.py:1433
 msgid "verification(s) pending"
 msgstr "التأكيد موقف مؤقتاً"
 

src/senaite/core/locales/bg_BG/LC_MESSAGES/plone.po

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2023-10-22 12:24+0000\n"
+"POT-Creation-Date: 2023-11-14 14:36+0000\n"
 "PO-Revision-Date: 2018-06-01 18:46+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian (Bulgaria) (https://app.transifex.com/senaite/teams/87045/bg_BG/)\n"