Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

Conflicts:
	test/phpunit/PricesTest.php
	test/phpunit/RestAPIUserTest.php
	test/phpunit/WebservicesInvoicesTest.php

README.md

@@ -1,6 +1,6 @@
 # DOLIBARR ERP & CRM
 
-![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg) ![Downloads per day](https://img.shields.io/sourceforge/dm/dolibarr.svg)
+![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/5.0.svg) ![Downloads per day](https://img.shields.io/sourceforge/dm/dolibarr.svg)
 
 Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).
 

test/phpunit/AdherentTest.php

@@ -61,7 +61,9 @@ class AdherentTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -79,7 +81,7 @@ class AdherentTest extends PHPUnit_Framework_TestCase
         global $conf,$user,$langs,$db;
         $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { 
+        if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {
             print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n";
             die();
         }

test/phpunit/AdminLibTest.php

@@ -59,7 +59,9 @@ class AdminLibTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -142,21 +144,21 @@ class AdminLibTest extends PHPUnit_Framework_TestCase
 
         return $result;
     }
-    
+
     /**
      * testEnableModule
-     * 
+     *
      * @return  void
      */
     public function testEnableModule()
     {
     	global $conf, $db, $langs, $user;
-    	
+
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.class.php';
 		print "Enable module modExpenseReport";
 		$moduledescriptor=new modExpenseReport($db);
 		$moduledescriptor->init();
 		$conf->setValues($db);
     }
-    
+
 }

test/phpunit/BankAccountTest.php

@@ -61,7 +61,9 @@ class BankAccountTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/BonPrelevementTest.php

@@ -62,6 +62,8 @@ class BonPrelevementTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/BuildDocTest.php

@@ -89,7 +89,9 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/CMailFileTest.php

@@ -59,7 +59,9 @@ class CMailFileTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -103,7 +105,7 @@ class CMailFileTest extends PHPUnit_Framework_TestCase
         $db=$this->savdb;
 
         $conf->global->MAIN_DISABLE_ALL_MAILS=1;    // If I comment/remove this lien, unit test still works alone but failed when ran from AllTest. Don't know why.
-        
+
         print __METHOD__."\n";
     }
     /**

test/phpunit/CategorieTest.php

@@ -60,7 +60,9 @@ class CategorieTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/ChargeSocialesTest.php

@@ -60,6 +60,8 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -117,7 +119,7 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     /**
      * testChargeSocialesCreate
-     * 
+     *
      * @return	void
      */
     public function testChargeSocialesCreate()
@@ -139,10 +141,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     /**
      * testChargeSocialesFetch
-     * 
+     *
      * @param	int		$id		Id of social contribution
      * @return	void
-     * 
+     *
      * @depends	testChargeSocialesCreate
      * The depends says test is run only if previous is ok
      */
@@ -164,10 +166,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     /**
      * testChargeSocialesValid
-     * 
+     *
      * @param	Object		$localobject	Social contribution
      * @return	void
-     * 
+     *
      * @depends	testChargeSocialesFetch
      * The depends says test is run only if previous is ok
      */
@@ -188,10 +190,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     /**
      * testChargeSocialesOther
-     * 
+     *
      * @param	Object	$localobject		Social contribution
      * @return	void
-     * 
+     *
      * @depends testChargeSocialesValid
      * The depends says test is run only if previous is ok
      */
@@ -216,10 +218,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     /**
      * testChargeSocialesDelete
-     * 
+     *
      * @param	int		$id			Social contribution
      * @return 	void
-     * 
+     *
      * @depends	testChargeSocialesOther
      * The depends says test is run only if previous is ok
      */

test/phpunit/CommandeFournisseurTest.php

@@ -61,7 +61,9 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/CommandeTest.php

@@ -59,7 +59,9 @@ class CommandeTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/CommonObjectTest.php

@@ -60,7 +60,9 @@ class CommonObjectTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/CompanyBankAccountTest.php

@@ -60,6 +60,8 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/ContactTest.php

@@ -68,6 +68,8 @@ class ContactTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -207,7 +209,7 @@ class ContactTest extends PHPUnit_Framework_TestCase
 		$localobject->email='newemail@newemail.com';
 		$localobject->jabberid='New im id';
 		$localobject->default_lang='es_ES';
