Dolibarr / dolibarr

test/phpunit/NumberingModulesTest.php

Spacing +93 added lines, -93 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';
@@ -55,7 +55,7 @@ 
 	 */
 	public function testFactureMercure()
 	{
-		global $conf,$user,$langs,$db,$mysoc;
+		global $conf, $user, $langs, $db, $mysoc;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -77,50 +77,50 @@ 
 		$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}
+		$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
+		$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
+		$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
 
 		// We emulate print on invoice 3 times
 		$localobject->pos_print_counter = 3;
 		$result = $localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(-6, $result, 'Test for is_erasable, 1st invoice already printed');						    // Can be deleted
+		$this->assertGreaterThanOrEqual(-6, $result, 'Test for is_erasable, 1st invoice already printed'); // Can be deleted
 
 
 		$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)
+		$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 reset)
+		$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
+		$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
+		$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}';
@@ -130,33 +130,33 @@ 
 		$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
+		$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->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)
+		$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->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)
+		$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}';
@@ -166,34 +166,34 @@ 
 		$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
+		$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
+		$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->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)
+		$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
+		$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
+		$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}';
@@ -201,42 +201,42 @@ 
 		$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
+		$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
+		$this->assertGreaterThanOrEqual(1, $result); // Can be deleted
 
 		$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)
+		$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
+		$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
+		$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->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)
+		$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}';
@@ -251,56 +251,56 @@ 
 		$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
+		$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
+		$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
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1930);	// we use same year but fiscal month after
+		$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 ''
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1931);	// we use same fiscal year but different year
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1931);	// we use different fiscal year but same year
+		$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)
@@ -312,47 +312,47 @@ 
 		$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
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1940);	// we use same year but fiscal month after
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1941);	// we use same fiscal year but different year
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1941);	// we use different discal year but same year
+		$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
@@ -364,47 +364,47 @@ 
 		$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
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1950);	// we use same year but fiscal month after
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1951);	// we use same fiscal year but different year
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1951);	// we use different discal year but same year
+		$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
@@ -416,47 +416,47 @@ 
 		$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
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1960);	// we use same year but fiscal month after
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1961);	// we use same fiscal year but different year
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1961);	// we use different discal year but same year
+		$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
@@ -468,47 +468,47 @@ 
 		$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
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1970);	// we use same year but fiscal month after
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1971);	// we use same fiscal year but different year
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1971);	// we use different fiscal year but same year
+		$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;
@@ -519,49 +519,49 @@ 
 		$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
+		$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->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
+		$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->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
+		$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->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
+		$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;
@@ -576,13 +576,13 @@ 
 		$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
+		$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;
@@ -596,7 +596,7 @@ 
 	 */
 	public function testShipmentSafor()
 	{
-		global $conf,$user,$langs,$db,$mysoc;
+		global $conf, $user, $langs, $db, $mysoc;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -609,11 +609,11 @@ 
 		$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}
+		$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
 	}
 }

htdocs/comm/action/card.php

Spacing +35 added lines, -35 removed lines

@@ -80,7 +80,7 @@ 
 $offsetunit = GETPOST('offsetunittype_duration', 'aZ09');
 $remindertype = GETPOST('selectremindertype', 'aZ09');
 $modelmail = GETPOSTINT('actioncommsendmodel_mail');
-$complete = GETPOST('complete', 'alpha');	// 'na' must be allowed
+$complete = GETPOST('complete', 'alpha'); // 'na' must be allowed
 $private = GETPOST('private', 'alphanohtml');
 if ($complete == 'na' || $complete == -2) {
 	$complete = -1;
@@ -164,7 +164,7 @@ 
 		'label' => $langs->trans('BrowserPush'),
 		'disabled' => (getDolGlobalString('AGENDA_REMINDER_BROWSER') ? 0 : 1),
 		'type' => ActionCommReminder::TYPE_USER,
-		'data-html' => img_picto('', 'globe', 'class="pictofixedwidth"') . $langs->trans('BrowserPush'),
+		'data-html' => img_picto('', 'globe', 'class="pictofixedwidth"').$langs->trans('BrowserPush'),
 	];
 }
 if (getDolGlobalString('AGENDA_REMINDER_EMAIL')) {
@@ -172,7 +172,7 @@ 
 		'label' => $langs->trans('EMail'),
 		'disabled' => (getDolGlobalString('AGENDA_REMINDER_EMAIL') ? 0 : 1),
 		'type' => ActionCommReminder::TYPE_USER,
-		'data-html' => img_picto('', 'email', 'class="pictofixedwidth"') . $langs->trans('EMail'),
+		'data-html' => img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans('EMail'),
 	];
 }
 if (getDolGlobalString('AGENDA_REMINDER_SMS')) {
@@ -181,7 +181,7 @@ 
 		'label' => $langs->trans('Sms'),
 		'disabled' => (getDolGlobalString('MAIN_SMS_SENDMODE') ? 0 : 1),
 		'type' => ActionCommReminder::TYPE_USER,
-		'data-html' => img_picto('', 'phoning_mobile', 'class="pictofixedwidth"') . $langs->trans('Sms'),
+		'data-html' => img_picto('', 'phoning_mobile', 'class="pictofixedwidth"').$langs->trans('Sms'),
 	];
 }
 $TDurationTypes = $form->getDurationTypes($langs);
@@ -593,7 +593,7 @@ 
 				if (is_array($listofresourceid) && count($listofresourceid)) {
 					foreach ($listofresourceid as $resource_id => $val) {
 						$resource_type = 'dolresource';
-						$busy = 1;//GETPOSTINT('busy');
+						$busy = 1; //GETPOSTINT('busy');
 
 						// Resources association
 						if (getDolGlobalString('RESOURCE_USED_IN_EVENT_CHECK')) {
@@ -609,24 +609,24 @@ 
 							}
 
 							$sql = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
-							$sql .= " FROM " . MAIN_DB_PREFIX . "element_resources as er";
-							$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "resource as r ON r.rowid = er.resource_id AND er.resource_type = '" . $db->escape($resource_type) . "'";
-							$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "actioncomm as ac ON ac.id = er.element_id AND er.element_type = '" . $db->escape($object->element) . "'";
-							$sql .= " WHERE er.resource_id = " . ((int) $resource_id);
+							$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
+							$sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = '".$db->escape($resource_type)."'";
+							$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element)."'";
+							$sql .= " WHERE er.resource_id = ".((int) $resource_id);
 							$sql .= " AND er.busy = 1";
 							$sql .= " AND (";
 
 							// event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
-							$sql .= " (ac.datep <= '" . $db->idate($eventDateStart) . "' AND (ac.datep2 IS NULL OR ac.datep2 >= '" . $db->idate($eventDateStart) . "'))";
+							$sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
 							// event date end between ac.datep and ac.datep2
 							if (!empty($eventDateEnd)) {
-								$sql .= " OR (ac.datep <= '" . $db->idate($eventDateEnd) . "' AND (ac.datep2 >= '" . $db->idate($eventDateEnd) . "'))";
+								$sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
 							}
 							// event date start before ac.datep and event date end after ac.datep2
 							$sql .= " OR (";
-							$sql .= "ac.datep >= '" . $db->idate($eventDateStart) . "'";
+							$sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
 							if (!empty($eventDateEnd)) {
-								$sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '" . $db->idate($eventDateEnd) . "')";
+								$sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
 							}
 							$sql .= ")";
 
@@ -640,9 +640,9 @@ 
 								if ($db->num_rows($resql) > 0) {
 									// Resource already in use
 									$error++;
-									$object->error = $langs->trans('ErrorResourcesAlreadyInUse') . ' : ';
+									$object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
 									while ($obj = $db->fetch_object($resql)) {
-										$object->error .= '<br> - ' . $langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label . ' [' . $obj->ac_id . ']');
+										$object->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
 									}
 									$object->errors[] = $object->error;
 
