[MiG] port from 19

1.25.0

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/testserver.iml" filepath="$PROJECT_DIR$/.idea/testserver.iml" />
-    </modules>
-  </component>
-</project>

.idea/testserver.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="PyDocumentationSettings">
-    <option name="format" value="PLAIN" />
-    <option name="myDocStringFormat" value="Plain" />
-  </component>
-</module>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.idea/workspace.xml

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="417d3a9a-dab7-4fec-b2a8-da7eae112104" name="Changes" comment="" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="EmbeddingIndexingInfo">
-    <option name="cachedIndexableFilesCount" value="36" />
-    <option name="fileBasedEmbeddingIndicesEnabled" value="true" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="McpProjectServerCommands">
-    <commands />
-    <urls />
-  </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "associatedIndex": 7,
-  "fromUser": false
-}]]></component>
-  <component name="ProjectId" id="3GRtXrhb1Z1wz5HO20Plf2KjZjN" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ModuleVcsDetector.initialDetectionPerformed": "true",
-    "RunOnceActivity.MCP Project settings loaded": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
-    "codeWithMe.voiceChat.enabledByDefault": "false",
-    "com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true",
-    "git-widget-placeholder": "19.0",
-    "junie.onboarding.icon.badge.shown": "true",
-    "last_opened_file_path": "/home/dochse/development/testserver",
-    "nodejs_package_manager_path": "npm",
-    "to.speed.mode.migration.done": "true",
-    "vue.rearranger.settings.migration": "true"
-  }
-}]]></component>
-  <component name="SharedIndexes">
-    <attachedChunks>
-      <set>
-        <option value="bundled-python-sdk-50341a9f1f9c-c2ffad84badb-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-261.26222.68" />
-      </set>
-    </attachedChunks>
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="417d3a9a-dab7-4fec-b2a8-da7eae112104" name="Changes" comment="" />
-      <created>1783946253712</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1783946253712</updated>
-      <workItem from="1783946254947" duration="22000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-</project>

mailcatcher_menu/__manifest__.py

@@ -13,7 +13,7 @@
     'website': "http://www.open2bizz.tech",
     'category': 'Tools',
     'license': "AGPL-3",
