Dolibarr / dolibarr

htdocs/compta/facture/list.php

Spacing +7 added lines, -7 removed lines

@@ -179,7 +179,7 @@ 
 $search_product_category = GETPOST('search_product_category', 'intcomma');
 $search_fac_rec_source_title = GETPOST("search_fac_rec_source_title", 'alpha');
 $search_fk_fac_rec_source = GETPOST('search_fk_fac_rec_source', 'int');
-$search_import_key  = trim(GETPOST("search_import_key", "alpha"));
+$search_import_key = trim(GETPOST("search_import_key", "alpha"));
 
 $search_option = GETPOST('search_option');
 if ($search_option == 'late') {
@@ -1013,7 +1013,7 @@ 
 	$sql .= natural_search('facrec.titre', $search_fac_rec_source_title);
 }
 if ($search_fk_fac_rec_source) {
-	$sql .= ' AND f.fk_fac_rec_source = ' . (int) $search_fk_fac_rec_source;
+	$sql .= ' AND f.fk_fac_rec_source = '.(int) $search_fk_fac_rec_source;
 }
 if ($search_import_key) {
 	$sql .= natural_search("s.import_key", $search_import_key);
@@ -1047,7 +1047,7 @@ 
 			if ($searchCategoryInvoiceOperator == 0) {
 				$searchCategoryInvoiceSqlList[] = " EXISTS (SELECT ck.fk_invoice FROM ".MAIN_DB_PREFIX."categorie_invoice as ck WHERE f.rowid = ck.fk_invoice AND ck.fk_categorie = ".((int) $searchCategoryInvoice).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryInvoice);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryInvoice);
 			}
 		}
 	}
@@ -1078,7 +1078,7 @@ 
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."facturedet as fd WHERE fd.fk_facture = f.rowid AND fd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
 			}
 		}
 	}
@@ -1108,7 +1108,7 @@ 
 			if ($searchCategoryCustomerOperator == 0) {
 				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = ".((int) $searchCategoryCustomer).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryCustomer);
 			}
 		}
 	}
@@ -1419,7 +1419,7 @@ 
 	$param .= '&search_fac_rec_source_title='.urlencode($search_fac_rec_source_title);
 }
 if ($search_fk_fac_rec_source) {
-	$param .= '&search_fk_fac_rec_source=' . (int) $search_fk_fac_rec_source;
+	$param .= '&search_fk_fac_rec_source='.(int) $search_fk_fac_rec_source;
 }
 if ($search_import_key != '') {
 	$param .= '&search_import_key='.urlencode($search_import_key);
@@ -2233,7 +2233,7 @@ 
 
 		$facturestatic->id = $obj->id;
 		$facturestatic->ref = $obj->ref;
-		$facturestatic->ref_client = $obj->ref_client;		// deprecated
+		$facturestatic->ref_client = $obj->ref_client; // deprecated
 		$facturestatic->ref_customer = $obj->ref_client;
 		$facturestatic->type = $obj->type;
 		$facturestatic->subtype = $obj->subtype;

htdocs/webportal/admin/setup_theme.php

Spacing +11 added lines, -11 removed lines

@@ -25,8 +25,8 @@ 
 
 // Load Dolibarr environment
 require_once "../../main.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT."/webportal/lib/webportal.lib.php";
 
 /**
  * @var Conf $conf
@@ -45,7 +45,7 @@ 
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');    // Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
@@ -63,12 +63,12 @@ 
 $useFormSetup = 1;
 
 if (!class_exists('FormSetup')) {
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formsetup.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
 }
 
 $formSetup = new FormSetup($db);
 
-require_once __DIR__ . '/../class/webPortalTheme.class.php';
+require_once __DIR__.'/../class/webPortalTheme.class.php';
 $webPortalTheme = new WebPortalTheme();
 
 // Setup conf for secondary color
@@ -80,12 +80,12 @@ 
 $options = [
 	'default' => [
 		'id' => 'default-login-theme',
-		'label' => '<img src="'. DOL_URL_ROOT . '/public/webportal/img/login-tpl/default.svg" alt="'.dolPrintHTMLForAttribute($langs->trans('UseDefaultLoginForm')).'" />',
+		'label' => '<img src="'.DOL_URL_ROOT.'/public/webportal/img/login-tpl/default.svg" alt="'.dolPrintHTMLForAttribute($langs->trans('UseDefaultLoginForm')).'" />',
 		'labelIsHtml' => true
 	],
 	'right' => [
 		'id' => 'right-login-theme',
-		'label' => '<img src="'. DOL_URL_ROOT . '/public/webportal/img/login-tpl/right.svg" alt="'.dolPrintHTMLForAttribute($langs->trans('UseRightLoginForm')).'" />',
+		'label' => '<img src="'.DOL_URL_ROOT.'/public/webportal/img/login-tpl/right.svg" alt="'.dolPrintHTMLForAttribute($langs->trans('UseRightLoginForm')).'" />',
 		'labelIsHtml' => true
 	],
 ];
@@ -121,7 +121,7 @@ 
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT . '/core/actions_setmoduleoptions.inc.php';
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 // Force always edit mode
 if (empty($action) || $action == 'update') {
@@ -141,7 +141,7 @@ 
 llxHeader('', $langs->trans($title), $help_url);
 
 // Subheader
-$linkback = '<a href="' . ($backtopage ? $backtopage : DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1') . '">' . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
 print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
 
@@ -156,10 +156,10 @@ 
 } elseif (!empty($formSetup->items)) {
 	print $formSetup->generateOutput();
 	print '<div class="tabsAction">';
-	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&token=' . newToken() . '">' . $langs->trans("Modify") . '</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 	print '</div>';
 } else {
-	print '<br>' . $langs->trans("NothingToSetup");
+	print '<br>'.$langs->trans("NothingToSetup");
 }
 
 

test/phpunit/DateLibTest.php

Spacing +48 added lines, -48 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';
@@ -60,7 +60,7 @@ 
 	 */
 	public function testNumBetweenDay()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -112,7 +112,7 @@ 
 	 */
 	public function testNumPublicHoliday()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -125,16 +125,16 @@ 
 
 		$result = num_public_holiday($date1, $date2, 'FR', 1);
 		print __METHOD__." for Tuesday 1 - Wednesday 2 jan 2013 for FR result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for FR');   // 1 closed days (country france)
+		$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for FR'); // 1 closed days (country france)
 
 		$result = num_public_holiday($date1, $date2, 'XX', 1);
 		print __METHOD__." for Tuesday 1 - Wednesday 2 jan 2013 for XX result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for XX');   // 1 closed days (country unknown)
+		$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for XX'); // 1 closed days (country unknown)
 
 		print '----'."\n";
 		$result = num_public_holiday($date2, $date3, 'FR', 1);
 		print __METHOD__." for Wednesday 2 - Thursday 3 jan 2013 for FR result=".$result."\n";
-		$this->assertEquals(0, $result, 'NumPublicHoliday for Wednesday 2 - Thursday 3 jan 2013 for FR');   // no closed days
+		$this->assertEquals(0, $result, 'NumPublicHoliday for Wednesday 2 - Thursday 3 jan 2013 for FR'); // no closed days
 
 		// Check with easter monday
 		$date1 = dol_mktime(0, 0, 0, 4, 21, 2019, 'gmt');
@@ -142,11 +142,11 @@ 
 
 		$result = num_public_holiday($date1, $date2, 'XX', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumPublicHoliday including eastermonday for XX');   // 2 opened day, 1 closed days (sunday)
+		$this->assertEquals(1, $result, 'NumPublicHoliday including eastermonday for XX'); // 2 opened day, 1 closed days (sunday)
 
 		$result = num_public_holiday($date1, $date2, 'FR', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumPublicHoliday including eastermonday for FR');   // 1 opened day, 2 closed days (sunday + easter monday)
+		$this->assertEquals(2, $result, 'NumPublicHoliday including eastermonday for FR'); // 1 opened day, 2 closed days (sunday + easter monday)
 
 		// Check for sunday/saturday - Friday 4 - Sunday 6 jan 2013
 		$date1 = dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt');
@@ -154,23 +154,23 @@ 
 
 		$result = num_public_holiday($date1, $date2, 'FR', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumPublicHoliday for FR');   // 1 opened day, 2 closed days
+		$this->assertEquals(2, $result, 'NumPublicHoliday for FR'); // 1 opened day, 2 closed days
 
 		$result = num_public_holiday($date1, $date2, 'FR', 1, 1, 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumPublicHoliday for FR');   // 1 opened day, 2 closed days
+		$this->assertEquals(2, $result, 'NumPublicHoliday for FR'); // 1 opened day, 2 closed days
 
 		$result = num_public_holiday($date1, $date2, 'FR', 1, 1, 0);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumPublicHoliday for FR');   // 2 opened day, 1 closed days
+		$this->assertEquals(1, $result, 'NumPublicHoliday for FR'); // 2 opened day, 1 closed days
 
 		$result = num_public_holiday($date1, $date2, 'FR', 1, 0, 0);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(0, $result, 'NumPublicHoliday for FR');   // 3 opened day, 0 closed days
+		$this->assertEquals(0, $result, 'NumPublicHoliday for FR'); // 3 opened day, 0 closed days
 
 		$result = num_public_holiday($date1, $date2, 'XX', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumPublicHoliday for XX');   // 1 opened day, 2 closed days (even if country unknown)
+		$this->assertEquals(2, $result, 'NumPublicHoliday for XX'); // 1 opened day, 2 closed days (even if country unknown)
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 	 */
 	public function testNumOpenDay()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -196,50 +196,50 @@ 
 
 
 		// With same hours - Tuesday/Wednesday jan 2013
-		$date1 = dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt');	// tuesday
-		$date2 = dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt');	// wednesday
-		$date3 = dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt');	// thursday
+		$date1 = dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt'); // tuesday
+		$date2 = dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt'); // wednesday
+		$date3 = dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt'); // thursday
 
 		$result = num_open_day($date1, $date2, 0, 1, 0, 'FR');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for FR');   // 1 opened days (country france)
+		$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for FR'); // 1 opened days (country france)
 
 		$result = num_open_day($date1, $date2, 0, 1, 0, 'XX');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for XX');   // 1 opened days (country unknown)
+		$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for XX'); // 1 opened days (country unknown)
 
 		$result = num_open_day($date2, $date3, 0, 1, 0, 'FR');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumOpenDay Wednesday 2 - Thursday 3 jan 2013 for FR');   // 2 opened days
+		$this->assertEquals(2, $result, 'NumOpenDay Wednesday 2 - Thursday 3 jan 2013 for FR'); // 2 opened days
 
 		// With same hours - Friday/Sunday jan 2013
-		$date1 = dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt');	// friday
-		$date2 = dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt');	// sunday
+		$date1 = dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt'); // friday
+		$date2 = dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt'); // sunday
 
 		$result = num_open_day($date1, $date2, 0, 1, 0, 'FR');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumOpenDay for FR');   // 1 opened day, 2 closed
+		$this->assertEquals(1, $result, 'NumOpenDay for FR'); // 1 opened day, 2 closed
 
 		$result = num_open_day($date1, $date2, 'XX', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumOpenDay for XX');   // 1 opened day, 2 closes (even if country unknown)
+		$this->assertEquals(1, $result, 'NumOpenDay for XX'); // 1 opened day, 2 closes (even if country unknown)
 
 		// Test option MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY and MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY
 		$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY = 0;
 		$result = num_open_day($date1, $date2, 0, 1, 0, 'FR');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumOpenDay for FR when saturday is a working day');   //2 opened day, 1 closed
+		$this->assertEquals(2, $result, 'NumOpenDay for FR when saturday is a working day'); //2 opened day, 1 closed
 
 		$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY = 0;
 		$result = num_open_day($date1, $date2, 'XX', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(3, $result, 'NumOpenDay for XX when saturday + sunday are working days');   // 3 opened day, 0 closes (even if country unknown)
+		$this->assertEquals(3, $result, 'NumOpenDay for XX when saturday + sunday are working days'); // 3 opened day, 0 closes (even if country unknown)
 
 		// Define specific dates for these tests
-		$date_friday_4 = dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt');   // Friday
+		$date_friday_4 = dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt'); // Friday
 		$date_saturday_5 = dol_mktime(0, 0, 0, 1, 5, 2013, 'gmt'); // Saturday
-		$date_monday_7 = dol_mktime(0, 0, 0, 1, 7, 2013, 'gmt');   // Monday
-		$date_friday_11 = dol_mktime(0, 0, 0, 1, 11, 2013, 'gmt');  // Following Friday
+		$date_monday_7 = dol_mktime(0, 0, 0, 1, 7, 2013, 'gmt'); // Monday
+		$date_friday_11 = dol_mktime(0, 0, 0, 1, 11, 2013, 'gmt'); // Following Friday
 
 		// Case 1: Weekend Boundary (Friday morning -> Saturday morning)
 		// Expected: 1 day. No half-day deduction for end date on a non-working day.
@@ -279,7 +279,7 @@ 
 	 */
 	public function testConvertTime2Seconds()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -299,7 +299,7 @@ 
 	 */
 	public function testConvertSecondToTime()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -323,14 +323,14 @@ 
 	 */
 	public function testDolPrintDate()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
 		$db = $this->savdb;
 
 		// Check %Y-%m-%d %H:%M:%S format
-		$result = dol_print_date('1970-01-01', '%Y-%m-%d %H:%M:%S', true);	// A case for compatibility check
+		$result = dol_print_date('1970-01-01', '%Y-%m-%d %H:%M:%S', true); // A case for compatibility check
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1970-01-01 00:00:00', $result);
 
@@ -346,22 +346,22 @@ 
 		$this->assertEquals('1970-01-01T00:00:00Z', $result);
 
 		// Check %Y-%m-%d %H:%M:%S format
-		$result = dol_print_date(16725225600, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		$result = dol_print_date(16725225600, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('2500-01-01 00:00:00', $result);
 
 		// Check %Y-%m-%d %H:%M:%S format
-		$result = dol_print_date(-1830384000, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		$result = dol_print_date(-1830384000, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1912-01-01 00:00:00', $result);	// dol_print_date use TZ (good) but epoch converter does not use it.
+		$this->assertEquals('1912-01-01 00:00:00', $result); // dol_print_date use TZ (good) but epoch converter does not use it.
 
 		// Check %Y-%m-%d %H:%M:%S format
-		$result = dol_print_date(-11676096000, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		$result = dol_print_date(-11676096000, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1600-01-01 00:00:00', $result);
 
 		// test with negative timezone
-		$result = dol_print_date(-1, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		$result = dol_print_date(-1, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1969-12-31 23:59:59', $result);
 
@@ -414,7 +414,7 @@ 
 	 */
 	public function testDolTimePlusDuree()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -444,7 +444,7 @@ 
 	 */
 	public function testDolStringToTime()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -490,16 +490,16 @@ 
 		$day = 3;
 		$month = 2;
 		$year = 2015;
-		$conf->global->MAIN_START_WEEK = 1;	// start on monday
+		$conf->global->MAIN_START_WEEK = 1; // start on monday
 		$prev = dol_get_first_day_week($day, $month, $year);
-		$this->assertEquals(2, (int) $prev['first_day']);		// monday for month 2, year 2014 is the 2
+		$this->assertEquals(2, (int) $prev['first_day']); // monday for month 2, year 2014 is the 2
 
 		$day = 3;
 		$month = 2;
 		$year = 2015;
-		$conf->global->MAIN_START_WEEK = 0;	// start on sunday
+		$conf->global->MAIN_START_WEEK = 0; // start on sunday
 		$prev = dol_get_first_day_week($day, $month, $year);
-		$this->assertEquals(1, (int) $prev['first_day']);		// sunday for month 2, year 2015 is the 1st
+		$this->assertEquals(1, (int) $prev['first_day']); // sunday for month 2, year 2015 is the 1st
 
 		return 1;
 	}
@@ -514,15 +514,15 @@ 
 	{
 		global $conf;
 
-		$now = 1800 + (24 * 3600 * 10);	// The 11th of january 1970 at 0:30 in UTC
+		$now = 1800 + (24 * 3600 * 10); // The 11th of january 1970 at 0:30 in UTC
 		$result = dol_get_first_hour($now, 'gmt');
 		print __METHOD__." now = ".$now.", dol_print_date(now, 'dayhourrfc', 'gmt') = ".dol_print_date($now, 'dayhourrfc', 'gmt').", result = ".$result.", dol_print_date(result, 'dayhourrfc', 'gmt') = ".dol_print_date($result, 'dayhourrfc', 'gmt')."\n";
-		$this->assertEquals('1970-01-11T00:00:00Z', dol_print_date($result, 'dayhourrfc', 'gmt'));		// monday for month 2, year 2014 is the 2
+		$this->assertEquals('1970-01-11T00:00:00Z', dol_print_date($result, 'dayhourrfc', 'gmt')); // monday for month 2, year 2014 is the 2
 
-		$now = 23.5 * 3600 + (24 * 3600 * 10);	// The 11th of january 1970 at 23:30 in UTC
+		$now = 23.5 * 3600 + (24 * 3600 * 10); // The 11th of january 1970 at 23:30 in UTC
 		$result = dol_get_first_hour($now, 'gmt');
 		print __METHOD__." now = ".$now.", dol_print_date(now, 'dayhourrfc', 'gmt') = ".dol_print_date($now, 'dayhourrfc', 'gmt').", result = ".$result.", dol_print_date(result, 'dayhourrfc', 'gmt') = ".dol_print_date($result, 'dayhourrfc', 'gmt')."\n";
-		$this->assertEquals('1970-01-11T00:00:00Z', dol_print_date($result, 'dayhourrfc', 'gmt'));		// monday for month 2, year 2014 is the 2
+		$this->assertEquals('1970-01-11T00:00:00Z', dol_print_date($result, 'dayhourrfc', 'gmt')); // monday for month 2, year 2014 is the 2
 
 		return 1;
 	}