From bc08a2deafa7a84a85d817a3364c545dfb87ae45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Lef=C3=A8vre?= <lul@odoo.com>
Date: Mon, 1 Jul 2019 09:26:45 +0000
Subject: [PATCH] [FIX] hr_contract: Load calendar mismatch style

Commit f17655d introduced a new file (`views/assets.xml`) in
the manifest to load a new scss file. But it also deleted from
the manifest an existing file (`views/hr_contract_templates.xml`)
without moving the content from removed file to the new file.
Hence, style defined in `calendar_mismatch.scss` was never loaded.
---
 addons/hr_contract/views/assets.xml                | 1 +
 addons/hr_contract/views/hr_contract_templates.xml | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 addons/hr_contract/views/hr_contract_templates.xml

diff --git a/addons/hr_contract/views/assets.xml b/addons/hr_contract/views/assets.xml
index f482256b4ae..59d7cff2534 100644
--- a/addons/hr_contract/views/assets.xml
+++ b/addons/hr_contract/views/assets.xml
@@ -2,6 +2,7 @@
     <template id="assets_backend" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
             <link rel="stylesheet" type="text/css" href="/hr_contract/static/src/scss/state_selection.scss"/>
+            <link rel="stylesheet" type="text/scss" href="/hr_contract/static/src/css/calendar_mismatch.scss"/>
         </xpath>
     </template>
 </odoo>
\ No newline at end of file
diff --git a/addons/hr_contract/views/hr_contract_templates.xml b/addons/hr_contract/views/hr_contract_templates.xml
deleted file mode 100644
index 90e7e2249b6..00000000000
--- a/addons/hr_contract/views/hr_contract_templates.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="hr_contract_assets_backend" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/hr_contract/static/src/css/calendar_mismatch.scss"/>
-        </xpath>
-    </template>
-</odoo>