From 9fc69acc09020ba80746dc16e5e0420761696fc3 Mon Sep 17 00:00:00 2001
From: Martin Geubelle <mge@odoo.com>
Date: Mon, 17 Dec 2018 16:30:33 +0100
Subject: [PATCH] [FIX] sale: correctly test all files

The rev. odoo/odoo@3aa6c94 has recently been forward-ported but was in conflict
with the rev odoo/odoo@856c2e9 ; both have created a inherited view to add their
test file in the qunit_suite view.

As both inherited views have the same id, one of the two files was not correctly
loaded in the test suite.
---
 addons/sale/views/assets.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/addons/sale/views/assets.xml b/addons/sale/views/assets.xml
index 5ee94f6fdc2d1..e29db4a454501 100644
--- a/addons/sale/views/assets.xml
+++ b/addons/sale/views/assets.xml
@@ -24,15 +24,10 @@
             <script type="text/javascript" src="/sale/static/src/js/sale_portal_sidebar.js"></script>
         </xpath>
     </template>
-    <template id="qunit_suite" name="product_configurator_tests" inherit_id="web.qunit_suite">
-        <xpath expr="//t[@t-set='head']" position="inside">
-            <script type="text/javascript" src="/sale/static/tests/product_configurator.test.js"></script>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" name="sales_team_dashboard_tests" inherit_id="web.qunit_suite">
+    <template id="qunit_suite" name="sale_tests" inherit_id="web.qunit_suite">
         <xpath expr="//t[@t-set='head']" position="inside">
             <script type="text/javascript" src="/sale/static/tests/sales_team_dashboard_tests.js"></script>
+            <script type="text/javascript" src="/sale/static/tests/product_configurator.test.js"></script>
         </xpath>
     </template>
 </odoo>