Dolibarr / dolibarr

test/phpunit/RestAPIContactTest.php

Spacing +28 added lines, -28 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';
@@ -37,8 +37,8 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
-$conf->global->MAIN_UMASK='0666';
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
+$conf->global->MAIN_UMASK = '0666';
 
 
 /**
@@ -60,7 +60,7 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		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.
 
 		if (!isModEnabled('api')) {
@@ -78,24 +78,24 @@ 
 	*/
 	protected function setUp(): void
 	{
-		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->api_url = DOL_MAIN_URL_ROOT.'/api/index.php';
 
-		$login='admin';
-		$password='admin';
-		$url=$this->api_url.'/login?login='.$login.'&password='.$password;
+		$login = 'admin';
+		$password = 'admin';
+		$url = $this->api_url.'/login?login='.$login.'&password='.$password;
 		// Call the API login method to save api_key for this test class.
 		// At first call, if token is not defined a random value is generated and returned.
-		$result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
+		$result = getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
 		print __METHOD__." result = ".var_export($result, true)."\n";
 		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
 		$this->assertEquals($result['curl_error_no'], '');
-		$object = json_decode($result['content'], true);	// If success content is just an id, if not an array
+		$object = json_decode($result['content'], true); // If success content is just an id, if not an array
 
 		$this->assertNotNull($object, "Parsing of json result must not be null");
 		$this->assertNotEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
@@ -114,7 +114,7 @@ 
 	 */
 	public function testRestGetContact()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		//fetch Non-Existent contact
 		$url = $this->api_url.'/contacts/123456789?api_key='.$this->api_key;
 		//$addheaders=array('Content-Type: application/json');
@@ -124,7 +124,7 @@ 
 		print __METHOD__." result for get on unexisting contact: ".var_export($result, true)."\n";
 		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
 		$this->assertEquals($result['curl_error_no'], '');
-		$object=json_decode($result['content'], true);
+		$object = json_decode($result['content'], true);
 		$this->assertNotNull($object, "Parsing of json result must not be null");
 		$this->assertEquals(404, $object['error']['code'], 'Error code is not 404');
 
@@ -132,11 +132,11 @@ 
 		$url = $this->api_url.'/contacts/1?api_key='.$this->api_key;
 
 		print __METHOD__." Request GET url=".$url."\n";
-		$result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
+		$result = getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
 		print __METHOD__." result for get on an existing contact: ".var_export($result, true)."\n";
 		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
 		$this->assertEquals($result['curl_error_no'], '');
-		$object=json_decode($result['content'], true);
+		$object = json_decode($result['content'], true);
 		$this->assertNotNull($object, "Parsing of json result must not be null");
 		$this->assertEquals(1, $object['statut']);
 	}
@@ -151,23 +151,23 @@ 
 	 */
 	public function testRestCreateContact()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		// attempt to create without mandatory fields
 		$url = $this->api_url.'/contacts?api_key='.$this->api_key;
-		$addheaders=array('Content-Type: application/json');
+		$addheaders = array('Content-Type: application/json');
 
