From be79570fb942a6ea03a95925161c8f18448e6c45 Mon Sep 17 00:00:00 2001
From: AjmalCybro <ajmal@cybrosys.in>
Date: Mon, 17 Feb 2025 13:10:00 +0530
Subject: [PATCH] Feb 17 [UPDT] : Updated
 'company_dependent_outgoing_mail_server'

---
 .../__init__.py                               |  7 ------
 .../__manifest__.py                           |  9 +-------
 .../doc/RELEASE_NOTES.md                      |  5 +++++
 .../models/ir_mail_server.py                  | 22 ++++++-------------
 .../static/src/js/get_company.js              | 15 -------------
 5 files changed, 13 insertions(+), 45 deletions(-)
 delete mode 100644 company_dependent_outgoing_mail_server/static/src/js/get_company.js

diff --git a/company_dependent_outgoing_mail_server/__init__.py b/company_dependent_outgoing_mail_server/__init__.py
index 494429a05..097bdb395 100644
--- a/company_dependent_outgoing_mail_server/__init__.py
+++ b/company_dependent_outgoing_mail_server/__init__.py
@@ -20,10 +20,3 @@
 #
 #############################################################################
 from . import models
-
-
-def _post_init_check_company(env):
-    """Set current company id to current.company.id key in
-    ir.config_parameter"""
-    env['ir.config_parameter'].sudo().set_param('current.company.id',
-                                                env.company.id)
diff --git a/company_dependent_outgoing_mail_server/__manifest__.py b/company_dependent_outgoing_mail_server/__manifest__.py
index 414b6476e..eb99a0017 100644
--- a/company_dependent_outgoing_mail_server/__manifest__.py
+++ b/company_dependent_outgoing_mail_server/__manifest__.py
@@ -21,7 +21,7 @@
 #############################################################################
 {
     'name': 'Company Dependent Outgoing Mail Server',
-    'version': '17.0.1.0.0',
+    'version': '17.0.1.1.1',
     'category': 'Extra Tools',
     'summary': 'Send outgoing mails from company depend outgoing mail server',
     'description': 'Configure multiple outgoing mail server and set each '
@@ -35,12 +35,6 @@
     'data': [
         'views/ir_mail_server_views.xml',
     ],
-    'assets': {
-        'web.assets_backend': [
-            'company_dependent_outgoing_mail_server/static/src/js/get_company'
-            '.js',
-        ],
-    },
     'images': [
         'static/description/banner.jpg',
     ],
@@ -48,5 +42,4 @@
     'installable': True,
     'auto_install': False,
     'application': False,
-    'post_init_hook': '_post_init_check_company',
 }
diff --git a/company_dependent_outgoing_mail_server/doc/RELEASE_NOTES.md b/company_dependent_outgoing_mail_server/doc/RELEASE_NOTES.md
index 5db7df5d7..f3909c1d1 100644
--- a/company_dependent_outgoing_mail_server/doc/RELEASE_NOTES.md
+++ b/company_dependent_outgoing_mail_server/doc/RELEASE_NOTES.md
@@ -4,3 +4,8 @@
 #### Version 17.0.1.0.0
 #### ADD
 - Initial commit for Company Dependent Outgoing Mail Server
+
+#### 08.04.2024
+#### Version 17.0.1.1.1
+#### UPDATE
+- updated python code and removed the usage of js
diff --git a/company_dependent_outgoing_mail_server/models/ir_mail_server.py b/company_dependent_outgoing_mail_server/models/ir_mail_server.py
index adc08e710..cda3316b2 100644
--- a/company_dependent_outgoing_mail_server/models/ir_mail_server.py
+++ b/company_dependent_outgoing_mail_server/models/ir_mail_server.py
@@ -34,21 +34,13 @@ class IrMailServer(models.Model):
     def _find_mail_server(self, email_from, mail_servers=None):
         """Function which finds appropriate outgoing email server for current
         company"""
+        current_id = self.env.company.id
         mail_server = self.env['ir.mail_server'].search([
-            (
-                'company_id.id', '=',
-                self.env['ir.config_parameter'].sudo().get_param(
-                    'current.company.id'))
-        ],
-            order='sequence asc', limit=1)
+            ('company_id', '=', current_id)
+        ], limit=1,order='sequence asc')
         res = super()._find_mail_server(email_from)
-        lst = list(res)
-        lst[0] = mail_server
-        res = tuple(lst)
+        if mail_server:
+            lst = list(res)
+            lst[0] = mail_server
+            res = tuple(lst)
         return res
-
-    @api.model
-    def get_company_id(self, current_company):
-        """Function called from orm and has current company id in argument"""
-        self.env['ir.config_parameter'].sudo().set_param('current.company.id',
-                                                         current_company)
diff --git a/company_dependent_outgoing_mail_server/static/src/js/get_company.js b/company_dependent_outgoing_mail_server/static/src/js/get_company.js
deleted file mode 100644
index 53d160984..000000000
--- a/company_dependent_outgoing_mail_server/static/src/js/get_company.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/** @odoo-module **/
-import { SwitchCompanyItem } from "@web/webclient/switch_company_menu/switch_company_menu";
-import { patch } from "@web/core/utils/patch";
-import { useService } from "@web/core/utils/hooks";
-/**Returns the current company id to function get_company_id through rpc call**/
-patch(SwitchCompanyItem.prototype,{
-    setup(){
-        this.orm = useService("orm");
-        return super.setup()
-    },
-    logIntoCompany() {
-        this.orm.call("ir.mail_server", "get_company_id", [this.props.company.id]);
-        return super.logIntoCompany();
-    }
-});