@@ -746,21 +746,21 @@ 
 			if ($selectedrecurrulefreq == 'WEEKLY' && !empty($selectedrecurrulebyday)) {
 				$firstdatearray = dol_get_first_day_week(GETPOSTINT("apday"), GETPOSTINT("apmonth"), GETPOSTINT("apyear"));
 				$datep = dol_mktime($fulldayevent ? 0 : GETPOSTINT("aphour"), $fulldayevent ? 0 : GETPOSTINT("apmin"), $fulldayevent ? 0 : GETPOSTINT("apsec"), $firstdatearray['month'], $firstdatearray['first_day'], $firstdatearray['year'], $tzforfullday ? $tzforfullday : 'tzuserrel');
-				$datep = dol_time_plus_duree($datep, $selectedrecurrulebyday + 6, 'd');//We begin the week after
+				$datep = dol_time_plus_duree($datep, $selectedrecurrulebyday + 6, 'd'); //We begin the week after
 				$dayoffset = 7;
 				$monthoffset = 0;
 				$yearoffset = 0;
 			} elseif ($selectedrecurrulefreq == 'MONTHLY' && !empty($selectedrecurrulebymonthday)) {
 				$firstday = $selectedrecurrulebymonthday;
-				$firstmonth = GETPOST("apday") > $selectedrecurrulebymonthday ? GETPOSTINT("apmonth") + 1 : GETPOSTINT("apmonth");//We begin the month after
+				$firstmonth = GETPOST("apday") > $selectedrecurrulebymonthday ? GETPOSTINT("apmonth") + 1 : GETPOSTINT("apmonth"); //We begin the month after
 				$datep = dol_mktime($fulldayevent ? 0 : GETPOSTINT("aphour"), $fulldayevent ? 0 : GETPOSTINT("apmin"), $fulldayevent ? 0 : GETPOSTINT("apsec"), $firstmonth, $firstday, GETPOSTINT("apyear"), $tzforfullday ? $tzforfullday : 'tzuserrel');
-				$datep = dol_time_plus_duree($datep, 1, 'm');//We begin the month after
+				$datep = dol_time_plus_duree($datep, 1, 'm'); //We begin the month after
 				$dayoffset = 0;
 				$monthoffset = 1;
 				$yearoffset = 0;
 			} elseif ($selectedrecurrulefreq == 'YEARLY' && !empty($selectedrecurrulebyyearmonthday)) {
 				$datep = dol_mktime($fulldayevent ? 0 : GETPOSTINT("aphour"), $fulldayevent ? 0 : GETPOSTINT("apmin"), $fulldayevent ? 0 : GETPOSTINT("apsec"), GETPOSTINT("apmonth"), GETPOSTINT("apday"), GETPOSTINT("apyear"), $tzforfullday ? $tzforfullday : 'tzuserrel');
-				$datep = dol_time_plus_duree($datep, 1, 'y');//We begin the year after
+				$datep = dol_time_plus_duree($datep, 1, 'y'); //We begin the year after
 				$dayoffset = 0;
 				$monthoffset = 0;
 				$yearoffset = 1;
@@ -857,11 +857,11 @@ 
 
 				// increment date for recurrent events
 				$datep = dol_time_plus_duree($datep, $dayoffset, 'd');
-				$datep = dol_time_plus_duree($datep, $monthoffset, 'm');  // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
-				$datep = dol_time_plus_duree($datep, $yearoffset, 'y');  // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
+				$datep = dol_time_plus_duree($datep, $monthoffset, 'm'); // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
+				$datep = dol_time_plus_duree($datep, $yearoffset, 'y'); // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
 				$datef = dol_time_plus_duree($datef, $dayoffset, 'd');
-				$datef = dol_time_plus_duree($datef, $monthoffset, 'm');  // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
-				$datef = dol_time_plus_duree($datef, $yearoffset, 'y');  // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
+				$datef = dol_time_plus_duree($datef, $monthoffset, 'm'); // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
+				$datef = dol_time_plus_duree($datef, $yearoffset, 'y'); // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
 			}
 		}
 
@@ -910,7 +910,7 @@ 
 		$object->fetch($id);
 		$object->fetch_optionals();
 		$object->fetch_userassigned();
-		$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 		// Clean parameters
 		if ($fulldayevent) {
@@ -1210,7 +1210,7 @@ 
 	$object->fetch($id);
 	$object->fetch_optionals();
 	$object->fetch_userassigned();
-	$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+	$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 	if ($user->hasRight('agenda', 'myactions', 'delete')
 		|| $user->hasRight('agenda', 'allactions', 'delete')) {
@@ -1232,7 +1232,7 @@ 
 if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate' && $usercancreate) {
 	$error = 0;
 
-	$shour = (int) dol_print_date($object->datep, "%H", 'tzuserrel');		// We take the date visible by user $newdate is also date visible by user.
+	$shour = (int) dol_print_date($object->datep, "%H", 'tzuserrel'); // We take the date visible by user $newdate is also date visible by user.
 	$smin = (int) dol_print_date($object->datep, "%M", 'tzuserrel');
 
 	$newdate = GETPOST('newdate', 'alpha');
@@ -1407,7 +1407,7 @@ 
 								if (new_startdate > old_enddate) {
 									var timeDiff = old_enddate - old_startdate;
 									var new_enddate = new Date(new_startdate.getTime() + timeDiff);
-									$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput') . '"));
+									$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput').'"));
 									$("#p2day").val(new_enddate.getDate());
 									$("#p2month").val(new_enddate.getMonth() + 1);
 									$("#p2year").val(new_enddate.getFullYear());
@@ -1479,7 +1479,7 @@ 
 		$default = getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT', 'AC_RDV');
 		print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"');
 		$selectedvalue = GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default);
-		print $formactions->select_type_actions($selectedvalue, "actioncode", "systemauto", 0, -1, 0, 1);	// TODO Replace 0 with -2 in onlyautoornot
+		print $formactions->select_type_actions($selectedvalue, "actioncode", "systemauto", 0, -1, 0, 1); // TODO Replace 0 with -2 in onlyautoornot
 		print '</td></tr>';
 	}
 
@@ -1574,7 +1574,7 @@ 
 		*/
 
 		// limit date
-		$repeateventlimitdate = empty($repeateventlimitdate) ?  (dol_now() + ((24 * 3600 * 365) + 1)) : $repeateventlimitdate;
+		$repeateventlimitdate = empty($repeateventlimitdate) ? (dol_now() + ((24 * 3600 * 365) + 1)) : $repeateventlimitdate;
 
 		print '<div class="hidden marginrightonly inline-block repeateventlimitdate">';
 		print $langs->trans("Until")." ";
@@ -1858,7 +1858,7 @@ 
 		}
 		//var_dump('origin='.$origin.' originid='.$originid.' hasPermissionOnLinkedObject='.$hasPermissionOnLinkedObject);
 
-		if (! in_array($origin, array('societe', 'project', 'project_task', 'user'))) {
+		if (!in_array($origin, array('societe', 'project', 'project_task', 'user'))) {
 			// We do not use link for object that already contains a hard coded field to make links with agenda events
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("LinkedObject").'</td>';
 			print '<td colspan="3">';
@@ -1948,7 +1948,7 @@ 
 						$("#addreminder").prop("checked", true);
 
 						// Set period with default reminder period
-						$("[name=\"offsetvalue\"]").val(\'' . dol_escape_js((string) $reminderDefaultOffset) . '\');
+						$("[name=\"offsetvalue\"]").val(\'' . dol_escape_js((string) $reminderDefaultOffset).'\');
 						$("#select_offsetunittype_duration").select2("destroy");
 						$("#select_offsetunittype_duration").val(\''.dol_escape_js($reminderDefaultUnit).'\');
 						$("#select_offsetunittype_duration").select2();
@@ -2106,7 +2106,7 @@ 
 									if (new_startdate > old_enddate) {
 										var timeDiff = old_enddate - old_startdate;
 										var new_enddate = new Date(new_startdate.getTime() + timeDiff);
-										$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput') . '"));
+										$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput').'"));
 										$("#p2day").val(new_enddate.getDate());
 										$("#p2month").val(new_enddate.getMonth() + 1);
 										$("#p2year").val(new_enddate.getFullYear());
@@ -2131,7 +2131,7 @@ 
 		if ($backtopage) {
 			print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : '').'">';
 		}
-		if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && ! preg_match('/^TICKET_MSG_PRIVATE/', $object->code)) {
+		if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && !preg_match('/^TICKET_MSG_PRIVATE/', $object->code)) {
 			print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">';
 		}
 
@@ -2580,7 +2580,7 @@ 
 					});
 			   })';
 			print '</script>'."\n";
-			print '</div>';		// End of div for reminderparameters
+			print '</div>'; // End of div for reminderparameters
 		}
 
 		print dol_get_fiche_end();
@@ -2861,7 +2861,7 @@ 
 
 		// Priority
 		if (getDolGlobalString('AGENDA_SUPPORT_PRIORITY_IN_EVENTS')) {
-			print '<tr><td class="nowrap" class="titlefield">' . $langs->trans("Priority") . '</td><td>';
+			print '<tr><td class="nowrap" class="titlefield">'.$langs->trans("Priority").'</td><td>';
 			print($object->priority ? $object->priority : '');
 			print '</td></tr>';
 		}

htdocs/blockedlog/admin/blockedlog.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 $block_static->loadTrackedEvents();
 
 $title = $langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog');
-$help_url="EN:Module_Unalterable_Archives_-_Logs|FR:Module_Archives_-_Logs_Inaltérable";
+$help_url = "EN:Module_Unalterable_Archives_-_Logs|FR:Module_Archives_-_Logs_Inaltérable";
 
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-blockedlog page-admin_blockedlog');
 

htdocs/compta/facture/class/facture.class.php

Spacing +61 added lines, -61 removed lines

@@ -495,7 +495,7 @@ 
 			$this->mode_reglement_id = 0;
 		}
 		$this->status = self::STATUS_DRAFT;
-		$this->statut = self::STATUS_DRAFT;	// deprecated
+		$this->statut = self::STATUS_DRAFT; // deprecated
 
 		if (!empty($this->multicurrency_code)) {
 			// Multicurrency (test on $this->multicurrency_tx because we should take the default rate of multicurrency_code only if not using original rate)
@@ -584,7 +584,7 @@ 
 			}
 
 			// Define the entity
-			$this->entity            = $_facrec->entity; // Invoice created in same entity than template
+			$this->entity = $_facrec->entity; // Invoice created in same entity than template
 
 			// Fields coming from GUI.
 			// @TODO Value of template should be used as default value on the form on the GUI, and we should here always use the value from GUI
@@ -623,7 +623,7 @@ 
 				$this->mode_reglement_id = 0;
 			}
 			$this->status = self::STATUS_DRAFT;
-			$this->statut = self::STATUS_DRAFT;	// deprecated
+			$this->statut = self::STATUS_DRAFT; // deprecated
 
 			$this->linked_objects = $_facrec->linkedObjectsIds;
 			// We do not add link to template invoice or next invoice will be linked to all generated invoices
@@ -874,7 +874,7 @@ 
 
 						// Complete vat rate with code
 						$vatrate = $newinvoiceline->tva_tx;
