From f412ce6a9cdd2a02ea870496ebd61baceaece834 Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Wed, 17 Apr 2019 10:49:39 +0200 Subject: [PATCH 1/3] fix #11023 --- htdocs/comm/propal/card.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 01c28fdcd31..355232a65af 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -759,6 +759,7 @@ if (empty($reshook)) $qty = GETPOST('qty' . $predef); $remise_percent = GETPOST('remise_percent' . $predef); + if (empty($remise_percent)) $remise_percent=0; // Extrafields $extrafieldsline = new ExtraFields($db); From 2b6cdd2e336165410a2ea643efc286d5bcfc529b Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Thu, 18 Apr 2019 10:01:05 +0200 Subject: [PATCH 2/3] Fix workfolow module launch trigger on order close --- .../triggers/interface_20_modWorkflow_WorkflowManager.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php index 157088d24db..9aa20f8854e 100644 --- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php +++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php @@ -307,7 +307,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers $diff_array=array_diff_assoc($qtyordred,$qtyshipped); if (count($diff_array)==0) { //No diff => mean everythings is shipped - $ret=$object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin); + $ret=$object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin, 'ORDER_CLOSE'); if ($ret<0) { $this->error=$object->error; $this->errors=$object->errors; return $ret; From 83cf08f2eb9ef0d7393f7cbd78d96a4f250da146 Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Thu, 18 Apr 2019 20:37:27 +0200 Subject: [PATCH 3/3] fix php warning --- htdocs/core/lib/sendings.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index 1cafb6dc3d4..6dc78611c26 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -51,7 +51,7 @@ function shipping_prepare_head($object) { // delivery link $object->fetchObjectLinked($object->id,$object->element); - if (count($object->linkedObjectsIds['delivery']) > 0) // If there is a delivery + if (is_array($object->linkedObjectsIds['delivery']) && count($object->linkedObjectsIds['delivery']) > 0) // If there is a delivery { // Take first one element of array $tmp = reset($object->linkedObjectsIds['delivery']);