diff --git a/ext/odoo/addons/web/models/ir_http.py b/ext/odoo/addons/web/models/ir_http.py index 23a87f4c..a5330448 100644 --- a/ext/odoo/addons/web/models/ir_http.py +++ b/ext/odoo/addons/web/models/ir_http.py @@ -35,7 +35,8 @@ class Http(models.AbstractModel): "username": user.login, "company_id": request.env.user.company_id.id if request.session.uid else None, "partner_id": request.env.user.partner_id.id if request.session.uid and request.env.user.partner_id else None, - "user_companies": {'current_company': (user.company_id.id, user.company_id.name), 'allowed_companies': [(comp.id, comp.name) for comp in user.company_ids]} if display_switch_company_menu else False, +# "user_companies": {'current_company': (user.company_id.id, user.company_id.name), 'allowed_companies': [(comp.id, comp.name, comp.partner_description or '') for comp in user.company_ids]} if display_switch_company_menu else False, + "user_companies": {'current_company': (user.company_id.id, user.company_id.name), 'allowed_companies': [(comp.id, comp.portal_prefix or '----', comp.partner_description or comp.name) for comp in user.company_ids]} if display_switch_company_menu else False, "currencies": self.get_currencies(), "web.base.url": self.env['ir.config_parameter'].sudo().get_param('web.base.url', default=''), } diff --git a/ext/odoo/addons/web/static/src/js/widgets/switch_company_menu.js b/ext/odoo/addons/web/static/src/js/widgets/switch_company_menu.js index a51f16eb..985d96ce 100644 --- a/ext/odoo/addons/web/static/src/js/widgets/switch_company_menu.js +++ b/ext/odoo/addons/web/static/src/js/widgets/switch_company_menu.js @@ -47,7 +47,7 @@ var SwitchCompanyMenu = Widget.extend({ } else { a = ''; } - companies_list += '
  • ' + a + company[1] + '
  • '; + companies_list += '
  • ' + a + company[1] + ' ' + company[2] + '
  • '; }); self.$('.dropdown-menu').html(companies_list); return this._super(); diff --git a/ext/odoo/odoo/addons/base/res/res_partner.py b/ext/odoo/odoo/addons/base/res/res_partner.py index d62eddde..c84cf56d 100644 --- a/ext/odoo/odoo/addons/base/res/res_partner.py +++ b/ext/odoo/odoo/addons/base/res/res_partner.py @@ -158,7 +158,7 @@ class Partner(models.Model): help='The internal user that is in charge of communicating with this contact if any.') vat = fields.Char(string='TIN', help="Tax Identification Number. " "Fill it if the company is subjected to taxes. " - "Used by the some of the legal statements.") + "Used by the some of the legal statements.",copy=False) bank_ids = fields.One2many('res.partner.bank', 'partner_id', string='Banks') website = fields.Char(help="Website of Partner or Company") comment = fields.Text(string='Notes')