-		$bodyobj= array(
+		$bodyobj = array(
 			"firstname" => "firstname"
 		);
 
 		$body = json_encode($bodyobj);
 
 		//print __METHOD__." Request POST url=".$url."\n";
-		$result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
+		$result = getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
 		//print __METHOD__." Result for creating incomplete contact".var_export($result, true)."\n";
 		//print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
 		$this->assertEquals($result['curl_error_no'], '');
-		$object = json_decode($result['content'], true);	// If success content is just an id, if not an array
+		$object = json_decode($result['content'], true); // If success content is just an id, if not an array
 		$this->assertNotNull($object, "Parsing of json result must no be null");
 		$this->assertEquals(400, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
 
@@ -177,7 +177,7 @@ 
 		unset($result);
 		// Creating a Contact
 		$bodyobj = array(
-			"firstname" => "testRestContact" . mt_rand(),
+			"firstname" => "testRestContact".mt_rand(),
 			"lastname" => "testRestContact",
 		);
 
@@ -187,7 +187,7 @@ 
 
 		$this->assertEquals($result['curl_error_no'], '');
 
-		$object = json_decode($result['content'], true);	// If success content is just an id, if not an array
+		$object = json_decode($result['content'], true); // If success content is just an id, if not an array
 		$this->assertNotNull($object, "Parsing of json result must not be null");
 		$this->assertNotEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
 		$this->assertGreaterThan(0, $object, 'ID return is no > 0');
@@ -206,10 +206,10 @@ 
 	 */
 	public function testRestUpdateContact($objid)
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		// attempt to create without mandatory fields
 		$url = $this->api_url.'/contacts?api_key='.$this->api_key;
-		$addheaders=array('Content-Type: application/json');
+		$addheaders = array('Content-Type: application/json');
 
 		//update the contact
 
@@ -219,7 +219,7 @@ 
 		);
 
 		$updateRequestBody = json_encode($updateBody);
-		$updateUrl = $this->api_url . '/contacts/' . $objid. '?api_key=' . $this->api_key;
+		$updateUrl = $this->api_url.'/contacts/'.$objid.'?api_key='.$this->api_key;
 		$updateResult = getURLContent($updateUrl, 'PUTALREADYFORMATED', $updateRequestBody, 1, $addheaders, array('http', 'https'), 2);
 		$this->assertEquals($updateResult['curl_error_no'], '');
 

test/phpunit/FactureTest.php

Spacing +66 added lines, -66 removed lines

@@ -25,7 +25,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';
@@ -37,7 +37,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -56,7 +56,7 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
 		if (!isModEnabled('facture')) {
 			print __METHOD__." module customer invoice must be enabled.\n";
@@ -80,15 +80,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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
 		return $result;
@@ -105,14 +105,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($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Facture($db);
+		$result = $localobject->fetch($id);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." id=".$id." result=".$result."\n";
@@ -130,14 +130,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);
@@ -155,19 +155,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($db);
+		$newlocalobject = new Facture($db);
 		$newlocalobject->initAsSpecimen();
 		$this->changeProperties($newlocalobject);
 
@@ -180,15 +180,15 @@ 
 			$newlocalobject,
 			true,
 			array(
-				'newref','oldref','id','lines','client','thirdparty','brouillon','user_creation_id','date_creation','date_validation','datem','date_modification',
-				'ref','statut','status','paye','specimen','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
+				'newref', 'oldref', 'id', 'lines', 'client', 'thirdparty', 'brouillon', 'user_creation_id', 'date_creation', 'date_validation', 'datem', 'date_modification',
+				'ref', 'statut', 'status', 'paye', 'specimen', 'ref', 'actiontypecode', 'actionmsg2', 'actionmsg', 'mode_reglement', 'cond_reglement',
 				'cond_reglement_doc', 'modelpdf',
-				'multicurrency_total_ht','multicurrency_total_tva',	'multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx',
-				'retained_warranty' ,'retained_warranty_date_limit', 'retained_warranty_fk_cond_reglement', 'specimen', 'situation_cycle_ref', 'situation_counter', 'situation_final',
-				'trackid','user_creat','user_valid'
+				'multicurrency_total_ht', 'multicurrency_total_tva', 'multicurrency_total_ttc', 'fk_multicurrency', 'multicurrency_code', 'multicurrency_tx',
+				'retained_warranty', 'retained_warranty_date_limit', 'retained_warranty_fk_cond_reglement', 'specimen', 'situation_cycle_ref', 'situation_counter', 'situation_final',
+				'trackid', 'user_creat', 'user_valid'
 			)
 		);
-		$this->assertEquals($arraywithdiff, array());    // Actual, Expected
+		$this->assertEquals($arraywithdiff, array()); // Actual, Expected
 
 		return $localobject;
 	}
@@ -204,11 +204,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";
@@ -219,7 +219,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);
 
@@ -237,44 +237,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($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Facture($db);
+		$result = $localobject->fetch($id);
 
 		// Create another invoice and validate it after $localobject
-		$localobject2=new Facture($db);
-		$result=$localobject2->initAsSpecimen();
-		$result=$localobject2->create($user);
-		$result=$localobject2->validate($user);
+		$localobject2 = new Facture($db);
+		$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');
 
@@ -289,7 +289,7 @@ 
 	 */
 	public function changeProperties(&$localobject)
 	{
-		$localobject->note_private='New note';
+		$localobject->note_private = 'New note';
 		//$localobject->note='New note after update';
 	}
 
@@ -304,23 +304,23 @@ 
 	 */
 	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);
+			$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])) {
-					$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]);
 				}
 				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]);
 				}
 			}
 		}

test/phpunit/CommandeFournisseurTest.php

Spacing +104 added lines, -104 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';
@@ -37,7 +37,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 
@@ -57,72 +57,72 @@ 
 	 */
 	public function testCommandeFournisseurCreate()
 	{
-		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;
 
 		// Set supplier and product to use
-		$socid=1;
-		$societe=new Societe($db);
+		$socid = 1;
+		$societe = new Societe($db);
 		$societe->fetch($socid);
-		$product=new ProductFournisseur($db);
+		$product = new ProductFournisseur($db);
 		$product->fetch(0, 'PINKDRESS');
 		if ($product->id <= 0) {
 			print "\n".__METHOD__." A product with ref PINKDRESS must exists into database";
 			die(1);
 		}
 
-		$quantity=10;
-		$ref_fourn='SUPPLIER_REF_PHPUNIT';
-		$tva_tx=19.6;
+		$quantity = 10;
+		$ref_fourn = 'SUPPLIER_REF_PHPUNIT';
+		$tva_tx = 19.6;
 
 		// Delete existing supplier prices
 		// TODO
 
 		// Create 1 supplier price with min qty = 10;
-		$result=$product->add_fournisseur($user, $societe->id, $ref_fourn, $quantity);    // This insert record with no value for price. Values are update later with update_buyprice
+		$result = $product->add_fournisseur($user, $societe->id, $ref_fourn, $quantity); // This insert record with no value for price. Values are update later with update_buyprice
 		print __METHOD__." add_fournisseur result=".$result."\n";
 		$this->assertGreaterThanOrEqual(0, $result, 'Create 1 supplier price with min qty = 10 if not exists');
-		$result=$product->update_buyprice($quantity, 20, $user, 'HT', $societe, '', $ref_fourn, $tva_tx, 0, 0);
+		$result = $product->update_buyprice($quantity, 20, $user, 'HT', $societe, '', $ref_fourn, $tva_tx, 0, 0);
 		print __METHOD__." update_buyprice result=".$result."\n";
 		$this->assertGreaterThanOrEqual(0, $result, 'Update buyprice');
 
 		// Create purchase order with a too low quantity and option SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY is on
 		$conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY = 1;
 
-		$localobject=new CommandeFournisseur($db);
+		$localobject = new CommandeFournisseur($db);
 		$localobject->initAsSpecimen();
-		$localobject->lines=array();    // Overwrite lines of order
-		$line=new CommandeFournisseurLigne($db);
-		$line->desc=$langs->trans("Description")." specimen line with qty too low";
-		$line->qty=1;                   // So lower than $quantity
-		$line->subprice=100;
-		$line->fk_product=$product->id;
-		$line->ref_fourn=$ref_fourn;
-		$localobject->lines[]=$line;
-
-		$result=$localobject->create($user);
+		$localobject->lines = array(); // Overwrite lines of order
+		$line = new CommandeFournisseurLigne($db);
+		$line->desc = $langs->trans("Description")." specimen line with qty too low";
+		$line->qty = 1; // So lower than $quantity
+		$line->subprice = 100;
+		$line->fk_product = $product->id;
+		$line->ref_fourn = $ref_fourn;
+		$localobject->lines[] = $line;
+
+		$result = $localobject->create($user);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(-1, $result, 'Creation of too low quantity');   // must be -1 because quantity is lower than minimum of supplier price
+		$this->assertEquals(-1, $result, 'Creation of too low quantity'); // must be -1 because quantity is lower than minimum of supplier price
 
-		$sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref IN ('', '(PROV)')";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref IN ('', '(PROV)')";
 		$db->query($sql);
 
 		// Create purchase order
-		$localobject2=new CommandeFournisseur($db);
-		$localobject2->initAsSpecimen();    // This create 5 lines of first product found for socid 1
-		$localobject2->lines=array();       // Overwrite lines of order
-		$line=new CommandeFournisseurLigne($db);
-		$line->desc=$langs->trans("Description")." specimen line ok";
-		$line->qty=10;                      // So enough quantity
-		$line->subprice=100;
-		$line->fk_product=$product->id;
-		$line->ref_fourn=$ref_fourn;
-		$localobject2->lines[]=$line;
-
-		$result=$localobject2->create($user);
+		$localobject2 = new CommandeFournisseur($db);
+		$localobject2->initAsSpecimen(); // This create 5 lines of first product found for socid 1
+		$localobject2->lines = array(); // Overwrite lines of order
+		$line = new CommandeFournisseurLigne($db);
+		$line->desc = $langs->trans("Description")." specimen line ok";
+		$line->qty = 10; // So enough quantity
+		$line->subprice = 100;
+		$line->fk_product = $product->id;
+		$line->ref_fourn = $ref_fourn;
+		$localobject2->lines[] = $line;
+
+		$result = $localobject2->create($user);
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);
 
@@ -130,37 +130,37 @@ 
 		// Create purchase order with a too low quantity but option SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY is off
 		$conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY = 0;
 
-		$localobject3=new CommandeFournisseur($db);
+		$localobject3 = new CommandeFournisseur($db);
 		$localobject3->initAsSpecimen();
-		$localobject3->lines=array();    // Overwrite lines of order
-		$line=new CommandeFournisseurLigne($db);
-		$line->desc=$langs->trans("Description")." specimen line with qty too low";
-		$line->qty=1;                   // So lower than $quantity
-		$line->subprice=100;
-		$line->fk_product=$product->id;
-		$line->ref_fourn=$ref_fourn;
-		$localobject3->lines[]=$line;
-
-		$result=$localobject3->create($user);
+		$localobject3->lines = array(); // Overwrite lines of order
+		$line = new CommandeFournisseurLigne($db);
+		$line->desc = $langs->trans("Description")." specimen line with qty too low";
+		$line->qty = 1; // So lower than $quantity
+		$line->subprice = 100;
+		$line->fk_product = $product->id;
+		$line->ref_fourn = $ref_fourn;
+		$localobject3->lines[] = $line;
+
+		$result = $localobject3->create($user);
 		print __METHOD__." result=".$result."\n";
-		$this->assertGreaterThan(0, $result, 'Creation of too low quantity should be ok');   // must be id of line because there is no test on minimum quantity
+		$this->assertGreaterThan(0, $result, 'Creation of too low quantity should be ok'); // must be id of line because there is no test on minimum quantity
 
-		$sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
 		$db->query($sql);
 
 		// Create purchase order
-		$localobject4=new CommandeFournisseur($db);
-		$localobject4->initAsSpecimen();    // This create 5 lines of first product found for socid 1
-		$localobject4->lines=array();       // Overwrite lines of order
-		$line=new CommandeFournisseurLigne($db);
-		$line->desc=$langs->trans("Description")." specimen line ok";
-		$line->qty=10;                      // So enough quantity
-		$line->subprice=100;
-		$line->fk_product=$product->id;
-		$line->ref_fourn=$ref_fourn;
-		$localobject4->lines[]=$line;
-
-		$result=$localobject4->create($user);
+		$localobject4 = new CommandeFournisseur($db);
+		$localobject4->initAsSpecimen(); // This create 5 lines of first product found for socid 1
+		$localobject4->lines = array(); // Overwrite lines of order
+		$line = new CommandeFournisseurLigne($db);
+		$line->desc = $langs->trans("Description")." specimen line ok";
+		$line->qty = 10; // So enough quantity
+		$line->subprice = 100;
+		$line->fk_product = $product->id;
+		$line->ref_fourn = $ref_fourn;
+		$localobject4->lines[] = $line;
+
+		$result = $localobject4->create($user);
 		print __METHOD__." id for purchase order created by testCommandeFournisseurCreate = ".$result."\n";
 		$this->assertGreaterThan(0, $result, 'Test to create a purchase order by testCommandeFournisseurCreate');
 
@@ -179,14 +179,14 @@ 
 	 */
 	public function testCommandeFournisseurFetch($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 CommandeFournisseur($db);
-		$result=$localobject->fetch($id);
+		$localobject = new CommandeFournisseur($db);
+		$result = $localobject->fetch($id);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Failed to fetch supplier order with id '.$id);
@@ -204,13 +204,13 @@ 
 	 */
 	public function testCommandeFournisseurValid($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);
@@ -228,13 +228,13 @@ 
 	 */
 	public function testCommandeFournisseurApprove($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->approve($user);
+		$result = $localobject->approve($user);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -252,13 +252,13 @@ 
 	 */
 	public function testCommandeFournisseurCancel($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->cancel($user);
+		$result = $localobject->cancel($user);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -276,11 +276,11 @@ 
 	 */
 	public function testCommandeFournisseurOther($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";
@@ -307,15 +307,15 @@ 
 	 */
 	public function testCommandeFournisseurDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new CommandeFournisseur($db);
-		$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 CommandeFournisseur($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);

test/phpunit/ImagesLibTest.php

Spacing +8 added lines, -8 removed lines

@@ -25,7 +25,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';
@@ -38,7 +38,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -57,14 +57,14 @@ 
 	 */
 	public function testgetImageSize()
 	{
-		$file=dirname(__FILE__).'/img250x50.jpg';
-		$tmp=dol_getImageSize($file);
+		$file = dirname(__FILE__).'/img250x50.jpg';
+		$tmp = dol_getImageSize($file);
 		print __METHOD__." result=".$tmp['width'].'/'.$tmp['height']."\n";
 		$this->assertEquals($tmp['width'], 250);
 		$this->assertEquals($tmp['height'], 50);
 
-		$file=dirname(__FILE__).'/img250x20.png';
-		$tmp=dol_getImageSize($file);
+		$file = dirname(__FILE__).'/img250x20.png';
+		$tmp = dol_getImageSize($file);
 		print __METHOD__." result=".$tmp['width'].'/'.$tmp['height']."\n";
 		$this->assertEquals($tmp['width'], 250);
 		$this->assertEquals($tmp['height'], 20);
@@ -87,8 +87,8 @@ 
 	{
 		global $conf;
 
-		$file=dirname(__FILE__).'/img250x20.png';
-		$filetarget=$conf->admin->dir_temp.'/img250x20.jpg';
+		$file = dirname(__FILE__).'/img250x20.png';
+		$filetarget = $conf->admin->dir_temp.'/img250x20.jpg';
 		dol_delete_file($filetarget);
 		$result = dol_imageResizeOrCrop($file, 0, 0, 0, 0, 0, $filetarget);
 		print __METHOD__." result=".$result."\n";

test/phpunit/CommonInvoiceTest.php

Spacing +8 added lines, -8 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;
 
 
 /**
@@ -55,13 +55,13 @@ 
 	 */
 	public function testCalculateDateLimReglement()
 	{
-		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($db);
+		$localobject = new Facture($db);
 		$localobject->fetch(1);
 		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 2010);
 

test/phpunit/EntrepotTest.php

Spacing +38 added lines, -38 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;
 
 
 /**
@@ -55,15 +55,15 @@ 
 	 */
 	public function testEntrepotCreate()
 	{
-		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 Entrepot($db);
+		$localobject = new Entrepot($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThan(0, $result);
@@ -82,14 +82,14 @@ 
 	 */
 	public function testEntrepotFetch($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Entrepot($db);
-		$result=$localobject->fetch($id);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new Entrepot($db);
+		$result = $localobject->fetch($id);
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
@@ -107,14 +107,14 @@ 
 	 */
 	public function testEntrepotUpdate($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($localobject->id, $user);
+		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($localobject->id, $user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
@@ -132,11 +132,11 @@ 
 	 */
 	public function testEntrepotOther($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->get_full_arbo();
 		$this->assertEquals('WAREHOUSE SPECIMEN', $result);
@@ -155,16 +155,16 @@ 
 	 */
 	public function testEntrepotDelete($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 Entrepot($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Entrepot($db);
+		$result = $localobject->fetch($id);
 
-		$result=$localobject->delete($user);
+		$result = $localobject->delete($user);
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0, $localobject->errorsToString());
 

test/phpunit/NumberingModulesTest.php

Spacing +312 added lines, -312 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;
 
 
 /**
@@ -54,527 +54,527 @@ 
 	 */
 	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_INVOICE='{yyyy}-{0000}';
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}';
-		$conf->global->FACTURE_MERCURE_MASK_DEPOSIT='{yyyy}-{0000}';
-		$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT='{yyyy}-{0000}';
-		$conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED=0;
-
-		$localobject=new Facture($db);
+		$conf->global->FACTURE_ADDON = 'mercure';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}-{0000}';
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}-{0000}';
+		$conf->global->FACTURE_MERCURE_MASK_DEPOSIT = '{yyyy}-{0000}';
+		$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT = '{yyyy}-{0000}';
+		$conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED = 0;
+
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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 (useful only if numbering is {0000@1}
-		$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 (useful only if numbering is {0000@1}
+		$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
+		$this->assertGreaterThanOrEqual(1, $result, 'Test for is_erasable, 1st invoice'); // Can be deleted
 
-		$localobject2=new Facture($db);
+		$localobject2 = new Facture($db);
 		$localobject2->initAsSpecimen();
 		$localobject2->fetch_thirdparty();
 
-		$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 reset)
-		$result2=$localobject2->create($user, 1);
+		$this->assertEquals('1916-0002', $result); // counter must be now 2 (not reset)
+		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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
+		$this->assertEquals('1910-0001', $result, 'Test for {yyyy}-{0000@1} 1st invoice'); // counter must start to 1
 
-		$localobject2=new Facture($db);
+		$localobject2 = new Facture($db);
 		$localobject2->initAsSpecimen();
 		$localobject2->fetch_thirdparty();
 
-		$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
+		$this->assertEquals('1910-0002', $result, 'Test for {yyyy}-{0000@1} 2nd invoice, same day'); // counter must be now 2
 
-		$localobject3=new Facture($db);
+		$localobject3 = new Facture($db);
 		$localobject3->initAsSpecimen();
 		$localobject3->fetch_thirdparty();
 
-		$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} 3rd invoice, same day');	// counter must be now 1
+		$this->assertEquals('1911-0001', $result, 'Test for {yyyy}-{0000@1} 3rd 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}';
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000@1}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000@1}';
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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
+		$this->assertGreaterThanOrEqual(1, $result); // Can be deleted
 
-		$localobject2=new Facture($db);
+		$localobject2 = new Facture($db);
 		$localobject2->initAsSpecimen();
 		$localobject2->fetch_thirdparty();
 
-		$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 reset to 1
-		$result=$localobject2->is_erasable();
+		$this->assertEquals('192101-0001', $result); // counter must be reset 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($db);
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '[mm}{yy}-{0000@1}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{mm}{yy}-{0000@1}';
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
-		$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'
+		$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
+		$this->assertGreaterThanOrEqual(1, $result); // Can be deleted
 
-		$localobject2=new Facture($db);
+		$localobject2 = new Facture($db);
 		$localobject2->initAsSpecimen();
 		$localobject2->fetch_thirdparty();
-		$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} 2nd invoice');			// counter must be now 2
-		$result=$localobject2->is_erasable();
+		$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} 2nd 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)
+		$this->assertLessThanOrEqual(0, $result); // Case 1 can not be deleted (because there is an invoice 2)
 
-		$localobject3=new Facture($db);
+		$localobject3 = new Facture($db);
 		$localobject3->initAsSpecimen();
 		$localobject3->fetch_thirdparty();
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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($db);
+		$tmpthirdparty = new Societe($db);
 		$tmpthirdparty->initAsSpecimen();
 		$tmpthirdparty->typent_code = 'TE_ABC';
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$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
 
 
 		return $result;
@@ -588,24 +588,24 @@ 
 	 */
 	public function testShipmentSafor()
 	{
-		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/expedition/class/expedition.class.php';
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/expedition/mod_expedition_safor.php';
 
-		$localobject=new Expedition($db);
+		$localobject = new Expedition($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date_creation = dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1915 to be sure to not have existing invoice for this year (useful only if numbering is {0000@1}
-		$numbering=new mod_expedition_safor();
-		$result=$numbering->getNextValue($mysoc, $localobject);
+		$localobject->date_creation = dol_mktime(12, 0, 0, 1, 1, 1980); // we use year 1915 to be sure to not have existing invoice for this year (useful only if numbering is {0000@1}
+		$numbering = new mod_expedition_safor();
+		$result = $numbering->getNextValue($mysoc, $localobject);
 
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('SH8001-0003', $result);	// counter must start to 1
+		$this->assertEquals('SH8001-0003', $result); // counter must start to 1
 	}
 }

test/phpunit/BonPrelevementTest.php

Spacing +9 added lines, -9 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;
 
 $langs->load("main");
 
@@ -57,11 +57,11 @@ 
 	 */
 	public function testBonPrelevementCreate()
 	{
-		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;
 
 		// TODO
 		// Create invoice
@@ -74,9 +74,9 @@ 
 
 
 		// Create withdraw record and generate SEPA file
-		$localobject=new BonPrelevement($db);
+		$localobject = new BonPrelevement($db);
 		//$localobject->date_solde=dol_now();
-		$result=$localobject->Create(0, 0, 'simu');
+		$result = $localobject->Create(0, 0, 'simu');
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 0);

test/phpunit/FichinterTest.php

Spacing +36 added lines, -36 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;
 
 
 /**
@@ -55,21 +55,21 @@ 
 	 */
 	public function testFichinterCreate()
 	{
-		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;
 
 		$soc = new Societe($db);
 		$soc->name = "FichinterTest Unittest";
 		$socid = $soc->create($user);
 		$this->assertLessThan($socid, 0, $soc->errorsToString());
 
-		$localobject=new Fichinter($db);
+		$localobject = new Fichinter($db);
 		$localobject->initAsSpecimen();
 		$localobject->socid = $socid;
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThan($result, 0, $localobject->errorsToString());
@@ -88,14 +88,14 @@ 
 	 */
 	public function testFichinterFetch($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 Fichinter($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Fichinter($db);
+		$result = $localobject->fetch($id);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0, $localobject->errorsToString());
@@ -114,13 +114,13 @@ 
 	 */
 	public function testFichinterValid($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->setValid($user);
+		$result = $localobject->setValid($user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertLessThan($result, 0, $localobject->errorsToString());
@@ -138,11 +138,11 @@ 
 	 */
 	public function testFichinterOther($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";
@@ -167,15 +167,15 @@ 
 	 */
 	public function testFichinterDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Fichinter($db);
-		$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 Fichinter($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0, $localobject->errorsToString());