From 5f22c8bf7f58e327b0cd818a533a9ea20111a98a Mon Sep 17 00:00:00 2001
From: Joseph Caburnay <jcb@odoo.com>
Date: Tue, 26 Jul 2022 11:58:24 +0000
Subject: [PATCH] [FIX] point_of_sale: pos config label misalign

Also includes a fix that properly opens the pos ui when clicking
the button (link) "Click here to close the session".

closes odoo/odoo#96765

Signed-off-by: Trinh Jacky (trj) <trj@odoo.com>
---
 addons/point_of_sale/models/res_config_settings.py       | 5 ++++-
 addons/point_of_sale/views/res_config_settings_views.xml | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/models/res_config_settings.py b/addons/point_of_sale/models/res_config_settings.py
index 0c91aadef0a..28bcf92e74d 100644
--- a/addons/point_of_sale/models/res_config_settings.py
+++ b/addons/point_of_sale/models/res_config_settings.py
@@ -173,7 +173,10 @@ class ResConfigSettings(models.TransientModel):
         }
 
     def pos_open_ui(self):
-        return self.pos_config_id.open_ui()
+        if self._context.get('pos_config_id'):
+            pos_config_id = self._context['pos_config_id'][0]
+            pos_config = self.env['pos.config'].browse(pos_config_id)
+            return pos_config.open_ui()
 
     @api.model
     def _is_cashdrawer_displayed(self, res_config):
diff --git a/addons/point_of_sale/views/res_config_settings_views.xml b/addons/point_of_sale/views/res_config_settings_views.xml
index 6336ab2e1ca..a5b333d14d4 100644
--- a/addons/point_of_sale/views/res_config_settings_views.xml
+++ b/addons/point_of_sale/views/res_config_settings_views.xml
@@ -23,7 +23,7 @@
                             <div class="o_setting_right_pane border-left-0 ms-0 ps-0">
                                 <div class="content-group">
                                     <div class="row mt8">
-                                        <label class="col-lg-3 ps-0" string="Point of Sale" for="pos_config_id"/>
+                                        <label class="col align-self-center ml8" string="Point of Sale" for="pos_config_id"/>
                                         <field name="pos_config_id" options="{'no_open': True, 'no_create': True}" title="Settings on this page will apply to this point of sale."/>
                                         <button name="action_pos_config_create_new" type="object" string="+ New Shop" class="col btn-link ms-2" style="line-height: 0.5;"/>
                                     </div>
@@ -46,7 +46,7 @@
                                 <!-- Wrap the warnings in an o_setting_box so that it doesn't show in the search. -->
                                 <div class="o_notification_alert alert alert-warning" attrs="{'invisible':[('pos_has_active_session','=', False)]}" role="alert">
                                     A session is currently opened for this PoS. Some settings can only be changed after the session is closed.
-                                    <button class="btn" style="padding:0" name="pos_open_ui" type="object">Click here to close the session</button>
+                                    <button class="btn-link" style="padding:0" name="pos_open_ui" type="object" context="{'pos_config_id': pos_config_id}">Click here to close the session</button>
                                 </div>
                                 <div class="o_notification_alert alert alert-warning" attrs="{'invisible': [('pos_company_has_template','=',True)]}" role="alert">
                                     There is no Chart of Accounts configured on the company. Please go to the invoicing settings to install a Chart of Accounts.