tryton 6.0.36__tar.gz → 6.0.38__tar.gz

{tryton-6.0.36 → tryton-6.0.38}/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 6.0.38 - 2024-04-17
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+Version 6.0.37 - 2024-04-04
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 6.0.36 - 2024-02-15
 ---------------------------
 * Bug fixes (see mercurial logs for details)

{tryton-6.0.36 → tryton-6.0.38}/COPYRIGHT

@@ -5,7 +5,7 @@ Copyright (C) 2007-2024 Cédric Krier.
 Copyright (C) 2008-2011 Udo Spallek.
 Copyright (C) 2008-2011 virtual things - Preisler & Spallek GbR.
 Copyright (C) 2008-2024 B2CK SPRL.
-Copyright (C) 2010-2023 Nicolas Évrard.
+Copyright (C) 2010-2024 Nicolas Évrard.
 Copyright (C) 2011-2012 Rodrigo Hübner.
 Copyright (C) 2012-2013 Antoine Smolders.
 Copyright (C) 2020-2021 Maxime Richez

{tryton-6.0.36 → tryton-6.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tryton
-Version: 6.0.36
+Version: 6.0.38
 Summary: Tryton desktop client
 Home-page: http://www.tryton.org/
 Download-URL: http://downloads.tryton.org/6.0/
@@ -8,7 +8,7 @@ Author: Tryton
 Author-email: bugs@tryton.org
 License: GPL-3
 Project-URL: Bug Tracker, https://bugs.tryton.org/
-Project-URL: Documentation, https://docs.tryton.org/
+Project-URL: Documentation, https://docs.tryton.org/latest/client-desktop/
 Project-URL: Forum, https://www.tryton.org/forum
 Project-URL: Source Code, https://hg.tryton.org/tryton
 Keywords: business application ERP

{tryton-6.0.36 → tryton-6.0.38}/bin/tryton

@@ -15,21 +15,21 @@ if hasattr(sys, 'frozen'):
         sys.stdout = open(os.devnull, 'w')
         sys.stderr = open(os.devnull, 'w')
     prefix = os.path.dirname(sys.executable)
+    share = os.path.join(prefix, 'share')
     os.environ['GTK_EXE_PREFIX'] = prefix
     os.environ['GTK_DATA_PREFIX'] = prefix
     os.environ['EV_BACKENDS_DIR'] = prefix
-    os.environ['XDG_DATA_DIRS'] = os.path.join(prefix, 'share')
-    etc = os.path.join(prefix, 'etc')
+    os.environ['XDG_DATA_DIRS'] = share
     os.environ['GDK_PIXBUF_MODULE_FILE'] = os.path.join(
-            etc, 'gtk-3.0', 'gdk-pixbuf.loaders')
+            share, 'gtk-3.0', 'gdk-pixbuf.loaders')
     os.environ['GTK_IM_MODULE_FILE'] = os.path.join(
-            etc, 'gtk-3.0', 'gtk.immodules')
+            share, 'gtk-3.0', 'gtk.immodules')
     os.environ['GI_TYPELIB_PATH'] = os.path.join(
             prefix, 'lib', 'girepository-1.0')
     os.environ.setdefault('SSL_CERT_FILE',
-        os.path.join(etc, 'ssl', 'cert.pem'))
+        os.path.join(share, 'ssl', 'cert.pem'))
     os.environ.setdefault('SSL_CERT_DIR',
-        os.path.join(etc, 'ssl', 'certs'))
+        os.path.join(share, 'ssl', 'certs'))
 
     if sys.platform == 'win32':
         # cx_freeze >= 5 put python modules under lib directory

{tryton-6.0.36 → tryton-6.0.38}/doc/conf.py

@@ -8,9 +8,8 @@ if base_url:
     modules_url = base_url + '/modules-{module}/'
     trytond_url = base_url + '/server/'
 else:
-    modules_url = (
-        'https://docs.tryton.org/projects/modules-{module}/en/{series}/')
-    trytond_url = 'https://docs.tryton.org/projects/server/en/{series}/'
+    modules_url = 'https://docs.tryton.org/${series}/modules-{module}/'
+    trytond_url = 'https://docs.tryton.org/${series}/server/'
 
 
 def get_info():

{tryton-6.0.36 → tryton-6.0.38}/setup-freeze.py