-		
+
 		$result=$localobject->update($localobject->id,$user);
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	$this->assertLessThan($result, 0, 'Contact::update error');

test/phpunit/ContratTest.php

@@ -60,6 +60,8 @@ class ContratTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/CoreTest.php

@@ -62,7 +62,9 @@ class CoreTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -290,22 +292,22 @@ class CoreTest extends PHPUnit_Framework_TestCase
         }
 
         // Run tests
-        
+
         $_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices';
         $result=test_sql_and_script_inject($_SERVER["PHP_SELF"], 2);
         $expectedresult=0;
         $this->assertEquals($expectedresult, $result, 'Error on test_sql_and_script_inject 1a');
-        
+
         $_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices;badaction';
         $result=test_sql_and_script_inject($_SERVER["PHP_SELF"], 2);
         $expectedresult=1;
         $this->assertEquals($expectedresult, $result, 'Error on test_sql_and_script_inject 1b');
-        
+
         $_GET['aaa']="<img src='1.jpg' onerror =javascript:alert('XSS')>";
         $result=test_sql_and_script_inject($_GET['aaa'], 0);
         $expectedresult=1;
         $this->assertEquals($expectedresult, $result, 'Error on test_sql_and_script_inject 2');
-        
+
         $_POST['bbb']="<img src='1.jpg' onerror =javascript:alert('XSS')>";
         $result=test_sql_and_script_inject($_POST['bbb'], 2);
         $expectedresult=1;

test/phpunit/DateLibTest.php

@@ -60,6 +60,8 @@ class DateLibTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/DateLibTzFranceTest.php

@@ -60,6 +60,8 @@ class DateLibTzFranceTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/DiscountTest.php

@@ -60,6 +60,8 @@ class DiscountTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/EntrepotTest.php

@@ -60,6 +60,8 @@ class EntrepotTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/ExportTest.php

@@ -64,6 +64,8 @@ class ExportTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/FactureFournisseurTest.php

@@ -60,6 +60,8 @@ class FactureFournisseurTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/FactureRecTest.php

@@ -61,6 +61,8 @@ class FactureRecTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/FactureTest.php

@@ -59,7 +59,9 @@ class FactureTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/FactureTestRounding.php

@@ -60,6 +60,8 @@ class FactureTestRounding extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/FichinterTest.php

@@ -60,6 +60,8 @@ class FichinterTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/FilesLibTest.php

@@ -61,6 +61,8 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -399,7 +401,7 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
         print __METHOD__." result=".join(',',$result)."\n";
         $this->assertEquals(0,count($result));
     }
