From 26dea77c720d4daddf7fb875ccc690bb51edfc09 Mon Sep 17 00:00:00 2001
From: Julien Mougenot <jum@odoo.com>
Date: Mon, 22 Feb 2021 11:57:54 +0100
Subject: [PATCH] [REF] point_of_sale: clean up assets views

This commit handles 2 things:

- The line odoo._modules = <t t-raw="get_modules_order()"/>; used to be in
assets_backend but is now directly added to the web.bootsrap (the odoo
index template). Since pos has its own index, we add it there.

- An "id" attribute has been removed from a link tag which was used to
indentify said link as an xpath target. The xpath has been adapted to
target the href instead.

This has been done to improve consistency in asset bundles declarations
by reducing them to the simplest possible templates.

Part of task: 2352566

Co-authored-by: Julien Mougenot <jum@odoo.com>
Co-authored-by: Simon Genin <ges@odoo.com>
---
 addons/point_of_sale/views/pos_assets_common.xml         | 2 +-
 addons/point_of_sale/views/pos_assets_index.xml          | 1 +
 addons/point_of_sale/views/pos_assets_qunit.xml          | 1 +
 addons/pos_restaurant/views/pos_restaurant_templates.xml | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/views/pos_assets_common.xml b/addons/point_of_sale/views/pos_assets_common.xml
index f86d19640db..102f97e2489 100644
--- a/addons/point_of_sale/views/pos_assets_common.xml
+++ b/addons/point_of_sale/views/pos_assets_common.xml
@@ -4,7 +4,7 @@
 <template id="point_of_sale.assets" name="point_of_sale assets">
     <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/fonts.scss"/>
     <link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css"/>
-    <link rel="stylesheet" href="/point_of_sale/static/src/css/pos.css" id="pos-stylesheet"/>
+    <link rel="stylesheet" href="/point_of_sale/static/src/css/pos.css"/>
     <link rel="stylesheet" href="/point_of_sale/static/src/css/keyboard.css"/>
     <link rel="stylesheet" href="/point_of_sale/static/src/css/pos_receipts.css"/>
     <link rel="stylesheet" type="text/less" href="/web/static/src/scss/fontawesome_overridden.scss"/>
diff --git a/addons/point_of_sale/views/pos_assets_index.xml b/addons/point_of_sale/views/pos_assets_index.xml
index c32a7f645be..6143bd2f98c 100644
--- a/addons/point_of_sale/views/pos_assets_index.xml
+++ b/addons/point_of_sale/views/pos_assets_index.xml
@@ -58,6 +58,7 @@
                 'login_number': login_number,
                 'debug': debug,
             })"/>;
+            odoo._modules = <t t-raw="get_modules_order()"/>;
         </script>
 
         <t t-call="point_of_sale.assets_common"/>
diff --git a/addons/point_of_sale/views/pos_assets_qunit.xml b/addons/point_of_sale/views/pos_assets_qunit.xml
index e58b3059460..cad10a2ee11 100644
--- a/addons/point_of_sale/views/pos_assets_qunit.xml
+++ b/addons/point_of_sale/views/pos_assets_qunit.xml
@@ -69,6 +69,7 @@
                     'session_info': session_info,
                     'debug': debug,
                 })"/>;
+                odoo._modules = <t t-raw="get_modules_order()"/>;
             </script>
 
             <t t-call="point_of_sale.assets_common" />
diff --git a/addons/pos_restaurant/views/pos_restaurant_templates.xml b/addons/pos_restaurant/views/pos_restaurant_templates.xml
index 8f5727a9447..198eaf772db 100644
--- a/addons/pos_restaurant/views/pos_restaurant_templates.xml
+++ b/addons/pos_restaurant/views/pos_restaurant_templates.xml
@@ -33,7 +33,7 @@
             <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/PaymentScreen.js"></script>
             <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/TipScreen.js"></script>
         </xpath>
-        <xpath expr="//link[@id='pos-stylesheet']" position="after">
+        <xpath expr="//link[@href='/point_of_sale/static/src/css/pos.css']" position="after">
             <link rel="stylesheet" href="/pos_restaurant/static/src/css/restaurant.css"/>
         </xpath>
     </template>