bikalims
diff --git a/‎.scrutinizer.yml
+5-8 b/‎.scrutinizer.yml
+5-8
diff --git a/‎CHANGES.rst
+35-1 b/‎CHANGES.rst
+35-1
diff --git a/‎CONTRIBUTORS.rst
+17-1 b/‎CONTRIBUTORS.rst
+17-1
diff --git a/‎RELEASE_NOTES.rst
+15-1 b/‎RELEASE_NOTES.rst
+15-1
diff --git a/‎buildout.cfg
+2-2 b/‎buildout.cfg
+2-2
diff --git a/‎setup.py
+7-2 b/‎setup.py
+7-2
diff --git a/‎src/bika/lims/adapters/addsample.py
+6 b/‎src/bika/lims/adapters/addsample.py
+6
diff --git a/‎src/bika/lims/api/__init__.py
+2 b/‎src/bika/lims/api/__init__.py
+2
diff --git a/‎src/bika/lims/api/snapshot.py
+2-2 b/‎src/bika/lims/api/snapshot.py
+2-2
diff --git a/‎src/bika/lims/browser/__init__.py
+1-67 b/‎src/bika/lims/browser/__init__.py
+1-67
@@ -21,21 +21,18 @@ filter:
 
 build:
   environment:
-    python: 2.7.9
+    python: 2.7.18
 
   dependencies:
     before:
-      - pip install -v pip==19.3.1
-      - pip install -v setuptools==44.1.1
-      - pip install -v zc.buildout==2.13.3
       - pip install virtualenv
       - pip install -r requirements.txt
