From d7b770bb7489381eb53de113c194e06b9d260087 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Tue, 25 Apr 2023 17:31:02 +0200 Subject: [PATCH 1/2] FIX : reopen supplier order after line delete if needed --- htdocs/fourn/commande/card.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index a8ee29fc974..91716dd27e2 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -857,8 +857,19 @@ if (empty($reshook)) { } if (!$error) { - $db->commit(); + // reopen order if necessary + if ($object->status == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) { + if ($object->setStatus($user, CommandeFournisseur::STATUS_RECEIVED_PARTIALLY) < 0) { + $db->rollback(); + setEventMessages($object->error, $object->errors, 'errors'); + $error++; + $action = ''; + } + } + } + if (!$error) { + $db->commit(); header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; } else { From 7afdf2270f3485af2675dc27b24f3986fbeb42bd Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Thu, 27 Apr 2023 08:44:22 +0200 Subject: [PATCH 2/2] remove rollback --- htdocs/fourn/commande/card.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 91716dd27e2..3838a968cbe 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -860,7 +860,6 @@ if (empty($reshook)) { // reopen order if necessary if ($object->status == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) { if ($object->setStatus($user, CommandeFournisseur::STATUS_RECEIVED_PARTIALLY) < 0) { - $db->rollback(); setEventMessages($object->error, $object->errors, 'errors'); $error++; $action = '';