From ae60f452cc8c5d909be58d26d74d0ec918fc2bc3 Mon Sep 17 00:00:00 2001 From: x Date: Wed, 3 Mar 2021 16:36:21 +0100 Subject: [PATCH 01/13] FIX : pencil to update employee field on card view --- htdocs/salaries/card.php | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index 91330cf318e..76a37382a45 100755 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -59,6 +59,7 @@ $datev = dol_mktime(12, 0, 0, GETPOST("datevmonth", 'int'), GETPOST("datevday", $datesp = dol_mktime(12, 0, 0, GETPOST("datespmonth", 'int'), GETPOST("datespday", 'int'), GETPOST("datespyear", 'int')); $dateep = dol_mktime(12, 0, 0, GETPOST("dateepmonth", 'int'), GETPOST("dateepday", 'int'), GETPOST("dateepyear", 'int')); $label = GETPOST('label'); +$fk_user = GETPOST('userid', 'int'); // Security check $socid = GETPOST("socid", "int"); @@ -98,6 +99,12 @@ if ($action == 'confirm_paid' && $user->rights->salaries->write && $confirm == ' $result = $object->set_paid($user); } +if($action == 'setfk_user' && $user->rights->salaries->write) { + $object->fetch($id); + $object->fk_user = $fk_user; + $object->update($user); +} + if ($action == 'reopen' && $user->rights->salaries->write) { $result = $object->fetch($id); if ($object->paye) @@ -627,11 +634,25 @@ if ($id) $morehtmlref .= ''; $morehtmlref .= ''; } - - // Employee - $userstatic = new User($db); - $userstatic->fetch($object->fk_user); - $morehtmlref .= '
' .$langs->trans('Employee').' : '.$userstatic->getNomUrl(1); + + //Employee + if($action != 'editfk_user') { + $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); + $userstatic->fetch($object->fk_user); + $morehtmlref .= $userstatic->getNomUrl(1); + } + } else { + $morehtmlref .= '
'.$langs->trans('Employee').' : '; + $morehtmlref .= '
'; + $morehtmlref .= ''; + $morehtmlref .= ''; + $morehtmlref .= $form->select_dolusers($object->fk_user, 'userid', 1); + $morehtmlref .= ''; + $morehtmlref .= '
'; + } // Project if (!empty($conf->projet->enabled)) From 55e9908601db3248e4c579c0719a02b1e77501fd Mon Sep 17 00:00:00 2001 From: x Date: Mon, 8 Mar 2021 10:09:38 +0100 Subject: [PATCH 02/13] FIX : PR returns --- htdocs/salaries/card.php | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index 76a37382a45..3c4ea63160a 100755 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -100,9 +100,15 @@ if ($action == 'confirm_paid' && $user->rights->salaries->write && $confirm == ' } if($action == 'setfk_user' && $user->rights->salaries->write) { - $object->fetch($id); - $object->fk_user = $fk_user; - $object->update($user); + $result = $object->fetch($id); + if ($result > 0){ + $object->fk_user = $fk_user; + $object->update($user); + } else { + dol_print_error($db); + exit; + } + } if ($action == 'reopen' && $user->rights->salaries->write) { @@ -641,8 +647,13 @@ if ($id) if(!empty($object->fk_user)) { $userstatic = new User($db); - $userstatic->fetch($object->fk_user); - $morehtmlref .= $userstatic->getNomUrl(1); + $result = $userstatic->fetch($object->fk_user); + if ($result > 0){ + $morehtmlref .= $userstatic->getNomUrl(1); + } else { + dol_print_error($db); + exit(); + } } } else { $morehtmlref .= '
'.$langs->trans('Employee').' : '; From 1fec98c546602a46ae8c07e51c0d2553e5bb91e8 Mon Sep 17 00:00:00 2001 From: x Date: Mon, 8 Mar 2021 11:10:51 +0100 Subject: [PATCH 03/13] FIX : Rounding amount on card updating --- htdocs/salaries/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 htdocs/salaries/card.php diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php old mode 100644 new mode 100755 index 72148a30c35..8cc504c0b99 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -718,7 +718,7 @@ if ($id) print '';*/ if ($action == 'edit') { - print '' . $langs->trans("Amount") . ''; + print '' . $langs->trans("Amount") . ''; } else { print '' . $langs->trans("Amount") . '' . price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency) . ''; } From cb5d5326650b7af51c5caed4d60f17e3fa378d54 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Mon, 8 Mar 2021 16:24:54 +0000 Subject: [PATCH 04/13] Fixing style errors. --- htdocs/salaries/card.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index 1e6726afefc..e1bbf371cc1 100755 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -108,16 +108,15 @@ if ($action == 'confirm_paid' && $user->rights->salaries->write && $confirm == ' $result = $object->set_paid($user); } -if($action == 'setfk_user' && $user->rights->salaries->write) { +if ($action == 'setfk_user' && $user->rights->salaries->write) { $result = $object->fetch($id); - if ($result > 0){ + if ($result > 0) { $object->fk_user = $fk_user; $object->update($user); } else { dol_print_error($db); exit; } - } if ($action == 'reopen' && $user->rights->salaries->write) { @@ -606,13 +605,13 @@ if ($id) { } //Employee - if($action != 'editfk_user') { + if ($action != 'editfk_user') { $morehtmlref .= '
' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1); - if(!empty($object->fk_user)) { + if (!empty($object->fk_user)) { $userstatic = new User($db); $result = $userstatic->fetch($object->fk_user); - if ($result > 0){ + if ($result > 0) { $morehtmlref .= $userstatic->getNomUrl(1); } else { dol_print_error($db); From a67fd6c0a428faa4b9828cbdf25867813a6d92d3 Mon Sep 17 00:00:00 2001 From: Adrien Raze Date: Tue, 9 Mar 2021 10:55:10 +0100 Subject: [PATCH 05/13] 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 { From c55c1ab854f36ab4f04483a2606f72fd2cedd846 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 9 Mar 2021 09:58:11 +0000 Subject: [PATCH 06/13] Fixing style errors. --- htdocs/salaries/card.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index caa37119c57..1082c6dbd80 100755 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -611,20 +611,20 @@ if ($id) { $resql = $db->query($sql); $obj = $db->fetch_object($resql); //Employee - if($action != 'editfk_user') { - if (!empty($obj) && !empty($object->fk_user)){ + if ($action != 'editfk_user') { + if (!empty($obj) && !empty($object->fk_user)) { $userstatic = new User($db); $result = $userstatic->fetch($object->fk_user); - if ($result > 0){ + 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)) { + if (!empty($object->fk_user)) { $userstatic = new User($db); $result = $userstatic->fetch($object->fk_user); - if ($result > 0){ + if ($result > 0) { $morehtmlref .= $userstatic->getNomUrl(1); } else { dol_print_error($db); From 07015ef29eceba2ba67103ae2b78c52039954769 Mon Sep 17 00:00:00 2001 From: Adrien Raze Date: Tue, 9 Mar 2021 11:35:24 +0100 Subject: [PATCH 07/13] FIX : Using function getSommePaiement() instead of using SQL request --- htdocs/salaries/card.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index 1082c6dbd80..c2f93cc8354 100755 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -604,15 +604,11 @@ if ($id) { $morehtmlref .= ''; } - $sql = 'SELECT fk_salary, amount'; - $sql .= ' FROM '.MAIN_DB_PREFIX.'payment_salary'; - $sql .= ' WHERE fk_salary = '.$object->id; - - $resql = $db->query($sql); - $obj = $db->fetch_object($resql); + $sal = new Salary($db); + $sal->fetch($object->id); //Employee if ($action != 'editfk_user') { - if (!empty($obj) && !empty($object->fk_user)) { + if ($sal->getSommePaiement() > 0 && !empty($object->fk_user)){ $userstatic = new User($db); $result = $userstatic->fetch($object->fk_user); if ($result > 0) { From 1afddabed45923558923d19707567f4efabde3b3 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 9 Mar 2021 10:41:03 +0000 Subject: [PATCH 08/13] Fixing style errors. --- htdocs/salaries/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index c2f93cc8354..98f2cec2523 100755 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -608,7 +608,7 @@ if ($id) { $sal->fetch($object->id); //Employee if ($action != 'editfk_user') { - if ($sal->getSommePaiement() > 0 && !empty($object->fk_user)){ + if ($sal->getSommePaiement() > 0 && !empty($object->fk_user)) { $userstatic = new User($db); $result = $userstatic->fetch($object->fk_user); if ($result > 0) { From b82f14859cfc03ca48b843870528d93fa92ddc74 Mon Sep 17 00:00:00 2001 From: Adrien Raze Date: Tue, 9 Mar 2021 11:48:25 +0100 Subject: [PATCH 09/13] FIX : no fetch required --- htdocs/salaries/card.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index 98f2cec2523..8fbcc53539b 100755 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -603,12 +603,10 @@ if ($id) { $morehtmlref .= ''; $morehtmlref .= ''; } - - $sal = new Salary($db); - $sal->fetch($object->id); + //Employee if ($action != 'editfk_user') { - if ($sal->getSommePaiement() > 0 && !empty($object->fk_user)) { + if ($object->getSommePaiement() > 0 && !empty($object->fk_user)) { $userstatic = new User($db); $result = $userstatic->fetch($object->fk_user); if ($result > 0) { From 93e50bcba63bc8900a8cd66bf29283b3e8d11af8 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 9 Mar 2021 10:50:59 +0000 Subject: [PATCH 10/13] Fixing style errors. --- htdocs/salaries/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index 8fbcc53539b..a816d6a7a07 100755 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -603,7 +603,7 @@ if ($id) { $morehtmlref .= ''; $morehtmlref .= ''; } - + //Employee if ($action != 'editfk_user') { if ($object->getSommePaiement() > 0 && !empty($object->fk_user)) { From f3508eed831b757e939a2cc6f2b1a2382bc948f3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 9 Mar 2021 15:09:28 +0100 Subject: [PATCH 11/13] Update card.php --- htdocs/salaries/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index a816d6a7a07..028f043b805 100755 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -714,7 +714,7 @@ if ($id) { if ($action == 'edit') { print '' . $langs->trans("Amount") . ''; } else { - print '' . $langs->trans("Amount") . '' . price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency) . ''; + print '' . $langs->trans("Amount") . '' . price($object->amount) . ''; } // Mode of payment From 6a7ecf210fb11ad46426508da8b297f697d93cb2 Mon Sep 17 00:00:00 2001 From: Adrien Raze Date: Wed, 10 Mar 2021 15:38:01 +0100 Subject: [PATCH 12/13] FIX : Travis returns --- htdocs/salaries/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index 028f043b805..53f46320073 100755 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -613,7 +613,7 @@ if ($id) { $morehtmlref .= '
' .$langs->trans('Employee').' : '.$userstatic->getNomUrl(1); } } else { - $morehtmlref .= '
' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1); + $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); From 2ff2640c8da4737beb399d2a39230ed4c7452d34 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Mar 2021 17:16:49 +0100 Subject: [PATCH 13/13] Update card.php --- htdocs/salaries/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index 53f46320073..9638c2ff019 100755 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -712,9 +712,9 @@ if ($id) { print '';*/ if ($action == 'edit') { - print '' . $langs->trans("Amount") . ''; + print '' . $langs->trans("Amount") . ''; } else { - print '' . $langs->trans("Amount") . '' . price($object->amount) . ''; + print '' . $langs->trans("Amount") . '' . price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency) . ''; } // Mode of payment