-						if ($newinvoiceline->vat_src_code && ! preg_match('/\(.*\)/', (string) $vatrate)) {
+						if ($newinvoiceline->vat_src_code && !preg_match('/\(.*\)/', (string) $vatrate)) {
 							$vatrate .= ' ('.$newinvoiceline->vat_src_code.')';
 						}
 
@@ -1086,7 +1086,7 @@ 
 						($_facrec->lines[$i]->date_end_fill == 1 && $previousdaynextdatewhen) ? $previousdaynextdatewhen : '',
 						0,
 						$tva_npr,
-						0,  // fk_remise_except
+						0, // fk_remise_except
 						'HT',
 						0,
 						$_facrec->lines[$i]->product_type,
@@ -1096,11 +1096,11 @@ 
 						0,
 						$fk_parent_line,
 						$fk_product_fournisseur_price,
-						is_null($buyprice) ? '' : $buyprice,	// do not use (float) here, it may be ''
+						is_null($buyprice) ? '' : $buyprice, // do not use (float) here, it may be ''
 						$_facrec->lines[$i]->label,
 						empty($_facrec->lines[$i]->array_options) ? null : $_facrec->lines[$i]->array_options,
-						100,	// situation percent is undefined on recurring invoice lines
-						0,  // fk_prev_id
+						100, // situation percent is undefined on recurring invoice lines
+						0, // fk_prev_id
 						$_facrec->lines[$i]->fk_unit,
 						$_facrec->lines[$i]->multicurrency_subprice,
 						$_facrec->lines[$i]->ref_ext,
@@ -1195,7 +1195,7 @@ 
 
 		$facture->fk_facture_source = $this->fk_facture_source;
 		$facture->type 			    = $this->type;
-		$facture->subtype 			= $this->subtype;
+		$facture->subtype = $this->subtype;
 		$facture->socid 		    = $this->socid;
 		$facture->date              = $this->date;
 		$facture->date_pointoftax   = $this->date_pointoftax;
@@ -1212,7 +1212,7 @@ 
 
 		$facture->origin            = $this->origin;
 		$facture->origin_id         = $this->origin_id;
-		$facture->fk_account         = $this->fk_account;
+		$facture->fk_account = $this->fk_account;
 
 		$facture->lines = $this->lines; // Array of lines of invoice
 		$facture->situation_counter = $this->situation_counter;
@@ -1317,7 +1317,7 @@ 
 		$object->date_modification = '';
 		$object->date_validation    = '';
 		$object->ref_client         = '';
-		$object->ref_customer         = '';
+		$object->ref_customer = '';
 		$object->close_code         = '';
 		$object->close_note         = '';
 		if (getDolGlobalInt('MAIN_DONT_KEEP_NOTE_ON_CLONING') == 1) {
@@ -1479,8 +1479,8 @@ 
 		$this->fk_account = $object->fk_account;
 		$this->cond_reglement_id    = $object->cond_reglement_id;
 		$this->mode_reglement_id    = $object->mode_reglement_id;
-		$this->fk_incoterms    		= $object->fk_incoterms;
-		$this->location_incoterms	= $object->location_incoterms;
+		$this->fk_incoterms = $object->fk_incoterms;
+		$this->location_incoterms = $object->location_incoterms;
 		$this->availability_id      = $object->availability_id;
 		$this->demand_reason_id     = $object->demand_reason_id;
 		$this->delivery_date        = $object->delivery_date;
@@ -1692,7 +1692,7 @@ 
 	{
 		global $conf, $langs, $hookmanager, $action;
 
-		if (! in_array($origin->element, array('propal', 'commande'))) {
+		if (!in_array($origin->element, array('propal', 'commande'))) {
 			$origin->error = 'ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder';
 			return null;
 		}
@@ -1702,7 +1702,7 @@ 
 			return null;
 		}
 
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 		if ($date > (dol_get_last_hour(dol_now('tzuserrel')) + getDolGlobalInt('INVOICE_MAX_FUTURE_DELAY'))) {
 			$origin->error = 'ErrorDateIsInFuture';
@@ -1747,7 +1747,7 @@ 
 		$deposit->pos_source = $origin->pos_source;
 		$deposit->model_pdf = 'crabe';
 
-		$modelByTypeConfName = 'FACTURE_ADDON_PDF_' . $deposit->type;
+		$modelByTypeConfName = 'FACTURE_ADDON_PDF_'.$deposit->type;
 
 		if (getDolGlobalString($modelByTypeConfName)) {
 			$deposit->model_pdf = getDolGlobalString($modelByTypeConfName);
@@ -1807,10 +1807,10 @@ 
 					$descriptions[$key] = '';
 				}
 				$TTotalByTva[$key] += $line->total_ttc;
-				$descriptions[$key] .= '<li>' . (!empty($line->product_ref) ? $line->product_ref . ' - ' : '');
-				$descriptions[$key] .= (!empty($line->product_label) ? $line->product_label . ' - ' : '');
-				$descriptions[$key] .= $langs->trans('Qty') . ' : ' . $line->qty;
-				$descriptions[$key] .= ' - ' . $langs->trans('TotalHT') . ' : ' . price($line->total_ht) . '</li>';
+				$descriptions[$key] .= '<li>'.(!empty($line->product_ref) ? $line->product_ref.' - ' : '');
+				$descriptions[$key] .= (!empty($line->product_label) ? $line->product_label.' - ' : '');
+				$descriptions[$key] .= $langs->trans('Qty').' : '.$line->qty;
+				$descriptions[$key] .= ' - '.$langs->trans('TotalHT').' : '.price($line->total_ht).'</li>';
 			}
 
 			foreach ($TTotalByTva as $tva => &$total) {
@@ -1834,10 +1834,10 @@ 
 				$totalamount += $lines[$i]->total_ht; // Fixme : is it not for the customer ? Shouldn't we take total_ttc ?
 				$tva_tx = $lines[$i]->tva_tx;
 				$amountdeposit[$tva_tx] += ((float) $lines[$i]->total_ht * (float) $origin->deposit_percent) / 100;
-				$descriptions[$tva_tx] .= '<li>' . (!empty($lines[$i]->product_ref) ? $lines[$i]->product_ref . ' - ' : '');
-				$descriptions[$tva_tx] .= (!empty($lines[$i]->product_label) ? $lines[$i]->product_label . ' - ' : '');
-				$descriptions[$tva_tx] .= $langs->trans('Qty') . ' : ' . $lines[$i]->qty;
-				$descriptions[$tva_tx] .= ' - ' . $langs->trans('TotalHT') . ' : ' . price($lines[$i]->total_ht) . '</li>';
+				$descriptions[$tva_tx] .= '<li>'.(!empty($lines[$i]->product_ref) ? $lines[$i]->product_ref.' - ' : '');
+				$descriptions[$tva_tx] .= (!empty($lines[$i]->product_label) ? $lines[$i]->product_label.' - ' : '');
+				$descriptions[$tva_tx] .= $langs->trans('Qty').' : '.$lines[$i]->qty;
+				$descriptions[$tva_tx] .= ' - '.$langs->trans('TotalHT').' : '.price($lines[$i]->total_ht).'</li>';
 			}
 
 			if ($totalamount == 0) {
@@ -1852,11 +1852,11 @@ 
 				continue;
 			}
 
-			$descline = '(DEPOSIT) ('. $origin->deposit_percent .'%) - '.$origin->ref;
+			$descline = '(DEPOSIT) ('.$origin->deposit_percent.'%) - '.$origin->ref;
 
 			// Hidden conf
 			if (getDolGlobalString('INVOICE_DEPOSIT_VARIABLE_MODE_DETAIL_LINES_IN_DESCRIPTION') && !empty($descriptions[$tva])) {
-				$descline .= '<ul>' . $descriptions[$tva] . '</ul>';
+				$descline .= '<ul>'.$descriptions[$tva].'</ul>';
 			}
 
 			$addlineResult = $deposit->addline(
@@ -2243,7 +2243,7 @@ 
 					: '';
 
 				if ($type !== 'separate') {
-					if (in_array($type, array('point','multipts','linestrg','polygon'))) {
+					if (in_array($type, array('point', 'multipts', 'linestrg', 'polygon'))) {
 						$sql .= ", ST_AsWKT(ef.".$key.") as ".$key;
 					} else {
 						$sql .= ", ef.".$key;
@@ -2286,9 +2286,9 @@ 
 				$this->id = $obj->rowid;
 				$this->entity = $obj->entity;
 
-				$this->ref					= $obj->ref;
-				$this->ref_client			= $obj->ref_client;
-				$this->ref_customer			= $obj->ref_client;
+				$this->ref = $obj->ref;
+				$this->ref_client = $obj->ref_client;
+				$this->ref_customer = $obj->ref_client;
 				$this->ref_ext				= $obj->ref_ext;
 				$this->type					= $obj->type;
 				$this->subtype				= $obj->subtype;
@@ -2314,7 +2314,7 @@ 
 				$this->fk_project = $obj->fk_project;
 				$this->project = null; // Clear if another value was already set by fetch_projet
 
-				$this->statut = $obj->status;	// deprecated
+				$this->statut = $obj->status; // deprecated
 				$this->status = $obj->status;
 
 				$this->date_lim_reglement = $this->db->jdate($obj->dlr);
@@ -2330,7 +2330,7 @@ 
 				$this->fk_fac_rec_source	= $obj->fk_fac_rec_source;
 				$this->note = $obj->note_private; // deprecated
 				$this->note_private = $obj->note_private;
-				$this->note_public			= $obj->note_public;
+				$this->note_public = $obj->note_public;
 				$this->user_creation_id     = $obj->fk_user_author;
 				$this->user_validation_id   = $obj->fk_user_valid;
 				$this->user_modification_id = $obj->fk_user_modif;
@@ -2383,15 +2383,15 @@ 
 
 							// date/datetime
 							if (in_array($type, array('date', 'datetime'))) {
-								$this->array_options['options_' . $key] = $this->db->jdate($rawval);
+								$this->array_options['options_'.$key] = $this->db->jdate($rawval);
 							} elseif ($type == 'password') {
 								if (!empty($rawval) && preg_match('/^dolcrypt:/', $rawval)) {
-									$this->array_options['options_' . $key] = dolDecrypt($rawval);
+									$this->array_options['options_'.$key] = dolDecrypt($rawval);
 								} else {
-									$this->array_options['options_' . $key] = $rawval;
+									$this->array_options['options_'.$key] = $rawval;
 								}
 							} else {
-								$this->array_options['options_' . $key] = $rawval;
+								$this->array_options['options_'.$key] = $rawval;
 							}
 						}
 					}
@@ -2402,7 +2402,7 @@ 
 							if (empty($conf->disable_compute)) {
 								global $objectoffield;
 								$objectoffield = $this;
-								$this->array_options['options_' . $key] = dol_eval((string) $extrafields->attributes[$this->table_element]['computed'][$key], 1, 0, '2');
+								$this->array_options['options_'.$key] = dol_eval((string) $extrafields->attributes[$this->table_element]['computed'][$key], 1, 0, '2');
 							}
 						}
 					}
@@ -2498,7 +2498,7 @@ 
 					: '';
 
 				if ($type !== 'separate') {
-					if (in_array($type, array('point','multipts','linestrg','polygon'))) {
+					if (in_array($type, array('point', 'multipts', 'linestrg', 'polygon'))) {
 						$sql .= ", ST_AsWKT(ef.".$key.") as ".$key;
 					} else {
 						$sql .= ", ef.".$key;
@@ -2538,7 +2538,7 @@ 
 				$line->ref              = $objp->product_ref; // Ref product
 				$line->product_ref      = $objp->product_ref; // Ref product
 				$line->libelle          = $objp->product_label; // deprecated
-				$line->product_label 	= $objp->product_label; // Label product
+				$line->product_label = $objp->product_label; // Label product
 				$line->product_barcode  = $objp->product_barcode; // Barcode number product
 				$line->product_desc     = $objp->product_desc; // Description product
 				$line->fk_product_type  = $objp->fk_product_type; // Type of product
@@ -2604,15 +2604,15 @@ 
 
 							// date/datetime
 							if (in_array($type, array('date', 'datetime'))) {
-								$line->array_options['options_' . $key] = $this->db->jdate($rawval);
+								$line->array_options['options_'.$key] = $this->db->jdate($rawval);
 							} elseif ($type == 'password') {
 								if (!empty($rawval) && preg_match('/^dolcrypt:/', $rawval)) {
-									$line->array_options['options_' . $key] = dolDecrypt($rawval);
+									$line->array_options['options_'.$key] = dolDecrypt($rawval);
 								} else {
-									$line->array_options['options_' . $key] = $rawval;
+									$line->array_options['options_'.$key] = $rawval;
 								}
 							} else {
-								$line->array_options['options_' . $key] = $rawval;
+								$line->array_options['options_'.$key] = $rawval;
 							}
 						}
 					}
@@ -2623,7 +2623,7 @@ 
 							if (empty($conf->disable_compute)) {
 								global $objectoffield;
 								$objectoffield = $line;
-								$line->array_options['options_' . $key] = dol_eval((string) $extrafields->attributes[$this->table_element_line]['computed'][$key], 1, 0, '2');
+								$line->array_options['options_'.$key] = dol_eval((string) $extrafields->attributes[$this->table_element_line]['computed'][$key], 1, 0, '2');
 							}
 						}
 					}
@@ -3544,10 +3544,10 @@ 
 		if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('facture', 'creer'))
 		|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('facture', 'invoice_advance', 'validate'))) {
 			$this->error = 'Permission denied';
-			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS=' . getDolGlobalString('MAIN_USE_ADVANCED_PERMS'), LOG_ERR);
+			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS='.getDolGlobalString('MAIN_USE_ADVANCED_PERMS'), LOG_ERR);
 			return -1;
 		}
-		if ((preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) &&	// empty should not happened, but when it occurs, the test save life
+		if ((preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) && // empty should not happened, but when it occurs, the test save life
 			getDolGlobalString('FAC_FORCE_DATE_VALIDATION')						// If option enabled, we force invoice date
 		) {
 			$this->date = dol_now();
@@ -3731,7 +3731,7 @@ 
 				for ($i = 0; $i < $cpt; $i++) {
 					if ($this->lines[$i]->fk_product > 0) {
 						$mouvP = new MouvementStock($this->db);
-						$mouvP->origin = &$this;	// deprecated
+						$mouvP->origin = &$this; // deprecated
 						$mouvP->setOrigin($this->element, $this->id);
 
 						// We decrease stock for product
@@ -3897,7 +3897,7 @@ 
 			// Set new ref and define current status
 			if (!$error) {
 				$this->ref = $num;
-				$this->statut = self::STATUS_VALIDATED;	// deprecated
+				$this->statut = self::STATUS_VALIDATED; // deprecated
 				$this->status = self::STATUS_VALIDATED;
 				$this->date_validation = $now;
 				$i = 0;
@@ -3923,13 +3923,13 @@ 
 						if ($this->situation_final) {
 							// If we must change situation_final
 							$this->situation_final = 0;
-							$this->setFinal($user, 1);		// Trigger is disabled, already run by the validate
+							$this->setFinal($user, 1); // Trigger is disabled, already run by the validate
 						}
 					} else {
 						if (!$this->situation_final) {
 							// If we must change situation_final
 							$this->situation_final = 1;
-							$this->setFinal($user, 1);		// Trigger is disabled, already run by the validate
+							$this->setFinal($user, 1); // Trigger is disabled, already run by the validate
 						}
 					}
 				}
@@ -4082,7 +4082,7 @@ 
 
 			if ($error == 0) {
 				$old_statut = $this->status;
-				$this->statut = self::STATUS_DRAFT;	// deprecated
+				$this->statut = self::STATUS_DRAFT; // deprecated
 				$this->status = self::STATUS_DRAFT;
 
 				// Call trigger
@@ -4680,7 +4680,7 @@ 
 				$this->line->rang = $rangmax + 1;
 			}
 			$apply_abs_price_on_credit_note = false;
-			if ($this->type == self::TYPE_CREDIT_NOTE  && !getDolGlobalInt('FACTURE_ENABLE_NEGATIVE_LINES') && !getDolGlobalInt('INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN')) {
+			if ($this->type == self::TYPE_CREDIT_NOTE && !getDolGlobalInt('FACTURE_ENABLE_NEGATIVE_LINES') && !getDolGlobalInt('INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN')) {
 				$apply_abs_price_on_credit_note = true;
 			}
 
@@ -5116,7 +5116,7 @@ 
 		}
 
 		if (!empty($addon)) {
-			dol_syslog("Call getNextNumRef with ".$addonConstName." = " . getDolGlobalString('FACTURE_ADDON').", thirdparty=".$soc->name.", type=".$soc->typent_code.", mode=".$mode, LOG_DEBUG);
+			dol_syslog("Call getNextNumRef with ".$addonConstName." = ".getDolGlobalString('FACTURE_ADDON').", thirdparty=".$soc->name.", type=".$soc->typent_code.", mode=".$mode, LOG_DEBUG);
 
 			$mybool = false;
 
@@ -5588,14 +5588,14 @@ 
 		$this->fk_incoterms = 0;
 		$this->location_incoterms = '';
 
-		$this->pos_print_counter = 0;	// Already printed 0 times
-		$this->email_sent_counter = 0;	// Already sent by email 0 times
+		$this->pos_print_counter = 0; // Already printed 0 times
+		$this->email_sent_counter = 0; // Already sent by email 0 times
 
 		$this->status = 0;
 
 		if (empty($option) || $option != 'nolines') {
 			// Lines
-			$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5);	// We can force the nb of lines to test from command line (but not more than 1000)
+			$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5); // We can force the nb of lines to test from command line (but not more than 1000)
 			$xnbp = 0;
 			while ($xnbp < $nbp) {
 				$line = new FactureLigne($this->db);
@@ -6223,14 +6223,14 @@ 
 		if (!empty($paymentmode) && $paymentmode != 'all') {
 			$sql .= ", ".MAIN_DB_PREFIX."c_paiement as cp";
 		}
-		$sql .= " WHERE f.paye = 0";	// Only unpaid
-		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED;	// Only validated status
+		$sql .= " WHERE f.paye = 0"; // Only unpaid
+		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED; // Only validated status
 		if ($datetouse == 'invoicedate') {
 			$sql .= " AND f.datef = '".$this->db->idate($tmpidate, 'gmt')."'";
 		} else {
 			$sql .= " AND f.date_lim_reglement = '".$this->db->idate($tmpidate, 'gmt')."'";
 		}
-		$sql .= " AND f.entity IN (".getEntity('facture', 0).")";	// One batch processes only one company (no sharing)
+		$sql .= " AND f.entity IN (".getEntity('facture', 0).")"; // One batch processes only one company (no sharing)
 		if (!empty($paymentmode) && $paymentmode != 'all') {
 			$sql .= " AND f.fk_mode_reglement = cp.id AND cp.code = '".$this->db->escape($paymentmode)."'";
 		}
@@ -6456,7 +6456,7 @@ 
 							$actioncomm->create($user);
 						}
 
-						$this->db->commit();	// We always commit
+						$this->db->commit(); // We always commit
 					}
 
 					if ($errormesg) {
@@ -6499,7 +6499,7 @@ 
 		// get date of last validated invoices of same type
 		$sql  = "SELECT datef";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql .= " WHERE type = " . (int) $this->type ;
+		$sql .= " WHERE type = ".(int) $this->type;
 		$sql .= " AND date_valid IS NOT NULL";
 		$sql .= " AND entity IN (".getEntity('invoice').")";
 		$sql .= " ORDER BY datef DESC LIMIT 1";

htdocs/asset/class/asset.class.php

Spacing +73 added lines, -73 removed lines

@@ -70,9 +70,9 @@ 
 	);
 
 
-	const STATUS_DRAFT = 0; 	// Draft
-	const STATUS_VALIDATED = 1; 	// In progress
-	const STATUS_DISPOSED = 9;	// Disposed
+	const STATUS_DRAFT = 0; // Draft
+	const STATUS_VALIDATED = 1; // In progress
+	const STATUS_DISPOSED = 9; // Disposed
 
 	/**
 	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:Sortfield]]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
@@ -631,11 +631,11 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if (empty($this->fk_asset_model)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetModel") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetModel").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -646,7 +646,7 @@ 
 
 		// Get depreciation options
 		//---------------------------
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 		$options_model = new AssetDepreciationOptions($this->db);
 		$result = $options_model->fetchDeprecationOptions(0, $this->fk_asset_model);
 		if ($result < 0) {
@@ -681,7 +681,7 @@ 
 		// Get accountancy codes
 		//---------------------------
 		if (!$error) {
-			require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/asset/class/assetaccountancycodes.class.php';
 			$accountancy_codes_model = new AssetAccountancyCodes($this->db);
 			$result = $accountancy_codes_model->fetchAccountancyCodes(0, $this->fk_asset_model);
 			if ($result < 0) {
@@ -740,7 +740,7 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -748,14 +748,14 @@ 
 		}
 
 		$sql = "SELECT ad.rowid, ad.depreciation_mode, ad.ref, ad.depreciation_date, ad.depreciation_ht, ad.cumulative_depreciation_ht,";
-		$sql .= " " . $this->db->ifsql('EXISTS (SELECT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type = \'asset\' AND ab.fk_docdet = ad.rowid)', '1', '0') . " AS bookkeeping";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
-		$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
+		$sql .= " ".$this->db->ifsql('EXISTS (SELECT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type = \'asset\' AND ab.fk_docdet = ad.rowid)', '1', '0')." AS bookkeeping";
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation AS ad";
+		$sql .= " WHERE ad.fk_asset = ".(int) $this->id;
 		$sql .= " ORDER BY ad.depreciation_date ASC";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines').': '.$this->db->lasterror();
 			return -1;
 		}
 
@@ -792,7 +792,7 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -814,14 +814,14 @@ 
 		*/
 
 		$sql = "SELECT COUNT(*) AS has_bookkeeping";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
-		$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
-		$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation AS ad";
+		$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
+		$sql .= " WHERE ad.fk_asset = ".(int) $this->id;
 		$sql .= " AND iab.fk_docdet IS NOT NULL";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines').': '.$this->db->lasterror();
 			return -1;
 		}
 
@@ -859,28 +859,28 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
 			return -1;
 		}
 
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "asset_depreciation(fk_asset, depreciation_mode, ref, depreciation_date, depreciation_ht, cumulative_depreciation_ht, accountancy_code_debit, accountancy_code_credit)";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."asset_depreciation(fk_asset, depreciation_mode, ref, depreciation_date, depreciation_ht, cumulative_depreciation_ht, accountancy_code_debit, accountancy_code_credit)";
 		$sql .= " VALUES ( ";
-		$sql .= " " . (int) $this->id;
-		$sql .= ", '" . $this->db->escape($mode) . "'";
-		$sql .= ", '" . $this->db->escape($ref) . "'";
-		$sql .= ", '" . $this->db->idate($depreciation_date) . "'";
-		$sql .= ", " . (float) $depreciation_ht;
-		$sql .= ", " . (float) $cumulative_depreciation_ht;
-		$sql .= ", '" . $this->db->escape($accountancy_code_debit) . "'";
-		$sql .= ", '" . $this->db->escape($accountancy_code_credit) . "'";
+		$sql .= " ".(int) $this->id;
+		$sql .= ", '".$this->db->escape($mode)."'";
+		$sql .= ", '".$this->db->escape($ref)."'";
+		$sql .= ", '".$this->db->idate($depreciation_date)."'";
+		$sql .= ", ".(float) $depreciation_ht;
+		$sql .= ", ".(float) $cumulative_depreciation_ht;
+		$sql .= ", '".$this->db->escape($accountancy_code_debit)."'";
+		$sql .= ", '".$this->db->escape($accountancy_code_credit)."'";
 		$sql .= ")";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorAddDepreciationLine') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorAddDepreciationLine').': '.$this->db->lasterror();
 			return -1;
 		}
 
@@ -903,20 +903,20 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
 			return -1;
 		}
 
-		if (! empty($this->not_depreciated)) {
+		if (!empty($this->not_depreciated)) {
 			return 1;
 		}
 
 		// Get depreciation options
 		//---------------------------
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 		$options = new AssetDepreciationOptions($this->db);
 		$result = $options->fetchDeprecationOptions($this->id);
 		if ($result < 0) {
@@ -927,7 +927,7 @@ 
 
 		// Get accountancy codes
 		//---------------------------
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetaccountancycodes.class.php';
 		$accountancy_codes = new AssetAccountancyCodes($this->db);
 		$result = $accountancy_codes->fetchAccountancyCodes($this->id);
 		if ($result < 0) {
@@ -943,20 +943,20 @@ 
 		foreach ($options->deprecation_options as $mode_key => $fields) {
 			$modes[$mode_key] = $this->db->escape($mode_key);
 		}
-		$sql = "DELETE FROM " . MAIN_DB_PREFIX . "asset_depreciation";
-		$sql .= " WHERE fk_asset = " . (int) $this->id;
-		$sql .= " AND depreciation_mode NOT IN ('" . $this->db->sanitize(implode("', '", $modes)) . "')";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."asset_depreciation";
+		$sql .= " WHERE fk_asset = ".(int) $this->id;
+		$sql .= " AND depreciation_mode NOT IN ('".$this->db->sanitize(implode("', '", $modes))."')";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines').': '.$this->db->lasterror();
 			$error++;
 		}
 
 		if (!$error) {
 			// Get fiscal period
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 			// @FIXME getCurrentPeriodOfFiscalYear return the first period found. What if there is several ? And what if not closed ? And what if end date not yet defined.
 			$dates = getCurrentPeriodOfFiscalYear($this->db, $conf, $this->date_start > $this->date_acquisition ? $this->date_start : $this->date_acquisition);
@@ -993,17 +993,17 @@ 
 				*/
 
 				$sql = "SELECT ad.depreciation_date, ad.cumulative_depreciation_ht";
-				$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
-				$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
-				$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
-				$sql .= " AND ad.depreciation_mode = '" . $this->db->escape($mode_key) . "'";
+				$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation AS ad";
+				$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
+				$sql .= " WHERE ad.fk_asset = ".(int) $this->id;
+				$sql .= " AND ad.depreciation_mode = '".$this->db->escape($mode_key)."'";
 				$sql .= " AND iab.fk_docdet IS NOT NULL";
 				$sql .= " ORDER BY ad.depreciation_date DESC";
 				$sql .= " LIMIT 1";
 
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->errors[] = $langs->trans('AssetErrorFetchMaxDepreciationDateForMode', $mode_key) . ': ' . $this->db->lasterror();
+					$this->errors[] = $langs->trans('AssetErrorFetchMaxDepreciationDateForMode', $mode_key).': '.$this->db->lasterror();
 					$error++;
 					break;
 				}
@@ -1015,27 +1015,27 @@ 
 				}
 
 				// Set last cumulative depreciation
-				$sql = "UPDATE " . MAIN_DB_PREFIX . $options->deprecation_options_fields[$mode_key]['table'];
-				$sql .= " SET total_amount_last_depreciation_ht = " . (empty($last_cumulative_depreciation_ht) ? 0 : $last_cumulative_depreciation_ht);
-				$sql .= " WHERE fk_asset = " . (int) $this->id;
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$options->deprecation_options_fields[$mode_key]['table'];
+				$sql .= " SET total_amount_last_depreciation_ht = ".(empty($last_cumulative_depreciation_ht) ? 0 : $last_cumulative_depreciation_ht);
+				$sql .= " WHERE fk_asset = ".(int) $this->id;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation') . ': ' . $this->db->lasterror();
+					$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation').': '.$this->db->lasterror();
 					$error++;
 					break;
 				}
 
 				// Delete old lines
-				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "asset_depreciation";
-				$sql .= " WHERE fk_asset = " . (int) $this->id;
-				$sql .= " AND depreciation_mode = '" . $this->db->escape($mode_key) . "'";
-				$sql .= " AND NOT EXISTS (SELECT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE doc_type = 'asset' AND fk_docdet = " . MAIN_DB_PREFIX . "asset_depreciation.rowid)";
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."asset_depreciation";
+				$sql .= " WHERE fk_asset = ".(int) $this->id;
+				$sql .= " AND depreciation_mode = '".$this->db->escape($mode_key)."'";
+				$sql .= " AND NOT EXISTS (SELECT fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'asset' AND fk_docdet = ".MAIN_DB_PREFIX."asset_depreciation.rowid)";
 				if ($last_depreciation_date !== "") {
 					$sql .= " AND ref <> ''";
 				}
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines') . ': ' . $this->db->lasterror();
+					$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines').': '.$this->db->lasterror();
 					$error++;
 					break;
 				}
@@ -1104,7 +1104,7 @@ 
 				//$first_period_date = isset($begin_period) && $begin_period > $fiscal_period_start ? $begin_period : $fiscal_period_start;
 				$first_period_date = $fiscal_period_start;
 
-				$ref_date_format = "%Y" . ($fields['duration_type'] == 1 || $fields['duration_type'] == 2 ? '-%m' : '') . ($fields['duration_type'] == 2 ? '-%d' : '');
+				$ref_date_format = "%Y".($fields['duration_type'] == 1 || $fields['duration_type'] == 2 ? '-%m' : '').($fields['duration_type'] == 2 ? '-%d' : '');
 
 				// Loop security
 				$idx_loop = 0;
@@ -1126,9 +1126,9 @@ 
 
 						$period_begin = dol_print_date($fiscal_period_start, $ref_date_format);
 						$period_end = dol_print_date($fiscal_period_end, $ref_date_format);
-						$ref = $period_begin . ($period_begin != $period_end ? ' - ' . $period_end : '');
+						$ref = $period_begin.($period_begin != $period_end ? ' - '.$period_end : '');
 						if ($fiscal_period_start <= $disposal_date && $disposal_date <= $fiscal_period_end) {
-							$ref .= ' - ' . $langs->transnoentitiesnoconv('AssetDisposal');
+							$ref .= ' - '.$langs->transnoentitiesnoconv('AssetDisposal');
 						}
 
 						$begin_date = $fiscal_period_start < $start_date && $start_date <= $fiscal_period_end ? $start_date : $fiscal_period_start;
@@ -1218,7 +1218,7 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($asset_depreciation_id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetDepreciation") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetDepreciation").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -1227,28 +1227,28 @@ 
 
 		$this->db->begin();
 
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 		$options = new AssetDepreciationOptions($this->db);
 
 		// Get last depreciation lines save in bookkeeping
 		//-----------------------------------------------------
 		$sql = "SELECT fk_asset, depreciation_mode, cumulative_depreciation_ht";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation";
-		$sql .= " WHERE rowid = " . (int) $asset_depreciation_id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation";
+		$sql .= " WHERE rowid = ".(int) $asset_depreciation_id;
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorFetchCumulativeDepreciation') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorFetchCumulativeDepreciation').': '.$this->db->lasterror();
 			$error++;
 		} else {
 			if ($obj = $this->db->fetch_object($resql)) {
 				$mode_key = $obj->depreciation_mode;
 				if (!empty($options->deprecation_options_fields[$mode_key])) {
-					$sql = "UPDATE " . MAIN_DB_PREFIX . $options->deprecation_options_fields[$mode_key]['table'];
-					$sql .= " SET total_amount_last_depreciation_ht = " . $obj->cumulative_depreciation_ht;
-					$sql .= " WHERE fk_asset = " . (int) $obj->fk_asset;
+					$sql = "UPDATE ".MAIN_DB_PREFIX.$options->deprecation_options_fields[$mode_key]['table'];
+					$sql .= " SET total_amount_last_depreciation_ht = ".$obj->cumulative_depreciation_ht;
+					$sql .= " WHERE fk_asset = ".(int) $obj->fk_asset;
 					$resql = $this->db->query($sql);
 					if (!$resql) {
-						$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation') . ': ' . $this->db->lasterror();
+						$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation').': '.$this->db->lasterror();
 						$error++;
 					}
 				}
@@ -1501,7 +1501,7 @@ 
 			if ($option == 'label') {
 				$name = $this->label;
 			} elseif ($option == 'with_label') {
-				$name .= ' - ' . $this->label;
+				$name .= ' - '.$this->label;
 			}
 			$result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
 		}
@@ -1510,7 +1510,7 @@ 
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
@@ -1595,12 +1595,12 @@ 
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
 
-				$this->user_creation_id		= $obj->fk_user_creat;
-				$this->user_modification_id	= $obj->fk_user_modif;
-				$this->user_validation_id	= $obj->fk_user_valid;
-				$this->date_creation		= $this->db->jdate($obj->datec);
-				$this->date_modification	= $this->db->jdate($obj->datem);
-				$this->date_validation		= $this->db->jdate($obj->datev);
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
+				$this->user_validation_id = $obj->fk_user_valid;
+				$this->date_creation = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation = $this->db->jdate($obj->datev);
 			}
 
 			$this->db->free($result);
@@ -1641,7 +1641,7 @@ 
 		if (getDolGlobalString('ASSET_ASSET_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('ASSET_ASSET_ADDON') . ".php";
+			$file = getDolGlobalString('ASSET_ASSET_ADDON').".php";
 			$classname = getDolGlobalString('ASSET_ASSET_ADDON');
 
 			// Include file with class

htdocs/main.inc.php

Spacing +62 added lines, -62 removed lines

@@ -42,7 +42,7 @@ 
 //@ini_set('memory_limit', '128M');	// This may be useless if memory is hard limited by your PHP
 
 // For optional tuning. Enabled if environment variable MAIN_SHOW_TUNING_INFO is defined.
-$micro_start_time = 0;	// Used as global var into printCommonFooter()
+$micro_start_time = 0; // Used as global var into printCommonFooter()
 if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO'])) {
 	list($usec, $sec) = explode(" ", microtime());
 	$micro_start_time = ((float) $usec + (float) $sec);
@@ -131,7 +131,7 @@ 
 		session_set_cookie_params($sessioncookieparams);
 	}
 	session_name($sessionname);
-	dol_session_start();	// This call the open and read of session handler
+	dol_session_start(); // This call the open and read of session handler
 	//exit;	// this exist generates a call to write and close
 }
 
@@ -176,12 +176,12 @@ 
 	if (!$ok) {
 		if (session_id() && isset($_SESSION["dol_login"]) && !in_array($_SESSION["dol_login"], explode(';', getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')))) {
 			print 'Sorry, your application is offline.'."\n";
-			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator users (' . str_replace(';', ', ', getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')).') is allowed to connect for the moment.'."\n";
-			$nexturl = dolBuildUrl(DOL_URL_ROOT . '/user/logout.php', [], true);
+			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator users ('.str_replace(';', ', ', getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')).') is allowed to connect for the moment.'."\n";
+			$nexturl = dolBuildUrl(DOL_URL_ROOT.'/user/logout.php', [], true);
 			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
 		} else {
-			print 'Sorry, your application is offline. Only administrator users (' . str_replace(';', ', ', getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')).') is allowed to connect for the moment.'."\n";
-			$nexturl = dolBuildUrl(DOL_URL_ROOT . '/');
+			print 'Sorry, your application is offline. Only administrator users ('.str_replace(';', ', ', getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')).') is allowed to connect for the moment.'."\n";
+			$nexturl = dolBuildUrl(DOL_URL_ROOT.'/');
 			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
 		}
 		exit;
@@ -396,7 +396,7 @@ 
 					print "Access to this page this way (POST method or GET with a sensible value for 'action' parameter) is refused by CSRF protection in main.inc.php. Token not provided.\n";
 					print "If you access your server behind a proxy using url rewriting and the parameter is provided by caller, you might check that all HTTP header are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0";
 					if (getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN')) {
-						print " instead of " . getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN');
+						print " instead of ".getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN');
 					}
 					print " into setup).\n";
 				}
@@ -424,7 +424,7 @@ 
 		unset($_GET['action']);
 		unset($_GET['confirmmassaction']);
 		unset($_GET['massaction']);
-		unset($_GET['token']);			// TODO Make a redirect if we have a token in url to remove it ?
+		unset($_GET['token']); // TODO Make a redirect if we have a token in url to remove it ?
 		if (isset($savid)) {
 			$_POST['id'] = ((int) $savid);
 		}
@@ -446,18 +446,18 @@ 
 	foreach ($disabled_modules as $module) {
 		if ($module) {
 			if (empty($conf->$module)) {
-				$conf->$module = new stdClass(); 	// To avoid warnings
+				$conf->$module = new stdClass(); // To avoid warnings
 			}
 
-			$conf->$module->enabled = false;		// Old usage
+			$conf->$module->enabled = false; // Old usage
 			unset($conf->modules[$module]);
 
 			foreach ($modulepartkeys as $modulepartkey) {
 				unset($conf->modules_parts[$modulepartkey][$module]);
 			}
 			if ($module == 'fournisseur') {		// Special case
-				$conf->supplier_order->enabled = 0;		// Old usage
-				$conf->supplier_invoice->enabled = 0;	// Old usage
+				$conf->supplier_order->enabled = 0; // Old usage
+				$conf->supplier_invoice->enabled = 0; // Old usage
 				unset($conf->modules['supplier_order']);
 				unset($conf->modules['supplier_invoice']);
 			}
@@ -554,7 +554,7 @@ 
 				if ($dol_use_jmobile) {
 					$query += ['dol_use_jmobile='.$dol_use_jmobile];
 				}
-				header("Location: " . dolBuildUrl(DOL_URL_ROOT . '/public/demo/index.php', $query));
+				header("Location: ".dolBuildUrl(DOL_URL_ROOT.'/public/demo/index.php', $query));
 				exit;
 			}
 		}
@@ -602,12 +602,12 @@ 
 					if (is_object($captchaobj) && method_exists($captchaobj, 'validateCodeAfterLoginSubmit')) {
 						$ok = $captchaobj->validateCodeAfterLoginSubmit(); // @phan-suppress-current-line PhanUndeclaredMethod
 					} else {
-						$_SESSION["dol_loginmesg"] =  'Error, the captcha handler '.get_class($captchaobj).' does not have any method validateCodeAfterLoginSubmit()';
+						$_SESSION["dol_loginmesg"] = 'Error, the captcha handler '.get_class($captchaobj).' does not have any method validateCodeAfterLoginSubmit()';
 						$test = false;
 						$error++;
 					}
 				} else {
-					$_SESSION["dol_loginmesg"] =  'Error, the captcha handler class '.$classname.' was not found after the include';
+					$_SESSION["dol_loginmesg"] = 'Error, the captcha handler class '.$classname.' was not found after the include';
 					$test = false;
 					$error++;
 				}
@@ -651,7 +651,7 @@ 
 
 		$allowedmethodtopostusername = 3;
 		if (defined('MAIN_AUTHENTICATION_POST_METHOD')) {
-			$allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');	// Note a value of 2 is not compatible with some authentication methods that put username as GET parameter
+			$allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD'); // Note a value of 2 is not compatible with some authentication methods that put username as GET parameter
 		}
 		// TODO Remove use of $_COOKIE['login_dolibarr'] by replacing line with $usertotest = GETPOST("username", "alpha", $allowedmethodtopostusername); ?
 		$usertotest = (!empty($_COOKIE['login_dolibarr']) ? preg_replace('/[^a-zA-Z0-9_@\-\.]/', '', $_COOKIE['login_dolibarr']) : GETPOST("username", "alpha", $allowedmethodtopostusername));
@@ -800,7 +800,7 @@ 
 				}
 
 				// Show login form
-				dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));	// This include http headers
+				dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : '')); // This include http headers
 			}
 			exit;
 		}
@@ -861,7 +861,7 @@ 
 			if (GETPOST('lang', 'aZ09')) {
 				$paramsurl += ['lang' => (string) GETPOST('lang', 'aZ09')];
 			}
-			header('Location: '.dolBuildUrl(DOL_URL_ROOT . '/index.php', $paramsurl));
+			header('Location: '.dolBuildUrl(DOL_URL_ROOT.'/index.php', $paramsurl));
 			exit;
 		} else {
 			// User is loaded, we may need to change language for him according to its choice
@@ -1158,7 +1158,7 @@ 
 } else {
 	// We may have NOLOGIN set, but NOREQUIREUSER not
 	if (!empty($user) && method_exists($user, 'loadDefaultValues') && !defined('NODEFAULTVALUES')) {
-		$user->loadDefaultValues();		// Load default values for everybody (works even if $user->id = 0
+		$user->loadDefaultValues(); // Load default values for everybody (works even if $user->id = 0
 	}
 }
 
@@ -1221,7 +1221,7 @@ 
 	$conf->dol_optimize_smallscreen = 1;
 
 	if (getDolGlobalInt('PRODUIT_DESC_IN_FORM') == 1) {
-		$conf->global->PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE = 0;	// This was set to PRODUIT_DESC_IN_FORM and is forced to 0 if smartphone in this case
+		$conf->global->PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE = 0; // This was set to PRODUIT_DESC_IN_FORM and is forced to 0 if smartphone in this case
 	}
 }
 // Replace themes bugged with jmobile with eldy
@@ -1326,7 +1326,7 @@ 
 	define('ROWS_9', 8);
 }
 
-$heightforframes = 52;	// Used by frames.php page
+$heightforframes = 52; // Used by frames.php page
 
 // Init menu manager
 if (!defined('NOREQUIREMENU')) {
@@ -1366,7 +1366,7 @@ 
 
 if (!empty(GETPOST('seteventmessages', 'alpha'))) {
 	$message = GETPOST('seteventmessages', 'alpha');
-	$messages  = explode(',', $message);
+	$messages = explode(',', $message);
 	foreach ($messages as $key => $msg) {
 		$tmp = explode(':', $msg);
 		setEventMessages($tmp[0], null, !empty($tmp[1]) ? $tmp[1] : 'mesgs');
@@ -1705,7 +1705,7 @@ 
 		}
 
 		if (getDolGlobalString('THEME_ELDY_TOPMENU_BACK1')) {
-			print '<meta name="theme-color" content="rgb(' . getDolGlobalString('THEME_ELDY_TOPMENU_BACK1').')">'."\n";
+			print '<meta name="theme-color" content="rgb('.getDolGlobalString('THEME_ELDY_TOPMENU_BACK1').')">'."\n";
 		}
 
 		// Auto refresh page
@@ -1754,7 +1754,7 @@ 
 
 		$themeparam = '?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09') ? '&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1) : '').(empty($user->id) ? '' : ('&amp;userid='.$user->id)).'&amp;entity='.$conf->entity;
 
-		$themeparam .= '&' .$ext . '&revision='.getDolGlobalInt("MAIN_IHM_PARAMS_REV");
+		$themeparam .= '&'.$ext.'&revision='.getDolGlobalInt("MAIN_IHM_PARAMS_REV");
 		if (GETPOSTISSET('dol_hide_topmenu')) {
 			$themeparam .= '&amp;dol_hide_topmenu='.GETPOSTINT('dol_hide_topmenu');
 		}
@@ -1794,24 +1794,24 @@ 
 					$jquerytheme = getDolGlobalString('MAIN_USE_JQUERY_THEME');
 				}
 				if (constant('JS_JQUERY_UI')) {
-					print '<link rel="stylesheet" type="text/css" href="' . JS_JQUERY_UI . 'css/' . $jquerytheme . '/jquery-ui.min.css?' . $ext . '">' . "\n"; // Forced JQuery
+					print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css?'.$ext.'">'."\n"; // Forced JQuery
 				} else {
-					print '<link rel="stylesheet" type="text/css" href="' . DOL_URL_ROOT . '/includes/jquery/css/' . $jquerytheme . '/jquery-ui.css?' . $ext . '">' . "\n"; // JQuery
+					print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css?'.$ext.'">'."\n"; // JQuery
 				}
 			}
 			if (!defined('DISABLE_JQUERY_JNOTIFY')) {
-				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css?' . $ext . '">'."\n"; // JNotify
+				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css?'.$ext.'">'."\n"; // JNotify
 			}
 			if (!defined('DISABLE_SELECT2') && (getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') || defined('REQUIRE_JQUERY_MULTISELECT'))) {     // jQuery plugin "mutiselect", "multiple-select", "select2"...
 				$tmpplugin = !getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') ? constant('REQUIRE_JQUERY_MULTISELECT') : getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT');
-				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css?' . $ext . '">'."\n";
+				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css?'.$ext.'">'."\n";
 			}
 		}
 
 		if (!defined('DISABLE_FONT_AWSOME')) {
 			print '<!-- Includes CSS for font awesome -->'."\n";
 			$fontawesome_directory = getDolGlobalString('MAIN_FONTAWESOME_DIRECTORY', '/theme/common/fontawesome-5');
-			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.$fontawesome_directory.'/css/all.min.css?' . $ext . '">'."\n";
+			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.$fontawesome_directory.'/css/all.min.css?'.$ext.'">'."\n";
 		}
 
 		// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
@@ -1829,7 +1829,7 @@ 
 
 		if (!defined('DISABLE_CSS_DEFAULT_THEME')) {
 			print '<!-- Includes CSS for Dolibarr theme -->'."\n";
-			print '<link rel="stylesheet" type="text/css" href="' . $themepath . $themeparam . '">' . "\n";
+			print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
 		}
 
 		// To fix old chrome bug
@@ -1841,8 +1841,8 @@ 
 
 		// LEAFLET AND GEOMAN
 		if (getDolGlobalString('MAIN_USE_GEOPHP')) {
-			print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/leaflet/leaflet.css?' . $ext . "\">\n";
-			print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/leaflet/leaflet-geoman.css?' . $ext . "\">\n";
+			print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/leaflet/leaflet.css?'.$ext."\">\n";
+			print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/leaflet/leaflet-geoman.css?'.$ext."\">\n";
 		}
 
 		// CSS forced by modules (relative url starting with /)
@@ -1889,7 +1889,7 @@ 
 		// Custom CSS
 		if (getDolGlobalString('MAIN_IHM_CUSTOM_CSS')) {
 			// If a custom CSS was set, we add link to the custom css php file
-			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/custom.css.php?' . $ext . '&amp;revision='.getDolGlobalInt("MAIN_IHM_PARAMS_REV").'">'."\n";
+			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/custom.css.php?'.$ext.'&amp;revision='.getDolGlobalInt("MAIN_IHM_PARAMS_REV").'">'."\n";
 		}
 
 		// Output standard javascript links
