Dolibarr / dolibarr

htdocs/product/stock/class/mouvementstock.class.php

Spacing +15 added lines, -15 removed lines

@@ -237,7 +237,7 @@ 
 				'skip_batch'       => &$skip_batch,
 				'id_product_batch' => &$id_product_batch
 			);
-			$reshook = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 			if ($reshook < 0) {
 				if (!empty($hookmanager->resPrint)) {
@@ -578,7 +578,7 @@ 
 			// Update stock quantity
 			if (!$error) {
 				if ($alreadyarecord > 0) {
-					$sql = "UPDATE ".$this->db->prefix()."product_stock SET reel = " . ((float) $oldqtywarehouse + (float) $qty);
+					$sql = "UPDATE ".$this->db->prefix()."product_stock SET reel = ".((float) $oldqtywarehouse + (float) $qty);
 					$sql .= " WHERE fk_entrepot = ".((int) $entrepot_id)." AND fk_product = ".((int) $fk_product);
 				} else {
 					$sql = "INSERT INTO ".$this->db->prefix()."product_stock";
@@ -726,8 +726,8 @@ 
 				$this->price = $obj->price;
 				$this->fk_user_author = $obj->fk_user_author;
 				$this->label = $obj->label;
-				$this->fk_origin = $obj->origin_id;		// For backward compatibility
-				$this->origintype = $obj->origin_type;	// For backward compatibility
+				$this->fk_origin = $obj->origin_id; // For backward compatibility
+				$this->origintype = $obj->origin_type; // For backward compatibility
 				$this->origin_id = $obj->origin_id;
 				$this->origin_type = $obj->origin_type;
 				$this->inventorycode = $obj->inventorycode;
@@ -962,8 +962,8 @@ 
 			} else {					// product_batch record not found
 				$pdluo->fk_product_stock = $vfk_product_stock;
 				$pdluo->qty = $qty;
-				$pdluo->eatby = empty($dluo['eatby']) ? '' : $dluo['eatby'];		// No more used. Now eatby date is store in table of lot, no more into prouct_batch table.
-				$pdluo->sellby = empty($dluo['sellby']) ? '' : $dluo['sellby'];		// No more used. Now sellby date is store in table of lot, no more into prouct_batch table.
+				$pdluo->eatby = empty($dluo['eatby']) ? '' : $dluo['eatby']; // No more used. Now eatby date is store in table of lot, no more into prouct_batch table.
+				$pdluo->sellby = empty($dluo['sellby']) ? '' : $dluo['sellby']; // No more used. Now sellby date is store in table of lot, no more into prouct_batch table.
 				$pdluo->batch = $vbatchnumber;
 
 				$result = $pdluo->create($user, 1);
@@ -1160,8 +1160,8 @@ 
 		$label .= '<div width="100%">';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->id;
 		$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
-		$qtylabel = (($this->qty > 0) ? '<span class="stockmovemententry">+' : '<span class="stockmovementexit">') . $this->qty . '</span>';
-		$label .= '<br><b>'.$langs->trans('Qty').':</b> ' . $qtylabel;
+		$qtylabel = (($this->qty > 0) ? '<span class="stockmovemententry">+' : '<span class="stockmovementexit">').$this->qty.'</span>';
+		$label .= '<br><b>'.$langs->trans('Qty').':</b> '.$qtylabel;
 		if ($this->batch) {
 			$label .= '<br><b>'.$langs->trans('Batch').':</b> '.$this->batch;
 		}
@@ -1289,8 +1289,8 @@ 
 		$sql = "SELECT sum(pb.qty) as cpt";
 		$sql .= " FROM ".$this->db->prefix()."product_batch as pb";
 		$sql .= " INNER JOIN ".$this->db->prefix()."product_stock as ps ON ps.rowid = pb.fk_product_stock";
-		$sql .= " WHERE ps.fk_product = " . ((int) $fk_product);
-		$sql .= " AND pb.batch = '" . $this->db->escape($batch) . "'";
+		$sql .= " WHERE ps.fk_product = ".((int) $fk_product);
+		$sql .= " AND pb.batch = '".$this->db->escape($batch)."'";
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -1314,7 +1314,7 @@ 
 	 */
 	public function reverseMouvement()
 	{
-		$formattedDate = "REVERTMV" .dol_print_date($this->datem, '%Y%m%d%His');
+		$formattedDate = "REVERTMV".dol_print_date($this->datem, '%Y%m%d%His');
 		if ($this->label == 'Annulation movement ID'.$this->id) {
 			return -1;
 		}
@@ -1350,11 +1350,11 @@ 
 	{
 		$date = '';
 
-		$sql = 	"SELECT MAX(datem) as datem";
+		$sql = "SELECT MAX(datem) as datem";
 		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement";
-		$sql .= " WHERE fk_product = " . ((int) $fk_product);
-		$sql .= " AND fk_entrepot  = " .((int) $fk_entrepot);
-		$sql .= " AND batch = '" . $this->db->escape($batch) . "'";
+		$sql .= " WHERE fk_product = ".((int) $fk_product);
+		$sql .= " AND fk_entrepot  = ".((int) $fk_entrepot);
+		$sql .= " AND batch = '".$this->db->escape($batch)."'";
 
 		$result = $this->db->query($sql);
 		if ($result) {

htdocs/bookcal/availabilities_list.php

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-	reset($object->fields);					// Reset is required to avoid key() to return null.
+	reset($object->fields); // Reset is required to avoid key() to return null.
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
@@ -386,7 +386,7 @@ 
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist mod-bookcal page-list_availabilities');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist mod-bookcal page-list_availabilities'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 // Example : Adding jquery code
 // print '<script type="text/javascript">
@@ -517,7 +517,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -611,7 +611,7 @@ 
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
 		$totalarray['nbfield']++;

htdocs/bookcal/calendar_list.php

Spacing +5 added lines, -5 removed lines

@@ -66,7 +66,7 @@ 
 $object = new Calendar($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array($contextpage)); 	// Note that conf->hooks_modules contains array of activated contexes
+$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -76,7 +76,7 @@ 
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-	reset($object->fields);					// Reset is required to avoid key() to return null.
+	reset($object->fields); // Reset is required to avoid key() to return null.
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
@@ -382,7 +382,7 @@ 
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist mod-bookcal page-list_calendar');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist mod-bookcal page-list_calendar'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -499,7 +499,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -592,7 +592,7 @@ 
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
 		$totalarray['nbfield']++;

htdocs/core/modules/modStock.class.php

Spacing +6 added lines, -6 removed lines

@@ -222,8 +222,8 @@ 
 			'd.code_departement' => 'List:c_departements:code_departement:code_departement:', 'c.code' => 'List:c_country:code:code:',
 			'e.phone' => 'Text', 'e.fax' => 'Text', 'e.statut' => 'Text', 'pe.rowid' => 'List:entrepot:ref:rowid:stock', 'pe.ref' => 'Text'
 		);
-		$this->export_entities_array[$r] = array();	// We define here only fields that use another icon that the one defined into export_icon
-		$this->export_aggregate_array[$r] = array();	// TODO Not used yet
+		$this->export_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into export_icon
+		$this->export_aggregate_array[$r] = array(); // TODO Not used yet
 		$keyforselect = 'warehouse';
 		$keyforelement = 'warehouse';
 		$keyforaliasextra = 'extra';
@@ -270,7 +270,7 @@ 
 			'p.datec' => 'product', 'p.tms' => 'product', 'p.pmp' => 'product', 'p.cost_price' => 'product',
 			'ps.reel' => 'stock',
 			'p.seuil_stock_alerte' => 'product', 'p.barcode' => 'product', 'bt.libelle' => 'product',
-		);	// We define here only fields that use another icon that the one defined into export_icon
+		); // We define here only fields that use another icon that the one defined into export_icon
 		if (isModEnabled('barcode')) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'product'));
 		}
@@ -329,7 +329,7 @@ 
 				'p.datec' => 'product', 'p.tms' => 'product', 'p.pmp' => 'product', 'p.cost_price' => 'product', 'lcpn.label'=>'product',
 				'pb.rowid' => 'batch', 'pb.batch' => 'batch', 'pb.qty' => 'batch', 'none.dateLastMovement' => 'movement',
 				'pl.eatby' => 'batch', 'pl.sellby' => 'batch'
-			);	// We define here only fields that use another icon that the one defined into export_icon
+			); // We define here only fields that use another icon that the one defined into export_icon
 			$this->export_special_array[$r] = array(
 				'none.dateLastMovement'=>array('rule'=>'compute', 'classfile'=>'/product/stock/class/mouvementstock.class.php', 'class'=>'MouvementStock', 'method'=>'getDateLastMovementProductBatch', 'method_params'=>['e_rowid', 'p_rowid', 'pb_batch']),
 			);
