From 45ffd68e92bb8e28a0916d3568edd1535499eb55 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jan 2022 19:26:29 +0100
Subject: [PATCH] Simplify code

---
 htdocs/contrat/card.php | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index ef0944883a8..3febcc868a0 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -40,9 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (!empty($conf->facture->enabled) && !empty($conf->global->CONTRACT_CREATE_FROM_INVOICE)) {
-	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-}
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 if (!empty($conf->propal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
@@ -251,11 +249,9 @@ if (empty($reshook)) {
 				if ($element == 'propal') {
 					$element = 'comm/propal'; $subelement = 'propal';
 				}
-				if (!empty($conf->global->CONTRACT_CREATE_FROM_INVOICE)) {
-					if ($element == 'invoice' || $element == 'facture') {
-						$element = 'compta/facture';
-						$subelement = 'facture';
-					}
+				if ($element == 'invoice' || $element == 'facture') {
+					$element = 'compta/facture';
+					$subelement = 'facture';
 				}
 
 				$object->origin    = $origin;
@@ -1049,11 +1045,9 @@ if ($action == 'create') {
 			if ($element == 'propal') {
 				$element = 'comm/propal'; $subelement = 'propal';
 			}
-			if (!empty($conf->global->CONTRACT_CREATE_FROM_INVOICE)) {
-				if ($element == 'invoice' || $element == 'facture') {
-					$element = 'compta/facture';
-					$subelement = 'facture';
-				}
+			if ($element == 'invoice' || $element == 'facture') {
+				$element = 'compta/facture';
+				$subelement = 'facture';
 			}
 
 			dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');