tryton 6.6.8__py3-none-any.whl → 6.8.1__py3-none-any.whl

tryton/gui/window/view_form/view/list_gtk/widget.py

@@ -2,6 +2,7 @@
 # this repository contains the full copyright notices and license terms.
 import datetime
 import gettext
+import logging
 import os
 import webbrowser
 from functools import partial, wraps
@@ -31,6 +32,7 @@ from tryton.gui.window.win_form import WinForm
 from tryton.gui.window.win_search import WinSearch
 
 _ = gettext.gettext
+logger = logging.getLogger(__name__)
 
 COLORS = {n: v for n, v in zip(
         ['muted', 'success', 'warning', 'danger'],
@@ -50,6 +52,23 @@ def send_keys(renderer, editable, position, treeview):
         editable.connect('changed', changed)
 
 
+def catch_errors(error_value=_('#ERROR')):
+    def decorator(func):
+        @wraps(func)
+        def wrapper(self, record):
+            if record.exception:
+                return error_value
+            try:
+                return func(self, record)
+            except Exception:
+                logger.error(
+                    f"Error calling {func.__name__} for {self} with {record}",
+                    exc_info=True)
+                return error_value
+        return wrapper
+    return decorator
+
+
 def realized(func):
 
     @wraps(func)
@@ -143,7 +162,7 @@ class Cell(object):
         if not store:
             store = self.view.treeview.get_model()
         record = store.get_value(iter_, 0)
-        field = record[self.attrs['name']]
+        field = record.group.fields[self.attrs['name']]
         return record, field
 
     def _set_visual(self, cell, record):
@@ -330,9 +349,9 @@ class GenericText(Cell):
             callback=None):
         raise NotImplementedError
 
+    @catch_errors()
     def get_textual_value(self, record):
-        if not record:
-            return ''
+        record.load(self.attrs['name'], process_exception=False)
         return record[self.attrs['name']].get_client(record)
 
     def value_from_text(self, record, text, callback=None):
@@ -396,9 +415,9 @@ class Int(GenericText):
             return [self.renderer_suffix]
         return []
 
+    @catch_errors()
     def get_textual_value(self, record):
-        if not record:
-            return ''
+        record.load(self.attrs['name'], process_exception=False)
         return record[self.attrs['name']].get_client(
             record, factor=self.factor, grouping=self.grouping)
 
@@ -464,9 +483,9 @@ class Date(GenericText):
         else:
             return '%x'
 
+    @catch_errors()
     def get_textual_value(self, record):
-        if not record:
-            return ''
+        record.load(self.attrs['name'], process_exception=False)
         value = record[self.attrs['name']].get_client(record)
         if value:
             return value.strftime(self.renderer.props.format)
@@ -487,9 +506,9 @@ class Time(Date):
         else:
             return '%X'
 
+    @catch_errors()
     def get_textual_value(self, record):
-        if not record:
-            return ''
+        record.load(self.attrs['name'], process_exception=False)
         value = record[self.attrs['name']].get_client(record)
         if value is not None:
             if isinstance(value, datetime.datetime):
@@ -549,7 +568,9 @@ class Binary(GenericText):
     def suffixes(self):
         return [self.renderer_save, self.renderer_select]
 
+    @catch_errors()
     def get_textual_value(self, record):
+        record.load(self.attrs['name'], process_exception=False)
         field = record[self.attrs['name']]
         if hasattr(field, 'get_size'):
             size = field.get_size(record)
@@ -604,6 +625,11 @@ class _BinaryIcon(Cell):
     def view(self):
         return self.binary.view
 
+    @catch_errors(False)
+    def _fetch_data(self, record):
+        record.fetch(self.attrs['name'], process_exception=False)
+        return True
+
 
 class _BinarySave(_BinaryIcon):
     icon_name = 'tryton-save'
@@ -631,6 +657,9 @@ class _BinarySave(_BinaryIcon):
     @CellCache.cache
     def setter(self, column, cell, store, iter_, user_data=None):
         record, field = self._get_record_field_from_iter(iter_, store)
+        if not self._fetch_data(record):
+            cell.set_property('visible', False)
+            return
         if hasattr(field, 'get_size'):
             size = field.get_size(record)
         else:
@@ -671,6 +700,9 @@ class _BinarySelect(_BinaryIcon):
     @CellCache.cache
     def setter(self, column, cell, store, iter_, user_data=None):
         record, field = self._get_record_field_from_iter(iter_, store)
+        if not self._fetch_data(record):
+            cell.set_property('visible', False)
+            return
         if hasattr(field, 'get_size'):
             size = field.get_size(record)
         else:
@@ -710,6 +742,9 @@ class _BinaryOpen(_BinarySave):
     def setter(self, column, cell, store, iter_, user_data=None):
         super().setter(column, cell, store, iter_)
         record, field = self._get_record_field_from_iter(iter_, store)
+        if not self._fetch_data(record):
+            cell.set_property('visible', False)
+            return
         filename_field = record.group.fields.get(self.attrs.get('filename'))
         filename = filename_field.get(record)
         if not filename:
@@ -731,22 +766,33 @@ class Image(GenericText):
     @CellCache.cache
     def setter(self, column, cell, store, iter_, user_data=None):
         record, field = self._get_record_field_from_iter(iter_, store)
+        value = self._get_data(record)
+        if value is None:
+            cell.set_property('pixbuf', None)
+            return
+        pixbuf = data2pixbuf(value)
+        if pixbuf:
+            pixbuf = common.resize_pixbuf(pixbuf, self.width, self.height)
+        cell.set_property('pixbuf', pixbuf)
+        self._set_visual(cell, record)
+
+    @catch_errors(None)
+    def _get_data(self, record):
+        record.load(self.attrs['name'], process_exception=False)
+        field = record[self.attrs['name']]
         value = field.get_client(record)
         if isinstance(value, int):
             if value > CONFIG['image.max_size']:
                 value = None
             else:
                 value = field.get_data(record)
-        pixbuf = data2pixbuf(value)
-        if pixbuf:
-            pixbuf = common.resize_pixbuf(pixbuf, self.width, self.height)
-        cell.set_property('pixbuf', pixbuf)
-        self._set_visual(cell, record)
+        return value
 
+    @catch_errors()
     def get_textual_value(self, record):
-        if not record:
-            return ''
-        return str(record[self.attrs['name']].get_size(record))
+        record.load(self.attrs['name'], process_exception=False)
+        field = record[self.attrs['name']]
+        return str(field.get_size(record))
 
 
 class M2O(GenericText):
@@ -974,9 +1020,11 @@ class O2O(M2O):
 class O2M(GenericText):
     align = 0.5
 
+    @catch_errors()
     def get_textual_value(self, record):
-        return '( ' + str(len(record[self.attrs['name']]
-                .get_eval(record))) + ' )'
+        record.load(self.attrs['name'], process_exception=False)
+        field = record[self.attrs['name']]
+        return '( ' + str(len(field.get_eval(record))) + ' )'
 
     def value_from_text(self, record, text, callback=None):
         if callback:
@@ -1045,16 +1093,24 @@ class Selection(GenericText, SelectionMixin, PopdownMixin):
         if 'renderer' not in kwargs:
             kwargs['renderer'] = CellRendererCombo
         super(Selection, self).__init__(*args, **kwargs)
-        self.init_selection()
-        # Use a variable let Python holding reference when calling set_property
-        model = self.get_popdown_model(self.selection)[0]
-        self.renderer.set_property('model', model)
-        self.renderer.set_property('text-column', 0)
+        if self.view and self.view.editable:
+            self.init_selection()
+            # Use a variable let Python holding reference when calling
+            # set_property
+            model = self.get_popdown_model(self.selection)[0]
+            self.renderer.set_property('model', model)
+            self.renderer.set_property('text-column', 0)
 
     def get_value(self, record, field):
         return field.get(record)
 
+    @catch_errors()
     def get_textual_value(self, record):
+        related = self.attrs['name'] + ':string'
+        if not self.view.editable and related in record.value:
+            return record.value[related]
+
+        record.load(self.attrs['name'], process_exception=False)
         field = record[self.attrs['name']]
         self.update_selection(record, field)
         value = self.get_value(record, field)
@@ -1119,7 +1175,8 @@ class MultiSelection(GenericText, SelectionMixin):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.init_selection()
+        if self.view and self.view.editable:
+            self.init_selection()
 
     @realized
     @CellCache.cache
@@ -1131,7 +1188,13 @@ class MultiSelection(GenericText, SelectionMixin):
         if callback:
             callback()
 
+    @catch_errors()
     def get_textual_value(self, record):
+        related = self.attrs['name'] + ':string'
+        if not self.view.editable and related in record.value:
+            return ";".join(record.value[related])
+
+        record.load(self.attrs['name'], process_exception=False)
         field = record[self.attrs['name']]
         self.update_selection(record, field)
         selection = dict(self.selection)
@@ -1180,6 +1243,7 @@ class Reference(M2O):
         _, value = value.split(',')
         return int(value)
 
+    @catch_errors()
     def get_textual_value(self, record):
         value = super().get_textual_value(record)
         if value:
@@ -1221,8 +1285,11 @@ class Dict(GenericText):
         super().setter(column, cell, store, iter_, user_data=None)
         cell.props.editable = False
 
+    @catch_errors()
     def get_textual_value(self, record):
-        return '(%s)' % len(record[self.attrs['name']].get_client(record))
+        record.load(self.attrs['name'], process_exception=False)
+        field = record[self.attrs['name']]
+        return '(%s)' % len(field.get_client(record))
 
 
 class ProgressBar(Cell):
@@ -1264,8 +1331,11 @@ class ProgressBar(Cell):
             callback=None):
         raise NotImplementedError
 
