From 467e96e81f33af4965ce8b0bf26290bf01234514 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 14 Aug 2024 15:32:34 +0200 Subject: [PATCH] Debug v20 --- htdocs/comm/propal/card.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 2368f17d9acd4..c3ff5db6c632e 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -744,7 +744,10 @@ if ($object->statut == $object::STATUS_VALIDATED || (getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE') && $object->statut == $object::STATUS_DRAFT)) { $db->begin(); - $result = $object->closeProposal($user, GETPOSTINT('statut'), GETPOSTINT('note_private')); + $oldstatus = $object->status; + + $result = $object->closeProposal($user, GETPOSTINT('statut'), GETPOST('note_private')); + if ($result < 0) { setEventMessages($object->error, $object->errors, 'errors'); $error++; @@ -758,7 +761,7 @@ $deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id); if ( - !$error && GETPOSTINT('statut') == $object::STATUS_SIGNED && GETPOSTINT('generate_deposit') == 'on' + !$error && GETPOSTINT('statut') == $object::STATUS_SIGNED && GETPOST('generate_deposit') == 'on' && !empty($deposit_percent_from_payment_terms) && isModEnabled('invoice') && $user->hasRight('facture', 'creer') ) { require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; @@ -777,7 +780,7 @@ $locationTarget = DOL_URL_ROOT . '/compta/facture/card.php?id=' . $deposit->id; } else { $error++; - setEventMessages($object->error, $object->errors, 'errors'); + setEventMessages("Failed to create down payment - ".$object->error, $object->errors, 'errors'); } } @@ -806,6 +809,9 @@ exit; } } else { + $object->status = $oldstatus; + $object->statut = $oldstatus; + $db->rollback(); $action = ''; }