-    
+
     /**
      * testDolDirList
      *
@@ -411,7 +413,7 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
     public function testDolDirList()
     {
         global $conf,$user,$langs,$db;
-    
+
         // Scan dir to guaruante we on't have library jquery twice (we accept exception of duplicte into ckeditor because all dir is removed for debian package, so there is no duplicate).
         $founddirs=dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.js', array('ckeditor'));
         print __METHOD__." count(founddirs)=".count($founddirs)."\n";

test/phpunit/FormAdminTest.php

@@ -60,6 +60,8 @@ class FormAdminTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/Functions2LibTest.php

@@ -63,7 +63,9 @@ class Functions2LibTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/FunctionsLibTest.php

@@ -63,7 +63,9 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/HolidayTest.php

@@ -62,6 +62,8 @@ class HolidayTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -201,11 +203,11 @@ class HolidayTest extends PHPUnit_Framework_TestCase
 		$localobject->email='newemail@newemail.com';
 		$localobject->jabberid='New im id';
 		$localobject->default_lang='es_ES';
-		
+
 		$result=$localobject->update($localobject->id,$user);
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	$this->assertLessThan($result, 0, 'Holiday::update error');
-		
+
     	$result=$localobject->update_note($localobject->note_private,'_private');
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Holiday::update_note (private) error');
@@ -213,7 +215,7 @@ class HolidayTest extends PHPUnit_Framework_TestCase
 		$result=$localobject->update_note($localobject->note_public, '_public');
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Holiday::update_note (public) error');
-		
+
 
 		$newobject=new Holiday($this->savdb);
     	$result=$newobject->fetch($localobject->id);

test/phpunit/ImagesLibTest.php

@@ -61,6 +61,8 @@ class ImagesLibTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/ImportTest.php

@@ -62,6 +62,8 @@ class ImportTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/JsonLibTest.php

@@ -62,7 +62,9 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -134,7 +136,7 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
         // Do a test with an array starting with 0
         $arraytotest=array(0=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
 		$arrayencodedexpected='[{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}]';
-		
+
         $encoded=json_encode($arraytotest);
         $this->assertEquals($arrayencodedexpected,$encoded);
         $decoded=json_decode($encoded,true);
@@ -148,7 +150,7 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
 		// Same test but array start with 2 instead of 0
         $arraytotest=array(2=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
 		$arrayencodedexpected='{"2":{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}}';
-		
+
         $encoded=json_encode($arraytotest);
         $this->assertEquals($arrayencodedexpected,$encoded);
         $decoded=json_decode($encoded,true);
@@ -158,7 +160,7 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($arrayencodedexpected,$encoded);
         $decoded=dol_json_decode($encoded,true);
         $this->assertEquals($arraytotest,$decoded,'test for dol_json_xxx');
-        
+
         // Test with object
         $now=gmmktime(12,0,0,1,1,1970);
         $objecttotest=new stdClass();

test/phpunit/LangTest.php

@@ -72,6 +72,8 @@ class LangTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/MarginsLibTest.php

@@ -60,6 +60,8 @@ class MarginsLibTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -136,7 +138,7 @@ class MarginsLibTest extends PHPUnit_Framework_TestCase
 		$this->assertEquals(25,$result[1]);
 		print __METHOD__." result[2]=".$result[2]."\n";
 		$this->assertEquals(20,$result[2]);
-		
+
 		$result=getMarginInfos(10, 10, 19.6, 0, 0, 0, 8);
 		print __METHOD__." result[0]=".$result[0]."\n";
 		$this->assertEquals(8,$result[0]);
@@ -144,7 +146,7 @@ class MarginsLibTest extends PHPUnit_Framework_TestCase
 		$this->assertEquals(12.5,$result[1]);
 		print __METHOD__." result[2]=".$result[2]."\n";
 		$this->assertEquals(1/9*100,$result[2]);
-		
+
 		return 0;
     }
 

test/phpunit/ModulesTest.php

@@ -59,6 +59,8 @@ class ModulesTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/MouvementStockTest.php

@@ -62,6 +62,8 @@ class MouvementStockTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/NumberingModulesTest.php

@@ -59,6 +59,8 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -75,7 +77,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
   	public static function setUpBeforeClass()
     {
     	global $conf,$user,$langs,$db;
-		
+
     	$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
     	print __METHOD__."\n";
@@ -138,7 +140,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}';
 		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000}';
         $conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED=0;
-        
+
 		$localobject=new Facture($this->savdb);
 		$localobject->initAsSpecimen();
 		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915);	// we use year 1915 to be sure to not have existing invoice for this year

test/phpunit/PaypalTest.php

@@ -61,6 +61,8 @@ class PaypalTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -135,9 +137,9 @@ class PaypalTest extends PHPUnit_Framework_TestCase
 
 		$urltotest=getPaypalPaymentUrl(1,'free');
 		print "urltotest=".$urltotest."\n";
-		
+
 		$result=getURLContent($urltotest, 'GET');
-		
+
         print __METHOD__." result=".$result."\n";
     	$this->assertLessThanOrEqual($result, 0);
 

test/phpunit/PdfDocTest.php

@@ -63,6 +63,8 @@ class PdfDocTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/PgsqlTest.php

@@ -62,6 +62,8 @@ class PgsqlTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
@@ -167,13 +169,13 @@ class PgsqlTest extends PHPUnit_Framework_TestCase
 		$result=DoliDBPgsql::convertSQLFromMysql($sql);
         print __METHOD__." result=".$result."\n";
     	$this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (without SEPARATOR)');
-    	
+
         // Test GROUP_CONCAT (with SEPARATOR)
 		$sql="SELECT a.b, GROUP_CONCAT(a.c SEPARATOR ',') FROM table GROUP BY a.b";
 		$result=DoliDBPgsql::convertSQLFromMysql($sql);
         print __METHOD__." result=".$result."\n";
     	$this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (with SEPARATOR)');
-    	
+
     	return $result;
     }
 }

test/phpunit/PricesTest.php

@@ -67,7 +67,9 @@ class PricesTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/ProductTest.php

@@ -60,7 +60,9 @@ class ProductTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/ProjectTest.php

@@ -61,6 +61,8 @@ class ProjectTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/PropalTest.php

@@ -60,6 +60,8 @@ class PropalTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/RestAPIUserTest.php

@@ -64,7 +64,9 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -106,7 +108,7 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
         $user=$this->savuser;
         $langs=$this->savlangs;
         $db=$this->savdb;
-        
+
         $this->api_url=DOL_MAIN_URL_ROOT.'/api/index.php';
 
         $login='admin';
@@ -158,7 +160,7 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
       $object=json_decode($result['content'], true);
       $this->assertNotNull($object, "Parsing of json result must no be null");
       $this->assertEquals(404, $object['error']['code']);
-      
+
       $url = $this->api_url.'/users/1?api_key='.$this->api_key;
 
       print __METHOD__." Request GET url=".$url."\n";
@@ -172,11 +174,11 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
     }
 
     public function testRestCreateUser() {
-      
+
       // attemp to create without mandatory fields :
       $url = $this->api_url.'/users?api_key='.$this->api_key;
       $addheaders=array('Content-Type: application/json');
-      
+
       $bodyobj = array(
         "lastname"=>"testRestUser",
         "password"=>"testRestPassword",
@@ -210,14 +212,14 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
       $resid=json_decode($result['content'], true);
       $this->assertNotNull($resid, "Parsing of json result must no be null");
       $this->assertGreaterThan(0, $resid, $object['error']['code'].' '.$object['error']['message']);
-      
+
       // attempt to create duplicated user
       print __METHOD__." Request POST url=".$url."\n";
       $result=getURLContent($url, 'POST', $body, 1, $addheaders);
       //print __METHOD__." Result for creating duplicate user".var_export($result, true)."\n";
       print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
       $this->assertEquals($result['curl_error_no'],'');
-      $object=json_decode($result['content'], true);      
+      $object=json_decode($result['content'], true);
       $this->assertNotNull($object, "Parsing of json result must no be null");
       $this->assertEquals(500, $object['error']['code'], $object['error']['code'].' '.$object['error']['message']);
     }

test/phpunit/ScriptsTest.php

@@ -72,6 +72,8 @@ class ScriptsTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/SecurityTest.php

@@ -72,6 +72,8 @@ class SecurityTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;

test/phpunit/SocieteTest.php

@@ -60,7 +60,9 @@ class SocieteTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/SqlTest.php

@@ -72,7 +72,9 @@ class SqlTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -143,16 +145,16 @@ class SqlTest extends PHPUnit_Framework_TestCase
 
         $listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration');
 
-        foreach ($listofsqldir as $dir) 
+        foreach ($listofsqldir as $dir)
         {
             print 'Process dir '.$dir."\n";
             $filesarray = scandir($dir);
-        
+
-            foreach($filesarray as $key => $file) 
+            foreach($filesarray as $key => $file)
             {
                 if (! preg_match('/\.sql$/',$file))
                     continue;
-                    
+
                 print 'Check sql file '.$file."\n";
                 $filecontent=file_get_contents($dir.'/'.$file);
 
@@ -167,7 +169,7 @@ class SqlTest extends PHPUnit_Framework_TestCase
                 $result=strpos($filecontent,'ON DELETE CASCADE');
                 print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n";
                 $this->assertTrue($result===false, 'Found ON DELETE CASCADE into '.$file.'. Bad.');
-                
+
                 if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration')
                 {
                     // Test for migration files only
@@ -176,9 +178,9 @@ class SqlTest extends PHPUnit_Framework_TestCase
                 else
                 {
                     if (preg_match('/\.key\.sql$/',$file))
-                    {                
+                    {
                         // Test for files key files only
-                    
+
                     }
                     else
                     {

test/phpunit/UserGroupTest.php

@@ -59,7 +59,9 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -117,7 +119,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupCreate
-     * 
+     *
      * @return	void
      */
     public function testUserGroupCreate()
