[IMP] web: replace property field icon with tooltip

PURPOSE
The purpose of this task is to improve the interface by removing the
fa-building icon which is automatically appended by the property field
(i.e. company-dependent) and, instead, indicates that a field has
company-specific values in the tooltip of the field.

closes odoo/odoo#52313

Taskid: 2266519
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>

2 files changed, 11 insertions, 14 deletions

diff --git a/addons/web/static/src/js/views/basic/basic_renderer.js b/addons/web/static/src/js/views/basic/basic_renderer.js
index 322b284a742..7a9693c11fc 100644
--- a/addons/web/static/src/js/views/basic/basic_renderer.js
+++ b/addons/web/static/src/js/views/basic/basic_renderer.js
@@ -11,6 +11,7 @@ var AbstractRenderer = require('web.AbstractRenderer');
 var config = require('web.config');
 var core = require('web.core');
 var dom = require('web.dom');
+const session = require('web.session');
 const utils = require('web.utils');
 var widgetRegistry = require('web.widget_registry');
 
@@ -18,6 +19,7 @@ const { WidgetAdapterMixin } = require('web.OwlCompatibility');
 const FieldWrapper = require('web.FieldWrapper');
 
 var qweb = core.qweb;
+const _t = core._t;
 
 var BasicRenderer = AbstractRenderer.extend(WidgetAdapterMixin, {
     custom_events: {
@@ -415,10 +417,14 @@ var BasicRenderer = AbstractRenderer.extend(WidgetAdapterMixin, {
     _getTooltipOptions: function (widget) {
         return {
             title: function () {
-                return qweb.render('WidgetLabel.tooltip', {
-                    debug: config.isDebug(),
-                    widget: widget,
-                });
+                let help = widget.attrs.help || widget.field.help || '';
+                if (session.display_switch_company_menu && widget.field.company_dependent) {
+                    help += (help ? '\n\n' : '') + _t('Values set here are company-specific.');
+                }
+                const debug = config.isDebug();
+                if (help || debug) {
+                    return qweb.render('WidgetLabel.tooltip', { debug, help, widget });
+                }
             }
         };
     },
diff --git a/addons/web/static/src/js/views/form/form_renderer.js b/addons/web/static/src/js/views/form/form_renderer.js
index 4a5cc2d3f94..fb8e908c0e1 100644
--- a/addons/web/static/src/js/views/form/form_renderer.js
+++ b/addons/web/static/src/js/views/form/form_renderer.js
@@ -836,13 +836,6 @@ var FormRenderer = BasicRenderer.extend({
             for: this._getIDForLabel(fieldName),
             text: text,
         });
-        const field = this.state.fields[fieldName];
-        if (field && field.company_dependent) {
-            $result.append($('<span>', {
-                class: 'fa fa-sm fa-building-o ml-2',
-                title: _t("Values set here are company-specific"),
-            }));
-        }
         if (node.tag === 'label') {
             this._handleAttributes($result, node);
         }
@@ -1032,9 +1025,7 @@ var FormRenderer = BasicRenderer.extend({
             var $widgets = self.$('.o_field_widget[name=' + widget.name + ']');
             var $label = idForLabel ? self.$('.o_form_label[for=' + idForLabel + ']') : $();
             $label = $label.eq($widgets.index(widget.$el));
-            if (config.isDebug() || widget.attrs.help || widget.field.help) {
-                self._addFieldTooltip(widget, $label);
-            }
+            self._addFieldTooltip(widget, $label);
             if (widget.attrs.widget === 'upgrade_boolean') {
                 // this widget needs a reference to its $label to be correctly
                 // rendered