-    'version': '19.0.1.0.0',
+    'version': '18.0.1.0.0',
     'module_type': 'official',
     'depends': ['mail','base',],
     'data': [

mailcatcher_menu/install_mailhog_as_service.sh

@@ -18,7 +18,7 @@ echo ""
 echo "==================================="
 echo "Install Go 1.24.3..."
 echo "==================================="
-GO_VERSION=1.24.3
+GO_VERSION=1.26.0
 wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz
 
 sudo rm -rf /usr/local/go

testserver_o2b/__manifest__.py

@@ -10,8 +10,8 @@
     'website': "http://www.open2bizz.tech",
     'category': 'Tools',
     'license': "AGPL-3",
-    'version': '19.0.1.0.0',
+    'version': '18.0.1.0.0',
-    'depends': ['mail', 'base', 'mailcatcher_menu'],
+    'depends': ['mail','base','mailcatcher_menu',],
     'data': [
         'views/templates.xml',
         'data/ir_cron.xml',

testserver_o2b/models/init_test.py

@@ -1,86 +1,74 @@
 # -*- coding: utf-8 -*-
 from odoo import tools
 from odoo import api, fields, models
-from datetime import datetime, timedelta
+from collections.abc import Mapping
+import logging
+_logger = logging.getLogger(__name__)
 import os
 import uuid
 import odoo
 
-import logging
-_logger = logging.getLogger(__name__)
-
 
 class IrLogging(models.Model):
     _inherit = 'ir.logging'
 
-    MAIL_SERVERS = (
-        ('127.0.0.1', '1025', 'Lokale mailcatcher', 'login', 'name', 't'),
-        ('192.168.78.199', '1025', 'Algemene mailcatcher', 'login', 'name', 'f'),
-        ('hnode6.openworx.nl', '1025', 'Algemene mailcatcher vanaf hnode4', 'login', 'name', 'f'),
-    )
-    EXPECTED_IP_PREFIX = '192.168.78.'
-    REPORT_URL = 'http://127.0.0.1:8069'
-    ENTERPRISE_CODE = 'M160129258730'
-    FILESTORE_CLEANUP_BATCH_LIMIT = 100
-
     def init(self):
-        database_uuid = str(uuid.uuid1())
+        db_id = uuid.uuid1()
-        _logger.debug(f"____ Database UID: {database_uuid}")
+        _logger.error(db_id)
-        self._reset_base_configuration(database_uuid)
+        self.env.cr.execute("""
-        _logger.debug(f"_____ reset_base_configuration ____")
+        UPDATE ir_mail_server set active = 'f';
-        self._remove_param_if_exists('web.base.url.freeze')
+        UPDATE fetchmail_server set active = 'f';
-        _logger.debug(f"______ remove_param_if_exists web.base.url.freeze ____")
+        UPDATE ir_cron set active = 'f';
-        self._create_param_if_missing('report.url', self.REPORT_URL)
+        DELETE FROM mail_mail;
-        _logger.debug(f"_______ create_param_if_missing report.url ____")
+        UPDATE ir_config_parameter set value = 'M160129258730' where key = 'database.enterprise_code';
+        UPDATE ir_config_parameter set value = (NOW() + INTERVAL '30 DAY') where key = 'database.expiration_date';        
+        UPDATE ir_config_parameter set value = '%s' where key = 'database.uuid';  
+        INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('127.0.0.1','1025','Lokale mailcatcher','login','name','t');         
+        INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('192.168.78.199','1025','Algemene mailcatcher','login','name','t');
+        INSERT INTO ir_mail_server(smtp_host,smtp_port,name,smtp_authentication,smtp_encryption,active) VALUES ('hnode6.openworx.nl','1025','Algemene mailcatcher vanaf hnode4','login','name','t');
+        """ %(db_id))
+        if self.env['ir.config_parameter'].search([('key','=','web.base.url.freeze')]):
+            self.env.cr.execute("""DELETE FROM ir_config_parameter WHERE key = 'web.base.url.freeze';""")
+        if not self.env['ir.config_parameter'].search([('key','=','report.url')]):
+            self.env.cr.execute("""INSERT INTO ir_config_parameter(key,value) VALUES ('report.url','http://127.0.0.1:8069');""")            
+        if self.env['ir.model'].search([('model','=','mail.partner.device')]):
+            self.env.cr.execute("""DELETE FROM mail_partner_device;""")
+        model = self.env['ir.model'].search([('model','=','delivery.carrier')])
+        if model:
+            field = self.env['ir.model.fields'].search([('name','=','prod_environment'),('model_id','=',model.id)])
+            if field:
+                self.env.cr.execute("""UPDATE delivery_carrier SET prod_environment = False WHERE id>0;""")
+        model = self.env['ir.model'].search([('model','=','payment.provider')])
+        if model:
+            field = self.env['ir.model.fields'].search([('name','=','state'),('model_id','=',model.id)])
+            if field:
+                self.env.cr.execute("""UPDATE payment_provider SET state = 'disabled' WHERE id>0;""") 
+        model = self.env['ir.model'].search([('model','=','account.online.link')])
+        if model:
+            field = self.env['ir.model.fields'].search([('id','>',0),('model_id','=',model.id)])
+            if field:
+                self.env.cr.execute("""DELETE FROM account_online_link WHERE id > 0;""") 
+        if self.env['ir.model'].search([('model','=','account.journal')]):
+            self.env.cr.execute("""UPDATE account_journal set bank_statements_source = 'undefined';""")
+        ip_ok = False
+        with os.popen("ip a") as f:
+            for x in f.readlines():
+                if float(x.find('192.168.78.')) > -1:
+                    ip_ok = True
+        if not ip_ok:
+            self.env.cr.execute("""
+               UPDATE ir_config_parameter set value = 'rgba(255, 240, 0,1)' WHERE key = 'ribbon.background.color';
+               UPDATE ir_config_parameter set value = '#000000' WHERE key = 'ribbon.color';
+               UPDATE ir_config_parameter set value = '!!! IP WRONG !!!' WHERE key = 'ribbon.name';
+            """)
+        ADDONS_PATH = odoo.tools.config['addons_path']
+        _logger.error(ADDONS_PATH)
+        for ap in ADDONS_PATH.split(','):
+            if ap[-10:] == 'testserver':
+                _logger.error(os.system('./%s/testserver.sh' %(ap)))
+
         self._disable_web_push_notifications()
         _logger.debug(f"_______ disable_web_push_notifications ____")
-        self._disable_delivery_carrier_prod_environment()
-        _logger.debug(f"_______ disable_delivery_carrier_prod_environment ____")
-        self._disable_payment_providers()
-        _logger.debug(f"_______ disable_delivery_carrier_prod_environment ____")
-        self._clear_account_online_links()
-        _logger.debug(f"_______ _disable_payment_providers ____")
-        self._reset_bank_statement_source()
-        _logger.debug(f"_______ _reset_bank_statement_source ____")
-        self._set_warning_ribbon_if_ip_is_invalid()
-        _logger.debug(f"_______ _set_warning_ribbon_if_ip_is_invalid ____")
-        self._run_testserver_script()
-        _logger.debug(f"_______ _run_testserver_script ____")
-
-    def _reset_base_configuration(self, database_uuid):
-        self.env.cr.execute("""
-            UPDATE ir_mail_server SET active = 'f';
-            UPDATE fetchmail_server SET active = 'f';
-            UPDATE ir_cron SET active = 'f';
-            DELETE FROM mail_mail;
-            UPDATE ir_config_parameter
-               SET value = %s
-             WHERE key = 'database.enterprise_code';
-            UPDATE ir_config_parameter
-               SET value = (NOW() + INTERVAL '30 DAY')
-             WHERE key = 'database.expiration_date';
-            UPDATE ir_config_parameter
-               SET value = %s
-             WHERE key = 'database.uuid';
-        """, (self.ENTERPRISE_CODE, database_uuid))
-
-        for mail_server in self.MAIL_SERVERS:
-            self.env.cr.execute("""
-                INSERT INTO ir_mail_server(
-                    smtp_host, smtp_port, name, smtp_authentication, smtp_encryption, active
-                ) VALUES (%s, %s, %s, %s, %s, %s);
-            """, mail_server)
-
-    def _remove_param_if_exists(self, key):
-        if self.env['ir.config_parameter'].search([('key', '=', key)], limit=1):
-            self.env.cr.execute("DELETE FROM ir_config_parameter WHERE key = %s;", (key,))
-
-    def _create_param_if_missing(self, key, value):
-        if not self.env['ir.config_parameter'].search([('key', '=', key)], limit=1):
-            self.env.cr.execute(
-                "INSERT INTO ir_config_parameter(key, value) VALUES (%s, %s);",
-                (key, value),
-            )
 
     def _disable_web_push_notifications(self):
         parameter = self.env['ir.config_parameter'].sudo()
@@ -90,117 +78,3 @@ class IrLogging(models.Model):
             ('key', 'in', ('mail.web_push_vapid_private_key', 'mail.web_push_vapid_public_key', 'mail.sfu_server_key'))])
         for parameter in parameters:
             parameter.sudo().unlink()