@@ -383,7 +383,7 @@ 
 			'e.rowid' => 'warehouse', 'e.ref' => 'warehouse', 'e.description' => 'warehouse', 'e.lieu' => 'warehouse', 'e.address' => 'warehouse', 'e.zip' => 'warehouse', 'e.town' => 'warehouse',
 			'p.rowid' => "product", 'p.ref' => "product", 'p.fk_product_type' => "product", 'p.label' => "product", 'p.description' => "product", 'p.note' => "product",
 			'p.price' => "product", 'p.tva_tx' => 'product', 'p.tosell' => "product", 'p.tobuy' => "product", 'p.duration' => "product", 'p.datec' => 'product', 'p.tms' => 'product'
-		);	// We define here only fields that use another icon that the one defined into export_icon
+		); // We define here only fields that use another icon that the one defined into export_icon
 		if (isModEnabled('productbatch')) {
 			$this->export_fields_array[$r]['sm.batch'] = 'Batch';
 			$this->export_TypeFields_array[$r]['sm.batch'] = 'Text';
@@ -434,7 +434,7 @@ 
 			'e.rowid' => 'warehouse', 'e.ref' => 'warehouse', 'e.description' => 'warehouse', 'e.lieu' => 'warehouse', 'e.address' => 'warehouse', 'e.zip' => 'warehouse', 'e.town' => 'warehouse',
 			'p.rowid' => "product", 'p.ref' => "product", 'p.fk_product_type' => "product", 'p.label' => "product", 'p.description' => "product", 'p.note' => "product",
 			'p.price' => "product", 'p.tva_tx' => 'product', 'p.tosell' => "product", 'p.tobuy' => "product", 'p.duration' => "product", 'p.datec' => 'product', 'p.tms' => 'product'
-		);	// We define here only fields that use another icon that the one defined into export_icon
+		); // We define here only fields that use another icon that the one defined into export_icon
 		if (isModEnabled('productbatch')) {
 			$this->export_fields_array[$r]['id.batch'] = 'Batch';
 			$this->export_TypeFields_array[$r]['id.batch'] = 'Text';

htdocs/public/fichinter/agendaexport.php

Spacing +3 added lines, -3 removed lines

@@ -584,9 +584,9 @@ 
 
 				$duration = $obj->duree;
 				$event['location'] = ($obj->socname ? $obj->socname : "");
-				$event['summary'] = $obj->ref." - ". $obj->description;
+				$event['summary'] = $obj->ref." - ".$obj->description;
 				if ($obj->ref_client)
-				$event['summary'].= " (".$obj->ref_client.")";
+				$event['summary'] .= " (".$obj->ref_client.")";
 
 				$event['desc'] = $obj->description;
 
@@ -597,7 +597,7 @@ 
 					$event['desc'] .= " - ".$obj->ref_contract;
 
 				if ($obj->note_public)
-					$event['desc'].= " - ".$obj->note_public;
+					$event['desc'] .= " - ".$obj->note_public;
 
 				$event['startdate'] = $datestart;
 				$event['enddate'] = ''; // $dateend; // Not required with type 'journal'

Braces +12 added lines, -8 removed lines

@@ -585,19 +585,23 @@
 				$duration = $obj->duree;
 				$event['location'] = ($obj->socname ? $obj->socname : "");
 				$event['summary'] = $obj->ref." - ". $obj->description;
-				if ($obj->ref_client)
-				$event['summary'].= " (".$obj->ref_client.")";
+				if ($obj->ref_client) {
+								$event['summary'].= " (".$obj->ref_client.")";
+				}
 
 				$event['desc'] = $obj->description;
 
-				if ($obj->ref_project)
-					$event['desc'] .= " - ".$obj->ref_project;
+				if ($obj->ref_project) {
+									$event['desc'] .= " - ".$obj->ref_project;
+				}
 
-				if ($obj->ref_contract)
-					$event['desc'] .= " - ".$obj->ref_contract;
+				if ($obj->ref_contract) {
+									$event['desc'] .= " - ".$obj->ref_contract;
+				}
 
-				if ($obj->note_public)
-					$event['desc'].= " - ".$obj->note_public;
+				if ($obj->note_public) {
+									$event['desc'].= " - ".$obj->note_public;
+				}
 
 				$event['startdate'] = $datestart;
 				$event['enddate'] = ''; // $dateend; // Not required with type 'journal'