tryton 6.6.8__tar.gz → 6.8.1__tar.gz

{tryton-6.6.8 → tryton-6.8.1}/CHANGELOG

@@ -1,37 +1,25 @@
 
-Version 6.6.8 - 2023-05-17
+Version 6.8.1 - 2023-05-17
 --------------------------
 * Bug fixes (see mercurial logs for details)
 
 
-Version 6.6.7 - 2023-05-03
---------------------------
-* Bug fixes (see mercurial logs for details)
-
-
-Version 6.6.6 - 2023-03-04
---------------------------
-* Bug fixes (see mercurial logs for details)
-
-Version 6.6.5 - 2023-02-17
---------------------------
-* Bug fixes (see mercurial logs for details)
-
-Version 6.6.4 - 2023-02-05
---------------------------
-* Bug fixes (see mercurial logs for details)
-
-Version 6.6.3 - 2023-01-15
---------------------------
-* Bug fixes (see mercurial logs for details)
-
-Version 6.6.2 - 2023-01-02
---------------------------
-* Bug fixes (see mercurial logs for details)
-
-Version 6.6.1 - 2022-11-17
+Version 6.8.0 - 2023-05-01
 --------------------------
 * Bug fixes (see mercurial logs for details)
+* Include events to logs
+* Add option to disable thread
+* Remove support for Python 3.7
+* Add support for Python 3.11
+* Save and Restore tree state on List Form
+* Do record (pre)validation and saving on selection change for list-form views
+* Eagerly read string value of selection fields
+* Do not select first record by default
+* Use ``&`` and ``|`` as boolean operator in search widget
+* Use toggle button and label on translate dialog
+* Manage domain on id in single value list as unique
+* Do not validate domain nor enforce uniqueness for empty fields unless they're required or invisible
+* Display the number of selected records on xxx2Many
 
 Version 6.6.0 - 2022-10-31
 --------------------------

{tryton-6.6.8 → tryton-6.8.1}/PKG-INFO

@@ -1,16 +1,16 @@
 Metadata-Version: 2.1
 Name: tryton
-Version: 6.6.8
+Version: 6.8.1
 Summary: Tryton desktop client
 Home-page: http://www.tryton.org/
-Download-URL: http://downloads.tryton.org/6.6/
+Download-URL: http://downloads.tryton.org/6.8/
 Author: Tryton
-Author-email: bugs@tryton.org
+Author-email: foundation@tryton.org
 License: GPL-3
 Project-URL: Bug Tracker, https://bugs.tryton.org/
 Project-URL: Documentation, https://docs.tryton.org/
 Project-URL: Forum, https://www.tryton.org/forum
-Project-URL: Source Code, https://hg.tryton.org/tryton
+Project-URL: Source Code, https://code.tryton.org/tryton
 Keywords: business application ERP
 Platform: any
 Classifier: Development Status :: 5 - Production/Stable
@@ -42,12 +42,12 @@ Classifier: Natural Language :: Japanese
 Classifier: Natural Language :: Ukrainian
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Office/Business
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Provides-Extra: calendar
 License-File: LICENSE
 

{tryton-6.6.8 → tryton-6.8.1}/doc/conf.py

@@ -30,7 +30,10 @@ def get_info():
         [sys.executable, 'setup.py', '--version'],
         stdout=subprocess.PIPE, check=True, cwd=module_dir)
     version = result.stdout.decode('utf-8').strip()
-    if 'dev' in version:
+    major_version, minor_version, _ = version.split('.', 2)
+    major_version = int(major_version)
+    minor_version = int(minor_version)
+    if minor_version % 2:
         info['series'] = 'latest'
     else:
         info['series'] = '.'.join(version.split('.', 2)[:2])

{tryton-6.6.8 → tryton-6.8.1}/doc/usage.rst

@@ -512,22 +512,26 @@ It is possible to escape special characters in values by using double quotes.
 Clause composition
 ++++++++++++++++++
 
-The clauses can be composed using the two boolean operators ``and`` and ``or``.
-By default, there is an implicit ``and`` between each clause if no operator is
+The clauses can be composed using the two boolean operators ``&`` (for `logical
+conjunction`_) and ``|`` (for `logical disjunction`_).
+By default, there is an implicit ``&`` between each clause if no operator is
 specified.
 
    For example: ``Name: Michael Amount: 100``
 
