From 085d7d484df2ed17ad64f9f709109faa841df756 Mon Sep 17 00:00:00 2001 From: "Julien Carion (juca)" Date: Thu, 23 Mar 2023 13:58:55 +0000 Subject: [PATCH] [REF] base: Remove res.company favicon field This commit simply removes the res.company favicon field and every related code because the feature is obsolete closes odoo/odoo#116367 Related: odoo/upgrade#4469 Signed-off-by: Pierre Paridans (app) --- addons/web/static/src/start.js | 7 ----- odoo/addons/base/data/res_company_data.xml | 1 - odoo/addons/base/models/res_company.py | 31 -------------------- odoo/addons/base/populate/res_company.py | 2 +- odoo/addons/base/views/res_company_views.xml | 1 - 5 files changed, 1 insertion(+), 41 deletions(-) diff --git a/addons/web/static/src/start.js b/addons/web/static/src/start.js index 1fc2b0dc685..abe8fb3611e 100644 --- a/addons/web/static/src/start.js +++ b/addons/web/static/src/start.js @@ -63,11 +63,4 @@ export async function startWebClient(Webclient) { // delete odoo.debug; // FIXME: some legacy code rely on this odoo.__WOWL_DEBUG__ = { root }; odoo.isReady = true; - - // Update Favicons - const favicon = `/web/image/res.company/${env.services.company.currentCompany.id}/favicon`; - const icons = document.querySelectorAll("link[rel*='icon']"); - for (const icon of icons) { - icon.href = favicon; - } } diff --git a/odoo/addons/base/data/res_company_data.xml b/odoo/addons/base/data/res_company_data.xml index b37f3d22b45..407f9ba6bde 100644 --- a/odoo/addons/base/data/res_company_data.xml +++ b/odoo/addons/base/data/res_company_data.xml @@ -5,7 +5,6 @@ My Company - diff --git a/odoo/addons/base/models/res_company.py b/odoo/addons/base/models/res_company.py index 2b9008d82ea..8fb9c6dc4ca 100644 --- a/odoo/addons/base/models/res_company.py +++ b/odoo/addons/base/models/res_company.py @@ -30,32 +30,6 @@ class Company(models.Model): def _default_currency_id(self): return self.env.user.company_id.currency_id - def _get_default_favicon(self, original=False): - img_path = get_resource_path('web', 'static/img/favicon.ico') - with tools.file_open(img_path, 'rb') as f: - if original: - return base64.b64encode(f.read()) - # Modify the source image to add a colored bar on the bottom - # This could seem overkill to modify the pixels 1 by 1, but - # Pillow doesn't provide an easy way to do it, and this - # is acceptable for a 16x16 image. - color = (randrange(32, 224, 24), randrange(32, 224, 24), randrange(32, 224, 24)) - original = Image.open(f) - new_image = Image.new('RGBA', original.size) - height = original.size[1] - width = original.size[0] - bar_size = 1 - for y in range(height): - for x in range(width): - pixel = original.getpixel((x, y)) - if height - bar_size <= y + 1 <= height: - new_image.putpixel((x, y), (color[0], color[1], color[2], 255)) - else: - new_image.putpixel((x, y), (pixel[0], pixel[1], pixel[2], pixel[3])) - stream = io.BytesIO() - new_image.save(stream, format="ICO") - return base64.b64encode(stream.getvalue()) - name = fields.Char(related='partner_id.name', string='Company Name', required=True, store=True, readonly=False) active = fields.Boolean(default=True) sequence = fields.Integer(help='Used to order Companies in the company switcher', default=10) @@ -91,7 +65,6 @@ class Company(models.Model): external_report_layout_id = fields.Many2one('ir.ui.view', 'Document Template') base_onboarding_company_state = fields.Selection([ ('not_done', "Not done"), ('just_done', "Just done"), ('done', "Done")], string="State of the onboarding company step", default='not_done') - favicon = fields.Binary(string="Company Favicon", help="This field holds the image used to display a favicon for a given company.", default=_get_default_favicon) font = fields.Selection([("Lato", "Lato"), ("Roboto", "Roboto"), ("Open_Sans", "Open Sans"), ("Montserrat", "Montserrat"), ("Oswald", "Oswald"), ("Raleway", "Raleway"), ('Tajawal', 'Tajawal')], default="Lato") primary_color = fields.Char() secondary_color = fields.Char() @@ -198,10 +171,6 @@ class Company(models.Model): @api.model_create_multi def create(self, vals_list): - # add default favicon - for vals in vals_list: - if not vals.get('favicon'): - vals['favicon'] = self._get_default_favicon() # create missing partners no_partner_vals_list = [ diff --git a/odoo/addons/base/populate/res_company.py b/odoo/addons/base/populate/res_company.py index 3f26ef176aa..b4671dc6f19 100644 --- a/odoo/addons/base/populate/res_company.py +++ b/odoo/addons/base/populate/res_company.py @@ -20,7 +20,7 @@ class Partner(models.Model): # Activate currency to avoid fail iterator (self.env.ref('base.USD') | self.env.ref('base.EUR')).active = True - # remaining: paperformat_id, parent_id, partner_id, favicon, font, report_header, external_report_layout_id, report_footer + # remaining: paperformat_id, parent_id, partner_id, font, report_header, external_report_layout_id, report_footer def get_name(values=None, counter=0, **kwargs): return 'company_%s_%s' % (counter, self.env['res.currency'].browse(values['currency_id']).name) diff --git a/odoo/addons/base/views/res_company_views.xml b/odoo/addons/base/views/res_company_views.xml index efe65145650..d075ae85700 100644 --- a/odoo/addons/base/views/res_company_views.xml +++ b/odoo/addons/base/views/res_company_views.xml @@ -39,7 +39,6 @@ -