trytond 7.2.2__tar.gz → 7.2.4__tar.gz

{trytond-7.2.2 → trytond-7.2.4}/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 7.2.4 - 2024-06-15
+--------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+Version 7.2.3 - 2024-06-02
+--------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 7.2.2 - 2024-05-15
 --------------------------
 * Bug fixes (see mercurial logs for details)

{trytond-7.2.2 → trytond-7.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trytond
-Version: 7.2.2
+Version: 7.2.4
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Download-URL: http://downloads.tryton.org/7.2/

{trytond-7.2.2 → trytond-7.2.4}/trytond/__init__.py

@@ -13,7 +13,7 @@ try:
 except ImportError:
     requests_utils = None
 
-__version__ = "7.2.2"
+__version__ = "7.2.4"
 
 os.environ.setdefault(
     'TRYTOND_APPNAME',

{trytond-7.2.2 → trytond-7.2.4}/trytond/convert.py

@@ -373,7 +373,8 @@ class Fs2bdAccessor:
         Model = self.pool.get(model_name)
         if not ids:
             ids = list(self.browserecord[module][model_name].keys())
-        models = Model.browse(ids)
+        with Transaction().set_context(language='en'):
+            models = Model.browse(ids)
         for model in models:
             if model.id in self.browserecord[module][model_name]:
                 for cache in Transaction().cache.values():
@@ -755,7 +756,8 @@ class TrytondXmlHandler(sax.handler.ContentHandler):
             record = self.fs2db.get_browserecord(
                 module, Model.__name__, record.id)
             if not record:
-                record = Model(record.id)
+                with Transaction().set_context(language='en'):
+                    record = Model(record.id)
             for key in values:
                 values[key] = self._clean_value(key, record)
 

{trytond-7.2.2 → trytond-7.2.4}/trytond/model/fields/function.py

@@ -130,7 +130,16 @@ class Function(Field):
                 else:
                     return {n: convert_dict(values[n], n) for n in name}
             else:
-                return {r.id: convert(method(r, name), name) for r in records}
+                if isinstance(name, str):
+                    return {
+                        r.id: convert(method(r, name), name) for r in records}
+                else:
+                    results = {n: {} for n in name}
+                    for r in records:
+                        values = method(r, name)
+                        for n in name:
+                            results[n][r.id] = values[n]
+                    return results
 
         def convert(value, name):
             from ..model import Model as BaseModel

{trytond-7.2.2 → trytond-7.2.4}/trytond/model/modelstorage.py

@@ -1069,7 +1069,7 @@ class ModelStorage(Model):
                     row[field[0][:-3]] = res
                 elif is_prefix_len and ':lang=' in field[-1]:
                     field_name, lang = field[-1].split(':lang=')
-                    translate.setdefault(lang, {})[field_name] = value or False
+                    translate.setdefault(lang, {})[field_name] = value
                 elif is_prefix_len and prefix == field[:-1]:
                     field_name = field[-1]
                     this_field_def = fields_def[field_name]

{trytond-7.2.2 → trytond-7.2.4}/trytond/modules/__init__.py

@@ -162,6 +162,14 @@ def load_module_graph(graph, pool, update=None, lang=None, indexes=True):
             module2state.update(cursor)
         modules = set(modules)
 
+        new_modules = modules - module2state.keys()
+        if new_modules:
+            cursor.execute(*ir_module.insert(
+                    [ir_module.name, ir_module.state,
+                        ir_module.create_uid, ir_module.create_date],
+                    [[m, 'not activated', 0, CurrentTimestamp()]
+                        for m in new_modules]))
+
         for node in graph:
             module = node.name
             if module not in MODULES:
@@ -378,10 +386,10 @@ def load_modules(
                 Module.update_list()
 
     if not Transaction().connection:
-        with Transaction().start(database_name, 0):
+        with Transaction().start(database_name, 0, readonly=not update):
             _load_modules(update)
     else:
-        with Transaction().new_transaction(), \
+        with Transaction().new_transaction(readonly=not update), \
                 Transaction().set_user(0), \
                 Transaction().reset_context():
             _load_modules(update)

{trytond-7.2.2 → trytond-7.2.4}/trytond/tools/email_.py

@@ -1,6 +1,8 @@
 # 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 email.header import Header
+
+import re
+from email.charset import Charset
 from email.utils import formataddr, parseaddr
 
 from trytond.pool import Pool
@@ -68,7 +70,7 @@ try:
             emailinfo = _validate_email(
                 email, check_deliverability=False,
                 test_environment=Pool.test)
-            return emailinfo.ascii_email
+            return emailinfo.ascii_email or emailinfo.normalized
         except EmailNotValidError:
             return email
 
@@ -87,7 +89,33 @@ except ImportError:
         pass
 
 
-def format_address(email, name=None):
+# Copy of email.utils.formataddr but without the ASCII enforcement
+specialsre = re.compile(r'[][\\()<>@,:;".]')
+escapesre = re.compile(r'[\\"]')
+
+
+def _formataddr(pair, charset='utf-8'):
+    name, address = pair
     if name:
-        name = str(Header(name, 'utf-8'))
-    return formataddr((name, convert_ascii_email(email)))
+        try:
+            name.encode('ascii')
+        except UnicodeEncodeError:
+            if isinstance(charset, str):
+                charset = Charset(charset)
+            encoded_name = charset.header_encode(name)
+            return "%s <%s>" % (encoded_name, address)
+        else:
+            quotes = ''
+            if specialsre.search(name):
+                quotes = '"'
+            name = escapesre.sub(r'\\\g<0>', name)
+            return '%s%s%s <%s>' % (quotes, name, quotes, address)
+    return address
+
+
+def format_address(email, name=None):
+    pair = (name, convert_ascii_email(email))
+    try:
+        return formataddr(pair)
+    except UnicodeEncodeError:
+        return _formataddr(pair)

{trytond-7.2.2 → trytond-7.2.4}/trytond/transaction.py

@@ -231,9 +231,7 @@ class Transaction(object):
             if transactions.count(self) == 1:
                 try:
                     try:
-                        # Transaction must be commited to send notifications
-                        if commit and (not self.readonly
-                                or self.database.has_channel()):
+                        if commit and not self.readonly:
                             self.commit()
                         else:
                             self.rollback()

{trytond-7.2.2 → trytond-7.2.4}/trytond.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trytond
-Version: 7.2.2
+Version: 7.2.4
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Download-URL: http://downloads.tryton.org/7.2/