-      - /home/scrutinizer/.pyenv/versions/2.7.9/bin/buildout -v
-      - mv -v /home/scrutinizer/build/develop-eggs/* /home/scrutinizer/.pyenv/versions/2.7.9/lib/python2.7/site-packages/
-      - mv -v /home/scrutinizer/build/eggs/*.egg /home/scrutinizer/.pyenv/versions/2.7.9/lib/python2.7/site-packages/
+      - /home/scrutinizer/.pyenv/versions/2.7.18/bin/buildout -v
+      - mv -v /home/scrutinizer/build/develop-eggs/* /home/scrutinizer/.pyenv/versions/2.7.18/lib/python2.7/site-packages/
+      - mv -v /home/scrutinizer/build/eggs/*.egg /home/scrutinizer/.pyenv/versions/2.7.18/lib/python2.7/site-packages/
 
   nodes:
     analysis:
       tests:
         override:
-          - py-scrutinizer-run
+          - py-scrutinizer-run
@@ -1,9 +1,43 @@
 Changelog
 =========
 
-2.0.1 (unreleased)
+2.2.0 (unreleased)
 ------------------
 
+- #1933 Added SENAITE maintenance scripts
+- #1932 Fix cannot attach documents to individual analyses in Worksheet context
+- #1930 Ensure valid timezone in DX datetime field setter
+- #1927 Fix Analysis attachment is copied on retest
+- #1928 Added `on_change` hook for methods in analyses listings
+- #1925 Fix sample transition in listings
+- #1924 Fix Login screen shows message error while rendering plone.htmlhead.socialtags
+- #1923 Use native date input fields in reports
+- #1920 Fix indexed attributes not set when adding a new index with catalog API
+- #1918 Fix stale combobox items displayed when search query changed
+- #1917 Fix wrong context in reference widget lookups
+- #1916 Provide the request record to object info adapters in the sample add form
+- #1913 Ported PR #1865 for dexterity contents
+- #1915 Support list queries in dx reference widget
+- #1914 Provide context, widget and fieldname for callable base queries in AT reference widgets
+- #1912 Fixed typo in sample view
+- #1909 Allow to navigate and select with arrow keys in dexterity reference widget
+- #1908 Added searchable text querystring converter to catalog API
+- #1907 Fix datetime field/widget shows current date and time if empty
+- #1905 Fix empty field in sample add form when using edit accessor
+
+
+2.1.0 (2022-01-05)
+------------------
+
+- #1903 Added date and time field/widget for Dexterity contents
+- #1901 Ensure `get_tool` returns a tool when a name is set as the default param
+- #1900 Fix snapshot listing fails on orphan catalog entries
+- #1897 Support date and number fields copy in sample add form
+- #1896 Custom date and time widget
+- #1895 Disable native form validation in header table
+- #1893 Removed unused field PasswordLifeTime
+- #1892 Drop jQuery Datepicker for HTML5 native date fields
+- #1890 Fix DurationValidator when field value is empty
 - #1886 Use the current timestamp instead of the client name for report archive download
 - #1883 Fix possible XSS in remarks field
 - #1882 Fix catalog query in analysis category modified handler
 
@@ -8,8 +8,8 @@ contributions descending.
 
 - Campbell McKellar-Basset, [email protected]
 - Jordi Puiggené, [email protected]
-- Pau Soliva, [email protected]
 - Ramon Bartl, [email protected]
+- Pau Soliva, [email protected]
 - Nihad Mammadli, [email protected]
 - Anneline Sweetname, [email protected]
 - Juan Gallostra, [email protected]
@@ -27,6 +27,7 @@ contributions descending.
 - witekdev, [email protected]
 - Anderson Smith, [email protected]
 - Javis Sullivan, [email protected]
+- toropok, [email protected]
 - Pieter van der Merwe, [email protected]
 - Jean Jordaan, [email protected]
 - MoffatMore, [email protected]
@@ -68,6 +69,8 @@ Translators
 - limsgr, [email protected], Greek (el)
 - Mike Metcalfe, [email protected], English (United States) (en_US)
 - PabloBF, [email protected], Esperanto (eo)
+- ELvira Aylon, [email protected], Spanish (es)
+- Leonardo J. Caballero G., [email protected], Spanish (es)
 - Leonardo Rojas, [email protected], Spanish (es)
 - Carlos Javier García Quintana, [email protected], Spanish (es)
 - Alfonso de la Guarda Reyes, [email protected], Spanish (es)
@@ -79,16 +82,20 @@ Translators
 - SSchott, [email protected], Spanish (es)
 - Michael Quintana, [email protected], Spanish (es)
 - Campbell McKellar-Basset, [email protected], Spanish (es)
+- Leonardo J. Caballero G., [email protected], Spanish (Latin America) (es_419)
 - Marco Rodriguez, [email protected], Spanish (Latin America) (es_419)
 - Didinson Muñoz, [email protected], Spanish (Latin America) (es_419)
+- Leonardo J. Caballero G., [email protected], Spanish (Argentina) (es_AR)
 - Fernando Sánchez, [email protected], Spanish (Peru) (es_PE)
 - Jordi Puiggené, [email protected], Spanish (Peru) (es_PE)
 - Alfonso de la Guarda Reyes, [email protected], Spanish (Peru) (es_PE)
 - Carlos Javier García Quintana, [email protected], Spanish (Peru) (es_PE)
 - Campbell McKellar-Basset, [email protected], Spanish (Peru) (es_PE)
+- roozbeh karimi, [email protected], Persian (fa)
 - alireza mashayekhi, [email protected], Persian (fa)
 - arma, [email protected], Persian (fa)
 - Mohammad Javad Danesh, [email protected], Persian (fa)
+- Ludwig Muster, [email protected], French (fr)
 - CestPasFaux, [email protected], French (fr)
 - Bonamour, [email protected], French (fr)
 - MALESSAN, [email protected], French (fr)
@@ -98,6 +105,7 @@ Translators
 - Didier Desplanque, [email protected], French (fr)
 - Ahmed BEN BRAHIM, [email protected], French (fr)
 - DELAMARRE, [email protected], French (fr)
+- Wei Chung Sim, [email protected], Malay (ms)
 - Jayadeep Karnati, [email protected], Hindi (hi)
 - Alphons Senki, [email protected], Hungarian (hu)
 - Fitra Purna, [email protected], Indonesian (id)
@@ -127,6 +135,8 @@ Translators
 - cruzrenato1, [email protected], Portuguese (Brazil) (pt_BR)
 - baktron, [email protected], Portuguese (Brazil) (pt_BR)
 - corneliu.e, [email protected], Romanian (Romania) (ro_RO)
+- Алексей Сериков, [email protected], Russian (ru)
+- Artem Kladov, [email protected], Russian (ru)
 - Oleksandr Fedorov, [email protected], Russian (ru)
 - Pavel Shuper, [email protected], Russian (ru)
 - Михаил Стручалин, [email protected], Russian (ru)
@@ -139,7 +149,12 @@ Translators
 - Dima Domin, [email protected], Ukrainian (Ukraine) (uk_UA)
 - Misha Bychkov, [email protected], Ukrainian (Ukraine) (uk_UA)
 - Pavel Shuper, [email protected], Ukrainian (Ukraine) (uk_UA)
+- Muzzammil Hussain, [email protected], Urdu (ur)
+- Kevin Xu, [email protected], Chinese (zh)
 - Rui Tang, [email protected], Chinese (zh)
+- xuhaida76, [email protected], Chinese (China) (zh_CN)
+- Raymond Yu, [email protected], Chinese (China) (zh_CN)
+- 道, [email protected], Chinese (China) (zh_CN)
 - lin chen, [email protected], Chinese (China) (zh_CN)
 - Rui Tang, [email protected], Chinese (China) (zh_CN)
 - jincheng_li, [email protected], Chinese (China) (zh_CN)
@@ -153,3 +168,4 @@ Translators
 - Rui Tang, [email protected], Chinese (Taiwan) (zh_TW)
 - Matthew Tsui, [email protected], Chinese (Taiwan) (zh_TW)
 - Liz Sung, [email protected], Chinese (Taiwan) (zh_TW)
+- Wei Chung Sim, [email protected], Chinese (Taiwan) (zh_TW)
@@ -1,6 +1,21 @@
 Release notes
 =============
 
+Update from 2.0.0 to 2.1.0
+--------------------------
+
+!!! This update requires at least Plone 5.2.5 and Python 2.x. !!!
+
+Please update your `buildout.cfg` configuration file to this version and re-run
+the `buildout` script.
+
+You can use the Plone unified installer to install Plone 5.x first:
+https://github.com/plone/Installers-UnifiedInstaller
+
+Please make sure to pin `senaite.lims` to version `2.1.0` to get the correct
+versions of all dependent SENAITE packages.
+
+
 Update from 1.3.x to 2.0.0
 --------------------------
 
@@ -18,7 +33,6 @@ versions of all dependent SENAITE packages.
 Run first the Plone upgrade before you continue to update SENAITE to version 2.x.
 
 
-
 Update from 1.3.0 to 1.3.1
 --------------------------
 
 
@@ -1,8 +1,8 @@
 [buildout]
 index = https://pypi.org/simple/
-extends = https://dist.plone.org/release/5.2.5/versions.cfg
+extends = https://dist.plone.org/release/5.2.6/versions.cfg
 find-links =
-    https://dist.plone.org/release/5.2.5/
+    https://dist.plone.org/release/5.2.6/
     https://dist.plone.org/thirdparty/
 
 parts =
 
@@ -21,7 +21,7 @@
 from setuptools import setup
 from setuptools import find_packages
 
-version = "2.0.1"
+version = "2.2.0"
 
 setup(
     name="senaite.core",
@@ -69,7 +69,7 @@
         "Products.DataGridField",
         "Products.TextIndexNG3",
         "Products.contentmigration",
-        # XXX: Remove after 2.0.1
+        # XXX: Remove after 2.1.0
         "zopyx.txng3.ext==3.4.0",
         # tinycss2 >= 1.0.0 does not support Python 2.x anymore
         "tinycss2<1.0.0",
@@ -106,5 +106,10 @@
           # -*- Entry points: -*-
           [z3c.autoinclude.plugin]
           target = plone
+
+          [console_scripts]
+          reindex = senaite.core.scripts:reindex
+          upgrade-sites = senaite.core.scripts:upgrade_sites
+          zope-passwd = senaite.core.scripts:zope_passwd
           """,
 )
@@ -50,3 +50,9 @@ def get_object_info(self):
         See IAddSampleObjectInfo for further details
         """
         raise NotImplementedError("get_object_info not implemented")
+
+    def get_object_info_with_record(self, record):
+        """Same as get_object_record, but contains the current request record
+        """
+        # default to the base object info
+        return self.get_object_info()
@@ -191,6 +191,8 @@ def get_tool(name, context=None, default=_marker):
         return ploneapi.portal.get_tool(name)
     except InvalidParameterError:
         if default is not _marker:
+            if isinstance(default, six.string_types):
+                return get_tool(default)
             return default
         fail("No tool named '%s' found." % name)
 
 
@@ -118,8 +118,6 @@ def get_version(obj):
     :returns: Current version of the object or -1
     """
     count = get_snapshot_count(obj)
-    if count == 0:
-        return -1
     return count - 1
 
 
@@ -441,6 +439,8 @@ def _get_title_or_id_from_uid(uid):
     try:
         obj = api.get_object_by_uid(uid)
     except api.APIError:
+        obj = None
+    if not obj:
         return "<Deleted {}>".format(uid)
     title_or_id = api.get_title(obj) or api.get_id(obj)
     return title_or_id
@@ -19,81 +19,18 @@
 # Some rights reserved, see README and LICENSE.
 
 import traceback
-from datetime import datetime
-from time import strptime
-
-import six
 
 from AccessControl import ClassSecurityInfo
 from bika.lims import api
 from bika.lims import logger
 from DateTime.DateTime import DateTime
-from DateTime.DateTime import safelocaltime
-from Products.ATContentTypes.utils import dt2DT
 from Products.CMFCore.utils import getToolByName
 from Products.CMFPlone.i18nl10n import ulocalized_time as _ut
 from Products.Five.browser import BrowserView as BaseBrowserView
 from zope.cachedescriptors.property import Lazy as lazy_property
 from zope.i18n import translate
 
 
-def get_date(context, value):
-    """Tries to return a DateTime.DateTime object
-    """
-    if not value:
-        return None
-    if isinstance(value, DateTime):
-        return value
-    if isinstance(value, datetime):
-        return dt2DT(value)
-    if not isinstance(value, six.string_types):
-        return None
-
-    def try_parse(date_string, format):
-        if not format:
-            return None
-        try:
-            struct_time = strptime(date_string, format)
-            return datetime(*struct_time[:6])
-        except ValueError:
-            pass
-        return None
-
-    def get_locale_format(key):
-        request = api.get_request()
-        format = translate(
-            key, domain="senaite.core", mapping={}, context=request)
-        # The variables at locales .po files (e.g. "date_format_short") take
-        # into consideration the translation service tool and therefore, their
-        # format is like "${d}/${m}/${Y}". We need to "convert" this format
-        # to %-like.
-        return format.replace(r"${", '%').replace('}', '')
-
-    # Try with prioritized formats
-    formats = [
-        get_locale_format("date_format_long"),
-        get_locale_format("date_format_short"),
-        "%Y-%m-%d %H:%M",
-        "%Y-%m-%d",
-        "%Y-%m-%d %H:%M:%S",
-    ]
-    for pri_format in formats:
-        val = try_parse(value, pri_format)
-        if not val:
-            continue
-        val = dt2DT(val)
-        if val.timezoneNaive():
-            # Use local timezone for tz naive strings
-            # see http://dev.plone.org/plone/ticket/10141
-            zone = val.localZone(safelocaltime(val.timeTime()))
-            parts = val.parts()[:-1] + (zone,)
-            val = DateTime(*parts)
-        return val
-
-    logger.warn("Unable to convert {} to datetime".format(value))
-    return None
-
-
 def ulocalized_time(time, long_format=None, time_only=None, context=None,
                     request=None):
     """
@@ -115,13 +52,10 @@ def ulocalized_time(time, long_format=None, time_only=None, context=None,
     """
     # if time is a string, we'll try pass it through strptime with the various
     # formats defined.
-    time = get_date(context, time)
+    time = api.to_date(time)
     if not time or not isinstance(time, DateTime):
         return ''
 
-    # no printing times if they were not specified in inputs
-    if time.second() + time.minute() + time.hour() == 0:
-        long_format = False
     try:
         time_str = _ut(time, long_format, time_only, context, 'senaite.core', request)
     except ValueError: