alxarafe / alixar

dolibarr/test/phpunit/FactureTest.php

Indentation +15 added lines, -15 removed lines

@@ -60,9 +60,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -225,22 +225,22 @@ 
         unset($localobject->array_options['options_reseller']);
 
         $arraywithdiff = $this->objCompare(
-			$localobject,
-			$newlocalobject,
-			true,
-			array(
-				'newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','date_modification',
-				'ref','statut','paye','specimen','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
-				'cond_reglement_doc','situation_cycle_ref','situation_counter','situation_final','multicurrency_total_ht','multicurrency_total_tva',
-				'multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx'
-			)
-		);
+            $localobject,
+            $newlocalobject,
+            true,
+            array(
+                'newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','date_modification',
+                'ref','statut','paye','specimen','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
+                'cond_reglement_doc','situation_cycle_ref','situation_counter','situation_final','multicurrency_total_ht','multicurrency_total_tva',
+                'multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx'
+            )
+        );
         $this->assertEquals($arraywithdiff, array());    // Actual, Expected
 
         return $localobject;
     }
 
-   /**
+    /**
      * testFactureOther
      *
      * @param   Object $localobject Invoice
@@ -268,7 +268,7 @@ 
 
         $result=$localobject->demande_prelevement($user);
         print __METHOD__." result=".$result."\n";
-       	$this->assertLessThan($result, 0);
+            $this->assertLessThan($result, 0);
 
         return $localobject->id;
     }
@@ -302,7 +302,7 @@ 
         $result=$localobject2->initAsSpecimen();
         $result=$localobject2->create($user);
         $result=$localobject2->validate($user);
-		print 'Invoice $localobject ref = '.$localobject->ref."\n";
+        print 'Invoice $localobject ref = '.$localobject->ref."\n";
         print 'Invoice $localobject2 created with ref = '.$localobject2->ref."\n";
 
         $conf->global->INVOICE_CAN_NEVER_BE_REMOVED = 1;

Spacing +80 added lines, -80 removed lines

@@ -24,7 +24,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -35,7 +35,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -63,11 +63,11 @@ 
     	parent::__construct();
 
     	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+        global $conf, $user, $langs, $db;
+        $this->savconf = $conf;
+        $this->savuser = $user;
+        $this->savlangs = $langs;
+        $this->savdb = $db;
 
         print __METHOD__." db->type=".$db->type." user->id=".$user->id;
         //print " - db ".$db->db;
@@ -77,10 +77,10 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
 
         if (empty($conf->facture->enabled)) { print __METHOD__." module customer invoice must be enabled.\n"; die(); }
-        if (! empty($conf->ecotaxdeee->enabled)) { print __METHOD__." ecotaxdeee module must not be enabled.\n"; die(); }
+        if (!empty($conf->ecotaxdeee->enabled)) { print __METHOD__." ecotaxdeee module must not be enabled.\n"; die(); }
 
         $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
@@ -90,7 +90,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -103,11 +103,11 @@ 
      */
     protected function setUp()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         print __METHOD__."\n";
     }
@@ -129,15 +129,15 @@ 
      */
     public function testFactureCreate()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $localobject=new Facture($this->savdb);
+        $localobject = new Facture($this->savdb);
         $localobject->initAsSpecimen();
-        $result=$localobject->create($user);
+        $result = $localobject->create($user);
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
         return $result;
@@ -154,14 +154,14 @@ 
      */
     public function testFactureFetch($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $localobject=new Facture($this->savdb);
-        $result=$localobject->fetch($id);
+        $localobject = new Facture($this->savdb);
+        $result = $localobject->fetch($id);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." id=".$id." result=".$result."\n";
@@ -179,14 +179,14 @@ 
      */
     public function testFactureUpdate($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         $this->changeProperties($localobject);
-        $result=$localobject->update($user);
+        $result = $localobject->update($user);
 
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -204,19 +204,19 @@ 
      */
     public function testFactureValid($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $result=$localobject->validate($user);
+        $result = $localobject->validate($user);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
         $this->assertLessThan($result, 0);
 
         // Test everything are still same than specimen
-        $newlocalobject=new Facture($this->savdb);
+        $newlocalobject = new Facture($this->savdb);
         $newlocalobject->initAsSpecimen();
         $this->changeProperties($newlocalobject);
 
@@ -229,13 +229,13 @@ 
 			$newlocalobject,
 			true,
 			array(
-				'newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','date_modification',
-				'ref','statut','paye','specimen','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
-				'cond_reglement_doc','situation_cycle_ref','situation_counter','situation_final','multicurrency_total_ht','multicurrency_total_tva',
-				'multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx'
+				'newref', 'oldref', 'id', 'lines', 'client', 'thirdparty', 'brouillon', 'user_author', 'date_creation', 'date_validation', 'datem', 'date_modification',
+				'ref', 'statut', 'paye', 'specimen', 'ref', 'actiontypecode', 'actionmsg2', 'actionmsg', 'mode_reglement', 'cond_reglement',
+				'cond_reglement_doc', 'situation_cycle_ref', 'situation_counter', 'situation_final', 'multicurrency_total_ht', 'multicurrency_total_tva',
+				'multicurrency_total_ttc', 'fk_multicurrency', 'multicurrency_code', 'multicurrency_tx'
 			)
 		);
-        $this->assertEquals($arraywithdiff, array());    // Actual, Expected
+        $this->assertEquals($arraywithdiff, array()); // Actual, Expected
 
         return $localobject;
     }
@@ -251,11 +251,11 @@ 
      */
     public function testFactureOther($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         /*$result=$localobject->setstatus(0);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -266,7 +266,7 @@ 
         print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
         $this->assertNotEquals($localobject->date_creation, '');
 
-        $result=$localobject->demande_prelevement($user);
+        $result = $localobject->demande_prelevement($user);
         print __METHOD__." result=".$result."\n";
        	$this->assertLessThan($result, 0);
 
@@ -284,44 +284,44 @@ 
      */
     public function testFactureDelete($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         // Force default setup
         unset($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED);
         unset($conf->global->INVOICE_CAN_NEVER_BE_REMOVED);
 
-        $localobject=new Facture($this->savdb);
-        $result=$localobject->fetch($id);
+        $localobject = new Facture($this->savdb);
+        $result = $localobject->fetch($id);
 
         // Create another invoice and validate it after $localobject
-        $localobject2=new Facture($this->savdb);
-        $result=$localobject2->initAsSpecimen();
-        $result=$localobject2->create($user);
-        $result=$localobject2->validate($user);
+        $localobject2 = new Facture($this->savdb);
+        $result = $localobject2->initAsSpecimen();
+        $result = $localobject2->create($user);
+        $result = $localobject2->validate($user);
 		print 'Invoice $localobject ref = '.$localobject->ref."\n";
         print 'Invoice $localobject2 created with ref = '.$localobject2->ref."\n";
 
         $conf->global->INVOICE_CAN_NEVER_BE_REMOVED = 1;
 
-        $result=$localobject2->delete($user);					// Deletion is KO, option INVOICE_CAN_NEVER_BE_REMOVED is on
+        $result = $localobject2->delete($user); // Deletion is KO, option INVOICE_CAN_NEVER_BE_REMOVED is on
         print __METHOD__." id=".$localobject2->id." ref=".$localobject2->ref." result=".$result."\n";
         $this->assertEquals(0, $result, 'Deletion should fail, option INVOICE_CAN_NEVER_BE_REMOVED is on');
 
         unset($conf->global->INVOICE_CAN_NEVER_BE_REMOVED);
 
-        $result=$localobject->delete($user);					// Deletion is KO, it is not last invoice
+        $result = $localobject->delete($user); // Deletion is KO, it is not last invoice
         print __METHOD__." id=".$localobject->id." ref=".$localobject->ref." result=".$result."\n";
         $this->assertEquals(0, $result, 'Deletion should fail, it is not last invoice');
 
-        $result=$localobject2->delete($user);					// Deletion is OK, it is last invoice
+        $result = $localobject2->delete($user); // Deletion is OK, it is last invoice
         print __METHOD__." id=".$localobject2->id." ref=".$localobject2->ref." result=".$result."\n";
         $this->assertGreaterThan(0, $result, 'Deletion should work, it is last invoice');
 
-        $result=$localobject->delete($user);					// Deletion is KO, it is not last invoice
+        $result = $localobject->delete($user); // Deletion is KO, it is not last invoice
         print __METHOD__." id=".$localobject->id." ref=".$localobject->ref." result=".$result."\n";
         $this->assertGreaterThan(0, $result, 'Deletion should work, it is again last invoice');
 
@@ -336,7 +336,7 @@ 
      */
     public function changeProperties(&$localobject)
     {
-        $localobject->note_private='New note';
+        $localobject->note_private = 'New note';
         //$localobject->note='New note after update';
     }
 
@@ -349,29 +349,29 @@ 
      * @param   array $fieldstoignorearray      Array of fields to ignore in diff
      * @return  array                           Array with differences
      */
-    public function objCompare($oA,$oB,$ignoretype=true,$fieldstoignorearray=array('id'))
+    public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
     {
-        $retAr=array();
+        $retAr = array();
 
         if (get_class($oA) !== get_class($oB))
         {
-            $retAr[]="Supplied objects are not of same class.";
+            $retAr[] = "Supplied objects are not of same class.";
         }
         else
         {
-            $oVarsA=get_object_vars($oA);
-            $oVarsB=get_object_vars($oB);
-            $aKeys=array_keys($oVarsA);
-            foreach($aKeys as $sKey)
+            $oVarsA = get_object_vars($oA);
+            $oVarsB = get_object_vars($oB);
+            $aKeys = array_keys($oVarsA);
+            foreach ($aKeys as $sKey)
             {
-                if (in_array($sKey,$fieldstoignorearray)) continue;
-                if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
+                if (in_array($sKey, $fieldstoignorearray)) continue;
+                if (!$ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
                 {
-                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+                    $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ?get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ?get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
                 }
                 if ($ignoretype && $oVarsA[$sKey] != $oVarsB[$sKey])
                 {
-                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+                    $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ?get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ?get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
                 }
             }
         }

Braces +4 added lines, -3 removed lines

@@ -356,15 +356,16 @@
         if (get_class($oA) !== get_class($oB))
         {
             $retAr[]="Supplied objects are not of same class.";
-        }
-        else
+        } else
         {
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
             foreach($aKeys as $sKey)
             {
-                if (in_array($sKey,$fieldstoignorearray)) continue;
+                if (in_array($sKey,$fieldstoignorearray)) {
+                    continue;
+                }
                 if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
                 {
                     $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);

dolibarr/test/phpunit/CompanyLibTest.php

Indentation +2 added lines, -2 removed lines

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

Spacing +24 added lines, -24 removed lines

@@ -23,7 +23,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -34,7 +34,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -62,11 +62,11 @@ 
     	parent::__construct();
 
     	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+        global $conf, $user, $langs, $db;
+        $this->savconf = $conf;
+        $this->savuser = $user;
+        $this->savlangs = $langs;
+        $this->savdb = $db;
 
         print __METHOD__." db->type=".$db->type." user->id=".$user->id;
         //print " - db ".$db->db;
@@ -76,7 +76,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        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";
@@ -85,7 +85,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -98,11 +98,11 @@ 
      */
     protected function setUp()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         print __METHOD__."\n";
     }
@@ -123,22 +123,22 @@ 
      */
     public function testNameCurrency()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $result=currency_name('USD');
+        $result = currency_name('USD');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('US Dollars',$result,'Test to get currency name USD in default language '.$langs->defaultlang);
+        $this->assertEquals('US Dollars', $result, 'Test to get currency name USD in default language '.$langs->defaultlang);
 
-        $outputlangs=new Translate('', $conf);
+        $outputlangs = new Translate('', $conf);
         $outputlangs->setDefaultLang('fr_FR');
 
-        $result=currency_name('USD', 1, $outputlangs);
+        $result = currency_name('USD', 1, $outputlangs);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals('USD - Dollars US',$result,'Test to get currency name USD in default language '.$outputlangs->getDefaultLang());
+        $this->assertEquals('USD - Dollars US', $result, 'Test to get currency name USD in default language '.$outputlangs->getDefaultLang());
 
         return $result;
     }

dolibarr/test/phpunit/FactureRecTest.php

Indentation +74 added lines, -74 removed lines

@@ -32,9 +32,9 @@ 
 
 if (empty($user->id))
 {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -48,75 +48,75 @@ 
  */
 class FactureRecTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return FactureTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return FactureTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        parent::__construct();
+
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+        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";
+        print __METHOD__."\n";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
-	protected function tearDown()
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
+    protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -126,23 +126,23 @@ 
      */
     public function testFactureRecCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobjectinv=new Facture($this->savdb);
-		$localobjectinv->initAsSpecimen();
-		$localobjectinv->create($user);
-
-		$localobject=new FactureRec($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user, $localobjectinv->id);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobjectinv=new Facture($this->savdb);
+        $localobjectinv->initAsSpecimen();
+        $localobjectinv->create($user);
+
+        $localobject=new FactureRec($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user, $localobjectinv->id);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
+        return $result;
     }
 
 
@@ -169,7 +169,7 @@ 
      * @param 	Object		$oB						Object operand 2
      * @param	boolean		$ignoretype				False will not report diff if type of value differs
      * @param	array		$fieldstoignorearray	Array of fields to ignore in diff
-	 * @return	array								Array with differences
+     * @return	array								Array with differences
      */
     public function objCompare($oA,$oB,$ignoretype=true,$fieldstoignorearray=array('id'))
     {

Spacing +35 added lines, -35 removed lines

@@ -23,7 +23,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -64,11 +64,11 @@ 
 		parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -78,8 +78,8 @@ 
 	// Static methods
   	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.
+    	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";
     }
@@ -87,7 +87,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -100,11 +100,11 @@ 
 	 */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
     }
@@ -126,19 +126,19 @@ 
      */
     public function testFactureRecCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobjectinv=new Facture($this->savdb);
+		$localobjectinv = new Facture($this->savdb);
 		$localobjectinv->initAsSpecimen();
 		$localobjectinv->create($user);
 
-		$localobject=new FactureRec($this->savdb);
+		$localobject = new FactureRec($this->savdb);
     	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user, $localobjectinv->id);
+    	$result = $localobject->create($user, $localobjectinv->id);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." result=".$result."\n";
@@ -158,7 +158,7 @@ 
      */
     public function changeProperties(&$localobject)
     {
-        $localobject->note_private='New note';
+        $localobject->note_private = 'New note';
         //$localobject->note='New note after update';
     }
 
@@ -171,29 +171,29 @@ 
      * @param	array		$fieldstoignorearray	Array of fields to ignore in diff
 	 * @return	array								Array with differences
      */
-    public function objCompare($oA,$oB,$ignoretype=true,$fieldstoignorearray=array('id'))
+    public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
     {
-        $retAr=array();
+        $retAr = array();
 
         if (get_class($oA) !== get_class($oB))
         {
-            $retAr[]="Supplied objects are not of same class.";
+            $retAr[] = "Supplied objects are not of same class.";
         }
         else
         {
-            $oVarsA=get_object_vars($oA);
-            $oVarsB=get_object_vars($oB);
-            $aKeys=array_keys($oVarsA);
-            foreach($aKeys as $sKey)
+            $oVarsA = get_object_vars($oA);
+            $oVarsB = get_object_vars($oB);
+            $aKeys = array_keys($oVarsA);
+            foreach ($aKeys as $sKey)
             {
-                if (in_array($sKey,$fieldstoignorearray)) continue;
-                if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
+                if (in_array($sKey, $fieldstoignorearray)) continue;
+                if (!$ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
                 {
-                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+                    $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ?get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ?get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
                 }
                 if ($ignoretype && $oVarsA[$sKey] != $oVarsB[$sKey])
                 {
-                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+                    $retAr[] = $sKey.' : '.(is_object($oVarsA[$sKey]) ?get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ?get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
                 }
             }
         }

Braces +4 added lines, -3 removed lines

@@ -178,15 +178,16 @@
         if (get_class($oA) !== get_class($oB))
         {
             $retAr[]="Supplied objects are not of same class.";
-        }
-        else
+        } else
         {
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
             foreach($aKeys as $sKey)
             {
-                if (in_array($sKey,$fieldstoignorearray)) continue;
+                if (in_array($sKey,$fieldstoignorearray)) {
+                    continue;
+                }
                 if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
                 {
                     $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);

dolibarr/test/phpunit/CodingSqlTest.php

Indentation +3 added lines, -3 removed lines

@@ -72,9 +72,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -165,7 +165,7 @@ 
                 $result=strpos($filecontent,'"');
                 if ($result)
                 {
-                	$result=(! strpos($filecontent,'["') && ! strpos($filecontent,'{"'));
+                    $result=(! strpos($filecontent,'["') && ! strpos($filecontent,'{"'));
                 }
                 print __METHOD__." Result for checking we don't have double quote = ".$result."\n";
                 $this->assertTrue($result===false, 'Found double quote that is not [" neither {" (used for json content) into '.$file.'. Bad.');

Spacing +59 added lines, -59 removed lines

@@ -23,23 +23,23 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
+if (!defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
+if (!defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined("NOLOGIN"))        define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 
 if (empty($user->id))
 {
@@ -47,7 +47,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -75,11 +75,11 @@ 
     	parent::__construct();
 
     	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+        global $conf, $user, $langs, $db;
+        $this->savconf = $conf;
+        $this->savuser = $user;
+        $this->savlangs = $langs;
+        $this->savdb = $db;
 
         print __METHOD__." db->type=".$db->type." user->id=".$user->id;
         //print " - db ".$db->db;
@@ -89,7 +89,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        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";
@@ -98,7 +98,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -111,11 +111,11 @@ 
      */
     protected function setUp()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         print __METHOD__."\n";
     }
@@ -137,11 +137,11 @@ 
      */
     public function testSql()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         $listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/data', DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration');
 
@@ -150,37 +150,37 @@ 
             print 'Process dir '.$dir."\n";
             $filesarray = scandir($dir);
 
-            foreach($filesarray as $key => $file)
+            foreach ($filesarray as $key => $file)
             {
-                if (! preg_match('/\.sql$/',$file))
+                if (!preg_match('/\.sql$/', $file))
                     continue;
 
                 print 'Check sql file '.$file."\n";
-                $filecontent=file_get_contents($dir.'/'.$file);
+                $filecontent = file_get_contents($dir.'/'.$file);
 
-                $result=strpos($filecontent,'`');
+                $result = strpos($filecontent, '`');
                 print __METHOD__." Result for checking we don't have back quote = ".$result."\n";
-                $this->assertTrue($result===false, 'Found back quote into '.$file.'. Bad.');
+                $this->assertTrue($result === false, 'Found back quote into '.$file.'. Bad.');
 
-                $result=strpos($filecontent,'"');
+                $result = strpos($filecontent, '"');
                 if ($result)
                 {
-                	$result=(! strpos($filecontent,'["') && ! strpos($filecontent,'{"'));
+                	$result = (!strpos($filecontent, '["') && !strpos($filecontent, '{"'));
                 }
                 print __METHOD__." Result for checking we don't have double quote = ".$result."\n";
-                $this->assertTrue($result===false, 'Found double quote that is not [" neither {" (used for json content) into '.$file.'. Bad.');
+                $this->assertTrue($result === false, 'Found double quote that is not [" neither {" (used for json content) into '.$file.'. Bad.');
 
-                $result=strpos($filecontent,'int(');
+                $result = strpos($filecontent, 'int(');
                 print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n";
-                $this->assertTrue($result===false, 'Found int(x) or tinyint(x) instead of integer or tinyint into '.$file.'. Bad.');
+                $this->assertTrue($result === false, 'Found int(x) or tinyint(x) instead of integer or tinyint into '.$file.'. Bad.');
 
-                $result=strpos($filecontent,'ON DELETE CASCADE');
+                $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.');
+                $this->assertTrue($result === false, 'Found ON DELETE CASCADE into '.$file.'. Bad.');
 
-                $result=strpos($filecontent,'NUMERIC(');
+                $result = strpos($filecontent, 'NUMERIC(');
                 print __METHOD__." Result for checking we don't have 'NUMERIC(' = ".$result."\n";
-                $this->assertTrue($result===false, 'Found NUMERIC( into '.$file.'. Bad.');
+                $this->assertTrue($result === false, 'Found NUMERIC( into '.$file.'. Bad.');
 
                 if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration')
                 {
@@ -192,18 +192,18 @@ 
                 }
                 else
                 {
-                    if (preg_match('/\.key\.sql$/',$file))
+                    if (preg_match('/\.key\.sql$/', $file))
                     {
                         // Test for key files only
                     }
                     else
                     {
                         // Test for non key files only
-                        $result=(strpos($filecontent,'KEY ') && strpos($filecontent,'PRIMARY KEY') == 0);
+                        $result = (strpos($filecontent, 'KEY ') && strpos($filecontent, 'PRIMARY KEY') == 0);
                         print __METHOD__." Result for checking we don't have ' KEY ' instead of a sql file to create index = ".$result."\n";
-                        $this->assertTrue($result===false, 'Found KEY into '.$file.'. Bad.');
+                        $this->assertTrue($result === false, 'Found KEY into '.$file.'. Bad.');
 
-                        $result=stripos($filecontent,'ENGINE=innodb');
+                        $result = stripos($filecontent, 'ENGINE=innodb');
                         print __METHOD__." Result for checking we have the ENGINE=innodb string = ".$result."\n";
                         $this->assertGreaterThan(0, $result, 'The ENGINE=innodb was not found into '.$file.'. Add it or just fix syntax to match case.');
                     }
@@ -221,27 +221,27 @@ 
      */
     public function testInitData()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         $filesarray = scandir(DOL_DOCUMENT_ROOT.'/../dev/initdata');
-        foreach($filesarray as $key => $file) {
-            if (! preg_match('/\.sql$/',$file))
+        foreach ($filesarray as $key => $file) {
+            if (!preg_match('/\.sql$/', $file))
                 continue;
 
             print 'Check sql file '.$file."\n";
-            $filecontent=file_get_contents(DOL_DOCUMENT_ROOT.'/../dev/initdata/'.$file);
+            $filecontent = file_get_contents(DOL_DOCUMENT_ROOT.'/../dev/initdata/'.$file);
 
-            $result=strpos($filecontent,'@gmail.com');
+            $result = strpos($filecontent, '@gmail.com');
             print __METHOD__." Result for checking we don't have personal data = ".$result."\n";
-            $this->assertTrue($result===false, 'Found a bad key into file '.$file);
+            $this->assertTrue($result === false, 'Found a bad key into file '.$file);
 
-            $result=strpos($filecontent,'eldy@');
+            $result = strpos($filecontent, 'eldy@');
             print __METHOD__." Result for checking we don't have personal data = ".$result."\n";
-            $this->assertTrue($result===false, 'Found a bad key into file '.$file);
+            $this->assertTrue($result === false, 'Found a bad key into file '.$file);
         }
 
         return;

Braces +42 added lines, -20 removed lines

@@ -30,16 +30,39 @@ 
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) {
+    define('NOREQUIREUSER','1');
+}
+if (! defined('NOREQUIREDB')) {
+    define('NOREQUIREDB','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+    define('NOREQUIRETRAN','1');
+}
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+// If there is no menu to show
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+// If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined("NOLOGIN")) {
+    define("NOLOGIN",'1');
+}
+// If this page is public (can be called outside logged session)
 
 if (empty($user->id))
 {
@@ -152,8 +175,9 @@ 
 
             foreach($filesarray as $key => $file)
             {
-                if (! preg_match('/\.sql$/',$file))
-                    continue;
+                if (! preg_match('/\.sql$/',$file)) {
+                                    continue;
+                }
 
                 print 'Check sql file '.$file."\n";
                 $filecontent=file_get_contents($dir.'/'.$file);
@@ -185,18 +209,15 @@ 
                 if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration')
                 {
                     // Test for migration files only
-                }
-                elseif ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/data')
+                } elseif ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/data')
                 {
                     // Test for data files only
-                }
-                else
+                } else
                 {
                     if (preg_match('/\.key\.sql$/',$file))
                     {
                         // Test for key files only
-                    }
-                    else
+                    } else
                     {
                         // Test for non key files only
                         $result=(strpos($filecontent,'KEY ') && strpos($filecontent,'PRIMARY KEY') == 0);
@@ -229,8 +250,9 @@ 
 
         $filesarray = scandir(DOL_DOCUMENT_ROOT.'/../dev/initdata');
         foreach($filesarray as $key => $file) {
-            if (! preg_match('/\.sql$/',$file))
-                continue;
+            if (! preg_match('/\.sql$/',$file)) {
+                            continue;
+            }
 
             print 'Check sql file '.$file."\n";
             $filecontent=file_get_contents(DOL_DOCUMENT_ROOT.'/../dev/initdata/'.$file);

dolibarr/test/phpunit/CodingPhpTest.php

Indentation +12 added lines, -12 removed lines

@@ -72,9 +72,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -164,12 +164,12 @@ 
             preg_match_all('/(..)\s*\.\s*\$this->db->idate\(/', $filecontent, $matches, PREG_SET_ORDER);
             foreach($matches as $key => $val)
             {
-            	if ($val[1] != '\'"' && $val[1] != '\'\'')
-            	{
-            		$ok=false;
-            		break;
-            	}
-            	//if ($reg[0] != 'db') $ok=false;
+                if ($val[1] != '\'"' && $val[1] != '\'\'')
+                {
+                    $ok=false;
+                    break;
+                }
+                //if ($reg[0] != 'db') $ok=false;
             }
             //print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
             $this->assertTrue($ok, 'Found a $this->db->idate to forge a sql request without quotes around this date field '.$file['fullname'].' :: '.$val[0]);
@@ -201,7 +201,7 @@ 
             preg_match_all('/(..............)\$_SERVER\[\'QUERY_STRING\'\]/', $filecontent, $matches, PREG_SET_ORDER);
             foreach($matches as $key => $val)
             {
-            	if ($val[1] != 'scape_htmltag(' && $val[1] != 'ing_nohtmltag(' && $val[1] != 'dol_escape_js(')
+                if ($val[1] != 'scape_htmltag(' && $val[1] != 'ing_nohtmltag(' && $val[1] != 'dol_escape_js(')
                 {
                     $ok=false;
                     break;
@@ -217,8 +217,8 @@ 
             preg_match_all('/print_liste_field_titre\(\$langs/', $filecontent, $matches, PREG_SET_ORDER);
             foreach($matches as $key => $val)
             {
-           		$ok=false;
-           		break;
+                    $ok=false;
+                    break;
             }
             $this->assertTrue($ok, 'Found a use of print_liste_field_titre with fist parameter that is a translated value instead of just the translation key in file '.$file['fullname'].'. Bad.');
 
@@ -230,7 +230,7 @@ 
             preg_match_all('/<br \/>/', $filecontent, $matches, PREG_SET_ORDER);
             foreach($matches as $key => $val)
             {
-            	if ($file['name'] != 'functions.lib.php')
+                if ($file['name'] != 'functions.lib.php')
                 {
                     $ok=false;
                     break;

Spacing +51 added lines, -51 removed lines

@@ -23,23 +23,23 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
+if (!defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
+if (!defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined("NOLOGIN"))        define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 
 if (empty($user->id))
 {
@@ -47,7 +47,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -75,11 +75,11 @@ 
     	parent::__construct();
 
     	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+        global $conf, $user, $langs, $db;
+        $this->savconf = $conf;
+        $this->savuser = $user;
+        $this->savlangs = $langs;
+        $this->savdb = $db;
 
         print __METHOD__." db->type=".$db->type." user->id=".$user->id;
         //print " - db ".$db->db;
@@ -89,7 +89,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        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";
@@ -98,7 +98,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -111,11 +111,11 @@ 
      */
     protected function setUp()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         print __METHOD__."\n";
     }
@@ -137,16 +137,16 @@ 
      */
     public function testPHP()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         $filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname');
 
-        foreach($filesarray as $key => $file)
+        foreach ($filesarray as $key => $file)
         {
             if (preg_match('/\/htdocs\/includes\//', $file['fullname'])) continue;
             if (preg_match('/\/htdocs\/custom\//', $file['fullname'])) continue;
@@ -155,18 +155,18 @@ 
             if (preg_match('/\/htdocs\/teclib/', $file['fullname'])) continue;
 
             print 'Check php file '.$file['fullname']."\n";
-            $filecontent=file_get_contents($file['fullname']);
+            $filecontent = file_get_contents($file['fullname']);
 
 
-            $ok=true;
-            $matches=array();
+            $ok = true;
+            $matches = array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/(..)\s*\.\s*\$this->db->idate\(/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
             	if ($val[1] != '\'"' && $val[1] != '\'\'')
             	{
-            		$ok=false;
+            		$ok = false;
             		break;
             	}
             	//if ($reg[0] != 'db') $ok=false;
@@ -176,15 +176,15 @@ 
             //exit;
 
 
-            $ok=true;
-            $matches=array();
+            $ok = true;
+            $matches = array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/(=|sql.+)\s*\'"\s*\.\s*\$this->(....)/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                 if ($val[2] != 'db->' && $val[2] != 'esca')
                 {
-                    $ok=false;
+                    $ok = false;
                     break;
                 }
                 //if ($reg[0] != 'db') $ok=false;
@@ -195,15 +195,15 @@ 
 
 
             // Test that output of $_SERVER\[\'QUERY_STRING\'\] is escaped.
-            $ok=true;
-            $matches=array();
+            $ok = true;
+            $matches = array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/(..............)\$_SERVER\[\'QUERY_STRING\'\]/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
             	if ($val[1] != 'scape_htmltag(' && $val[1] != 'ing_nohtmltag(' && $val[1] != 'dol_escape_js(')
                 {
-                    $ok=false;
+                    $ok = false;
                     break;
                 }
             }
@@ -211,28 +211,28 @@ 
 
 
             // Test that first param of print_liste_field_titre is a translation key and not the translated value
-            $ok=true;
-            $matches=array();
+            $ok = true;
+            $matches = array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/print_liste_field_titre\(\$langs/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
-           		$ok=false;
+           		$ok = false;
            		break;
             }
             $this->assertTrue($ok, 'Found a use of print_liste_field_titre with fist parameter that is a translated value instead of just the translation key in file '.$file['fullname'].'. Bad.');
 
 
             // Test we don't have <br />
-            $ok=true;
-            $matches=array();
+            $ok = true;
+            $matches = array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/<br \/>/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
             	if ($file['name'] != 'functions.lib.php')
                 {
-                    $ok=false;
+                    $ok = false;
                     break;
                 }
             }

Braces +48 added lines, -15 removed lines

@@ -30,16 +30,39 @@ 
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) {
+    define('NOREQUIREUSER','1');
+}
+if (! defined('NOREQUIREDB')) {
+    define('NOREQUIREDB','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+    define('NOREQUIRETRAN','1');
+}
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+// If there is no menu to show
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+// If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined("NOLOGIN")) {
+    define("NOLOGIN",'1');
+}
+// If this page is public (can be called outside logged session)
 
 if (empty($user->id))
 {
@@ -148,11 +171,21 @@ 
 
         foreach($filesarray as $key => $file)
         {
-            if (preg_match('/\/htdocs\/includes\//', $file['fullname'])) continue;
-            if (preg_match('/\/htdocs\/custom\//', $file['fullname'])) continue;
-            if (preg_match('/\/htdocs\/dolimed/', $file['fullname'])) continue;
-            if (preg_match('/\/htdocs\/nltechno/', $file['fullname'])) continue;
-            if (preg_match('/\/htdocs\/teclib/', $file['fullname'])) continue;
+            if (preg_match('/\/htdocs\/includes\//', $file['fullname'])) {
+                continue;
+            }
+            if (preg_match('/\/htdocs\/custom\//', $file['fullname'])) {
+                continue;
+            }
+            if (preg_match('/\/htdocs\/dolimed/', $file['fullname'])) {
+                continue;
+            }
+            if (preg_match('/\/htdocs\/nltechno/', $file['fullname'])) {
+                continue;
+            }
+            if (preg_match('/\/htdocs\/teclib/', $file['fullname'])) {
+                continue;
+            }
 
             print 'Check php file '.$file['fullname']."\n";
             $filecontent=file_get_contents($file['fullname']);

dolibarr/test/phpunit/NumberingModulesTest.php

Indentation +505 added lines, -505 removed lines

@@ -30,9 +30,9 @@ 
 
 if (empty($user->id))
 {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -46,76 +46,76 @@ 
  */
 class NumberingModulesTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return NumberingModulesTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return NumberingModulesTest
+     */
+    function __construct()
+    {
+        parent::__construct();
+
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+        public static function setUpBeforeClass()
     {
-    	global $conf,$user,$langs,$db;
+        global $conf,$user,$langs,$db;
 
-    	$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
-	protected function tearDown()
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
+    protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -125,454 +125,454 @@ 
      */
     public function testFactureMercure()
     {
-    	global $conf,$user,$langs,$db,$mysoc;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php';
-		require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/mod_facture_mercure.php';
-
-		// First we try with a simple mask, with no reset
-		// and we test counter is still increase second year.
-		$conf->global->FACTURE_ADDON='mercure';
-		$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
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1915-0001', $result, 'Test for {yyyy}-{0000}, 1st invoice');				// counter must start to 1
-		$result2=$localobject->create($user,1);
-		print __METHOD__." result2=".$result."\n";
-		$result3=$localobject->validate($user, $result);		// create invoice by forcing ref
-		print __METHOD__." result3=".$result."\n";
-		$this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok');	// counter must start to 1
-		$result=$localobject->is_erasable();
-		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result, 'Test for is_erasable, 1st invoice');						    // Can be deleted
-		$localobject2=new Facture($this->savdb);
-		$localobject2->initAsSpecimen();
-		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1916);	// we use following year for second invoice (there is no reset into mask)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject2, 'last');
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1915-0001', $result, "Test to get last value with param 'last'");
-		$result=$numbering->getNextValue($mysoc, $localobject2);
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1916-0002', $result);				// counter must be now 2 (not reseted)
-		$result2=$localobject2->create($user,1);
-		print __METHOD__." result2=".$result."\n";
-		$result3=$localobject2->validate($user, $result);		// create invoice by forcing ref
-		print __METHOD__." result3=".$result."\n";
-		$this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok');	// counter must start to 1
-		$result=$localobject2->is_erasable();
-		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
-		$result=$localobject->is_erasable();
-		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertLessThanOrEqual(0, $result, 'Test for {yyyy}-{0000} that is_erasable is 0 for 1st invoice');						// 1 can no more be deleted (2 is more recent)
-
-		// Now we try with a reset
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000@1}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000@1}';
-
-		$localobject=new Facture($this->savdb);
-		$localobject->initAsSpecimen();
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1910);	// we use year 1910 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user,1);
-		$result3=$localobject->validate($user, $result);
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1910-0001', $result, 'Test for {yyyy}-{0000@1} 1st invoice');				// counter must start to 1
-		$localobject2=new Facture($this->savdb);
-		$localobject2->initAsSpecimen();
-		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1910);	// we use same year for second invoice (and there is a reset required)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject2);
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1910-0002', $result, 'Test for {yyyy}-{0000@1} 2nd invoice, same day');	// counter must be now 2
-		$localobject3=new Facture($this->savdb);
-		$localobject3->initAsSpecimen();
-		$localobject3->date=dol_mktime(12, 0, 0, 1, 1, 1911);	// we use next year for third invoice (and there is a reset required)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject3);
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1911-0001', $result, 'Test for {yyyy}-{0000@1} 3nd invoice, same day');	// counter must be now 1
-
-		// Same but we add month after year
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@1}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@1}';
-		$localobject=new Facture($this->savdb);
-		$localobject->initAsSpecimen();
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1920);	// we use year 1920 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user,1);
-		$result3=$localobject->validate($user, $result);
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('192001-0001', $result, 'Test for {yyyy}{mm}-{0000@1} 1st invoice');			// counter must start to 1
-		$result=$localobject->is_erasable();
-		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
-		$localobject2=new Facture($this->savdb);
-		$localobject2->initAsSpecimen();
-		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1921);	// we use following year for second invoice (and there is a reset required)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject2);
-		$result2=$localobject2->create($user,1);
-		$result3=$localobject2->validate($user, $result);
-		print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('192101-0001', $result);			// counter must be reseted to 1
-    	$result=$localobject2->is_erasable();
-    	print __METHOD__." is_erasable=".$result."\n";
-    	$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
-    	$result=$localobject->is_erasable();
-    	print __METHOD__." is_erasable=".$result."\n";
-    	$this->assertGreaterThanOrEqual(1, $result);						// Case 1 can be deleted (because there was a reset for case 2)
-
-		// Same but we add month before year and use a year on 2 digits
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='[mm}{yy}-{0000@1}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{mm}{yy}-{0000@1}';
-		$localobject=new Facture($this->savdb);
-		$localobject->initAsSpecimen();
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1925);	// we use year 1925 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user,1);
-		$result3=$localobject->validate($user, $result);
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('0125-0001', $result, 'Test for {mm}{yy}-{0000@1} 1st invoice');				// counter must start to 1
-		$result=$localobject->is_erasable();					// This call get getNextNumRef with param 'last'
-		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
-		$localobject2=new Facture($this->savdb);
-		$localobject2->initAsSpecimen();
-		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1925);	// we use same year 1925 for second invoice (and there is a reset required)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject2);
-		$result2=$localobject2->create($user,1);
-		$result3=$localobject2->validate($user, $result);
-		print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('0125-0002', $result, 'Test for {mm}{yy}-{0000@1} 2st invoice');			// counter must be now 2
-    	$result=$localobject2->is_erasable();
-    	print __METHOD__." is_erasable=".$result."\n";
-    	$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
-    	$result=$localobject->is_erasable();
-    	print __METHOD__." is_erasable=".$result."\n";
-    	$this->assertLessThanOrEqual(0, $result);						// Case 1 can not be deleted (because there is an invoice 2)
-		$localobject3=new Facture($this->savdb);
-		$localobject3->initAsSpecimen();
-		$localobject3->date=dol_mktime(12, 0, 0, 1, 1, 1926);	// we use following year for third invoice (and there is a reset required)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject3);
-		print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('0126-0001', $result, 'Test for {mm}{yy}-{0000@1} 3rd invoice');			// counter must be now 1
-
-    	// Try an offset when an invoice already exists
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}';
-    	$result=$numbering->getNextValue($mysoc, $localobject2);
-
-		// Now we try with a different fiscal month (forced by mask)
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@6}';
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1930);	// we use year 1930 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject, 'last');
-    	print __METHOD__." result for last=".$result."\n";
-    	$this->assertEquals('', $result);						// no existing ref into reset range
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('193001-0001', $result);			// counter must start to 1
-    	$result=$numbering->getNextValue($mysoc, $localobject, 'last');
-    	print __METHOD__." result for last=".$result."\n";
-    	$this->assertEquals('193001-0001', $result);			// last ref into reset range should be same than last created
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1930);	// we use same year but fiscal month after
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject, 'last');
-    	print __METHOD__." result for last=".$result."\n";
-    	$this->assertEquals('', $result);						// last ref into reset range should be ''
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('193012-0001', $result);	// counter must be reset to 1
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1931);	// we use same fiscal year but different year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('193101-0002', $result);	// counter must be 2
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1931);	// we use different fiscal year but same year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('193112-0001', $result);	// counter must be reset to 1
-
-
-    	// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START)
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@0}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@0}';
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1940);	// we use year 1940 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('194001-0001', $result);	// counter must start to 1
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1940);	// we use same year but fiscal month after
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('194012-0001', $result);	// counter must be reset to 1
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1941);	// we use same fiscal year but different year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('194101-0002', $result);	// counter must be 2
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1941);	// we use different discal year but same year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('194112-0001', $result);	// counter must be reset to 1
-
-
-    	// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want year of element
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@=}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@=}';
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1950);	// we use year 1950 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('195001-0001', $result);	// counter must start to 1
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1950);	// we use same year but fiscal month after
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('195012-0001', $result);	// counter must be reset to 1
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1951);	// we use same fiscal year but different year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('195101-0002', $result);	// counter must be 2
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1951);	// we use different discal year but same year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('195112-0001', $result);	// counter must be reset to 1
-
-
-    	// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want start year
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@-}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@-}';
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1960);	// we use year 1960 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('195901-0001', $result);	// counter must start to 1
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1960);	// we use same year but fiscal month after
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('196012-0001', $result);	// counter must be reset to 1
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1961);	// we use same fiscal year but different year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('196001-0002', $result);	// counter must be 2
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1961);	// we use different discal year but same year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('196112-0001', $result);	// counter must be reset to 1
-
-
-    	// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want end year
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@+}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@+}';
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1970);	// we use year 1970 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('197001-0001', $result);	// counter must start to 1
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1970);	// we use same year but fiscal month after
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('197112-0001', $result);	// counter must be reset to 1
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1971);	// we use same fiscal year but different year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('197101-0002', $result);	// counter must be 2
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1971);	// we use different fiscal year but same year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('197212-0001', $result);	// counter must be reset to 1
-
-    	// Now we try with a reset every month (@99)
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@99}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@99}';
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('198001-0001', $result);	// counter must start to 1
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('198001-0002', $result);	// counter must start to 2
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 2, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('198002-0001', $result);	// counter must start to 1
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1981);	// we use year 1981 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('198101-0001', $result);	// counter must start to 1
-
-    	// Test with {t} tag
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=1;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{t}{yyyy}{mm}-{0000}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{t}{yyyy}{mm}-{0000}';
-
-    	$tmpthirdparty=new Societe($this->savdb);
-    	$tmpthirdparty->initAsSpecimen();
-    	$tmpthirdparty->typent_code = 'TE_ABC';
-
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1982);	// we use year 1982 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($tmpthirdparty, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('A198201-0001', $result);	// counter must start to 1
-
-
-
-    	return $result;
+        global $conf,$user,$langs,$db,$mysoc;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php';
+        require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/mod_facture_mercure.php';
+
+        // First we try with a simple mask, with no reset
+        // and we test counter is still increase second year.
+        $conf->global->FACTURE_ADDON='mercure';
+        $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
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1915-0001', $result, 'Test for {yyyy}-{0000}, 1st invoice');				// counter must start to 1
+        $result2=$localobject->create($user,1);
+        print __METHOD__." result2=".$result."\n";
+        $result3=$localobject->validate($user, $result);		// create invoice by forcing ref
+        print __METHOD__." result3=".$result."\n";
+        $this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok');	// counter must start to 1
+        $result=$localobject->is_erasable();
+        print __METHOD__." is_erasable=".$result."\n";
+        $this->assertGreaterThanOrEqual(1, $result, 'Test for is_erasable, 1st invoice');						    // Can be deleted
+        $localobject2=new Facture($this->savdb);
+        $localobject2->initAsSpecimen();
+        $localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1916);	// we use following year for second invoice (there is no reset into mask)
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject2, 'last');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1915-0001', $result, "Test to get last value with param 'last'");
+        $result=$numbering->getNextValue($mysoc, $localobject2);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1916-0002', $result);				// counter must be now 2 (not reseted)
+        $result2=$localobject2->create($user,1);
+        print __METHOD__." result2=".$result."\n";
+        $result3=$localobject2->validate($user, $result);		// create invoice by forcing ref
+        print __METHOD__." result3=".$result."\n";
+        $this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok');	// counter must start to 1
+        $result=$localobject2->is_erasable();
+        print __METHOD__." is_erasable=".$result."\n";
+        $this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
+        $result=$localobject->is_erasable();
+        print __METHOD__." is_erasable=".$result."\n";
+        $this->assertLessThanOrEqual(0, $result, 'Test for {yyyy}-{0000} that is_erasable is 0 for 1st invoice');						// 1 can no more be deleted (2 is more recent)
+
+        // Now we try with a reset
+        $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000@1}';
+        $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000@1}';
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1910);	// we use year 1910 to be sure to not have existing invoice for this year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1910-0001', $result, 'Test for {yyyy}-{0000@1} 1st invoice');				// counter must start to 1
+        $localobject2=new Facture($this->savdb);
+        $localobject2->initAsSpecimen();
+        $localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1910);	// we use same year for second invoice (and there is a reset required)
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject2);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1910-0002', $result, 'Test for {yyyy}-{0000@1} 2nd invoice, same day');	// counter must be now 2
+        $localobject3=new Facture($this->savdb);
+        $localobject3->initAsSpecimen();
+        $localobject3->date=dol_mktime(12, 0, 0, 1, 1, 1911);	// we use next year for third invoice (and there is a reset required)
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject3);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1911-0001', $result, 'Test for {yyyy}-{0000@1} 3nd invoice, same day');	// counter must be now 1
+
+        // Same but we add month after year
+        $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@1}';
+        $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@1}';
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1920);	// we use year 1920 to be sure to not have existing invoice for this year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('192001-0001', $result, 'Test for {yyyy}{mm}-{0000@1} 1st invoice');			// counter must start to 1
+        $result=$localobject->is_erasable();
+        print __METHOD__." is_erasable=".$result."\n";
+        $this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
+        $localobject2=new Facture($this->savdb);
+        $localobject2->initAsSpecimen();
+        $localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1921);	// we use following year for second invoice (and there is a reset required)
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject2);
+        $result2=$localobject2->create($user,1);
+        $result3=$localobject2->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('192101-0001', $result);			// counter must be reseted to 1
+        $result=$localobject2->is_erasable();
+        print __METHOD__." is_erasable=".$result."\n";
+        $this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
+        $result=$localobject->is_erasable();
+        print __METHOD__." is_erasable=".$result."\n";
+        $this->assertGreaterThanOrEqual(1, $result);						// Case 1 can be deleted (because there was a reset for case 2)
+
+        // Same but we add month before year and use a year on 2 digits
+        $conf->global->FACTURE_MERCURE_MASK_CREDIT='[mm}{yy}-{0000@1}';
+        $conf->global->FACTURE_MERCURE_MASK_INVOICE='{mm}{yy}-{0000@1}';
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1925);	// we use year 1925 to be sure to not have existing invoice for this year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('0125-0001', $result, 'Test for {mm}{yy}-{0000@1} 1st invoice');				// counter must start to 1
+        $result=$localobject->is_erasable();					// This call get getNextNumRef with param 'last'
+        print __METHOD__." is_erasable=".$result."\n";
+        $this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
+        $localobject2=new Facture($this->savdb);
+        $localobject2->initAsSpecimen();
+        $localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1925);	// we use same year 1925 for second invoice (and there is a reset required)
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject2);
+        $result2=$localobject2->create($user,1);
+        $result3=$localobject2->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('0125-0002', $result, 'Test for {mm}{yy}-{0000@1} 2st invoice');			// counter must be now 2
+        $result=$localobject2->is_erasable();
+        print __METHOD__." is_erasable=".$result."\n";
+        $this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
+        $result=$localobject->is_erasable();
+        print __METHOD__." is_erasable=".$result."\n";
+        $this->assertLessThanOrEqual(0, $result);						// Case 1 can not be deleted (because there is an invoice 2)
+        $localobject3=new Facture($this->savdb);
+        $localobject3->initAsSpecimen();
+        $localobject3->date=dol_mktime(12, 0, 0, 1, 1, 1926);	// we use following year for third invoice (and there is a reset required)
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject3);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('0126-0001', $result, 'Test for {mm}{yy}-{0000@1} 3rd invoice');			// counter must be now 1
+
+        // Try an offset when an invoice already exists
+        $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
+        $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}';
+        $result=$numbering->getNextValue($mysoc, $localobject2);
+
+        // Now we try with a different fiscal month (forced by mask)
+        $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}';
+        $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@6}';
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1930);	// we use year 1930 to be sure to not have existing invoice for this year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject, 'last');
+        print __METHOD__." result for last=".$result."\n";
+        $this->assertEquals('', $result);						// no existing ref into reset range
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('193001-0001', $result);			// counter must start to 1
+        $result=$numbering->getNextValue($mysoc, $localobject, 'last');
+        print __METHOD__." result for last=".$result."\n";
+        $this->assertEquals('193001-0001', $result);			// last ref into reset range should be same than last created
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 12, 1, 1930);	// we use same year but fiscal month after
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject, 'last');
+        print __METHOD__." result for last=".$result."\n";
+        $this->assertEquals('', $result);						// last ref into reset range should be ''
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('193012-0001', $result);	// counter must be reset to 1
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1931);	// we use same fiscal year but different year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('193101-0002', $result);	// counter must be 2
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 12, 1, 1931);	// we use different fiscal year but same year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('193112-0001', $result);	// counter must be reset to 1
+
+
+        // Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START)
+        $conf->global->SOCIETE_FISCAL_MONTH_START=6;
+        $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@0}';
+        $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@0}';
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1940);	// we use year 1940 to be sure to not have existing invoice for this year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('194001-0001', $result);	// counter must start to 1
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 12, 1, 1940);	// we use same year but fiscal month after
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('194012-0001', $result);	// counter must be reset to 1
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1941);	// we use same fiscal year but different year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('194101-0002', $result);	// counter must be 2
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 12, 1, 1941);	// we use different discal year but same year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('194112-0001', $result);	// counter must be reset to 1
+
+
+        // Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want year of element
+        $conf->global->SOCIETE_FISCAL_MONTH_START=6;
+        $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@=}';
+        $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@=}';
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1950);	// we use year 1950 to be sure to not have existing invoice for this year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('195001-0001', $result);	// counter must start to 1
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 12, 1, 1950);	// we use same year but fiscal month after
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('195012-0001', $result);	// counter must be reset to 1
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1951);	// we use same fiscal year but different year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('195101-0002', $result);	// counter must be 2
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 12, 1, 1951);	// we use different discal year but same year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('195112-0001', $result);	// counter must be reset to 1
+
+
+        // Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want start year
+        $conf->global->SOCIETE_FISCAL_MONTH_START=6;
+        $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@-}';
+        $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@-}';
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1960);	// we use year 1960 to be sure to not have existing invoice for this year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('195901-0001', $result);	// counter must start to 1
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 12, 1, 1960);	// we use same year but fiscal month after
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('196012-0001', $result);	// counter must be reset to 1
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1961);	// we use same fiscal year but different year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('196001-0002', $result);	// counter must be 2
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 12, 1, 1961);	// we use different discal year but same year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('196112-0001', $result);	// counter must be reset to 1
+
+
+        // Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want end year
+        $conf->global->SOCIETE_FISCAL_MONTH_START=6;
+        $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@+}';
+        $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@+}';
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1970);	// we use year 1970 to be sure to not have existing invoice for this year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('197001-0001', $result);	// counter must start to 1
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 12, 1, 1970);	// we use same year but fiscal month after
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('197112-0001', $result);	// counter must be reset to 1
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1971);	// we use same fiscal year but different year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('197101-0002', $result);	// counter must be 2
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 12, 1, 1971);	// we use different fiscal year but same year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('197212-0001', $result);	// counter must be reset to 1
+
+        // Now we try with a reset every month (@99)
+        $conf->global->SOCIETE_FISCAL_MONTH_START=6;
+        $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@99}';
+        $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@99}';
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('198001-0001', $result);	// counter must start to 1
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('198001-0002', $result);	// counter must start to 2
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 2, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('198002-0001', $result);	// counter must start to 1
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1981);	// we use year 1981 to be sure to not have existing invoice for this year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($mysoc, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('198101-0001', $result);	// counter must start to 1
+
+        // Test with {t} tag
+        $conf->global->SOCIETE_FISCAL_MONTH_START=1;
+        $conf->global->FACTURE_MERCURE_MASK_CREDIT='{t}{yyyy}{mm}-{0000}';
+        $conf->global->FACTURE_MERCURE_MASK_INVOICE='{t}{yyyy}{mm}-{0000}';
+
+        $tmpthirdparty=new Societe($this->savdb);
+        $tmpthirdparty->initAsSpecimen();
+        $tmpthirdparty->typent_code = 'TE_ABC';
+
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1982);	// we use year 1982 to be sure to not have existing invoice for this year
+        $numbering=new mod_facture_mercure();
+        $result=$numbering->getNextValue($tmpthirdparty, $localobject);
+        $result2=$localobject->create($user,1);
+        $result3=$localobject->validate($user, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('A198201-0001', $result);	// counter must start to 1
+
+
+
+        return $result;
     }
 }

Spacing +310 added lines, -310 removed lines

@@ -23,7 +23,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -34,7 +34,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -62,11 +62,11 @@ 
 		parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -76,9 +76,9 @@ 
 	// Static methods
   	public static function setUpBeforeClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 
-    	$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+    	$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
     	print __METHOD__."\n";
     }
@@ -86,7 +86,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -99,11 +99,11 @@ 
 	 */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
     }
@@ -125,451 +125,451 @@ 
      */
     public function testFactureMercure()
     {
-    	global $conf,$user,$langs,$db,$mysoc;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db, $mysoc;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php';
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/mod_facture_mercure.php';
 
 		// First we try with a simple mask, with no reset
 		// and we test counter is still increase second year.
-		$conf->global->FACTURE_ADDON='mercure';
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000}';
-		$conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED=0;
+		$conf->global->FACTURE_ADDON = 'mercure';
+		$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 = 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
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
+		$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
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1915-0001', $result, 'Test for {yyyy}-{0000}, 1st invoice');				// counter must start to 1
-		$result2=$localobject->create($user,1);
+		$this->assertEquals('1915-0001', $result, 'Test for {yyyy}-{0000}, 1st invoice'); // counter must start to 1
+		$result2 = $localobject->create($user, 1);
 		print __METHOD__." result2=".$result."\n";
-		$result3=$localobject->validate($user, $result);		// create invoice by forcing ref
+		$result3 = $localobject->validate($user, $result); // create invoice by forcing ref
 		print __METHOD__." result3=".$result."\n";
-		$this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok');	// counter must start to 1
-		$result=$localobject->is_erasable();
+		$this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok'); // counter must start to 1
+		$result = $localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result, 'Test for is_erasable, 1st invoice');						    // Can be deleted
-		$localobject2=new Facture($this->savdb);
+		$this->assertGreaterThanOrEqual(1, $result, 'Test for is_erasable, 1st invoice'); // Can be deleted
+		$localobject2 = new Facture($this->savdb);
 		$localobject2->initAsSpecimen();
-		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1916);	// we use following year for second invoice (there is no reset into mask)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject2, 'last');
+		$localobject2->date = dol_mktime(12, 0, 0, 1, 1, 1916); // we use following year for second invoice (there is no reset into mask)
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject2, 'last');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1915-0001', $result, "Test to get last value with param 'last'");
-		$result=$numbering->getNextValue($mysoc, $localobject2);
+		$result = $numbering->getNextValue($mysoc, $localobject2);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1916-0002', $result);				// counter must be now 2 (not reseted)
-		$result2=$localobject2->create($user,1);
+		$this->assertEquals('1916-0002', $result); // counter must be now 2 (not reseted)
+		$result2 = $localobject2->create($user, 1);
 		print __METHOD__." result2=".$result."\n";
-		$result3=$localobject2->validate($user, $result);		// create invoice by forcing ref
+		$result3 = $localobject2->validate($user, $result); // create invoice by forcing ref
 		print __METHOD__." result3=".$result."\n";
-		$this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok');	// counter must start to 1
-		$result=$localobject2->is_erasable();
+		$this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok'); // counter must start to 1
+		$result = $localobject2->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
-		$result=$localobject->is_erasable();
+		$this->assertGreaterThanOrEqual(1, $result); // Can be deleted
+		$result = $localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertLessThanOrEqual(0, $result, 'Test for {yyyy}-{0000} that is_erasable is 0 for 1st invoice');						// 1 can no more be deleted (2 is more recent)
+		$this->assertLessThanOrEqual(0, $result, 'Test for {yyyy}-{0000} that is_erasable is 0 for 1st invoice'); // 1 can no more be deleted (2 is more recent)
 
 		// Now we try with a reset
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000@1}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000@1}';
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}-{0000@1}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}-{0000@1}';
 
-		$localobject=new Facture($this->savdb);
+		$localobject = new Facture($this->savdb);
 		$localobject->initAsSpecimen();
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1910);	// we use year 1910 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user,1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1910); // we use year 1910 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1910-0001', $result, 'Test for {yyyy}-{0000@1} 1st invoice');				// counter must start to 1
-		$localobject2=new Facture($this->savdb);
+		$this->assertEquals('1910-0001', $result, 'Test for {yyyy}-{0000@1} 1st invoice'); // counter must start to 1
+		$localobject2 = new Facture($this->savdb);
 		$localobject2->initAsSpecimen();
-		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1910);	// we use same year for second invoice (and there is a reset required)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject2);
+		$localobject2->date = dol_mktime(12, 0, 0, 1, 1, 1910); // we use same year for second invoice (and there is a reset required)
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject2);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1910-0002', $result, 'Test for {yyyy}-{0000@1} 2nd invoice, same day');	// counter must be now 2
-		$localobject3=new Facture($this->savdb);
+		$this->assertEquals('1910-0002', $result, 'Test for {yyyy}-{0000@1} 2nd invoice, same day'); // counter must be now 2
+		$localobject3 = new Facture($this->savdb);
 		$localobject3->initAsSpecimen();
-		$localobject3->date=dol_mktime(12, 0, 0, 1, 1, 1911);	// we use next year for third invoice (and there is a reset required)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject3);
+		$localobject3->date = dol_mktime(12, 0, 0, 1, 1, 1911); // we use next year for third invoice (and there is a reset required)
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject3);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1911-0001', $result, 'Test for {yyyy}-{0000@1} 3nd invoice, same day');	// counter must be now 1
+		$this->assertEquals('1911-0001', $result, 'Test for {yyyy}-{0000@1} 3nd invoice, same day'); // counter must be now 1
 
 		// Same but we add month after year
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@1}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@1}';
-		$localobject=new Facture($this->savdb);
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000@1}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000@1}';
+		$localobject = new Facture($this->savdb);
 		$localobject->initAsSpecimen();
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1920);	// we use year 1920 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user,1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1920); // we use year 1920 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('192001-0001', $result, 'Test for {yyyy}{mm}-{0000@1} 1st invoice');			// counter must start to 1
-		$result=$localobject->is_erasable();
+		$this->assertEquals('192001-0001', $result, 'Test for {yyyy}{mm}-{0000@1} 1st invoice'); // counter must start to 1
+		$result = $localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
-		$localobject2=new Facture($this->savdb);
+		$this->assertGreaterThanOrEqual(1, $result); // Can be deleted
+		$localobject2 = new Facture($this->savdb);
 		$localobject2->initAsSpecimen();
-		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1921);	// we use following year for second invoice (and there is a reset required)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject2);
-		$result2=$localobject2->create($user,1);
-		$result3=$localobject2->validate($user, $result);
+		$localobject2->date = dol_mktime(12, 0, 0, 1, 1, 1921); // we use following year for second invoice (and there is a reset required)
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject2);
+		$result2 = $localobject2->create($user, 1);
+		$result3 = $localobject2->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('192101-0001', $result);			// counter must be reseted to 1
-    	$result=$localobject2->is_erasable();
+    	$this->assertEquals('192101-0001', $result); // counter must be reseted to 1
+    	$result = $localobject2->is_erasable();
     	print __METHOD__." is_erasable=".$result."\n";
-    	$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
-    	$result=$localobject->is_erasable();
+    	$this->assertGreaterThanOrEqual(1, $result); // Can be deleted
+    	$result = $localobject->is_erasable();
     	print __METHOD__." is_erasable=".$result."\n";
-    	$this->assertGreaterThanOrEqual(1, $result);						// Case 1 can be deleted (because there was a reset for case 2)
+    	$this->assertGreaterThanOrEqual(1, $result); // Case 1 can be deleted (because there was a reset for case 2)
 
 		// Same but we add month before year and use a year on 2 digits
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='[mm}{yy}-{0000@1}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{mm}{yy}-{0000@1}';
-		$localobject=new Facture($this->savdb);
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '[mm}{yy}-{0000@1}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{mm}{yy}-{0000@1}';
+		$localobject = new Facture($this->savdb);
 		$localobject->initAsSpecimen();
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1925);	// we use year 1925 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user,1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1925); // we use year 1925 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('0125-0001', $result, 'Test for {mm}{yy}-{0000@1} 1st invoice');				// counter must start to 1
-		$result=$localobject->is_erasable();					// This call get getNextNumRef with param 'last'
+		$this->assertEquals('0125-0001', $result, 'Test for {mm}{yy}-{0000@1} 1st invoice'); // counter must start to 1
+		$result = $localobject->is_erasable(); // This call get getNextNumRef with param 'last'
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
-		$localobject2=new Facture($this->savdb);
+		$this->assertGreaterThanOrEqual(1, $result); // Can be deleted
+		$localobject2 = new Facture($this->savdb);
 		$localobject2->initAsSpecimen();
-		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1925);	// we use same year 1925 for second invoice (and there is a reset required)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject2);
-		$result2=$localobject2->create($user,1);
-		$result3=$localobject2->validate($user, $result);
+		$localobject2->date = dol_mktime(12, 0, 0, 1, 1, 1925); // we use same year 1925 for second invoice (and there is a reset required)
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject2);
+		$result2 = $localobject2->create($user, 1);
+		$result3 = $localobject2->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('0125-0002', $result, 'Test for {mm}{yy}-{0000@1} 2st invoice');			// counter must be now 2
-    	$result=$localobject2->is_erasable();
+    	$this->assertEquals('0125-0002', $result, 'Test for {mm}{yy}-{0000@1} 2st invoice'); // counter must be now 2
+    	$result = $localobject2->is_erasable();
     	print __METHOD__." is_erasable=".$result."\n";
-    	$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
-    	$result=$localobject->is_erasable();
+    	$this->assertGreaterThanOrEqual(1, $result); // Can be deleted
+    	$result = $localobject->is_erasable();
     	print __METHOD__." is_erasable=".$result."\n";
-    	$this->assertLessThanOrEqual(0, $result);						// Case 1 can not be deleted (because there is an invoice 2)
-		$localobject3=new Facture($this->savdb);
+    	$this->assertLessThanOrEqual(0, $result); // Case 1 can not be deleted (because there is an invoice 2)
+		$localobject3 = new Facture($this->savdb);
 		$localobject3->initAsSpecimen();
-		$localobject3->date=dol_mktime(12, 0, 0, 1, 1, 1926);	// we use following year for third invoice (and there is a reset required)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject3);
+		$localobject3->date = dol_mktime(12, 0, 0, 1, 1, 1926); // we use following year for third invoice (and there is a reset required)
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject3);
 		print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('0126-0001', $result, 'Test for {mm}{yy}-{0000@1} 3rd invoice');			// counter must be now 1
+    	$this->assertEquals('0126-0001', $result, 'Test for {mm}{yy}-{0000@1} 3rd invoice'); // counter must be now 1
 
     	// Try an offset when an invoice already exists
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}';
-    	$result=$numbering->getNextValue($mysoc, $localobject2);
+    	$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000+9990}';
+    	$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000+9990}';
+    	$result = $numbering->getNextValue($mysoc, $localobject2);
 
 		// Now we try with a different fiscal month (forced by mask)
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@6}';
+    	$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000@6}';
+    	$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000@6}';
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1930);	// we use year 1930 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject, 'last');
+    	$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1930); // we use year 1930 to be sure to not have existing invoice for this year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject, 'last');
     	print __METHOD__." result for last=".$result."\n";
-    	$this->assertEquals('', $result);						// no existing ref into reset range
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$this->assertEquals('', $result); // no existing ref into reset range
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('193001-0001', $result);			// counter must start to 1
-    	$result=$numbering->getNextValue($mysoc, $localobject, 'last');
+    	$this->assertEquals('193001-0001', $result); // counter must start to 1
+    	$result = $numbering->getNextValue($mysoc, $localobject, 'last');
     	print __METHOD__." result for last=".$result."\n";
-    	$this->assertEquals('193001-0001', $result);			// last ref into reset range should be same than last created
+    	$this->assertEquals('193001-0001', $result); // last ref into reset range should be same than last created
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1930);	// we use same year but fiscal month after
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject, 'last');
+    	$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1930); // we use same year but fiscal month after
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject, 'last');
     	print __METHOD__." result for last=".$result."\n";