+    @catch_errors()
     def get_textual_value(self, record):
-        return record[self.attrs['name']].get_client(record, factor=100) or ''
+        record.load(self.attrs['name'], process_exception=False)
+        field = record[self.attrs['name']]
+        return field.get_client(record, factor=100) or ''
 
     def value_from_text(self, record, text, callback=None):
         field = record[self.attrs['name']]

tryton/gui/window/win_form.py

@@ -21,7 +21,7 @@ _ = gettext.gettext
 class WinForm(NoModal, InfoBar):
     "Form window"
 
-    def __init__(self, screen, callback, view_type='form',
+    def __init__(self, screen, callback=None, view_type='form',
             new=False, many=0, domain=None, context=None,
             save_current=False, title='', rec_name=None):
         tooltips = common.Tooltips()
@@ -345,7 +345,7 @@ class WinForm(NoModal, InfoBar):
         win.show()
 
     def record_message(self, position, size, *args):
-        self.activate_save()
+        self.set_buttons_sensitive()
         if self.view_type != 'tree':
             return
         name = '_'
@@ -380,10 +380,10 @@ class WinForm(NoModal, InfoBar):
         self.label.set_text(line)
 
     def record_modified(self, *args):
-        self.activate_save()
+        self.set_buttons_sensitive()
         self.info_bar_refresh()
 
-    def activate_save(self):
+    def set_buttons_sensitive(self):
         modified = self.screen.modified()
         # Keep sensible as change could have been trigger by a Many2One edition
         sensitive = modified or self.but_ok.props.sensitive
@@ -448,7 +448,8 @@ class WinForm(NoModal, InfoBar):
             result = False
         else:
             result = response_id not in cancel_responses
-        self.callback(result)
+        if self.callback:
+            self.callback(result)
         self.destroy()
 
     def new(self):

tryton/rpc.py

@@ -45,12 +45,12 @@ context_reset()
 def db_list(host, port):
     try:
         connection = ServerProxy(host, port)
-        logging.getLogger(__name__).info('common.db.list()')
+        logger.info('common.db.list()')
         result = connection.common.db.list()
-        logging.getLogger(__name__).debug(repr(result))
+        logger.debug('%r', result)
         return result
     except Fault as exception:
-        logging.getLogger(__name__).debug(exception.faultCode)
+        logger.debug(exception.faultCode)
         if exception.faultCode == str(HTTPStatus.FORBIDDEN.value):
             return []
         else:
@@ -60,13 +60,12 @@ def db_list(host, port):
 def server_version(host, port):
     try:
         connection = ServerProxy(host, port)
-        logging.getLogger(__name__).info(
-            'common.server.version(None, None)')
+        logger.info('common.server.version(None, None)')
         result = connection.common.server.version()
-        logging.getLogger(__name__).debug(repr(result))
+        logger.debug('%r', result)
         return result
     except Exception as e:
-        logging.getLogger(__name__).error(e)
+        logger.exception(e)
         return None
 
 
@@ -75,10 +74,10 @@ def authentication_services(host, port):
         connection = ServerProxy(host, port)
         logger.info('common.authentication.services()')
         services = connection.common.authentication.services()
-        logger.debug(repr(services))
+        logger.debug('%r', services)
         return connection.url, services
     except Exception as e:
-        logger.error(e)
+        logger.exception(e)
         return '', []
 
 
@@ -119,10 +118,9 @@ def login(parameters):
     language = CONFIG['client.lang']
     parameters['device_cookie'] = device_cookie.get()
     connection = ServerProxy(hostname, port, database)
-    logging.getLogger(__name__).info('common.db.login(%s, %s, %s)'
-        % (username, 'x' * 10, language))
+    logger.info('common.db.login(%s, %s, %s)', username, 'x' * 10, language)
     result = connection.common.db.login(username, parameters, language)
-    logging.getLogger(__name__).debug(repr(result))
+    logger.debug('%r', result)
     _USER = result[0]
     session = ':'.join(map(str, [username] + result))
     if CONNECTION is not None:
@@ -137,7 +135,7 @@ def logout():
     global CONNECTION, _USER
     if CONNECTION is not None:
         try:
-            logging.getLogger(__name__).info('common.db.logout()')
+            logger.info('common.db.logout()')
             with CONNECTION() as conn:
                 conn.common.db.logout()
         except (Fault, socket.error, http.client.CannotSendRequest):
@@ -154,12 +152,12 @@ def execute(*args):
     try:
         name = '.'.join(args[:3])
         args = args[3:]
-        logging.getLogger(__name__).info('%s%s' % (name, args))
+        logger.info('%s%r', name, args)
         with CONNECTION() as conn:
             result = getattr(conn, name)(*args)
     except (http.client.CannotSendRequest, socket.error) as exception:
         raise TrytonServerUnavailable(*exception.args)
-    logging.getLogger(__name__).debug(repr(result))
+    logger.debug('%r', result)
     return result
 
 

tryton/tests/test_common.py

@@ -0,0 +1,46 @@
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+from unittest import TestCase
+
+from tryton.common import humanize
+
+
+class Humanize(TestCase):
+    "Test humanize"
+
+    def test_humanize(self):
+        "Test humanize"
+        for value, text in [
+                (0, '0'),
+                (1, '1'),
+                (5, '5'),
+                (10, '10'),
+                (50, '50'),
+                (100, '100'),
+                (1000, '1000'),
+                (1001, '1k'),
+                (1500, '1.5k'),
+                (1000000, '1000k'),
+                (1000001, '1M'),
+                (1010000, '1.01M'),
+                (10**33, '1000Q'),
+                (0.1, '0.1'),
+                (0.5, '0.5'),
+                (0.01, '0.01'),
+                (0.05, '0.05'),
+                (0.001, '1m'),
+                (0.0001, '0.1m'),
+                (0.000001, '1µ'),
+                (0.0000015, '1.5µ'),
+                (0.00000105, '1.05µ'),
+                (0.000001001, '1µ'),
+                (10**-33, '0.001q'),
+                ]:
+            with self.subTest(value=value):
+                self.assertEqual(humanize(value), text)
+            if value:
+                value *= -1
+                text = '-' + text
+                with self.subTest(value=value):
+                    self.assertEqual(humanize(value), text)

tryton/tests/test_common_domain_parser.py

@@ -529,31 +529,31 @@ class DomainParserTestCase(TestCase):
         double_null_ = ('e', None, None)
         for value, result in (
                 (['a'], ['a']),
-                (['a', 'or', 'b'], [['OR', 'a', 'b']]),
-                (['a', 'or', 'b', 'or', 'c'], [['OR', ['OR', 'a', 'b'], 'c']]),
-                (['a', 'b', 'or', 'c'], ['a', ['OR', 'b', 'c']]),
-                (['a', 'or', 'b', 'c'], [['OR', 'a', 'b'], 'c']),
+                (['a', '|', 'b'], [['OR', 'a', 'b']]),
+                (['a', '|', 'b', '|', 'c'], [['OR', ['OR', 'a', 'b'], 'c']]),
+                (['a', 'b', '|', 'c'], ['a', ['OR', 'b', 'c']]),
+                (['a', '|', 'b', 'c'], [['OR', 'a', 'b'], 'c']),
                 (['a', iter(['b', 'c'])], ['a', ['b', 'c']]),
                 (['a', iter(['b', 'c']), 'd'], ['a', ['b', 'c'], 'd']),
-                (['a', 'or', iter(['b', 'c'])], [['OR', 'a', ['b', 'c']]]),
-                (['a', 'or', iter(['b', 'c']), 'd'],
+                (['a', '|', iter(['b', 'c'])], [['OR', 'a', ['b', 'c']]]),
+                (['a', '|', iter(['b', 'c']), 'd'],
                     [['OR', 'a', ['b', 'c']], 'd']),
-                (['a', iter(['b', 'c']), 'or', 'd'],
+                (['a', iter(['b', 'c']), '|', 'd'],
                     ['a', ['OR', ['b', 'c'], 'd']]),
-                (['a', 'or', iter(['b', 'or', 'c'])],
+                (['a', '|', iter(['b', '|', 'c'])],
                     [['OR', 'a', [['OR', 'b', 'c']]]]),
-                (['or'], []),
-                (['or', 'a'], ['a']),
-                (['a', iter(['or', 'b'])], ['a', ['b']]),
-                (['a', 'or', 'or', 'b'], [['OR', 'a', 'b']]),
-                (['or', 'or', 'a'], ['a']),
-                (['or', 'or', 'a', 'b'], ['a', 'b']),
-                (['or', 'or', 'a', 'or', 'b'], [['OR', 'a', 'b']]),
-                (['a', iter(['b', 'or', 'c'])], ['a', [['OR', 'b', 'c']]]),
-                ([a, iter([b, ('or',), c])], [a, [['OR', b, c]]]),
-                (['a', iter(['b', 'or'])], ['a', [['OR', 'b']]]),
+                (['|'], []),
+                (['|', 'a'], ['a']),
+                (['a', iter(['|', 'b'])], ['a', ['b']]),
+                (['a', '|', '|', 'b'], [['OR', 'a', 'b']]),
+                (['|', '|', 'a'], ['a']),
+                (['|', '|', 'a', 'b'], ['a', 'b']),
+                (['|', '|', 'a', '|', 'b'], [['OR', 'a', 'b']]),
+                (['a', iter(['b', '|', 'c'])], ['a', [['OR', 'b', 'c']]]),
+                ([a, iter([b, ('|',), c])], [a, [['OR', b, c]]]),
+                (['a', iter(['b', '|'])], ['a', [['OR', 'b']]]),
                 ([null_], [null_]),
-                ([null_, 'or', double_null_], [['OR', null_, double_null_]]),
+                ([null_, '|', double_null_], [['OR', null_, double_null_]]),
                 ):
             self.assertEqual(
                 rlist(operatorize(iter(value))), result,
@@ -696,14 +696,14 @@ class DomainParserTestCase(TestCase):
             dom.string(['OR',
                 ('name', 'ilike', '%Doe%'),
                 ('name', 'ilike', '%Jane%')]),
-            'Name: Doe or Name: Jane')
+            'Name: Doe | Name: Jane')
         self.assertEqual(
             dom.string([
                 ('name', 'ilike', '%Doe%'),
                 ['OR',
                     ('name', 'ilike', '%John%'),
                     ('name', 'ilike', '%Jane%')]]),
-            'Name: Doe (Name: John or Name: Jane)')
+            'Name: Doe (Name: John | Name: Jane)')
         self.assertEqual(dom.string([]), '')
         self.assertEqual(
             dom.string([('surname', 'ilike', '%Doe%')]), '"(Sur)Name": Doe')
@@ -1121,10 +1121,10 @@ class DomainParserTestCase(TestCase):
         self.assertEqual(list(dom.completion('Name: !=foo')), [])
         self.assertEqual(list(dom.completion('')), ['Name: '])
         self.assertEqual(list(dom.completion(' ')), ['', 'Name: '])
-        self.assertEqual(list(dom.completion('Name: foo or')), ['Name: foo'])
+        self.assertEqual(list(dom.completion('Name: foo |')), ['Name: foo'])
         self.assertEqual(
-            list(dom.completion('Name: foo (Name: foo or N')),
-            ['Name: foo (Name: foo or Name: '])
+            list(dom.completion('Name: foo (Name: foo | N')),
+            ['Name: foo (Name: foo | Name: '])
 
     def test_completion_many2one(self):
         "Test completion many2one"

{tryton-6.6.8.dist-info → tryton-6.8.1.dist-info}/METADATA

@@ -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
 License-File: LICENSE
 Requires-Dist: pycairo
 Requires-Dist: python-dateutil