Completed
Branch develop (da9fd8)
by
unknown
16:44
created
htdocs/compta/stats/cabyprodserv.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
 	$month_current = dol_print_date(dol_now(), '%m');
102 102
 	$year_start = $year;
103 103
 }
104
-$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver');	// We use timezone of server so report is same from everywhere
105
-$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');		// We use timezone of server so report is same from everywhere
104
+$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
105
+$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
106 106
 // Quarter
107 107
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
108 108
 	$q = GETPOSTINT("q");
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
 				if ($searchCategoryProductOperator == 0) {
342 342
 					$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck WHERE l.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
343 343
 				} else {
344
-					$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
344
+					$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
345 345
 				}
346 346
 			}
347 347
 		}
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 				if ($searchCategorySocieteOperator == 0) {
373 373
 					$searchCategorySocieteSqlList[] = " EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE f.fk_soc = cs.fk_soc AND cs.fk_categorie = ".((int) $searchCategorySociete).")";
374 374
 				} else {
375
-					$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategorySociete);
375
+					$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategorySociete);
376 376
 				}
377 377
 			}
378 378
 		}
Please login to merge, or discard this patch.
htdocs/debugbar/class/DebugBar.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -80,10 +80,10 @@
 block discarded – undo
80 80
 			$baseUrl = DOL_URL_ROOT.'/includes/maximebf/debugbar/src/DebugBar/Resources';
81 81
 		}
82 82
 		$renderer = parent::getJavascriptRenderer($baseUrl, $basePath);
83
-		$renderer->disableVendor('jquery');			// We already have jquery loaded globally by the main.inc.php
84
-		$renderer->disableVendor('fontawesome');	// We already have fontawesome loaded globally by the main.inc.php
85
-		$renderer->disableVendor('highlightjs');	// We don't need this
86
-		$renderer->setEnableJqueryNoConflict(false);	// We don't need no conflict
83
+		$renderer->disableVendor('jquery'); // We already have jquery loaded globally by the main.inc.php
84
+		$renderer->disableVendor('fontawesome'); // We already have fontawesome loaded globally by the main.inc.php
85
+		$renderer->disableVendor('highlightjs'); // We don't need this
86
+		$renderer->setEnableJqueryNoConflict(false); // We don't need no conflict
87 87
 
88 88
 		return $renderer;
89 89
 	}
Please login to merge, or discard this patch.