Fix warning

htdocs/core/class/conf.class.php

@@ -566,8 +566,8 @@ class Conf extends stdClass
 
 			// Exception: Some dir are not the name of module. So we keep exception here for backward compatibility.
 
-			// Module fournisseur
+			// Module supplier is on
-			if (!empty($this->fournisseur)) {
+			if (isModEnabled('fournisseur')) {
 				$this->fournisseur->commande = new stdClass();
 				$this->fournisseur->commande->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");
 				$this->fournisseur->commande->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/commande/temp");
@@ -592,8 +592,8 @@ class Conf extends stdClass
 				$this->fournisseur->payment->dir_output = $rootfordata."/fournisseur/payment"; // For backward compatibility
 				$this->fournisseur->payment->dir_temp = $rootfortemp."/fournisseur/payment/temp"; // For backward compatibility
 
-				// To prepare split of module fournisseur into module 'fournisseur' + supplier_order + supplier_invoice
+				// To prepare split of module supplier into module 'supplier' + 'supplier_order' + 'supplier_invoice'
-				if (!empty($this->fournisseur->enabled) && empty($this->global->MAIN_USE_NEW_SUPPLIERMOD)) {  // By default, if module supplier is on, and we don't use yet the new modules, we set artificially the module properties
+				if (!getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) {  // By default, if module supplier is on, and we don't use yet the new modules, we set artificially the module properties
 					$this->supplier_order = new stdClass();
 					$this->supplier_order->enabled = 1;
 					$this->supplier_order->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");

htdocs/core/lib/functions.lib.php

@@ -234,6 +234,7 @@ define(
 		'ficheinter' => 'intervention',  // Backup for 'fichinter'
 		'propale' => 'propal', // Has old directory
 		'socpeople' => 'contact', // Has old directory
+		'fournisseur' => 'supplier',  // Has old directory
 
 		'actioncomm' => 'agenda',  // NO module directory (public dir agenda)
 		'product_price' => 'productprice', // NO directory

test/phpunit/BuildDocTest.php

@@ -87,11 +87,15 @@ class BuildDocTest extends CommonClassTest
 	{
 		global $conf,$user,$langs,$db;
 
-		if (!isModEnabled('facture')) {
+		if (!isModEnabled('supplier')) {
+			print __METHOD__." supplier module not enabled\n";
+			die(1);
+		}
+		if (!isModEnabled('invoice')) {
 			print __METHOD__." invoice module not enabled\n";
 			die(1);
 		}
-		if (!isModEnabled('commande')) {
+		if (!isModEnabled('order')) {
 			print __METHOD__." order module not enabled\n";
 			die(1);
 		}
@@ -99,15 +103,15 @@ class BuildDocTest extends CommonClassTest
 			print __METHOD__." propal module not enabled\n";
 			die(1);
 		}
-		if (!isModEnabled('projet')) {
+		if (!isModEnabled('project')) {
 			print __METHOD__." project module not enabled\n";
 			die(1);
 		}
-		if (!isModEnabled('expedition')) {
+		if (!isModEnabled('shipping')) {
 			print __METHOD__." shipment module not enabled\n";
 			die(1);
 		}
-		if (!isModEnabled('ficheinter')) {
+		if (!isModEnabled('intervention')) {
 			print __METHOD__." intervention module not enabled\n";
 			die(1);
 		}
@@ -233,7 +237,7 @@ class BuildDocTest extends CommonClassTest
 		$langs = $this->savlangs;
 		$db = $this->savdb;
 
-		$conf->fournisseur->facture->dir_output .= '/temp';
+		$conf->fournisseur->facture->dir_output .= '/temp';	// To not poluate the existing dir_output dir
 		$localobject = new FactureFournisseur($db);
 		$localobject->initAsSpecimen();
 

test/phpunit/WebservicesInvoicesTest.php

@@ -231,7 +231,10 @@ class WebservicesInvoicesTest extends CommonClassTest
 		}
 
 		print __METHOD__." result=".$result['result']['result_code']." ".$result['result']['result_label']."\n";
-		$this->assertEquals('OK', $result['result']['result_code']);
+
+		$resultcode = empty($result['result']['result_code']) ? 'KO' : $result['result']['result_code'];
+
+		$this->assertEquals('OK', $resultcode);
 		$this->assertEquals('ref-phpunit-2', $result['ref_ext']);
 
 

test/phpunit/WebservicesProductsTest.php

@@ -126,7 +126,10 @@ class WebservicesProductsTest extends CommonClassTest
 		}
 		print var_export($result, true);
 		print __METHOD__." count(result)=".(is_array($result) ? count($result) : '')."\n";
-		$this->assertEquals('OK', $result['result']['result_code']);
+
+		$resultcode = empty($result['result']['result_code']) ? 'KO' : $result['result']['result_code'];
+
+		$this->assertEquals('OK', $resultcode);
 
 		return $result['id'];
 	}

test/phpunit/WebservicesThirdpartyTest.php

@@ -348,7 +348,10 @@ class WebservicesThirdpartyTest extends CommonClassTest
 		}
 
 		print __METHOD__." count(result)=".(is_array($result) ? count($result) : 0)."\n";
-		$this->assertEquals('OK', $result['result']['result_code']);
+
+		$resultcode = empty($result['result']['result_code']) ? 'KO' : $result['result']['result_code'];
+
+		$this->assertEquals('OK', $resultcode);
 
 		return $result;
 	}