lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX : We must not be able to delete sociale charge, vat or salary if there are payments

Browse Source
This commit is contained in:
Gauthier PC portable 024 2021-04-26 10:48:50 +02:00
parent c3d3b79315
commit ae1586fcc6
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/compta/sociales/card.php
View File

@ -134,6 +134,8 @@ if ($action == 'setbankaccount' && $user->rights->tax->charges->creer) {
// Delete social contribution // Delete social contribution
if ($action == 'confirm_delete' && $confirm == 'yes') { if ($action == 'confirm_delete' && $confirm == 'yes') {
$object->fetch($id); $object->fetch($id);
$totalpaye = $object->getSommePaiement();
if (empty($totalpaye)) {
$result = $object->delete($user); $result = $object->delete($user);
if ($result > 0) { if ($result > 0) {
header("Location: list.php"); header("Location: list.php");
@ -141,6 +143,9 @@ if ($action == 'confirm_delete' && $confirm == 'yes') {
} else { } else {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} else {
setEventMessages($langs->trans('DisabledBecausePayments'), null, 'errors');
}
} }
@ -771,8 +776,10 @@ if ($id > 0) {
} }
// Delete // Delete
if ($user->rights->tax->charges->supprimer) { if ($user->rights->tax->charges->supprimer && empty($totalpaye)) {
print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a></div>'; print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
} else {
print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("DisabledBecausePayments"))).'">'.$langs->trans("Delete").'</a></div>';
} }
print "</div>"; print "</div>";