Dolibarr / dolibarr

htdocs/product/inventory/ajax/searchfrombarcode.php

Spacing +10 added lines, -10 removed lines

@@ -78,7 +78,7 @@ 
 	$result = $db->query($sql);
 	if ($result) {
 		$nbline = $db->num_rows($result);
-		for ($i=0; $i < $nbline; $i++) {
+		for ($i = 0; $i < $nbline; $i++) {
 			$object = $db->fetch_object($result);
 			if (($mode == "barcode" && $barcode == $object->barcode) || ($mode == "lotserial" && $barcode == $object->batch)) {
 				$warehouse->fetch(0, $product["Warehouse"]);
@@ -88,22 +88,22 @@ 
 					$fk_product = $object->fk_product;
 					$reelqty = $object->reel;
 
-					$objectreturn = array('fk_warehouse'=>$warehouseid,'fk_product'=>$fk_product,'reelqty'=>$reelqty);
+					$objectreturn = array('fk_warehouse'=>$warehouseid, 'fk_product'=>$fk_product, 'reelqty'=>$reelqty);
 				}
 			}
 		}
 		if ($warehousefound < 1) {
-			$response = array('status'=>'error','errorcode'=>'NotFound','message'=>'No warehouse found for barcode'.$barcode);
+			$response = array('status'=>'error', 'errorcode'=>'NotFound', 'message'=>'No warehouse found for barcode'.$barcode);
 		} elseif ($warehousefound > 1) {
-			$response = array('status'=>'error','errorcode'=>'TooManyWarehouse','message'=>'Too many warehouse found');
+			$response = array('status'=>'error', 'errorcode'=>'TooManyWarehouse', 'message'=>'Too many warehouse found');
 		} else {
-			$response = array('status'=>'success','message'=>'Warehouse found','object'=>$objectreturn);
+			$response = array('status'=>'success', 'message'=>'Warehouse found', 'object'=>$objectreturn);
 		}
 	} else {
-		$response = array('status'=>'error','errorcode'=>'NotFound','message'=>"No results found for barcode");
+		$response = array('status'=>'error', 'errorcode'=>'NotFound', 'message'=>"No results found for barcode");
 	}
 } else {
-	$response = array('status'=>'error','errorcode'=>'ActionError','message'=>"Error on action");
+	$response = array('status'=>'error', 'errorcode'=>'ActionError', 'message'=>"Error on action");
 }
 
 if ($action == "addnewlineproduct") {
@@ -122,12 +122,12 @@ 
 
 		$result = $inventoryline->create($user);
 		if ($result > 0) {
-			$response = array('status'=>'success','message'=>'Success on creating line','id_line'=>$result);
+			$response = array('status'=>'success', 'message'=>'Success on creating line', 'id_line'=>$result);
 		} else {
-			$response = array('status'=>'error','errorcode'=>'ErrorCreation','message'=>"Error on line creation");
+			$response = array('status'=>'error', 'errorcode'=>'ErrorCreation', 'message'=>"Error on line creation");
 		}
 	} else {
-		$response = array('status'=>'error','errorcode'=>'NoIdForInventory','message'=>"No id for inventory");
+		$response = array('status'=>'error', 'errorcode'=>'NoIdForInventory', 'message'=>"No id for inventory");
 	}
 }
 

htdocs/takepos/split.php

Braces +4 added lines, -1 removed lines