@@ -139,7 +141,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupFetch
-     * 
+     *
      * @param   int $id             Id of group
      * @return  void
      * @depends testUserGroupCreate
@@ -163,7 +165,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupUpdate
-     * 
+     *
      * @param   Object $localobject Group
      * @return  void
      * @depends testUserGroupFetch
@@ -187,7 +189,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupAddRight
-     * 
+     *
      * @param   Object $localobject Object to show
      * @return  void
      * @depends testUserGroupUpdate
@@ -210,7 +212,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupDelRight
-     * 
+     *
      * @param   Object $localobject Object
      * @return  void
      * @depends testUserGroupAddRight
@@ -233,7 +235,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupOther
-     * 
+     *
      * @param   Object $localobject Object
      * @return  void
      * @depends testUserGroupDelRight
@@ -261,7 +263,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupDelete
-     * 
+     *
      * @param   int $id             Id of object
      * @return  void
      * @depends testUserGroupOther

test/phpunit/UserTest.php

@@ -59,7 +59,9 @@ class UserTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/WebservicesInvoicesTest.php

@@ -54,11 +54,11 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 	protected $savlangs;
 	protected $savdb;
 	protected $soapclient;
-	
+
 	private static $socid;
-	
+
 	protected $ns = 'http://www.dolibarr.org/ns/';