@@ -1897,36 +1897,36 @@ 
 			// JQuery. Must be before other includes
 			print '<!-- Includes JS for JQuery -->'."\n";
 			if (defined('JS_JQUERY') && constant('JS_JQUERY')) {
-				print '<script nonce="'.getNonce().'" src="'.JS_JQUERY.'jquery.min.js?' . $ext . '"></script>'."\n";
+				print '<script nonce="'.getNonce().'" src="'.JS_JQUERY.'jquery.min.js?'.$ext.'"></script>'."\n";
 			} else {
-				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js?' . $ext . '"></script>'."\n";
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js?'.$ext.'"></script>'."\n";
 			}
 			if (!defined('DISABLE_JQUERY_UI')) {
 				if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
-					print '<script nonce="' . getNonce() . '" src="' . JS_JQUERY_UI . 'jquery-ui.min.js?' . $ext . '"></script>' . "\n";
+					print '<script nonce="'.getNonce().'" src="'.JS_JQUERY_UI.'jquery-ui.min.js?'.$ext.'"></script>'."\n";
 				} else {
-					print '<script nonce="' . getNonce() . '" src="' . DOL_URL_ROOT . '/includes/jquery/js/jquery-ui.min.js?' . $ext . '"></script>' . "\n";
+					print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js?'.$ext.'"></script>'."\n";
 				}
 			}
 			// jQuery jnotify
 			if (!getDolGlobalString('MAIN_DISABLE_JQUERY_JNOTIFY') && !defined('DISABLE_JQUERY_JNOTIFY')) {
-				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js?' . $ext . '"></script>'."\n";
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js?'.$ext.'"></script>'."\n";
 			}
 			// Table drag and drop lines
 			if (empty($disableforlogin) && !defined('DISABLE_JQUERY_TABLEDND')) {
-				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js?' . $ext . '"></script>'."\n";
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js?'.$ext.'"></script>'."\n";
 			}
 			// Chart
 			if (empty($disableforlogin) && (!getDolGlobalString('MAIN_JS_GRAPH') || getDolGlobalString('MAIN_JS_GRAPH') == 'chart') && !defined('DISABLE_JS_GRAPH')) {
-				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/nnnick/chartjs/dist/chart.min.js?' . $ext . '"></script>'."\n";
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/nnnick/chartjs/dist/chart.min.js?'.$ext.'"></script>'."\n";
 			}
 
 			// jQuery jeditable for Edit In Place features
 			if (getDolGlobalString('MAIN_USE_JQUERY_JEDITABLE') && !defined('DISABLE_JQUERY_JEDITABLE')) {
 				print '<!-- JS to manage editInPlace feature -->'."\n";
-				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.js?' . $ext . '"></script>'."\n";
-				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js?' . $ext . '"></script>'."\n";
-				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js?' . $ext . '"></script>'."\n";
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.js?'.$ext.'"></script>'."\n";
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js?'.$ext.'"></script>'."\n";
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js?'.$ext.'"></script>'."\n";
 				print '<script nonce="'.getNonce().'" >'."\n";
 				print 'var urlSaveInPlace = \''.DOL_URL_ROOT.'/core/ajax/saveinplace.php\';'."\n";
 				print 'var urlLoadInPlace = \''.DOL_URL_ROOT.'/core/ajax/loadinplace.php\';'."\n";
@@ -1937,16 +1937,16 @@ 
 				print 'var indicatorInPlace = \'<img src="'.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'">\';'."\n";
 				print 'var withInPlace = 300;'; // width in pixel for default string edit
 				print '</script>'."\n";
-				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/core/js/editinplace.js?' . $ext . '"></script>'."\n";
-				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js?' . $ext . '"></script>'."\n";
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/core/js/editinplace.js?'.$ext.'"></script>'."\n";
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js?'.$ext.'"></script>'."\n";
 			}
 			if (!defined('DISABLE_SELECT2') && (getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') || defined('REQUIRE_JQUERY_MULTISELECT'))) {
 				// jQuery plugin "mutiselect", "multiple-select", "select2", ...
 				$tmpplugin = !getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') ? constant('REQUIRE_JQUERY_MULTISELECT') : getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT');
-				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js?' . $ext . '"></script>'."\n"; // We include full because we need the support of containerCssClass
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js?'.$ext.'"></script>'."\n"; // We include full because we need the support of containerCssClass
 			}
 			if (!defined('DISABLE_MULTISELECT')) {     // jQuery plugin "mutiselect" to select with checkboxes. Can be removed once we have an enhanced search tool
-				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js?' . $ext . '"></script>'."\n";
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js?'.$ext.'"></script>'."\n";
 			}
 		}
 
@@ -1963,11 +1963,11 @@ 
 				print '<script nonce="'.getNonce().'">';
 				print '/* enable ckeditor by main.inc.php */';
 				print 'var CKEDITOR_BASEPATH = \''.dol_escape_js($pathckeditor).'\';'."\n";
-				print 'var ckeditorConfig = \''.dol_escape_js(dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js?' . $ext, 1)).'\';'."\n"; // $themesubdir='' in standard usage
+				print 'var ckeditorConfig = \''.dol_escape_js(dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js?'.$ext, 1)).'\';'."\n"; // $themesubdir='' in standard usage
 				print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
 				print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
 				print '</script>'."\n";
-				print '<script src="'.$pathckeditor.$jsckeditor. '?' . $ext . '"></script>'."\n";
+				print '<script src="'.$pathckeditor.$jsckeditor.'?'.$ext.'"></script>'."\n";
 				print '<script>';
 				if (GETPOST('mode', 'aZ09') == 'Full_inline') {
 					print 'CKEDITOR.disableAutoInline = false;'."\n";
@@ -1988,20 +1988,20 @@ 
 				}
 				if ($enablebrowsernotif) {
 					print '<!-- Includes JS of Dolibarr (browser layout = '.$conf->browser->layout.')-->'."\n";
-					print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php?lang='.$langs->defaultlang. '&' . $ext . '"></script>'."\n";
+					print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php?lang='.$langs->defaultlang.'&'.$ext.'"></script>'."\n";
 				}
 			}
 
 			// Global js function
 			print '<!-- Includes JS of Dolibarr -->'."\n";
 			if (!defined('DISABLE_LIB_HEAD_JS')) {
-				print '<script nonce="' . getNonce() . '" src="' . DOL_URL_ROOT . '/core/js/lib_head.js.php?lang=' . $langs->defaultlang . '&' . $ext . '"></script>' . "\n";
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.'&'.$ext.'"></script>'."\n";
 			}
 
 			// Leaflet
 			if (getDolGlobalString('MAIN_USE_GEOPHP')) {
-				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/leaflet/leaflet.js?' . $ext . '"></script>'."\n";
-				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/leaflet/leaflet-geoman.min.js?' . $ext . '"></script>'."\n";
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/leaflet/leaflet.js?'.$ext.'"></script>'."\n";
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/leaflet/leaflet-geoman.min.js?'.$ext.'"></script>'."\n";
 			}
 
 			// JS forced by modules (relative url starting with /)
@@ -2038,7 +2038,7 @@ 
 		if (getDolGlobalString('ALLOW_THEME_JS')) {
 			$theme_js = dol_buildpath('/theme/'.$conf->theme.'/'.$conf->theme.'.js', 0);
 			if (file_exists($theme_js)) {
-				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/'.$conf->theme.'.js?' . $ext . '"></script>'."\n";
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/'.$conf->theme.'.js?'.$ext.'"></script>'."\n";
 			}
 		}
 
@@ -2046,7 +2046,7 @@ 
 			print $head."\n";
 		}
 		if (getDolGlobalString('MAIN_HTML_HEADER')) {
-			print getDolGlobalString('MAIN_HTML_HEADER') . "\n";
+			print getDolGlobalString('MAIN_HTML_HEADER')."\n";
 		}
 
 		$parameters = array();
@@ -2174,7 +2174,7 @@ 
 
 		$toprightmenu .= '</div>';
 
-		$toprightmenu .= '</div>'."\n";		 // end div class="login_block_tools"
+		$toprightmenu .= '</div>'."\n"; // end div class="login_block_tools"
 
 
 		// Add block for other tools
@@ -2195,7 +2195,7 @@ 
 
 		// Link to module builder
 		if (isModEnabled('modulebuilder')) {
-			$text = '<a href="' . dolBuildUrl(DOL_URL_ROOT . '/modulebuilder/index.php', ['mainmenu' => 'home', 'leftmenu' => 'admintools']) .'" target="modulebuilder">';
+			$text = '<a href="'.dolBuildUrl(DOL_URL_ROOT.'/modulebuilder/index.php', ['mainmenu' => 'home', 'leftmenu' => 'admintools']).'" target="modulebuilder">';
 			//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
 			$text .= '<span class="fa fa-bug atoplogin valignmiddle"></span>';
 			$text .= '</a>';
@@ -2475,7 +2475,7 @@ 
 	}
 
 	if (empty($urllogout)) {
-		$urllogout = dolBuildUrl(DOL_URL_ROOT . '/user/logout.php', [], true);
+		$urllogout = dolBuildUrl(DOL_URL_ROOT.'/user/logout.php', [], true);
 	}
 
 	// Defined the links for bottom of card
@@ -2884,7 +2884,7 @@ 
 		$langs->load(explode('@', $item['name'])[1]);
 		$dropDownQuickAddHtml .= '
 			<a class="dropdown-item quickadd-item" href="'.DOL_URL_ROOT.$item['url'].'" title="'.$langs->trans(explode('@', $item['title'])[0]).'">
-			'. img_picto('', $item['picto'], 'style="width:18px;"') . ' ' . $langs->trans(explode('@', $item['name'])[0]) . '</a>
+			'. img_picto('', $item['picto'], 'style="width:18px;"').' '.$langs->trans(explode('@', $item['name'])[0]).'</a>
 		';
 	}
 
@@ -2989,7 +2989,7 @@ 
  */
 function top_menu_search()
 {
-	global $langs, $conf, $db, $user, $hookmanager;	// used by htdocs/core/ajax/selectsearchbox.php
+	global $langs, $conf, $db, $user, $hookmanager; // used by htdocs/core/ajax/selectsearchbox.php
 
 	$html = '';
 
@@ -3677,7 +3677,7 @@ 
 
 		if (!empty($conf->use_javascript_ajax)) {
 			print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
-			print '<script src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang . '&' . $ext .'"></script>'."\n";
+			print '<script src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.'&'.$ext.'"></script>'."\n";
 		}
 
 		// JS wrapper to add an unalterable log when clicking on Download or Preview
@@ -3771,7 +3771,7 @@ 
 			} elseif (!isRegistrationDataSaved()) {
 				print "\n<!-- NO JS CODE TO ENABLE the registration. Registration data not saved -->\n";
 			} else {
-				$hash_unique_id_registration = dol_hash('dolibarr'.$conf->file->instance_unique_id, 'sha256', 1);	// Same than getHashUniqueIdOfRegistration()
+				$hash_unique_id_registration = dol_hash('dolibarr'.$conf->file->instance_unique_id, 'sha256', 1); // Same than getHashUniqueIdOfRegistration()
 				$constanttosavelastko = 'MAIN_LAST_REGISTRATION_KO_DATE';
 				$constanttosavefirstok = 'MAIN_FIRST_REGISTRATION_OK_DATE';
 				$constanttosavefirstokid = 'MAIN_FIRST_REGISTRATION_OK_ID';