@@ -23,8 +23,6 @@ except IOError:
 
 
 include_files = [
-    (os.path.join('tryton', 'data'), 'data'),
-    (os.path.join('tryton', 'plugins'), 'plugins'),
     (os.path.join(sys.prefix, 'share', 'glib-2.0', 'schemas'),
         os.path.join('share', 'glib-2.0', 'schemas')),
     (os.path.join(sys.prefix, 'lib', 'gtk-3.0'),
@@ -33,14 +31,12 @@ include_files = [
         os.path.join('lib', 'gdk-pixbuf-2.0')),
     (os.path.join(sys.prefix, 'lib', 'evince'),
         os.path.join('lib', 'evince')),
-    (os.path.join(sys.prefix, 'share', 'locale'),
-        os.path.join('share', 'locale')),
     (os.path.join(sys.prefix, 'share', 'icons', 'Adwaita'),
         os.path.join('share', 'icons', 'Adwaita')),
     (os.path.join(sys.platform, 'gtk-3.0', 'gtk.immodules'),
-        os.path.join('etc', 'gtk-3.0', 'gtk.immodules')),
+        os.path.join('share', 'gtk-3.0', 'gtk.immodules')),
     (os.path.join(sys.platform, 'gtk-3.0', 'gdk-pixbuf.loaders'),
-        os.path.join('etc', 'gtk-3.0', 'gdk-pixbuf.loaders')),
+        os.path.join('share', 'gtk-3.0', 'gdk-pixbuf.loaders')),
     ]
 
 required_gi_namespaces = [
@@ -70,7 +66,10 @@ def replace_path(match):
     libs = [os.path.basename(p) for p in match.group(1).split(',')]
     required_libs.update(libs)
     if sys.platform == 'darwin':
-        libs = [os.path.join('@executable_path', l) for l in libs]
+        prefix = '@executable_path/lib'
+    else:
+        prefix = 'lib'
+    libs = [os.path.join(prefix, l) for l in libs]
     return 'shared-library="%s"' % ','.join(libs)
 
 
@@ -109,14 +108,14 @@ for lib in required_libs:
             break
     else:
         raise Exception('%s not found' % lib)
-    include_files.append((path, lib))
+    include_files.append((path, os.path.join('lib', lib)))
 
 ssl_paths = ssl.get_default_verify_paths()
 include_files.append(
-    (ssl_paths.openssl_cafile, os.path.join('etc', 'ssl', 'cert.pem')))
+    (ssl_paths.openssl_cafile, os.path.join('share', 'ssl', 'cert.pem')))
 if os.path.exists(ssl_paths.openssl_capath):
     include_files.append(
-        (ssl_paths.openssl_capath, os.path.join('etc', 'ssl', 'certs')))
+        (ssl_paths.openssl_capath, os.path.join('share', 'ssl', 'certs')))
 
 version = Popen(
     'python3 ./setup.py --version', stdout=PIPE, shell=True, encoding='utf-8'

{tryton-6.0.36 → tryton-6.0.38}/setup.py

@@ -80,7 +80,7 @@ dist = setup(name=name,
     download_url=download_url,
     project_urls={
         "Bug Tracker": 'https://bugs.tryton.org/',
-        "Documentation": 'https://docs.tryton.org/',
+        "Documentation": 'https://docs.tryton.org/latest/client-desktop/',
         "Forum": 'https://www.tryton.org/forum',
         "Source Code": 'https://hg.tryton.org/tryton',
         },

{tryton-6.0.36 → tryton-6.0.38}/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.0.36"
+__version__ = "6.0.38"
 import gi
 import locale
 

{tryton-6.0.36 → tryton-6.0.38}/tryton/config.py

@@ -159,8 +159,6 @@ class ConfigManager(object):
 
 CONFIG = ConfigManager()
 CURRENT_DIR = os.path.dirname(__file__)
-if hasattr(sys, 'frozen'):
-    CURRENT_DIR = os.path.dirname(sys.executable)
 if not isinstance(CURRENT_DIR, str):
     CURRENT_DIR = str(CURRENT_DIR, sys.getfilesystemencoding())
 

{tryton-6.0.36 → tryton-6.0.38}/tryton/gui/window/view_form/view/graph_gtk/graph.py

@@ -12,6 +12,7 @@ import cairo
 from gi.repository import Gdk, Gtk
 
 import tryton.rpc as rpc
+from tryton import common
 from tryton.action import Action
 from tryton.common import hex2rgb, generateColorscheme, COLOR_SCHEMES
 from tryton.config import CONFIG
@@ -386,7 +387,8 @@ class Graph(Gtk.DrawingArea):
                     if isinstance(value, datetime.timedelta):
                         value = value.total_seconds()
                     self.datas[x][key] += float(value or 0)
-        date_format = self.view.screen.context.get('date_format', '%x')
+        date_format = common.date_format(
+            self.view.screen.context.get('date_format'))
         datetime_format = date_format + ' %X'
         if isinstance(minx, datetime.datetime):
             date = minx

{tryton-6.0.36 → tryton-6.0.38}/tryton/gui/window/win_form.py

@@ -445,7 +445,7 @@ class WinForm(NoModal, InfoBar):
                 record.modified_fields.setdefault('id')
             result = False
         else:
-            result = response_id not in cancel_responses
+            result = (response_id not in cancel_responses) and not readonly
         self.callback(result)
         self.destroy()
 

{tryton-6.0.36 → tryton-6.0.38}/tryton/pyson.py

@@ -188,7 +188,7 @@ class Not(PYSON):
 
     @staticmethod
     def eval(dct, context):
-        return not dct['v']
+        return not Bool(dct['v']).eval(dct, context)
 
 
 class Bool(PYSON):

{tryton-6.0.36 → tryton-6.0.38}/tryton.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tryton
-Version: 6.0.36
+Version: 6.0.38
 Summary: Tryton desktop client
 Home-page: http://www.tryton.org/
 Download-URL: http://downloads.tryton.org/6.0/
@@ -8,7 +8,7 @@ Author: Tryton
 Author-email: bugs@tryton.org
 License: GPL-3
 Project-URL: Bug Tracker, https://bugs.tryton.org/
-Project-URL: Documentation, https://docs.tryton.org/
+Project-URL: Documentation, https://docs.tryton.org/latest/client-desktop/
 Project-URL: Forum, https://www.tryton.org/forum
 Project-URL: Source Code, https://hg.tryton.org/tryton
 Keywords: business application ERP

{tryton-6.0.36 → tryton-6.0.38}/tryton.egg-info/SOURCES.txt

@@ -1,4 +1,3 @@
-.readthedocs.yaml
 CHANGELOG
 COPYRIGHT
 LICENSE

tryton-6.0.36/.readthedocs.yaml

@@ -1,7 +0,0 @@
-version: 2
-build:
-  os: ubuntu-22.04
-  tools:
-    python: "3"
-sphinx:
-  configuration: tryton/doc/conf.py