-	
+
 	/**
 	 * Constructor
 	 * We save global variables into local variables
@@ -67,13 +67,15 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
 		$this->savuser=$user;
 		$this->savlangs=$langs;
 		$this->savdb=$db;
-		
+
 		// Set the WebService URL
 		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php';
 		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
@@ -83,7 +85,7 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 			$this->soapclient->soap_defencoding='UTF-8';
 			$this->soapclient->decodeUTF8(false);
 		}
-		
+
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
 		print "\n";
@@ -116,7 +118,7 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 		$societe->date_creation=$now;
 		$societe->tva_assuj=0;
 		$societe->particulier=0;
-		
+
 		$societe->create($user);
 
 		self::$socid = $societe->id;
@@ -257,13 +259,13 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 
     	return $result;
     }
-    
+
     /**
      * testWSInvoicesGetInvoiceByRefExt
-     * 
+     *
      * Retrieve an invoice using ref_ext
      * @depends testWSInvoicesCreateInvoice
-     * 
+     *
      * @param	array	$result		Invoice created by create method
      * @return	array				Invoice
      */
@@ -313,13 +315,13 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 
     	return $result;
     }
-    
+
     /**
      * testWSInvoicesUpdateInvoiceByRefExt
-     * 
+     *
      * Update an invoice using ref_ext
      * @depends testWSInvoicesCreateInvoice
-     * 
+     *
      * @param	array	$result		invoice created by create method
      * @return	array 				Invoice
      */

test/phpunit/WebservicesOrdersTest.php

@@ -61,7 +61,9 @@ class WebservicesOrdersTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/WebservicesOtherTest.php

@@ -61,7 +61,9 @@ class WebservicesOtherTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/WebservicesProductsTest.php

@@ -68,7 +68,9 @@ class WebservicesProductsTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/WebservicesThirdpartyTest.php

@@ -53,12 +53,12 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     protected $savlangs;
     protected $savdb;
     protected $soapclient;
-    
+
     private $_WS_DOL_URL;
     private $_ns='http://www.dolibarr.org/ns/';
