FIX : allow setDraft on cancelled orders if ORDER_REOPEN_TO_DRAFT is …

…set (#30396) * Fix missing loading trans file * FIX : allow setDraft on cancelled orders if ORDER_REOPEN_TO_DRAFT is set --------- Co-authored-by: Laurent Destailleur <[email protected]> Co-authored-by: Christophe Battarel <[email protected]>
Dolibarr · Jul 16, 2024 · 97b4093 · 97b4093
1 parent 8258928
commit 97b4093
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
@@ -643,7 +643,7 @@ public function setDraft($user, $idwarehouse = -1)
 		$error = 0;
 
 		// Protection
-		if ($this->statut <= self::STATUS_DRAFT) {
+		if ($this->statut <= self::STATUS_DRAFT && !getDolGlobalInt('ORDER_REOPEN_TO_DRAFT')) {
 			return 0;
 		}
 

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
@@ -2197,6 +2197,7 @@
 					);
 				}
 				if (isModEnabled('supplier_invoice') && $object->status > 0 && $soc->fournisseur == 1) {
+					$langs->load("suppliers");
 					$arrayofcreatebutton[] = array(
 						'url' => '/fourn/facture/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->thirdparty->id,
 						'label' => $langs->trans('AddSupplierInvoice'),