From 2f526dcd656c619205028d1ea00cfb7456487da4 Mon Sep 17 00:00:00 2001
From: RomainLibert <rli@odoo.com>
Date: Wed, 16 Jan 2019 09:45:23 +0000
Subject: [PATCH] [FIX] hr_payroll: do not display conflicting leave button
 when no type

Basically you can have two types of error when using benefits, the
conflicting leave error and the no benefit type set error.
You can have either one of them or both of them at the same time.

The problem is that when there is an error, we currently have no way of
knowing which error it is.

To resolve this we only display one error at a time starting with the
no benefit type error and then if there is a conflicting leave we
display the next error

closes odoo/odoo#30259
---
 addons/hr_payroll/views/hr_benefit_views.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_payroll/views/hr_benefit_views.xml b/addons/hr_payroll/views/hr_benefit_views.xml
index a6f30e416f7..2802bcc739c 100644
--- a/addons/hr_payroll/views/hr_benefit_views.xml
+++ b/addons/hr_payroll/views/hr_benefit_views.xml
@@ -67,7 +67,7 @@ if records:
                 <header>
                     <field name="display_warning" invisible="1"/>
                     <field name="leave_id" invisible="1"/>
-                    <button string="Go To Conflicting Leave" name="action_leave" type="object" attrs="{'invisible': ['|', '!',('display_warning', '=', True), '!', ('leave_id', '!=', False)]}"/>
+                    <button string="Go To Conflicting Leave" name="action_leave" type="object" attrs="{'invisible': ['|', '|', '!',('display_warning', '=', True), '!', ('leave_id', '!=', False), ('benefit_type_id', '=', False)]}"/>
                     <field name="state" widget="statusbar" options="{'clickable': '1'}"/>
                 </header>
                 <sheet>
@@ -160,4 +160,4 @@ if records:
         sequence="25"
     />
 
-</odoo>
\ No newline at end of file
+</odoo>