From 1c0de2fc193f0b367172a5ffa6e7144c9532bfc1 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Fri, 30 Aug 2019 09:49:59 +0000
Subject: [PATCH] [FIX] hr_work_entry: Remove warning banner on conflicts

---
 .../hr_work_entry/static/src/xml/work_entry_templates.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/addons/hr_work_entry/static/src/xml/work_entry_templates.xml b/addons/hr_work_entry/static/src/xml/work_entry_templates.xml
index ad1f6d9e523..bc216ae634f 100644
--- a/addons/hr_work_entry/static/src/xml/work_entry_templates.xml
+++ b/addons/hr_work_entry/static/src/xml/work_entry_templates.xml
@@ -4,12 +4,4 @@
         <button t-if="disabled" disabled="" title="Solve conflicts first" t-attf-class="btn btn-primary btn-work-entry {{ event_class }}" type="button" t-esc="button_text"/>
         <button t-else="" t-attf-class="btn btn-primary btn-work-entry {{ event_class }}" type="button" t-esc="button_text"/>
     </t>
-
-    <t t-name="hr_work_entry.work_entry_error_message">
-        <div role='alertdialog' class='alert alert-info'>We found some conflicts,
-                <strong>
-                    <a role='button' type="action" name='hr_work_entry.hr_work_entry_action_conflict'>click here to revise them</a>
-                </strong>
-        </div>
-    </t>
 </templates>