-    	$this->assertEquals('', $result);						// last ref into reset range should be ''
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$this->assertEquals('', $result); // last ref into reset range should be ''
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('193012-0001', $result);	// counter must be reset to 1
+    	$this->assertEquals('193012-0001', $result); // counter must be reset to 1
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1931);	// we use same fiscal year but different year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1931); // we use same fiscal year but different year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('193101-0002', $result);	// counter must be 2
+    	$this->assertEquals('193101-0002', $result); // counter must be 2
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1931);	// we use different fiscal year but same year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
+    	$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1931); // we use different fiscal year but same year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('193112-0001', $result);	// counter must be reset to 1
+    	$this->assertEquals('193112-0001', $result); // counter must be reset to 1
 
 
     	// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START)
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@0}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@0}';
+    	$conf->global->SOCIETE_FISCAL_MONTH_START = 6;
+    	$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000@0}';
+    	$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000@0}';
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1940);	// we use year 1940 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1940); // we use year 1940 to be sure to not have existing invoice for this year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('194001-0001', $result);	// counter must start to 1
+    	$this->assertEquals('194001-0001', $result); // counter must start to 1
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1940);	// we use same year but fiscal month after
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1940); // we use same year but fiscal month after
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('194012-0001', $result);	// counter must be reset to 1
+    	$this->assertEquals('194012-0001', $result); // counter must be reset to 1
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1941);	// we use same fiscal year but different year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1941); // we use same fiscal year but different year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('194101-0002', $result);	// counter must be 2
+    	$this->assertEquals('194101-0002', $result); // counter must be 2
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1941);	// we use different discal year but same year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
+    	$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1941); // we use different discal year but same year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('194112-0001', $result);	// counter must be reset to 1
+    	$this->assertEquals('194112-0001', $result); // counter must be reset to 1
 
 
     	// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want year of element
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@=}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@=}';
+    	$conf->global->SOCIETE_FISCAL_MONTH_START = 6;
+    	$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000@=}';
+    	$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000@=}';
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1950);	// we use year 1950 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1950); // we use year 1950 to be sure to not have existing invoice for this year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('195001-0001', $result);	// counter must start to 1
+    	$this->assertEquals('195001-0001', $result); // counter must start to 1
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1950);	// we use same year but fiscal month after
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1950); // we use same year but fiscal month after
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('195012-0001', $result);	// counter must be reset to 1
+    	$this->assertEquals('195012-0001', $result); // counter must be reset to 1
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1951);	// we use same fiscal year but different year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1951); // we use same fiscal year but different year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('195101-0002', $result);	// counter must be 2
+    	$this->assertEquals('195101-0002', $result); // counter must be 2
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1951);	// we use different discal year but same year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
+    	$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1951); // we use different discal year but same year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('195112-0001', $result);	// counter must be reset to 1
+    	$this->assertEquals('195112-0001', $result); // counter must be reset to 1
 
 
     	// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want start year
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@-}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@-}';
+    	$conf->global->SOCIETE_FISCAL_MONTH_START = 6;
+    	$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000@-}';
+    	$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000@-}';
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1960);	// we use year 1960 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1960); // we use year 1960 to be sure to not have existing invoice for this year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('195901-0001', $result);	// counter must start to 1
+    	$this->assertEquals('195901-0001', $result); // counter must start to 1
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1960);	// we use same year but fiscal month after
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1960); // we use same year but fiscal month after
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('196012-0001', $result);	// counter must be reset to 1
+    	$this->assertEquals('196012-0001', $result); // counter must be reset to 1
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1961);	// we use same fiscal year but different year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1961); // we use same fiscal year but different year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('196001-0002', $result);	// counter must be 2
+    	$this->assertEquals('196001-0002', $result); // counter must be 2
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1961);	// we use different discal year but same year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
+    	$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1961); // we use different discal year but same year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('196112-0001', $result);	// counter must be reset to 1
+    	$this->assertEquals('196112-0001', $result); // counter must be reset to 1
 
 
     	// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want end year
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@+}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@+}';
+    	$conf->global->SOCIETE_FISCAL_MONTH_START = 6;
+    	$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000@+}';
+    	$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000@+}';
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1970);	// we use year 1970 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1970); // we use year 1970 to be sure to not have existing invoice for this year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('197001-0001', $result);	// counter must start to 1
+    	$this->assertEquals('197001-0001', $result); // counter must start to 1
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1970);	// we use same year but fiscal month after
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1970); // we use same year but fiscal month after
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('197112-0001', $result);	// counter must be reset to 1
+    	$this->assertEquals('197112-0001', $result); // counter must be reset to 1
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1971);	// we use same fiscal year but different year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1971); // we use same fiscal year but different year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('197101-0002', $result);	// counter must be 2
+    	$this->assertEquals('197101-0002', $result); // counter must be 2
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1971);	// we use different fiscal year but same year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
+    	$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1971); // we use different fiscal year but same year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('197212-0001', $result);	// counter must be reset to 1
+    	$this->assertEquals('197212-0001', $result); // counter must be reset to 1
 
     	// Now we try with a reset every month (@99)
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@99}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@99}';
+    	$conf->global->SOCIETE_FISCAL_MONTH_START = 6;
+    	$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000@99}';
+    	$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000@99}';
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1980); // we use year 1980 to be sure to not have existing invoice for this year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('198001-0001', $result);	// counter must start to 1
+    	$this->assertEquals('198001-0001', $result); // counter must start to 1
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1980); // we use year 1980 to be sure to not have existing invoice for this year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('198001-0002', $result);	// counter must start to 2
+    	$this->assertEquals('198001-0002', $result); // counter must start to 2
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 2, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 2, 1, 1980); // we use year 1980 to be sure to not have existing invoice for this year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('198002-0001', $result);	// counter must start to 1
+    	$this->assertEquals('198002-0001', $result); // counter must start to 1
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1981);	// we use year 1981 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1981); // we use year 1981 to be sure to not have existing invoice for this year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($mysoc, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('198101-0001', $result);	// counter must start to 1
+    	$this->assertEquals('198101-0001', $result); // counter must start to 1
 
     	// Test with {t} tag
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=1;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{t}{yyyy}{mm}-{0000}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{t}{yyyy}{mm}-{0000}';
+    	$conf->global->SOCIETE_FISCAL_MONTH_START = 1;
+    	$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{t}{yyyy}{mm}-{0000}';
+    	$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{t}{yyyy}{mm}-{0000}';
 
-    	$tmpthirdparty=new Societe($this->savdb);
+    	$tmpthirdparty = new Societe($this->savdb);
     	$tmpthirdparty->initAsSpecimen();
     	$tmpthirdparty->typent_code = 'TE_ABC';
 
-    	$localobject=new Facture($this->savdb);
+    	$localobject = new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1982);	// we use year 1982 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($tmpthirdparty, $localobject);
-    	$result2=$localobject->create($user,1);
-    	$result3=$localobject->validate($user, $result);
+    	$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1982); // we use year 1982 to be sure to not have existing invoice for this year
+    	$numbering = new mod_facture_mercure();
+    	$result = $numbering->getNextValue($tmpthirdparty, $localobject);
+    	$result2 = $localobject->create($user, 1);
+    	$result3 = $localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('A198201-0001', $result);	// counter must start to 1
+    	$this->assertEquals('A198201-0001', $result); // counter must start to 1
 
 
 

dolibarr/test/phpunit/ModulesTest.php

Indentation +80 added lines, -80 removed lines

@@ -30,9 +30,9 @@ 
 
 if (empty($user->id))
 {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -46,74 +46,74 @@ 
  */
 class ModulesTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return BuildDocTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return BuildDocTest
+     */
+    function __construct()
+    {
+        parent::__construct();
+
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+        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.
+        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";
+        print __METHOD__."\n";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -123,34 +123,34 @@ 
      */
     public function testModulesInit()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$modulelist=array('Accounting','Adherent','Agenda','Banque','Barcode','BlockedLog','Bookmark',
-		'CashDesk','Categorie','ClickToDial','Collab','Commande','Comptabilite','Contrat','Cron','Deplacement','DocumentGeneration','Don','DynamicPrices',
-		'ECM','Expedition','ExpenseReport','Export','ExternalRss','ExternalSite',
-		'Facture','Fckeditor','Ficheinter','Fournisseur','FTP','GeoIPMaxmind','Gravatar','Holiday','HRM','Import','Incoterm','Label','Ldap','Loan',
-		'Mailing','MailmanSpip','Margin','ModuleBuilder','MultiCurrency',
-		'Notification','Oauth','OpenSurvey','Paybox','Paypal','Prelevement','Printing','Product','ProductBatch','Projet','Propale','ReceiptPrinter','Resource',
-		'Salaries','Service','Skype','Societe','Stock','Stripe','SupplierProposal','Syslog','Tax','Ticket','User','Variants','WebServices','WebServicesClient','Website','Workflow');
-		foreach($modulelist as $modlabel)
-		{
-    		require_once DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php';
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $modulelist=array('Accounting','Adherent','Agenda','Banque','Barcode','BlockedLog','Bookmark',
+        'CashDesk','Categorie','ClickToDial','Collab','Commande','Comptabilite','Contrat','Cron','Deplacement','DocumentGeneration','Don','DynamicPrices',
+        'ECM','Expedition','ExpenseReport','Export','ExternalRss','ExternalSite',
+        'Facture','Fckeditor','Ficheinter','Fournisseur','FTP','GeoIPMaxmind','Gravatar','Holiday','HRM','Import','Incoterm','Label','Ldap','Loan',
+        'Mailing','MailmanSpip','Margin','ModuleBuilder','MultiCurrency',
+        'Notification','Oauth','OpenSurvey','Paybox','Paypal','Prelevement','Printing','Product','ProductBatch','Projet','Propale','ReceiptPrinter','Resource',
+        'Salaries','Service','Skype','Societe','Stock','Stripe','SupplierProposal','Syslog','Tax','Ticket','User','Variants','WebServices','WebServicesClient','Website','Workflow');
+        foreach($modulelist as $modlabel)
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php';
             $class='mod'.$modlabel;
-    		$mod=new $class($db);
+            $mod=new $class($db);
             $result=$mod->remove();
             $result=$mod->init();
-        	$this->assertLessThan($result, 0, $modlabel);
-        	print __METHOD__." test remove/init for module ".$modlabel.", result=".$result."\n";
-
-        	if (in_array($modlabel, array('Ldap', 'MailmanSpip')))
-        	{
-        	    $result=$mod->remove();
-        	}
-		}
+            $this->assertLessThan($result, 0, $modlabel);
+            print __METHOD__." test remove/init for module ".$modlabel.", result=".$result."\n";
+
+            if (in_array($modlabel, array('Ldap', 'MailmanSpip')))
+            {
+                $result=$mod->remove();
+            }
+        }
 
         return 0;
     }

Spacing +34 added lines, -34 removed lines

@@ -23,7 +23,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -34,7 +34,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -62,11 +62,11 @@ 
 		parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -76,8 +76,8 @@ 
 	// Static methods
   	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.