-        if self.env['ir.model'].search([('model', '=', 'mail.partner.device')]):
-            self.env.cr.execute("""DELETE FROM mail_partner_device;""")
-
-    def _model_has_field(self, model_name, field_name=None):
-        model = self.env['ir.model'].search([('model', '=', model_name)], limit=1)
-        if not model:
-            return False
-        if field_name is None:
-            return True
-        return bool(
-            self.env['ir.model.fields'].search(
-                [('name', '=', field_name), ('model_id', '=', model.id)],
-                limit=1,
-            )
-        )
-
-    def _disable_delivery_carrier_prod_environment(self):
-        if self._model_has_field('delivery.carrier', 'prod_environment'):
-            self.env.cr.execute(
-                "UPDATE delivery_carrier SET prod_environment = False WHERE id > 0;"
-            )
-
-    def _disable_payment_providers(self):
-        if self._model_has_field('payment.provider', 'state'):
-            self.env.cr.execute(
-                "UPDATE payment_provider SET state = 'disabled' WHERE id > 0;"
-            )
-
-    def _clear_account_online_links(self):
-        model = self.env['ir.model'].search([('model', '=', 'account.online.link')], limit=1)
-        if not model:
-            return
-
-        has_any_field = self.env['ir.model.fields'].search(
-            [('id', '>', 0), ('model_id', '=', model.id)],
-            limit=1,
-        )
-        if has_any_field:
-            self.env.cr.execute("DELETE FROM account_online_link WHERE id > 0;")
-
-    def _reset_bank_statement_source(self):
-        if self.env['ir.model'].search([('model', '=', 'account.journal')], limit=1):
-            self.env.cr.execute(
-                "UPDATE account_journal SET bank_statements_source = 'undefined';"
-            )
-
-    def _has_expected_ip(self):
-        with os.popen("ip a") as command_output:
-            return any(self.EXPECTED_IP_PREFIX in line for line in command_output.readlines())
-
-    def _set_warning_ribbon_if_ip_is_invalid(self):
-        if self._has_expected_ip():
-            return
-
-        self.env.cr.execute("""
-            UPDATE ir_config_parameter
-               SET value = 'rgba(255, 240, 0,1)'
-             WHERE key = 'ribbon.background.color';
-            UPDATE ir_config_parameter
-               SET value = '#000000'
-             WHERE key = 'ribbon.color';
-            UPDATE ir_config_parameter
-               SET value = '!!! IP WRONG !!!'
-             WHERE key = 'ribbon.name';
-        """)
-
-    def _run_testserver_script(self):
-        addons_path = odoo.tools.config['addons_path']
-        _logger.error(addons_path)
-
-        addons_list = addons_path.split(',') if isinstance(addons_path, str) else list(addons_path)
-        for addon_path in addons_list:
-            if addon_path.endswith('testserver'):
-                _logger.error(os.system(f'./{addon_path}/testserver.sh'))
-
-    def _get_unneeded_filestore_attachment_ids(self, limit):
-        self.env.cr.execute(
-            """
-            SELECT id
-              FROM ir_attachment
-             WHERE type = 'binary'
-               AND res_field IS NULL
-               AND store_fname IS NOT NULL
-               AND res_model not in ('sign.document','sign.request')
-               AND public = 'f'
-             ORDER BY COALESCE(file_size, 0) DESC, id ASC
-             LIMIT %s
-            """,
-            (limit,),
-        )
-        return [row[0] for row in self.env.cr.fetchall()]
-
-    def cleanup_unneeded_filestore_attachments(self, limit=FILESTORE_CLEANUP_BATCH_LIMIT):
-        limit = int(limit or 0)
-        if limit <= 0:
-            return 0
-
-        attachment_ids = self._get_unneeded_filestore_attachment_ids(limit)
-        if not attachment_ids:
-            return 0
-
-        self.env['ir.attachment'].sudo().browse(attachment_ids).unlink()
-        _logger.info('Deleted %s unneeded filestore attachments', len(attachment_ids))
-        return len(attachment_ids)
-
-    def set_db_param(self):
-        ## Script to set database expiration date, when enterprise and test env.
-        parameter = self.env['ir.config_parameter'].search(
-            [('key', '=', 'database.expiration_date')],
-            limit=1,
-        )
-        if parameter:
-            new_date_time = datetime.now() + timedelta(days=30)
-            parameter.write({'value': str(new_date_time)[:19]})

testserver_website_o2b/__manifest__.py

@@ -8,9 +8,8 @@
 
     'author': "Open2bizz",
     'website': "http://www.open2bizz.tech",
-    'category': 'Tools',
+    'category': 'Uncategorized',
-    'license': "AGPL-3",
+    'version': '18.0.1.0.0',
-    'version': '19.0.1.0.0',
     'depends': ['testserver_o2b','website'],
     'data': [
         'views/templates.xml',