-   is the same as ``Name: Michael and Amount: 100``
+   is the same as ``Name: Michael & Amount: 100``
 
-The ``and`` operator has a highest precedence than ``or`` but you can change it
-by using parenthesis.
+The ``&`` operator has a highest precedence than ``|`` but you can change it by
+using parenthesis.
 
-   For example: ``(Name: Michael or Name: Pam) and Amount: 100``
+   For example: ``(Name: Michael | Name: Pam) & Amount: 100``
 
-   is different than ``Name: Michael or Name: Pam and Amount: 100``
+   is different than ``Name: Michael | Name: Pam & Amount: 100``
 
-   which is evaluated as ``Name: Michael or (Name: Pam and Amount: 100)``
+   which is evaluated as ``Name: Michael | (Name: Pam & Amount: 100)``
+
+.. _logical conjunction: https://en.wikipedia.org/wiki/Logical_conjunction
+.. _logical disjunction: https://en.wikipedia.org/wiki/Logical_disjunction
 
 RichText Editor
 ^^^^^^^^^^^^^^^

{tryton-6.6.8 → tryton-6.8.1}/setup.py

@@ -68,22 +68,25 @@ major_version = int(major_version)
 minor_version = int(minor_version)
 name = 'tryton'
 
-download_url = 'http://downloads.tryton.org/%s.%s/' % (
-    major_version, minor_version)
+if minor_version % 2:
+    download_url = ''
+else:
+    download_url = 'http://downloads.tryton.org/%s.%s/' % (
+        major_version, minor_version)
 
 dist = setup(name=name,
     version=version,
     description='Tryton desktop client',
     long_description=read('README.rst'),
     author='Tryton',
-    author_email='bugs@tryton.org',
+    author_email='foundation@tryton.org',
     url='http://www.tryton.org/',
     download_url=download_url,
     project_urls={
         "Bug Tracker": 'https://bugs.tryton.org/',
         "Documentation": 'https://docs.tryton.org/',
         "Forum": 'https://www.tryton.org/forum',
-        "Source Code": 'https://hg.tryton.org/tryton',
+        "Source Code": 'https://code.tryton.org/tryton',
         },
     keywords='business application ERP',
     packages=find_packages(),
@@ -120,15 +123,15 @@ dist = setup(name=name,
         'Natural Language :: Ukrainian',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Topic :: Office/Business',
         ],
     platforms='any',
     license='GPL-3',
-    python_requires='>=3.7',
+    python_requires='>=3.8',
     install_requires=[
         'pycairo',
         "python-dateutil",

tryton-6.8.1/tox.ini

@@ -0,0 +1,14 @@
+[tox]
+envlist = py38,py39,py310,py311
+
+[testenv]
+usedevelop = true
+commands =
+    coverage run --omit=*/tests/* -m xmlrunner discover -s tryton.tests {posargs}
+commands_post =
+    coverage report
+    coverage xml
+deps =
+    coverage
+    unittest-xml-reporting
+passenv = *

{tryton-6.6.8 → tryton-6.8.1}/tryton/__init__.py

@@ -1,6 +1,6 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-__version__ = "6.6.8"
+__version__ = "6.8.1"
 import locale
 
 import gi

{tryton-6.6.8 → tryton-6.8.1}/tryton/action/main.py

@@ -6,7 +6,6 @@ import webbrowser
 import tryton.rpc as rpc
 from tryton.common import (
     RPCException, RPCExecute, file_open, file_write, message, selection)
-from tryton.config import CONFIG
 from tryton.pyson import PYSONDecoder
 
 _ = gettext.gettext
@@ -91,14 +90,15 @@ class Action(object):
                 return name
 
         data['action_id'] = action['id']
+        params = {
+            'icon': action.get('icon.rec_name') or '',
+            }
         if action['type'] == 'ir.action.act_window':
-            view_ids = []
-            view_mode = None
             if action.get('views', []):
-                view_ids = [x[0] for x in action['views']]
-                view_mode = [x[1] for x in action['views']]
+                params['view_ids'] = [x[0] for x in action['views']]
+                params['view_mode'] = [x[1] for x in action['views']]
             elif action.get('view_id', False):
-                view_ids = [action['view_id'][0]]
+                params['view_ids'] = [action['view_id'][0]]
 
             action.setdefault('pyson_domain', '[]')
             ctx = {
@@ -109,58 +109,47 @@ class Action(object):
             ctx.update(rpc.CONTEXT)
             ctx['_user'] = rpc._USER
             decoder = PYSONDecoder(ctx)
-            action_ctx = context.copy()
-            action_ctx.update(
+            params['context'] = context.copy()
+            params['context'].update(
                 decoder.decode(action.get('pyson_context') or '{}'))
-            ctx.update(action_ctx)
+            ctx.update(params['context'])
 
             ctx['context'] = ctx
             decoder = PYSONDecoder(ctx)
-            domain = decoder.decode(action['pyson_domain'])
-            order = decoder.decode(action['pyson_order'])
-            search_value = decoder.decode(action['pyson_search_value'] or '[]')
-            tab_domain = [(n, decoder.decode(d), c)
-                for n, d, c in action['domains']]
+            params['domain'] = decoder.decode(action['pyson_domain'])
+            params['order'] = decoder.decode(action['pyson_order'])
+            params['search_value'] = decoder.decode(
+                action['pyson_search_value'] or '[]')
+            params['tab_domain'] = [
+                (n, decoder.decode(d), c) for n, d, c in action['domains']]
 
             name = action.get('name', '')
             if action.get('keyword', ''):
-                name = add_name_suffix(name, action_ctx)
+                name = add_name_suffix(name, params['context'])
+            params['name'] = name
 
             res_model = action.get('res_model', data.get('res_model'))
-            res_id = action.get('res_id', data.get('res_id'))
+            params['res_id'] = action.get('res_id', data.get('res_id'))
+            params['context_model'] = action.get('context_model')
+            params['context_domain'] = action.get('context_domain')
             limit = action.get('limit')
-            if limit is None:
-                limit = CONFIG['client.limit']
-
-            Window.create(res_model,
-                view_ids=view_ids,
-                res_id=res_id,
-                domain=domain,
-                context=action_ctx,
-                order=order,
-                mode=view_mode,
-                name=name,
-                limit=limit,
-                search_value=search_value,
-                icon=(action.get('icon.rec_name') or ''),
-                tab_domain=tab_domain,
-                context_model=action['context_model'],
-                context_domain=action['context_domain'])
+            if limit is not None:
+                params['limit'] = limit
+
+            Window.create(res_model, **params)
         elif action['type'] == 'ir.action.wizard':
+            params['context'] = context
+            params['window'] = action.get('window')
             name = action.get('name', '')
             if action.get('keyword', 'form_action') == 'form_action':
                 name = add_name_suffix(name, context)
-            Window.create_wizard(action['wiz_name'], data,
-                direct_print=action.get('direct_print', False),
-                name=name,
-                context=context, icon=(action.get('icon.rec_name') or ''),
-                window=action.get('window', False))
-
+            params['name'] = name
+            Window.create_wizard(action['wiz_name'], data, **params)
         elif action['type'] == 'ir.action.report':
-            Action.exec_report(
-                action['report_name'], data,
-                direct_print=action.get('direct_print', False),
-                context=context)
+            params['direct_print'] = action.get('direct_print', False)
+            params['context'] = context
+            del params['icon']
+            Action.exec_report(action['report_name'], data, **params)
 
         elif action['type'] == 'ir.action.url':
             if action['url']:

{tryton-6.6.8 → tryton-6.8.1}/tryton/bus.py

@@ -25,6 +25,8 @@ CHANNELS = [
 
 
 def listen(connection):
+    if not CONFIG['thread']:
+        return
     listener = threading.Thread(
         target=_listen, args=(connection,), daemon=True)
     listener.start()

{tryton-6.6.8 → tryton-6.8.1}/tryton/client.py

@@ -30,6 +30,9 @@ def main():
     label.editable {
         font-style: italic;
     }
+    label.warning {
+        color: @warning_color;
+    }
     .window-title, .wizard-title {
         font-size: large;
         font-weight: bold;

{tryton-6.6.8 → tryton-6.8.1}/tryton/common/button.py

@@ -37,7 +37,9 @@ class Button(Gtk.Button):
             self.hide()
         else:
             self.show()
-        self.set_sensitive(not states.get('readonly', False))
+        self.set_sensitive(
+            not (record.readonly if record else False)
+            and not states.get('readonly', False))
         self._set_icon(states.get('icon', self.attrs.get('icon')))
 
         if self.attrs.get('rule'):

{tryton-6.6.8 → tryton-6.8.1}/tryton/common/common.py

@@ -23,7 +23,6 @@ try:
 except ImportError:
     from http import client as HTTPStatus
 
-import _thread
 import shlex
 import socket
 import sys
@@ -34,6 +33,7 @@ import urllib.request
 import webbrowser
 from functools import lru_cache, wraps
 from string import Template
+from threading import Lock, Thread
 
 import tryton.rpc as rpc
 from tryton.config import CONFIG, PIXMAPS_DIR, TRYTON_ICON
@@ -43,9 +43,8 @@ try:
 except ImportError:
     ssl = None
 import zipfile
-from threading import Lock
 
-from gi.repository import Gdk, GdkPixbuf, GLib, GObject, Gtk
+from gi.repository import Gdk, GdkPixbuf, Gio, GLib, GObject, Gtk
 
 from tryton import __version__
 from tryton.exceptions import TrytonError, TrytonServerError
@@ -104,6 +103,8 @@ class IconFactory:
         try:
             icon_ref = (cls._name2id[iconname], iconname)
         except KeyError:
+            logger.error(f"Unknown icon {iconname}")
+            cls._icons[iconname] = None
             return
         idx = cls._tryton_icons.index(icon_ref)
         to_load = slice(max(0, idx - cls.batchnum // 2),
@@ -128,13 +129,14 @@ class IconFactory:
         colors = CONFIG['icon.colors'].split(',')
         cls.register_icon(iconname)
         if iconname not in cls._pixbufs[(size, badge)]:
+            data = None
             if iconname in cls._icons:
                 data = cls._icons[iconname]
             elif iconname in cls._local_icons:
                 path = cls._local_icons[iconname]
                 with open(path, 'rb') as fp:
                     data = fp.read()
-            else:
+            if not data:
                 logger.error("Unknown icon %s" % iconname)
                 return
             if not color:
@@ -439,16 +441,8 @@ def file_selection(title, filename='',
         action=Gtk.FileChooserAction.OPEN, preview=True, multi=False,
         filters=None):
     parent = get_toplevel_window()
-    if action == Gtk.FileChooserAction.OPEN:
-        buttons = (set_underline(_("Cancel")), Gtk.ResponseType.CANCEL,
-            set_underline(_("Select")), Gtk.ResponseType.OK)
-    else:
-        buttons = (set_underline(_("Cancel")), Gtk.ResponseType.CANCEL,
-            set_underline(_("Save")), Gtk.ResponseType.OK)
-    win = Gtk.FileChooserDialog(
+    win = Gtk.FileChooserNative(
         title=title, transient_for=parent, action=action)
-    win.add_buttons(*buttons)
-    win.set_icon(TRYTON_ICON)
     if filename:
         if action in (Gtk.FileChooserAction.SAVE,
                 Gtk.FileChooserAction.CREATE_FOLDER):
@@ -459,7 +453,6 @@ def file_selection(title, filename='',
     if hasattr(win, 'set_do_overwrite_confirmation'):
         win.set_do_overwrite_confirmation(True)
     win.set_select_multiple(multi)
-    win.set_default_response(Gtk.ResponseType.OK)
     if filters is not None:
         for filt in filters:
             win.add_filter(filt)
@@ -484,7 +477,7 @@ def file_selection(title, filename='',
         win.connect('update-preview', update_preview_cb, img_preview)
 
     button = win.run()
-    if button != Gtk.ResponseType.OK:
+    if button != Gtk.ResponseType.ACCEPT:
         result = None
     elif not multi:
         result = PurePath(win.get_filename())
@@ -546,10 +539,8 @@ def file_open(filename, type=None, print_p=False):
                     file_open(zfilename, type=ztype, print_p=True)
         return
 
-    if os.name == 'nt':
-        operation = 'open'
-        if print_p:
-            operation = 'print'
+    if hasattr(os, 'startfile'):
+        operation = 'print' if print_p else 'open'
         try:
             os.startfile(os.path.normpath(filename), operation)
         except WindowsError:
@@ -574,12 +565,20 @@ def file_open(filename, type=None, print_p=False):
         except OSError:
             save()
     else:
+        uri = GLib.filename_to_uri(filename)
         try:
-            subprocess.Popen(['xdg-open', filename])
-        except OSError:
+            Gio.AppInfo.launch_default_for_uri(uri)
+        except GLib.Error:
             save()
 
 
+def webbrowser_open(url):
+    try:
+        Gio.AppInfo.launch_default_for_uri(url)
+    except GLib.Error:
+        webbrowser.open(url)
+
+
 def url_open(uri):
     try:
         return urllib.request.urlopen(uri)
@@ -640,7 +639,7 @@ def mailto(to=None, cc=None, subject=None, body=None, attachment=None):
         url += "&body=" + urllib.parse.quote(body, "")
     if attachment:
         url += "&attachment=" + urllib.parse.quote(attachment, "")
-    webbrowser.open(url, new=1)
+    webbrowser_open(url, new=1)
 
 
 class UniqueDialog(object):
@@ -882,7 +881,7 @@ class ErrorDialog(UniqueDialog):
             CONFIG['bug.url'], _("Report Bug"))
         button_roundup.get_child().set_halign(Gtk.Align.START)
         button_roundup.connect('activate-link',
-            lambda widget: webbrowser.open(CONFIG['bug.url'], new=2))
+            lambda widget: webbrowser_open(CONFIG['bug.url'], new=2))
         dialog.vbox.pack_start(
             button_roundup, expand=False, fill=False, padding=0)
 
@@ -892,8 +891,7 @@ class ErrorDialog(UniqueDialog):
         if isinstance(title, Exception):
             title = "%s: %s" % (title.__class__.__name__, title)
         details += '\n' + title
-        log = logging.getLogger(__name__)
-        log.error(details)
+        logger.error(details)
         return super(ErrorDialog, self).__call__(title, details)
 
 
@@ -903,7 +901,7 @@ error = ErrorDialog()
 def check_version(box, version=__version__):
     def info_bar_response(info_bar, response, box, url):
         if response == Gtk.ResponseType.ACCEPT:
-            webbrowser.open(url)
+            webbrowser_open(url)
         box.remove(info_bar)
 
     class HeadRequest(urllib.request.Request):
@@ -955,7 +953,7 @@ def open_documentation():
         version = 'latest'
     else:
         version = '.'.join(version)
-    webbrowser.open(CONFIG['doc.url'] % {
+    webbrowser_open(CONFIG['doc.url'] % {
             'lang': CONFIG['client.lang'],
             'version': version,
             })
@@ -1049,7 +1047,7 @@ def get_credentials(user_id=None):
             query['renew'] = user_id
         url_parts[4] = urlencode(query)
         url = urlunparse(url_parts)
-        webbrowser.open(url)
+        webbrowser_open(url)
 
         class RequestHandler(BaseHTTPRequestHandler):
             def do_GET(self):
@@ -1213,7 +1211,7 @@ class RPCProgress(object):
         else:
             if not self.res:
                 self.error = True
-        if self.callback:
+        if self.callback and CONFIG['thread']:
             # Post to GTK queue to be run by the main thread
             GLib.idle_add(self.process)
         return True
@@ -1222,12 +1220,12 @@ class RPCProgress(object):
         self.process_exception_p = process_exception_p
         self.callback = callback
 
-        if callback:
+        if callback and CONFIG['thread']:
             # Parent is only useful if it is asynchronous
             # otherwise the cursor is not updated.
             self.parent = get_toplevel_window()
             self._cursor_timeout = GLib.timeout_add(3000, self._set_cursor)
-            _thread.start_new_thread(self.start, ())
+            Thread(target=self.start).start()
             return
         else:
             self.start()
@@ -1365,14 +1363,29 @@ def untimezoned_date(date):
 
 
 def humanize(size, suffix=''):
-    for u in ['', 'K', 'M', 'G', 'T', 'P']:
-        if size <= 1000:
-            if isinstance(size, int) or size.is_integer():
-                size = locale.localize('{0:.0f}'.format(size))
-            else:
-                size = locale.localize('{0:.{1}f}'.format(size, 2).rstrip('0'))
-            return ''.join([size, u, suffix])
-        size /= 1000.0
+    if 0 < abs(size) < 1:
+        for u in ['', 'm', 'µ', 'n', 'p', 'f', 'a', 'z', 'y', 'r', 'q']:
+            if abs(size) >= 0.01:
+                break
+            size *= 1000.0
+        else:
+            size /= 1000.0
+    else:
+        for u in ['', 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y', 'R', 'Q']:
+            if abs(size) <= 1000:
+                break
+            size /= 1000.0
+        else:
+            size *= 1000.0
+    if isinstance(size, int) or size.is_integer():
+        size = locale.localize(str(int(size)))
+    elif abs(size) < 0.01:
+        size = locale.localize(
+            '{0:f}'.format(size).rstrip('0').rstrip('.'))
+    else:
+        size = locale.localize(
+            '{0:.{1}f}'.format(size, 2).rstrip('0').rstrip('.'))
+    return ''.join([size, u, suffix])
 
 
 def get_hostname(netloc):
@@ -1445,13 +1458,12 @@ def ellipsize(string, length):
 def get_align(float_, expand=True):
     "Convert float align into Gtk.Align"
     value = float(float_)
+    if expand:
+        return Gtk.Align.FILL
     if value < 0.5:
         return Gtk.Align.START
     elif value == 0.5:
-        if expand:
-            return Gtk.Align.FILL
-        else:
-            return Gtk.Align.CENTER
+        return Gtk.Align.CENTER
     else:
         return Gtk.Align.END
 

{tryton-6.6.8 → tryton-6.8.1}/tryton/common/datetime_.py

@@ -129,8 +129,9 @@ class Date(Gtk.Entry):
                 self.__date.month - 1, self.__date.year)
             self.__calendar.select_day(self.__date.day)
         self.__cal_popup.set_transient_for(self.get_toplevel())
-        popup_position(self, self.__cal_popup)
+        # Show popup before because position needs the popup allocation
         popup_show(self.__cal_popup)
+        popup_position(self, self.__cal_popup)
 
     def cal_popup_changed(self, calendar):
         year, month, day = self.__calendar.get_date()
@@ -532,8 +533,19 @@ GObject.type_register(DateTime)
 
 def popup_position(widget, popup):
     allocation = widget.get_allocation()
+    popup_allocation = popup.get_allocation()
     x, y = widget.get_window().get_root_coords(allocation.x, allocation.y)
-    popup.move(x, y + allocation.height)
+    display = widget.get_display()
+    monitor = display.get_monitor_at_window(widget.get_window())
+    monitor_geometry = monitor.get_geometry()
+    if (monitor_geometry.height
+            < y + allocation.height + popup_allocation.height):
+        y -= popup_allocation.height
+    else:
+        y += allocation.height
+    if monitor_geometry.width < x + popup_allocation.width:
+        x -= popup_allocation.width
+    popup.move(x, y)
 
 
 def popup_show(popup):

{tryton-6.6.8 → tryton-6.8.1}/tryton/common/domain_inversion.py

@@ -381,16 +381,16 @@ def unique_value(domain):
     "Return if unique, the field and the value"
     if (isinstance(domain, list)
             and len(domain) == 1):
-        domain, = domain
-        name = domain[0]
-        value = domain[2]
-        count = 0
-        if len(domain) == 4 and name[-3:] == '.id':
-            count = 1
-            model = domain[3]
-            value = [model, value]
-        if name.count('.') == count and domain[1] == '=':
-            return True, name, value
+        name, operator, value, *model = domain[0]
+        if operator == '=' or (operator == 'in' and len(value) == 1):
+            value = value if operator == '=' else value[0]
+            count = 0
+            if model and name.endswith('.id'):
+                count = 1
+                model = model[0]
+                value = [model, value]
+            if name.count('.') == count:
+                return True, name, value
     return False, None, None