+    	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";
     }
@@ -85,7 +85,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -98,11 +98,11 @@ 
 	 */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
     }
@@ -123,32 +123,32 @@ 
      */
     public function testModulesInit()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$modulelist=array('Accounting','Adherent','Agenda','Banque','Barcode','BlockedLog','Bookmark',
-		'CashDesk','Categorie','ClickToDial','Collab','Commande','Comptabilite','Contrat','Cron','Deplacement','DocumentGeneration','Don','DynamicPrices',
-		'ECM','Expedition','ExpenseReport','Export','ExternalRss','ExternalSite',
-		'Facture','Fckeditor','Ficheinter','Fournisseur','FTP','GeoIPMaxmind','Gravatar','Holiday','HRM','Import','Incoterm','Label','Ldap','Loan',
-		'Mailing','MailmanSpip','Margin','ModuleBuilder','MultiCurrency',
-		'Notification','Oauth','OpenSurvey','Paybox','Paypal','Prelevement','Printing','Product','ProductBatch','Projet','Propale','ReceiptPrinter','Resource',
-		'Salaries','Service','Skype','Societe','Stock','Stripe','SupplierProposal','Syslog','Tax','Ticket','User','Variants','WebServices','WebServicesClient','Website','Workflow');
-		foreach($modulelist as $modlabel)
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$modulelist = array('Accounting', 'Adherent', 'Agenda', 'Banque', 'Barcode', 'BlockedLog', 'Bookmark',
+		'CashDesk', 'Categorie', 'ClickToDial', 'Collab', 'Commande', 'Comptabilite', 'Contrat', 'Cron', 'Deplacement', 'DocumentGeneration', 'Don', 'DynamicPrices',
+		'ECM', 'Expedition', 'ExpenseReport', 'Export', 'ExternalRss', 'ExternalSite',
+		'Facture', 'Fckeditor', 'Ficheinter', 'Fournisseur', 'FTP', 'GeoIPMaxmind', 'Gravatar', 'Holiday', 'HRM', 'Import', 'Incoterm', 'Label', 'Ldap', 'Loan',
+		'Mailing', 'MailmanSpip', 'Margin', 'ModuleBuilder', 'MultiCurrency',
+		'Notification', 'Oauth', 'OpenSurvey', 'Paybox', 'Paypal', 'Prelevement', 'Printing', 'Product', 'ProductBatch', 'Projet', 'Propale', 'ReceiptPrinter', 'Resource',
+		'Salaries', 'Service', 'Skype', 'Societe', 'Stock', 'Stripe', 'SupplierProposal', 'Syslog', 'Tax', 'Ticket', 'User', 'Variants', 'WebServices', 'WebServicesClient', 'Website', 'Workflow');
+		foreach ($modulelist as $modlabel)
 		{
     		require_once DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php';
-            $class='mod'.$modlabel;
-    		$mod=new $class($db);
-            $result=$mod->remove();
-            $result=$mod->init();
+            $class = 'mod'.$modlabel;
+    		$mod = new $class($db);
+            $result = $mod->remove();
+            $result = $mod->init();
         	$this->assertLessThan($result, 0, $modlabel);
         	print __METHOD__." test remove/init for module ".$modlabel.", result=".$result."\n";
 
         	if (in_array($modlabel, array('Ldap', 'MailmanSpip')))
         	{
-        	    $result=$mod->remove();
+        	    $result = $mod->remove();
         	}
 		}
 

dolibarr/test/phpunit/FactureFournisseurTest.php

Indentation +115 added lines, -115 removed lines

@@ -32,9 +32,9 @@ 
 
 if (empty($user->id))
 {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -48,74 +48,74 @@ 
  */
 class FactureFournisseurTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return FactureFournisseurTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return FactureFournisseurTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        parent::__construct();
 
-    	print __METHOD__."\n";
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+        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";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -125,19 +125,19 @@ 
      */
     public function testFactureFournisseurCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new FactureFournisseur($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new FactureFournisseur($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
+        return $result;
     }
 
     /**
@@ -151,18 +151,18 @@ 
      */
     public function testFactureFournisseurFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new FactureFournisseur($this->savdb);
-    	$result=$localobject->fetch($id);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new FactureFournisseur($this->savdb);
+        $result=$localobject->fetch($id);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        return $localobject;
     }
 
     /**
@@ -176,18 +176,18 @@ 
      */
     public function testFactureFournisseurUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject->note='New note after update';
-    	$result=$localobject->update($user);
-
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject->note='New note after update';
+        $result=$localobject->update($user);
+
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
     /**
@@ -201,20 +201,20 @@ 
      */
     public function testFactureFournisseurValid($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$result=$localobject->validate($user);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $result=$localobject->validate($user);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
-   /**
+    /**
      * testFactureFournisseurOther
      *
      * @param	Object	$localobject		Supplier invoice
@@ -254,18 +254,18 @@ 
      */
     public function testFactureFournisseurDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new FactureFournisseur($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
-
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new FactureFournisseur($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($user);
+
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $result;
     }
 }

Spacing +56 added lines, -56 removed lines

@@ -24,7 +24,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -64,11 +64,11 @@ 
 		parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -78,8 +78,8 @@ 
 	// Static methods
   	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.
+    	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";
     }
@@ -87,7 +87,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -100,11 +100,11 @@ 
 	 */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
     }
@@ -125,15 +125,15 @@ 
      */
     public function testFactureFournisseurCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new FactureFournisseur($this->savdb);
+		$localobject = new FactureFournisseur($this->savdb);
     	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+    	$result = $localobject->create($user);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." result=".$result."\n";
@@ -151,14 +151,14 @@ 
      */
     public function testFactureFournisseurFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new FactureFournisseur($this->savdb);
-    	$result=$localobject->fetch($id);
+		$localobject = new FactureFournisseur($this->savdb);
+    	$result = $localobject->fetch($id);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." id=".$id." result=".$result."\n";
@@ -176,14 +176,14 @@ 
      */
     public function testFactureFournisseurUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject->note='New note after update';
-    	$result=$localobject->update($user);
+		$localobject->note = 'New note after update';
+    	$result = $localobject->update($user);
 
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	$this->assertLessThan($result, 0);
@@ -201,13 +201,13 @@ 
      */
     public function testFactureFournisseurValid($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-    	$result=$localobject->validate($user);
+    	$result = $localobject->validate($user);
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
     	$this->assertLessThan($result, 0);
@@ -225,11 +225,11 @@ 
      */
     public function testFactureFournisseurOther($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         /*$result=$localobject->setstatus(0);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -254,15 +254,15 @@ 
      */
     public function testFactureFournisseurDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new FactureFournisseur($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new FactureFournisseur($this->savdb);
+    	$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);

dolibarr/test/phpunit/PropalTest.php

Indentation +126 added lines, -126 removed lines

@@ -31,9 +31,9 @@ 
 
 if (empty($user->id))
 {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,75 +47,75 @@ 
  */
 class PropalTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return PropalTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return PropalTest
+     */
+    function __construct()
+    {
+        parent::__construct();
+
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+        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.
+        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";
+        print __METHOD__."\n";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		print __METHOD__."\n";
-		//print $db->getVersion()."\n";
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        print __METHOD__."\n";
+        //print $db->getVersion()."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -125,19 +125,19 @@ 
      */
     public function testPropalCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Propal($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new Propal($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
+        return $result;
     }
 
     /**
@@ -151,18 +151,18 @@ 
      */
     public function testPropalFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Propal($this->savdb);
-    	$result=$localobject->fetch($id);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new Propal($this->savdb);
+        $result=$localobject->fetch($id);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        return $localobject;
     }
 
     /**
@@ -176,18 +176,18 @@ 
      */
     public function testPropalUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$localobject->note_private='New note private after update';
-    	$result=$localobject->update($user);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject->note_private='New note private after update';
+        $result=$localobject->update($user);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        return $localobject;
     }
 
     /**
@@ -201,18 +201,18 @@ 
      */
     public function testPropalAddLine($localobject)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
         $localobject->fetch_thirdparty();
-    	$result=$localobject->addline('Added line', 10, 2, 19.6);
+        $result=$localobject->addline('Added line', 10, 2, 19.6);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	return $localobject;
+        $this->assertLessThan($result, 0);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        return $localobject;
     }
 
     /**
@@ -226,20 +226,20 @@ 
      */
     public function testPropalValid($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$result=$localobject->valid($user);
+        $result=$localobject->valid($user);
 
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
-   /**
+    /**
      * testPropalOther
      *
      * @param	Propal	$localobject	Proposal
@@ -279,18 +279,18 @@ 
      */
     public function testPropalDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Propal($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
-
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new Propal($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($user);
+
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $result;
     }
 }

Spacing +62 added lines, -62 removed lines

@@ -23,7 +23,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -35,7 +35,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -63,11 +63,11 @@ 
 		parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -77,8 +77,8 @@ 
 	// Static methods
   	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.
+    	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";
     }
@@ -86,7 +86,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -99,11 +99,11 @@ 
 	 */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
 		//print $db->getVersion()."\n";
@@ -125,15 +125,15 @@ 
      */
     public function testPropalCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new Propal($this->savdb);
+		$localobject = new Propal($this->savdb);
     	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+    	$result = $localobject->create($user);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." result=".$result."\n";
@@ -151,14 +151,14 @@ 
      */
     public function testPropalFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new Propal($this->savdb);
-    	$result=$localobject->fetch($id);
+		$localobject = new Propal($this->savdb);
+    	$result = $localobject->fetch($id);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." id=".$id." result=".$result."\n";
@@ -176,14 +176,14 @@ 
      */
     public function testPropalUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+    	$conf = $this->savconf;
+    	$user = $this->savuser;
+    	$langs = $this->savlangs;
+    	$db = $this->savdb;
 
-    	$localobject->note_private='New note private after update';
-    	$result=$localobject->update($user);
+    	$localobject->note_private = 'New note private after update';
+    	$result = $localobject->update($user);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." id=".$id." result=".$result."\n";
@@ -201,14 +201,14 @@ 
      */
     public function testPropalAddLine($localobject)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+    	$conf = $this->savconf;
+    	$user = $this->savuser;
+    	$langs = $this->savlangs;
+    	$db = $this->savdb;
 
         $localobject->fetch_thirdparty();
-    	$result=$localobject->addline('Added line', 10, 2, 19.6);
+    	$result = $localobject->addline('Added line', 10, 2, 19.6);
 
     	$this->assertLessThan($result, 0);
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -226,13 +226,13 @@ 
      */
     public function testPropalValid($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-    	$result=$localobject->valid($user);
+    	$result = $localobject->valid($user);
 
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	$this->assertLessThan($result, 0);
@@ -250,11 +250,11 @@ 
      */
     public function testPropalOther($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         /*$result=$localobject->setstatus(0);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -279,15 +279,15 @@ 
      */
     public function testPropalDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Propal($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new Propal($this->savdb);
+    	$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);