summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Lefèvre <lul@odoo.com>2019-07-01 09:26:45 +0000
committerLucas Lefèvre <lul@odoo.com>2019-07-01 09:34:59 +0000
commitbc08a2deafa7a84a85d817a3364c545dfb87ae45 (patch)
tree0e8f7c9fff4605847e15571ef4a6ddb4c07bc49c
parenteffcf0d13bff56de4d7541d3035ec3546c8df0b3 (diff)
[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.
-rw-r--r--addons/hr_contract/views/assets.xml1
-rw-r--r--addons/hr_contract/views/hr_contract_templates.xml8
2 files changed, 1 insertions, 8 deletions
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>