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

Retours PR

Browse Source
This commit is contained in:
Adrien Raze 2020-09-03 14:25:17 +02:00
parent 8c514c8025
commit bcd9a0b29f
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/comm/propal/list.php
View File

@ -1314,21 +1314,28 @@ if ($resql)
if ($action == 'validate') { if ($action == 'validate') {
if (GETPOST('confirm') == 'yes') { if (GETPOST('confirm') == 'yes') {
$tmpproposal = new Propal($db); $tmpproposal = new Propal($db);
$db->begin();
foreach ($toselect as $checked) { foreach ($toselect as $checked) {
$tmpproposal->fetch($checked);
if ($tmpproposal->fetch($checked)) { if ($tmpproposal->fetch($checked)) {
if ($tmpproposal->statut == 0) { if ($tmpproposal->statut == 0) {
$tmpproposal->valid($user); if($tmpproposal->valid($user)){
setEventMessage($tmpproposal->ref . " " . $langs->trans('PassedInOpenStatus'), 'mesgs'); setEventMessage($tmpproposal->ref . " " . $langs->trans('PassedInOpenStatus'), 'mesgs');
} else {
setEventMessage($langs->trans('CantBeValidated'), 'errors');
}
} else { } else {
setEventMessage($tmpproposal->ref . " " . $langs->trans('IsNotADraft'), 'errors'); setEventMessage($tmpproposal->ref . " " . $langs->trans('IsNotADraft'), 'errors');
} }
} }
} }
$db->commit();
}
}
if ($action == "sign") { if ($action == "sign") {
if (GETPOST('confirm') == 'yes') { if (GETPOST('confirm') == 'yes') {
$tmpproposal = new Propal($db); $tmpproposal = new Propal($db);
$db->begin();
foreach ($toselect as $checked) { foreach ($toselect as $checked) {
$tmpproposal->fetch($checked); $tmpproposal->fetch($checked);
if ($tmpproposal->fetch($checked)) { if ($tmpproposal->fetch($checked)) {
@ -1347,8 +1354,10 @@ if ($resql)
dol_print_error($db); dol_print_error($db);
} }
} }
$db->commit();
} }
} }
} else { } else {
dol_print_error($db); dol_print_error($db);
} }

1
htdocs/langs/fr_FR/propal.lang
View File

@ -91,6 +91,7 @@ CantBeSign = ne peut pas être signée
Sign = Signer Sign = Signer
Signed = signé Signed = signé
CantBeSign = ne peut pas être signé CantBeSign = ne peut pas être signé
CantBeValidated = Ne peut pas être validé
ConfirmMassValidation = Confirmer la validation ? ConfirmMassValidation = Confirmer la validation ?
ConfirmMassSignature = Confirmer la signature ? ConfirmMassSignature = Confirmer la signature ?
ConfirmMassValidationQuestion = Voulez-vous confirmer la validation des devis brouillons selectionnés ? ConfirmMassValidationQuestion = Voulez-vous confirmer la validation des devis brouillons selectionnés ?