-    
+
-    
+
-    
+
 
     /**
      * Constructor
@@ -68,15 +68,17 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
         $this->savlangs=$langs;
         $this->savdb=$db;
-        
+
         $this->_WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php';
-        
+
         // Set the WebService URL
         print __METHOD__." create nusoap_client for URL=".$this->_WS_DOL_URL."\n";
         $this->soapclient = new nusoap_client($this->_WS_DOL_URL);
@@ -146,10 +148,10 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     	$user=$this->savuser;
     	$langs=$this->savlangs;
     	$db=$this->savdb;
-    
+
     	$WS_METHOD  = 'createThirdParty';
-   
+
-    
+
     	// Call the WebService method and store its result in $result.
     	$authentication=array(
     			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
@@ -157,7 +159,7 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     			'login'=>'admin',
     			'password'=>'admin',
     			'entity'=>'');
-    
+
     	$body = array (
     			"id" => NULL,
     			"ref" => "name",
@@ -195,7 +197,7 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     			"vat_used" => "",
     			"vat_number" => ""
     	);
-    	
+
     	// Test URL
     	$result='';
     	$parameters = array('authentication'=>$authentication, 'thirdparty'=>$body);
@@ -215,20 +217,20 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     		print $this->soapclient->response;
     		print "\n";
     	}
-    
+
     	print __METHOD__." result=".$result['result']['result_code']."\n";
     	$this->assertEquals('OK',$result['result']['result_code']);
-    	$this->assertEquals('name',$result['ref']);    	 
+    	$this->assertEquals('name',$result['ref']);
-    
+
     	return $result;
     }
 
     /**
      * testWSThirdpartygetThirdPartyById
-     * 
+     *
      * Use id to retrieve thirdparty
      * @depends testWSThirdpartycreateThirdParty
-     * 
+     *
      * @param	array	$result		thirdparty created by create method
      * @return	array				thirpdarty updated
      */
@@ -278,18 +280,18 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('0', $result['thirdparty']['status']);
         $this->assertEquals('1', $result['thirdparty']['client']);
         $this->assertEquals('0', $result['thirdparty']['supplier']);
-        
+
-        
+
         return $result;
     }
-    
+
     /**
      * testWSThirdpartygetThirdPartyByRefExt
      *
      * Use ref_ext to retrieve thirdparty
      *
 	 * @depends testWSThirdpartycreateThirdParty
-	 * 
+	 *
      * @param	array	$result		thirdparty created by create method
      * @return	array				thirdparty
      */
@@ -301,9 +303,9 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     	$langs=$this->savlangs;
     	$db=$this->savdb;
     	$id = $result['id'];
-    
+
     	$WS_METHOD  = 'getThirdParty';
-    
+
     	// Call the WebService method and store its result in $result.
     	$authentication=array(
     			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
@@ -311,7 +313,7 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     			'login'=>'admin',
     			'password'=>'admin',
     			'entity'=>'');
-    
+
     	// Test URL
     	$result='';
     	$parameters = array('authentication'=>$authentication, 'id'=>'', 'ref'=>'', 'ref_ext'=>'12');
@@ -332,7 +334,7 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     		print $this->soapclient->response;
     		print "\n";
     	}
-        
+
     	print __METHOD__." result=".$result['result']['result_code']."\n";
     	$this->assertEquals('OK',$result['result']['result_code']);
     	$this->assertEquals($id, $result['thirdparty']['id']);
@@ -341,11 +343,11 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     	$this->assertEquals('0', $result['thirdparty']['status']);
     	$this->assertEquals('1', $result['thirdparty']['client']);
     	$this->assertEquals('0', $result['thirdparty']['supplier']);
-    
+
-    
+
     	return $result;
     }
-    
+
     /**
      * testWSThirdpartydeleteThirdParty
      *
@@ -362,9 +364,9 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     	$langs=$this->savlangs;
     	$db=$this->savdb;
     	$id = $result['id'];
-    
+
     	$WS_METHOD  = 'deleteThirdParty';
-    
+
     	// Call the WebService method and store its result in $result.
     	$authentication=array(
     			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
@@ -372,7 +374,7 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     			'login'=>'admin',
     			'password'=>'admin',
     			'entity'=>'');
-    
+
     	$result='';
     	$parameters = array('authentication'=>$authentication, 'id'=>$id, 'ref'=>'', 'ref_ext'=>'');
     	print __METHOD__." call method ".$WS_METHOD."\n";
@@ -393,7 +395,7 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__." result=".$result['result']['result_code']."\n";
     	$this->assertEquals('OK',$result['result']['result_code']);
-    
+
     	return $result;
     }
 

test/phpunit/WebservicesUserTest.php

@@ -61,7 +61,9 @@ class WebservicesUserTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

test/phpunit/XCalLibTest.php

@@ -59,7 +59,9 @@ class XCalLibTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;