Dolibarr / dolibarr

htdocs/accountancy/closure/index.php

Spacing +4 added lines, -4 removed lines

@@ -87,9 +87,9 @@ 
 	// Specify as export : update field date_validated on selected month/year
 	$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
 	$sql .= " SET date_validated = '".$db->idate($now)."'";
-	$sql .= " WHERE entity = " . ((int) $conf->entity);
-	$sql .= " AND doc_date >= '" . $db->idate($date_start) . "'";
-	$sql .= " AND doc_date <= '" . $db->idate($date_end) . "'";
+	$sql .= " WHERE entity = ".((int) $conf->entity);
+	$sql .= " AND doc_date >= '".$db->idate($date_start)."'";
+	$sql .= " AND doc_date <= '".$db->idate($date_end)."'";
 	$sql .= " AND date_validated IS NULL";
 
 	dol_syslog("/accountancy/closure/index.php action=validate_movement_confirm -> Set movements as validated", LOG_DEBUG);
@@ -122,7 +122,7 @@ 
 
 $title = $langs->trans('Closure');
 
-$help_url ='EN:Module_Double_Entry_Accounting';
+$help_url = 'EN:Module_Double_Entry_Accounting';
 
 llxHeader('', $title, $help_url);
 

htdocs/holiday/month_report.php

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
 $sql .= " AND cp.statut = ".Holiday::STATUS_APPROVED;
 $sql .= " AND (";
 $sql .= " (date_format(cp.date_debut, '%Y-%m') = '".$db->escape($year_month)."' OR date_format(cp.date_fin, '%Y-%m') = '".$db->escape($year_month)."')";
-$sql .= " OR";	// For leave over several months
+$sql .= " OR"; // For leave over several months
 $sql .= " (date_format(cp.date_debut, '%Y-%m') < '".$db->escape($year_month)."' AND date_format(cp.date_fin, '%Y-%m') > '".$db->escape($year_month)."') ";
 $sql .= " )";
 if (!empty($search_ref)) {

htdocs/core/modules/product/doc/pdf_standard.modules.php

Spacing +6 added lines, -6 removed lines

@@ -294,20 +294,20 @@
 					$nexY = $pdf->GetY();
 				}
 				if ($object->length) {
-					$texttoshow = $langs->trans("Length") . ' x ' . $langs->trans("Width") . ' x ' . $langs->trans("Height") . ': ' . ($object->length != '' ? $object->length : '?') . ' x ' . ($object->width != '' ? $object->width : '?') . ' x ' . ($object->height != '' ? $object->height : '?');
-					$texttoshow .= ' ' . measuringUnitString(0, "size", $object->length_units);
+					$texttoshow = $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != '' ? $object->length : '?').' x '.($object->width != '' ? $object->width : '?').' x '.($object->height != '' ? $object->height : '?');
+					$texttoshow .= ' '.measuringUnitString(0, "size", $object->length_units);
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}
 				if ($object->surface) {
-					$texttoshow = $langs->trans("Surface") . ': ' . dol_htmlentitiesbr($object->surface);
-					$texttoshow .= ' ' . measuringUnitString(0, "surface", $object->surface_units);
+					$texttoshow = $langs->trans("Surface").': '.dol_htmlentitiesbr($object->surface);
+					$texttoshow .= ' '.measuringUnitString(0, "surface", $object->surface_units);
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}
 				if ($object->volume) {
-					$texttoshow = $langs->trans("Volume") . ': ' . dol_htmlentitiesbr($object->volume);
-					$texttoshow .= ' ' . measuringUnitString(0, "volume", $object->volume_units);
+					$texttoshow = $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume);
+					$texttoshow .= ' '.measuringUnitString(0, "volume", $object->volume_units);
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}

htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php

Spacing +9 added lines, -9 removed lines

@@ -37,8 +37,8 @@ 
 	$h = 0;
 	$head = array();
 