@@ -84,7 +84,10 @@
 		$db->query($sql);
 	} elseif ($split==0) { // Unsplit line
 		$invoice = new Facture($db);
-		if ($place=="SPLIT") $place="0"; // Avoid move line to the same place (from SPLIT to SPLIT place)
+		if ($place=="SPLIT") {
+			$place="0";
+		}
+		// Avoid move line to the same place (from SPLIT to SPLIT place)
 		$ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')');
 		if ($ret > 0) {
 			$placeid = $invoice->id;

Spacing +7 added lines, -7 removed lines

@@ -56,10 +56,10 @@ 
  * Actions
  */
 
-if ($action=="split") {
+if ($action == "split") {
 	$line = GETPOST('line', 'int');
 	$split = GETPOST('split', 'int');
-	if ($split==1) { // Split line
+	if ($split == 1) { // Split line
 		$invoice = new Facture($db);
 		$ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-SPLIT)');
 		if ($ret > 0) {
@@ -85,9 +85,9 @@ 
 		}
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set fk_facture=".$placeid." where rowid=".$line;
 		$db->query($sql);
-	} elseif ($split==0) { // Unsplit line
+	} elseif ($split == 0) { // Unsplit line
 		$invoice = new Facture($db);
-		if ($place=="SPLIT") $place="0"; // Avoid move line to the same place (from SPLIT to SPLIT place)
+		if ($place == "SPLIT") $place = "0"; // Avoid move line to the same place (from SPLIT to SPLIT place)
 		$ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')');
 		if ($ret > 0) {
 			$placeid = $invoice->id;
@@ -164,7 +164,7 @@ 
 <script>
 function Split(selectedline, split) {
 	$.ajax({
-		url: "split.php?action=split&token=<?php echo newToken(); ?>&line="+selectedline+"&split="+split+"&place=<?php echo $place;?>",
+		url: "split.php?action=split&token=<?php echo newToken(); ?>&line="+selectedline+"&split="+split+"&place=<?php echo $place; ?>",
 		context: document.body
 	}).done(function() {
 		$("#currentplace").load("invoice.php?place="+parent.place+"&invoiceid="+parent.invoiceid, function() {
@@ -201,8 +201,8 @@ 
 
 
 
-	$("#headersplit1").html("<?php echo $langs->trans("Place");?> "+parent.place);
-	$("#headersplit2").html("<?php echo $langs->trans("SplitSale");?>");
+	$("#headersplit1").html("<?php echo $langs->trans("Place"); ?> "+parent.place);
+	$("#headersplit2").html("<?php echo $langs->trans("SplitSale"); ?>");
 
 });
 </script>

htdocs/core/multicompany_page.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 $title = $langs->trans("Multicompanies");
 
 // URL http://mydolibarr/core/multicompany_page?dol_use_jmobile=1 can be used for tests
-$head = '<!-- Multicompany selection -->'."\n";	// This is used by DoliDroid to know page is a multicompany selection page
+$head = '<!-- Multicompany selection -->'."\n"; // This is used by DoliDroid to know page is a multicompany selection page
 $arrayofjs = array();
 $arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);

htdocs/core/bookmarks_page.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 $title = $langs->trans("Bookmarks");
 
 // URL http://mydolibarr/core/bookmarks_page?dol_use_jmobile=1 can be used for tests
-$head = '<!-- Bookmarks -->'."\n";	// This is used by DoliDroid to know page is a bookmark selection page
+$head = '<!-- Bookmarks -->'."\n"; // This is used by DoliDroid to know page is a bookmark selection page
 $arrayofjs = array();
 $arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);

htdocs/core/get_menudiv.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 $title = $langs->trans("Menu");
 
 // URL http://mydolibarr/core/get_menudiv.php?dol_use_jmobile=1 can be used for tests
-$head = '<!-- Menu -->'."\n";	// This is used by DoliDroid to know page is a menu page
+$head = '<!-- Menu -->'."\n"; // This is used by DoliDroid to know page is a menu page
 $arrayofjs = array();
 $arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);

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/reception/card.php

Indentation +1 added lines, -1 removed lines

@@ -916,7 +916,7 @@
 			/**
 			 * @var array $suffix2numAsked map HTTP query parameter suffixes (like '1_0') to line indices so that
 			 *                             extrafields from HTTP query can be assigned to the correct dispatch line
-			*/
+			 */
 			$suffix2numAsked = array();
 			$dispatchLines = array();
 

Spacing +23 added lines, -23 removed lines

@@ -86,7 +86,7 @@ 
 $line_id = GETPOST('lineid', 'int') ?GETPOST('lineid', 'int') : '';
 $facid = GETPOST('facid', 'int');
 
-$action	= GETPOST('action', 'alpha');
+$action = GETPOST('action', 'alpha');
 //Select mail models is same action as presend
 if (GETPOST('modelselected')) {
 	$action = 'presend';
@@ -342,7 +342,7 @@ 
 
 		// Loop lines to calculate $totalqty
 		for ($i = 1; $i <= $num; $i++) {
-			$idl = "idl".$i;	// id line source
+			$idl = "idl".$i; // id line source
 
 			//$sub_qty = array();
 			//$subtotalqty = 0;
@@ -350,7 +350,7 @@ 
 			//$j = 0;
 			//$batch = "batchl".$i."_0";
 			//$stockLocation = "ent1".$i."_0";
-			$qty = "qtyl".$i;	// qty
+			$qty = "qtyl".$i; // qty
 
 			//reception line for product with no batch management and no multiple stock location
 			if (GETPOST($qty, 'alpha') > 0) {
@@ -364,7 +364,7 @@ 
 
 		if ($totalqty > 0) {  // There is at least one thing to ship
 			for ($i = 1; $i <= $num; $i++) {
-				$idl = "idl".$i;	// id line source
+				$idl = "idl".$i; // id line source
 				$lineToTest = '';
 				$lineId = GETPOST($idl, 'int');
 				foreach ($objectsrc->lines as $linesrc) {
@@ -971,35 +971,35 @@ 
 				$reg = array();
 				if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg)) {
 					$numAsked++;
-					$paramSuffix = $reg[1] . '_' . $reg[2];
+					$paramSuffix = $reg[1].'_'.$reg[2];
 					$suffix2numAsked[$paramSuffix] = $numAsked;
 
 					// $numline=$reg[2] + 1; // line of product
 					$numline = $numAsked;
 
-					$prod = "product_" . $paramSuffix;
-					$qty = "qty_" . $paramSuffix;
-					$ent = "entrepot_" . $paramSuffix;
-					$pu = "pu_" . $paramSuffix; // This is unit price including discount
-					$fk_commandefourndet = "fk_commandefourndet_" . $paramSuffix;
+					$prod = "product_".$paramSuffix;
+					$qty = "qty_".$paramSuffix;
+					$ent = "entrepot_".$paramSuffix;
+					$pu = "pu_".$paramSuffix; // This is unit price including discount
+					$fk_commandefourndet = "fk_commandefourndet_".$paramSuffix;
 					$dispatchLines[$numAsked] = array('paramSuffix'=>$paramSuffix, 'prod' => GETPOST($prod, 'int'), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' => GETPOST($ent, 'int'), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' => GETPOST('comment'), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'));
 				}
 
 				// with batch module enabled and product with lot/serial
 				if (preg_match('/^product_batch_([0-9]+)_([0-9]+)$/i', $key, $reg)) {
 					$numAsked++;
-					$paramSuffix = $reg[1] . '_' . $reg[2];
+					$paramSuffix = $reg[1].'_'.$reg[2];
 					$suffix2numAsked[$paramSuffix] = $numAsked;
 
 					// eat-by date dispatch
 					// $numline=$reg[2] + 1; // line of product
 					$numline = $numAsked;
 
-					$prod = 'product_batch_' . $paramSuffix;
-					$qty = 'qty_' . $paramSuffix;
-					$ent = 'entrepot_' . $paramSuffix;
-					$pu = 'pu_' . $paramSuffix;
-					$lot = 'lot_number_' . $paramSuffix;
+					$prod = 'product_batch_'.$paramSuffix;
+					$qty = 'qty_'.$paramSuffix;
+					$ent = 'entrepot_'.$paramSuffix;
+					$pu = 'pu_'.$paramSuffix;
+					$lot = 'lot_number_'.$paramSuffix;
 					$dDLUO = dol_mktime(12, 0, 0, GETPOST('dluo_'.$paramSuffix.'month', 'int'), GETPOST('dluo_'.$paramSuffix.'day', 'int'), GETPOST('dluo_'.$paramSuffix.'year', 'int'));
 					$dDLC = dol_mktime(12, 0, 0, GETPOST('dlc_'.$paramSuffix.'month', 'int'), GETPOST('dlc_'.$paramSuffix.'day', 'int'), GETPOST('dlc_'.$paramSuffix.'year', 'int'));
 					$fk_commandefourndet = 'fk_commandefourndet_'.$paramSuffix;
@@ -1033,7 +1033,7 @@ 
 			// Note that if an extrafield with the same name exists in the origin supplier order line, the value
 			// from the HTTP query will be ignored
 			foreach ($suffix2numAsked as $suffix => $n) {
-				$dispatchLines[$n]['array_options'] = $extrafields->getOptionalsFromPost('commande_fournisseur_dispatch', '_' . $suffix, '');
+				$dispatchLines[$n]['array_options'] = $extrafields->getOptionalsFromPost('commande_fournisseur_dispatch', '_'.$suffix, '');
 			}
 
 			print '<script type="text/javascript">
@@ -1097,7 +1097,7 @@ 
 			// $objectsrc->lines contains the line of the purchase order
 			// $dispatchLines is list of lines with dispatching detail (with product, qty and warehouse). One purchase order line may have n of this dispatch lines.
 
-			$arrayofpurchaselinealreadyoutput= array();
+			$arrayofpurchaselinealreadyoutput = array();
 
 			// $_POST contains fk_commandefourndet_X_Y    where Y is num of product line and X is number of splitted line
 			$indiceAsked = 1;
@@ -1138,7 +1138,7 @@ 
 
 					print '<input type="hidden" name="productl'.$indiceAsked.'" value="'.$line->fk_product.'">';
 
-					if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) {	// Add test to avoid to show qty twice
+					if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) {	// Add test to avoid to show qty twice
 						print '<input type="hidden" name="productid'.$indiceAsked.'" value="'.$line->fk_product.'">';
 
 						// Show product and description
@@ -1160,7 +1160,7 @@ 
 					print '</td>';
 				} else {
 					print "<td>";
-					if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) {	// Add test to avoid to show qty twice
+					if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) {	// Add test to avoid to show qty twice
 						if ($type == 1) {
 							$text = img_object($langs->trans('Service'), 'service');
 						} else {
@@ -1189,7 +1189,7 @@ 
 
 				// Qty in source purchase order line
 				print '<td class="center">';
-				if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) {	// Add test to avoid to show qty twice
+				if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) {	// Add test to avoid to show qty twice
 					print $line->qty;
 				}
 				print '<input type="hidden" name="fk_commandefournisseurdet'.$indiceAsked.'" value="'.$line->id.'">';
@@ -1201,7 +1201,7 @@ 
 				// Qty already received
 				print '<td class="center">';
 				$quantityDelivered = $objectsrc->receptions[$line->id];
-				if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) {	// Add test to avoid to show qty twice
+				if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) {	// Add test to avoid to show qty twice
 					print $quantityDelivered;
 				}
 				print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
@@ -2037,7 +2037,7 @@ 
 							$detail = $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $batchinfo);
 						}
 					}
-					print $detail . '</td>';
+					print $detail.'</td>';
 				} else {
 					print '<td></td>';
 				}

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();
 				}

Braces +3 added lines, -1 removed lines

@@ -714,7 +714,9 @@
 		global $conf, $langs, $hookmanager;
 
 		$ltrdirection = 'L';
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
+			$ltrdirection = 'R';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders"));