From a67fd6c0a428faa4b9828cbdf25867813a6d92d3 Mon Sep 17 00:00:00 2001 From: Adrien Raze Date: Tue, 9 Mar 2021 10:55:10 +0100 Subject: [PATCH] FIX : Update pencil should be shown only when no payments has been entered --- htdocs/salaries/card.php | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index e1bbf371cc1..caa37119c57 100755 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -604,18 +604,32 @@ if ($id) { $morehtmlref .= ''; } - //Employee - if ($action != 'editfk_user') { - $morehtmlref .= '
' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1); + $sql = 'SELECT fk_salary, amount'; + $sql .= ' FROM '.MAIN_DB_PREFIX.'payment_salary'; + $sql .= ' WHERE fk_salary = '.$object->id; - if (!empty($object->fk_user)) { + $resql = $db->query($sql); + $obj = $db->fetch_object($resql); + //Employee + if($action != 'editfk_user') { + if (!empty($obj) && !empty($object->fk_user)){ $userstatic = new User($db); $result = $userstatic->fetch($object->fk_user); - if ($result > 0) { - $morehtmlref .= $userstatic->getNomUrl(1); - } else { - dol_print_error($db); - exit(); + if ($result > 0){ + $morehtmlref .= '
' .$langs->trans('Employee').' : '.$userstatic->getNomUrl(1); + } + } else { + $morehtmlref .= '
' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1); + + if(!empty($object->fk_user)) { + $userstatic = new User($db); + $result = $userstatic->fetch($object->fk_user); + if ($result > 0){ + $morehtmlref .= $userstatic->getNomUrl(1); + } else { + dol_print_error($db); + exit(); + } } } } else {