-	$withProjectUrl='';
-	if ($with_project>0) {
+	$withProjectUrl = '';
+	if ($with_project > 0) {
 		$withProjectUrl = "&withproject=1";
 	}
 
@@ -131,7 +131,7 @@ 
 	$head[$h][2] = 'conferenceorbooth';
 	// Enable caching of conf or booth count attendees
 	$nbAttendees = 0;
-	$nbConferenceOrBooth= 0;
+	$nbConferenceOrBooth = 0;
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 	$cachekey = 'count_conferenceorbooth_project_'.$object->id;
 	$dataretrieved = dol_getcache($cachekey);
@@ -139,14 +139,14 @@ 
 		$nbAttendees = $dataretrieved;
 	} else {
 		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
-		$conforbooth=new ConferenceOrBooth($db);
+		$conforbooth = new ConferenceOrBooth($db);
 		$result = $conforbooth->fetchAll('', '', 0, 0, array('t.fk_project'=>$object->id));
-		if (!is_array($result) && $result<0) {
+		if (!is_array($result) && $result < 0) {
 			setEventMessages($conforbooth->error, $conforbooth->errors, 'errors');
 		} else {
 			$nbConferenceOrBooth = count($result);
 		}
-		dol_setcache($cachekey, $nbConferenceOrBooth, 120);	// If setting cache fails, this is not a problem, so we do not test result.
+		dol_setcache($cachekey, $nbConferenceOrBooth, 120); // If setting cache fails, this is not a problem, so we do not test result.
 	}
 	if ($nbConferenceOrBooth > 0) {
 		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbConferenceOrBooth.'</span>';
@@ -165,14 +165,14 @@ 
 		$nbAttendees = $dataretrieved;
 	} else {
 		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
-		$attendees=new ConferenceOrBoothAttendee($db);
+		$attendees = new ConferenceOrBoothAttendee($db);
 		$result = $attendees->fetchAll('', '', 0, 0, array('t.fk_project'=>$object->id));
-		if (!is_array($result) && $result<0) {
+		if (!is_array($result) && $result < 0) {
 			setEventMessages($attendees->error, $attendees->errors, 'errors');
 		} else {
 			$nbAttendees = count($result);
 		}
-		dol_setcache($cachekey, $nbAttendees, 120);	// If setting cache fails, this is not a problem, so we do not test result.
+		dol_setcache($cachekey, $nbAttendees, 120); // If setting cache fails, this is not a problem, so we do not test result.
 	}
 	if ($nbAttendees > 0) {
 		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbAttendees.'</span>';

htdocs/core/modules/takepos/mod_takepos_ref_simple.php

Spacing +5 added lines, -5 removed lines

@@ -76,7 +76,7 @@ 
 	 */
 	public function getExample()
 	{
-		return $this->prefix.'0-0501-0001';		// TC0-0501-0001
+		return $this->prefix.'0-0501-0001'; // TC0-0501-0001
 	}
 
 	/**
@@ -92,10 +92,10 @@ 
 		$pryymm = '';
 		$max = '';
 
-		$pos_source = 0;	// POS source = Terminal ID
+		$pos_source = 0; // POS source = Terminal ID
 
 		// First, we get the max value
-		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;	// So posindice is position after TCX-YYMM-
+		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM-
 
 		$sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
@@ -135,10 +135,10 @@ 
 	{
 		global $db;
 
-		$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;	// POS source = Terminal ID
+		$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0; // POS source = Terminal ID
 
 		// First, we get the max value
-		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;	// So posindice is position after TCX-YYMM-
+		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM-
 		$sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source."-____-%")."'";

htdocs/societe/ajax/company.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 	$match = preg_grep('/('.preg_quote($htmlname, '/').'[0-9]+)/', array_keys($_GET));
 	sort($match);
 
-	$id = (!empty($match[0]) ? $match[0] : '');		// Take first key found into GET array with matching $htmlname123
+	$id = (!empty($match[0]) ? $match[0] : ''); // Take first key found into GET array with matching $htmlname123
 
 	// When used from jQuery, the search term is added as GET param "term".
 	$searchkey = (($id && GETPOST($id, 'alpha')) ? GETPOST($id, 'alpha') : (($htmlname && GETPOST($htmlname, 'alpha')) ?GETPOST($htmlname, 'alpha') : ''));

htdocs/fourn/paiement/list.php

Spacing +10 added lines, -10 removed lines

@@ -53,20 +53,20 @@ 
 // Security check
 if ($user->socid) $socid = $user->socid;
 
-$search_ref				= GETPOST('search_ref', 'alpha');
-$search_date_startday	= GETPOST('search_date_startday', 'int');
-$search_date_startmonth	= GETPOST('search_date_startmonth', 'int');
-$search_date_startyear	= GETPOST('search_date_startyear', 'int');
+$search_ref = GETPOST('search_ref', 'alpha');
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
 $search_date_endday		= GETPOST('search_date_endday', 'int');
-$search_date_endmonth	= GETPOST('search_date_endmonth', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
 $search_date_endyear	= GETPOST('search_date_endyear', 'int');
-$search_date_start		= dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end		= dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_company			= GETPOST('search_company', 'alpha');
 $search_payment_type	= GETPOST('search_payment_type');
-$search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
+$search_cheque_num = GETPOST('search_cheque_num', 'alpha');
 $search_bank_account	= GETPOST('search_bank_account', 'int');
-$search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
+$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield				= GETPOST('sortfield', 'aZ09comma');
@@ -207,10 +207,10 @@ 
 	$sql .= natural_search('p.ref', $search_ref);
 }
 if ($search_date_start) {
-	$sql .= " AND p.datep >= '" . $db->idate($search_date_start) . "'";
+	$sql .= " AND p.datep >= '".$db->idate($search_date_start)."'";
 }
 if ($search_date_end) {
-	$sql .=" AND p.datep <= '" . $db->idate($search_date_end) . "'";
+	$sql .= " AND p.datep <= '".$db->idate($search_date_end)."'";
 }
 
 if ($search_company) {

htdocs/hrm/class/skillrank.class.php

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
 
 // Put here all includes required by your class file
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skillrank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skillrank.lib.php';
 
 /**
  * Class for SkillRank
@@ -104,7 +104,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'fk_skill' => array('type'=>'integer:Skill:hrm/class/skill.class.php:1', 'label'=>'Skill', 'enabled'=>'1', 'position'=>3, 'notnull'=>1, 'visible'=>1, 'index'=>1,),
 		'rankorder' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>'1', 'position'=>4, 'notnull'=>1, 'visible'=>1, 'default' => 0),
@@ -371,13 +371,13 @@ 
 		global $user;
 
 		$this->fk_skill 		= $currentSkill->fk_skill;
-		$this->rankorder 			= $currentSkill->rankorder;
+		$this->rankorder = $currentSkill->rankorder;
 		$this->fk_object		= $fk_user;
 		$this->date_creation 	= dol_now();
 		$this->fk_user_creat 	= $user->id;
 		$this->fk_user_modif 	= $user->id;
-		$this->objecttype	 	= self::SKILLRANK_TYPE_USER;
-		$result =  $this->create($user);
+		$this->objecttype = self::SKILLRANK_TYPE_USER;
+		$result = $this->create($user);
 
 		return $result;
 	}

htdocs/hrm/lib/hrm_skillrank.lib.php

Spacing +10 added lines, -10 removed lines

@@ -108,14 +108,14 @@ 
 {
 	global $db, $conf, $langs;
 
-	require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
-	require_once DOL_DOCUMENT_ROOT . '/hrm/class/skilldet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/hrm/class/skilldet.class.php';
 
 	// On charge les différentes notes possibles pour la compétence $fk_skill
 	$skilldet = new Skilldet($db);
 	$Lines = $skilldet->fetchAll('ASC', 'rankorder', 0, 0, array('customsql'=>'fk_skill = '.$fk_skill));
 
-	if (!is_array($Lines) && $Lines<0) {
+	if (!is_array($Lines) && $Lines < 0) {
 		setEventMessages($skilldet->error, $skilldet->errors, 'errors');
 	}
 	if (empty($Lines)) return $langs->trans('SkillHasNoLines');
@@ -128,29 +128,29 @@ 
 				continue;
 			}
 
-			$ret .= '<span title="' . $line->description . '" class="radio_js_bloc_number ' . $inputname . '_' . $line->fk_skill;
+			$ret .= '<span title="'.$line->description.'" class="radio_js_bloc_number '.$inputname.'_'.$line->fk_skill;
 			$ret .= $line->rankorder == $selected_rank ? ' selected' : '';
-			$ret .= '">' . $line->rankorder . '</span>';
+			$ret .= '">'.$line->rankorder.'</span>';
 		}
 
 		if ($mode == 'edit') {
 			$ret .= '
-		<input type="hidden" id="' . $inputname . '_' . $fk_skill . '" name="' . $inputname . '[' . $fk_skill . ']" value="' . $selected_rank . '">
+		<input type="hidden" id="' . $inputname.'_'.$fk_skill.'" name="'.$inputname.'['.$fk_skill.']" value="'.$selected_rank.'">
 		<script type="text/javascript">
 			$(document).ready(function(){
 				$(".radio_js_bloc_number").tooltip();
 				var error,same;
-				$(".' . $inputname . '_' . $fk_skill . '").on("click",function(){
+				$(".' . $inputname.'_'.$fk_skill.'").on("click",function(){
 					same=false;
 					val = $(this).html();
 					if($(this).hasClass("selected"))same=true;
-					$(".' . $inputname . '_' . $fk_skill . '").removeClass("selected");
+					$(".' . $inputname.'_'.$fk_skill.'").removeClass("selected");
 					if(same)
 					{
-						$("#' . $inputname . '_' . $fk_skill . '").val("");
+						$("#' . $inputname.'_'.$fk_skill.'").val("");
 					}else {
 						$(this).addClass("selected");
-						$("#' . $inputname . '_' . $fk_skill . '").val(val);
+						$("#' . $inputname.'_'.$fk_skill.'").val(val);
 					}
 				});