Dolibarr / dolibarr

htdocs/expensereport/card.php

Spacing +7 added lines, -7 removed lines

@@ -72,7 +72,7 @@ 
 
 if (!empty($conf->global->EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH)) {
 	if (empty($date_start)) {
-		$date_start = dol_mktime(0, 0, 0, (int) dol_print_date(dol_now(), '%m'),  1, (int) dol_print_date(dol_now(), '%Y'));
+		$date_start = dol_mktime(0, 0, 0, (int) dol_print_date(dol_now(), '%m'), 1, (int) dol_print_date(dol_now(), '%Y'));
 	}
 
 	if (empty($date_end)) {
@@ -150,7 +150,7 @@ 
 }
 $result = restrictedArea($user, 'expensereport', $object->id, 'expensereport');
 
-$permissiontoadd = $user->rights->expensereport->creer;	// Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->rights->expensereport->creer; // Used by the include of actions_dellink.inc.php
 
 
 /*
@@ -300,7 +300,7 @@ 
 
 			if ($overlappingExpenseReportID > 0) {
 				$error++;
-				setEventMessages($langs->trans("ErrorDoubleDeclaration").' <a href="'.$_SERVER['PHP_SELF'].'?id='.$overlappingExpenseReportID.'">'. $langs->trans('ShowTrip').'</a>', null, 'errors');
+				setEventMessages($langs->trans("ErrorDoubleDeclaration").' <a href="'.$_SERVER['PHP_SELF'].'?id='.$overlappingExpenseReportID.'">'.$langs->trans('ShowTrip').'</a>', null, 'errors');
 				$action = 'create';
 			}
 		}
@@ -2310,7 +2310,7 @@ 
 							}
 						}
 
-						$tredited = 'tredited';	// Case the addfile and linkto file is used for edit (used by following tpl)
+						$tredited = 'tredited'; // Case the addfile and linkto file is used for edit (used by following tpl)
 						include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
 						include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
 
@@ -2365,7 +2365,7 @@ 
 
 						// Quantity
 						print '<td class="right">';
-						print '<input type="text" min="0" class="input_qty right maxwidth50"  name="qty" value="'.dol_escape_htmltag($line->qty).'" />';  // We must be able to enter decimal qty
+						print '<input type="text" min="0" class="input_qty right maxwidth50"  name="qty" value="'.dol_escape_htmltag($line->qty).'" />'; // We must be able to enter decimal qty
 						print '</td>';
 
 						//print '<td class="right">'.$langs->trans('AmountHT').'</td>';
@@ -2470,7 +2470,7 @@ 
 				print '</script>'."\n";
 				print '</td></tr>';
 
-				$tredited = '';	// Case the addfile and linkto file is used for edit (used by following tpl)
+				$tredited = ''; // Case the addfile and linkto file is used for edit (used by following tpl)
 				include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
 				include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
 
@@ -2590,7 +2590,7 @@ 
 				});
 			';
 
-			if (! empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+			if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 				print '
 
                 /* unit price coef calculation */

htdocs/expensereport/ajax/ajaxik.php

Spacing +4 added lines, -4 removed lines

@@ -68,21 +68,21 @@
 
 
 if (empty($fk_expense) || $fk_expense < 0) {
-	$rep->errorMessage =   $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense');
+	$rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense');
 } elseif (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) {
-	$rep->errorMessage =  $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat');
+	$rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat');
 
 	$rep->response_status = 'error';
 } else {
 	// @see ndfp.class.php:3576 (method: compute_total_km)
 	$expense = new ExpenseReport($db);
 	if ($expense->fetch($fk_expense) <= 0) {
-		$rep->errorMessage =  $langs->transnoentitiesnoconv('ErrorRecordNotFound');
+		$rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound');
 		$rep->response_status = 'error';
 	} else {
 		$userauthor = new User($db);
 		if ($userauthor->fetch($expense->fk_user_author) <= 0) {
-			$rep->errorMessage =  $langs->transnoentitiesnoconv('ErrorRecordNotFound');
+			$rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound');
 			$rep->response_status = 'error';
 		} else {
 			$expense = new ExpenseReport($db);

htdocs/bom/tpl/objectline_edit.tpl.php

Spacing +4 added lines, -4 removed lines

@@ -129,21 +129,21 @@
 	if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 		$coldisplay++;
 		print '<td class="nobottom nowrap linecolunit right">';
-		print  $formproduct->selectMeasuringUnits("fk_unit",  '',  (($line->fk_unit) ? $line->fk_unit : ''),  0,  0);
+		print  $formproduct->selectMeasuringUnits("fk_unit", '', (($line->fk_unit) ? $line->fk_unit : ''), 0, 0);
 		print '</td>';
 	}
 
 	$coldisplay++;
-	print '<td class="nobottom linecolqtyfrozen right"><input type="checkbox" name="qty_frozen" id="qty_frozen" class="flat right" value="1"' . (GETPOSTISSET("qty_frozen") ? (GETPOST('qty_frozen', 'int') ? ' checked="checked"' : '') : ($line->qty_frozen ? ' checked="checked"' : '')) . '>';
+	print '<td class="nobottom linecolqtyfrozen right"><input type="checkbox" name="qty_frozen" id="qty_frozen" class="flat right" value="1"'.(GETPOSTISSET("qty_frozen") ? (GETPOST('qty_frozen', 'int') ? ' checked="checked"' : '') : ($line->qty_frozen ? ' checked="checked"' : '')).'>';
 	print '</td>';
 
 	$coldisplay++;
-	print '<td class="nobottom linecoldisablestockchange right"><input type="checkbox" name="disable_stock_change" id="disable_stock_change" class="flat right" value="1"' . (GETPOSTISSET('disablestockchange') ? (GETPOST("disable_stock_change", 'int') ? ' checked="checked"' : '') : ($line->disable_stock_change ? ' checked="checked"' : '')) . '">';
+	print '<td class="nobottom linecoldisablestockchange right"><input type="checkbox" name="disable_stock_change" id="disable_stock_change" class="flat right" value="1"'.(GETPOSTISSET('disablestockchange') ? (GETPOST("disable_stock_change", 'int') ? ' checked="checked"' : '') : ($line->disable_stock_change ? ' checked="checked"' : '')).'">';
 	print '</td>';
 
 	$coldisplay++;
 	print '<td class="nobottom nowrap linecollost right">';
-	print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="' . $line->efficiency . '"></td>';
+	print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="'.$line->efficiency.'"></td>';
 
 	$coldisplay++;
 	print '<td class="nobottom nowrap linecolcostprice right">';

htdocs/bom/tpl/objectline_view.tpl.php

Spacing +10 added lines, -10 removed lines

@@ -67,8 +67,8 @@ 
 }
 
 // add html5 elements
-if ($filtertype == 1) $domData  = ' data-element="'.$line->element.'service"';
-else $domData  = ' data-element="'.$line->element.'"';
+if ($filtertype == 1) $domData = ' data-element="'.$line->element.'service"';
+else $domData = ' data-element="'.$line->element.'"';
 
 $domData .= ' data-id="'.$line->id.'"';
 $domData .= ' data-qty="'.$line->qty.'"';
@@ -128,7 +128,7 @@ 
 if ($filtertype != 1) {
 	if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 		print '<td class="linecoluseunit nowrap left">';
-		$label = measuringUnitString($line->fk_unit, '',  '', 1);
+		$label = measuringUnitString($line->fk_unit, '', '', 1);
 		if ($label !== '') {
 			print $langs->trans($label);
 		}
@@ -239,7 +239,7 @@ 
 // Select of all the sub-BOM lines
 // From this pont to the end of the file, we only take care of sub-BOM lines
 $sql = 'SELECT rowid, fk_bom_child, fk_product, qty FROM '.MAIN_DB_PREFIX.'bom_bomline AS bl';
-$sql.= ' WHERE fk_bom ='. (int) $tmpbom->id;
+$sql .= ' WHERE fk_bom ='.(int) $tmpbom->id;
 $resql = $object->db->query($sql);
 
 if ($resql) {
@@ -309,7 +309,7 @@ 
 		if (!empty($sub_bom->id)) {
 			$sub_bom->calculateCosts();
 			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price(price2num($sub_bom->total_cost * $sub_bom_line->qty * $line->qty, 'MT')).'</span></td>';
-			$total_cost+= $sub_bom->total_cost * $sub_bom_line->qty * $line->qty;
+			$total_cost += $sub_bom->total_cost * $sub_bom_line->qty * $line->qty;
 		} elseif ($sub_bom_product->type == Product::TYPE_SERVICE && isModEnabled('workstation') && !empty($sub_bom_product->fk_default_workstation)) {
 			//Convert qty to hour
 			$unit = measuringUnitString($sub_bom_line->fk_unit, '', '', 1);
@@ -323,24 +323,24 @@ 
 		} elseif ($sub_bom_product->cost_price > 0) {
 			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'">';
 			print '<span class="amount">'.price(price2num($sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty, 'MT')).'</span></td>';
-			$total_cost+= $sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty;
+			$total_cost += $sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty;
 		} elseif ($sub_bom_product->pmp > 0) {	// PMP if cost price isn't defined
 			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'">';
 			print '<span class="amount">'.price(price2num($sub_bom_product->pmp * $sub_bom_line->qty * $line->qty, 'MT')).'</span></td>';
-			$total_cost.= $sub_bom_product->pmp * $sub_bom_line->qty * $line->qty;
+			$total_cost .= $sub_bom_product->pmp * $sub_bom_line->qty * $line->qty;
 		} else {	// Minimum purchase price if cost price and PMP aren't defined
 			$sql_supplier_price = 'SELECT MIN(price) AS min_price, quantity AS qty FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
-			$sql_supplier_price.= ' WHERE fk_product = '. (int) $sub_bom_product->id;
+			$sql_supplier_price .= ' WHERE fk_product = '.(int) $sub_bom_product->id;
 			$resql_supplier_price = $object->db->query($sql_supplier_price);
 			if ($resql_supplier_price) {
 				$obj = $object->db->fetch_object($resql_supplier_price);
 				if (!empty($obj->qty) && !empty($sub_bom_line->qty) && !empty($line->qty)) {
-					$line_cost = $obj->min_price/$obj->qty * $sub_bom_line->qty * $line->qty;
+					$line_cost = $obj->min_price / $obj->qty * $sub_bom_line->qty * $line->qty;
 				} else {
 					$line_cost = $obj->min_price;
 				}
 				print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price2num($line_cost, 'MT').'</span></td>';
-				$total_cost+= $line_cost;
+				$total_cost += $line_cost;
 			}
 		}
 

htdocs/bom/bom_card.php

Braces +18 added lines, -8 removed lines

@@ -176,8 +176,12 @@ 
 		if (!empty($idprod) && isModEnabled('workstation')) {
 			$product = new Product($db);
 			$res = $product->fetch($idprod);
-			if ($res > 0 && $product->type == Product::TYPE_SERVICE) $fk_default_workstation = $product->fk_default_workstation;
-			if (empty($fk_unit)) $fk_unit = $product->fk_unit;
+			if ($res > 0 && $product->type == Product::TYPE_SERVICE) {
+				$fk_default_workstation = $product->fk_default_workstation;
+			}
+			if (empty($fk_unit)) {
+				$fk_unit = $product->fk_unit;
+			}
 		}
 
 		if ($qty == '') {
@@ -615,9 +619,12 @@ 
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-				if (empty($reshook))
-					$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+				if ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
+									$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+				}
 			}
 		}
 
@@ -662,9 +669,12 @@ 
 				// Add services form
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectServiceLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-				if (empty($reshook))
-					$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+				if ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
+									$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+				}
 			}
 		}
 	}

htdocs/bom/class/bom.class.php

Braces +12 added lines, -5 removed lines

@@ -781,7 +781,9 @@ 
 			$line->import_key = $import_key;
 			$line->position = $rankToUse;
 
-			if (!empty($fk_unit)) $line->fk_unit = $fk_unit;
+			if (!empty($fk_unit)) {
+				$line->fk_unit = $fk_unit;
+			}
 
 
 			if (is_array($array_options) && count($array_options) > 0) {
@@ -1475,8 +1477,9 @@ 
 						$workstation = new Workstation($this->db);
 						$res = $workstation->fetch($tmpproduct->fk_default_workstation);
 
-						if ($res > 0) $line->total_cost = price2num($qtyhourforline * ($workstation->thm_operator_estimated + $workstation->thm_machine_estimated), 'MT');
-						else {
+						if ($res > 0) {
+							$line->total_cost = price2num($qtyhourforline * ($workstation->thm_operator_estimated + $workstation->thm_machine_estimated), 'MT');
+						} else {
 							$this->error = $workstation->error;
 								return -3;
 						}
@@ -1540,7 +1543,9 @@ 
 		if (!empty($this->lines)) {
 			foreach ($this->lines as $line) {
 				if (!empty($line->childBom)) {
-					foreach ($line->childBom as $childBom) $childBom->getNetNeeds($TNetNeeds, $line->qty*$qty);
+					foreach ($line->childBom as $childBom) {
+						$childBom->getNetNeeds($TNetNeeds, $line->qty*$qty);
+					}
 				} else {
 					if (empty($TNetNeeds[$line->fk_product])) {
 						$TNetNeeds[$line->fk_product] = 0;
@@ -1595,7 +1600,9 @@ 
 			return;
 		}
 
-		if (empty($bom_id)) $bom_id=$this->id;
+		if (empty($bom_id)) {
+			$bom_id=$this->id;
+		}
 
 		$sql = 'SELECT l.fk_bom, b.label
 				FROM '.MAIN_DB_PREFIX.'bom_bomline l

htdocs/mrp/mo_production.php

Spacing +47 added lines, -47 removed lines

@@ -132,7 +132,7 @@ 
 		$also_cancel_consumed_and_produced_lines = (GETPOST('alsoCancelConsumedAndProducedLines', 'alpha') ? 1 : 0);
 		$result = $object->cancel($user, 0, $also_cancel_consumed_and_produced_lines);
 		if ($result > 0) {
-			header("Location: " . dol_buildpath('/mrp/mo_card.php?id=' . $object->id, 1));
+			header("Location: ".dol_buildpath('/mrp/mo_card.php?id='.$object->id, 1));
 			exit;
 		} else {
 			$action = '';
@@ -142,7 +142,7 @@ 
 		$also_cancel_consumed_and_produced_lines = (GETPOST('alsoCancelConsumedAndProducedLines', 'alpha') ? 1 : 0);
 		$result = $object->delete($user, 0, $also_cancel_consumed_and_produced_lines);
 		if ($result > 0) {
-			header("Location: " . $backurlforlist);
+			header("Location: ".$backurlforlist);
 			exit;
 		} else {
 			$action = '';
@@ -577,7 +577,7 @@ 
 				'value' => empty($conf->global->MO_ALSO_CANCEL_CONSUMED_AND_PRODUCED_LINES_BY_DEFAULT) ? 0 : 1
 			),
 		);
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CancelMo'), $langs->trans('ConfirmCancelMo'), 'confirm_cancel', $formquestion, 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('CancelMo'), $langs->trans('ConfirmCancelMo'), 'confirm_cancel', $formquestion, 0, 1);
 	}
 
 	// Call Hook formConfirm
@@ -814,7 +814,7 @@ 
 		// Qty
 		print '<td class="right">'.$langs->trans("Qty").'</td>';
 		// Unit
-		if ($conf->global->PRODUCT_USE_UNITS) print '<td class="right">' . $langs->trans("Unit") . '</td>';
+		if ($conf->global->PRODUCT_USE_UNITS) print '<td class="right">'.$langs->trans("Unit").'</td>';
 		// Cost price
 		if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
 			print '<td class="right">'.$langs->trans("UnitCost").'</td>';
@@ -910,7 +910,7 @@ 
 
 		// Lines to consume
 
-		$bomcostupdated = 0;	// We will recalculate the unitary cost to produce a product using the real "products to consume into MO"
+		$bomcostupdated = 0; // We will recalculate the unitary cost to produce a product using the real "products to consume into MO"
 
 		if (!empty($object->lines)) {
 			$nblinetoconsume = 0;
@@ -941,8 +941,8 @@ 
 								$costprice = 0;
 							}
 						}
-						$linecost = price2num(($line->qty * $costprice) / $object->qty, 'MT');	// price for line for all quantities
-						$bomcostupdated += price2num(($line->qty * $costprice) / $object->qty, 'MU');	// same but with full accuracy
+						$linecost = price2num(($line->qty * $costprice) / $object->qty, 'MT'); // price for line for all quantities
+						$bomcostupdated += price2num(($line->qty * $costprice) / $object->qty, 'MU'); // same but with full accuracy
 					}
 
 					$bomcostupdated = price2num($bomcostupdated, 'MU');
@@ -962,23 +962,23 @@ 
 								$alreadyconsumed += $line2['qty'];
 							}
 						}
-						$suffix = '_' . $line->id;
-						print '<!-- Line to dispatch ' . $suffix . ' -->' . "\n";
+						$suffix = '_'.$line->id;
+						print '<!-- Line to dispatch '.$suffix.' -->'."\n";
 						// hidden fields for js function
-						print '<input id="qty_ordered' . $suffix . '" type="hidden" value="' . $line->qty . '">';
+						print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$line->qty.'">';
 						// Duration - Time spent
-						print '<input id="qty_dispatched' . $suffix . '" type="hidden" value="' . $alreadyconsumed . '">';
+						print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.$alreadyconsumed.'">';
 						print '<tr>';
-						print '<input name="lineid" type="hidden" value="' . $line->id . '">';
+						print '<input name="lineid" type="hidden" value="'.$line->id.'">';
 
 						// Product
-						print '<td>' . $tmpproduct->getNomUrl(1);
-						print '<br><div class="opacitymedium small tdoverflowmax150" title="' . dol_escape_htmltag($tmpproduct->label) . '">' . $tmpproduct->label . '</span>';
+						print '<td>'.$tmpproduct->getNomUrl(1);
+						print '<br><div class="opacitymedium small tdoverflowmax150" title="'.dol_escape_htmltag($tmpproduct->label).'">'.$tmpproduct->label.'</span>';
 						print '</td>';
 
 						// Qty
 						print '<td class="right nowraponall">';
-						print '<input name="qty_lineProduce" type="number" value="'. $line->qty.'" width="25px">';
+						print '<input name="qty_lineProduce" type="number" value="'.$line->qty.'" width="25px">';
 						print '</td>';
 						// Unit
 						if ($conf->global->PRODUCT_USE_UNITS) {
@@ -988,7 +988,7 @@ 
 						}
 						// Qty consumed
 						print '<td class="right">';
-						print ' ' . price2num($alreadyconsumed, 'MS');
+						print ' '.price2num($alreadyconsumed, 'MS');
 						print '</td>';
 						// Entrepot
 						print '<td class="right">';
@@ -998,7 +998,7 @@ 
 						if ($tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
 							print img_warning($langs->trans('StockTooLow')).' ';
 						}
-						print '<span class="left">'. $tmpproduct->stock_reel  .' </span>';
+						print '<span class="left">'.$tmpproduct->stock_reel.' </span>';
 						print '</td>';
 						// Batch
 						print '<td class="right">';
@@ -1006,8 +1006,8 @@ 
 
 						// Action delete line
 						print '<td>';
-						print '<input type="submit" class="button buttongen button-add" name="save" value="' . $langs->trans("Edit") . '">';
-						print '<input type="submit" class="button buttongen button-cancel" name="cancel" value="' . $langs->trans("Cancel") . '">';
+						print '<input type="submit" class="button buttongen button-add" name="save" value="'.$langs->trans("Edit").'">';
+						print '<input type="submit" class="button buttongen button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 						print '</td>';
 
 						// Action delete line
@@ -1017,28 +1017,28 @@ 
 						print '<td></td>';
 						print '</tr>';
 					} else {
-						$suffix = '_' . $line->id;
-						print '<!-- Line to dispatch ' . $suffix . ' -->' . "\n";
+						$suffix = '_'.$line->id;
+						print '<!-- Line to dispatch '.$suffix.' -->'."\n";
 						// hidden fields for js function
-						print '<input id="qty_ordered' . $suffix . '" type="hidden" value="' . $line->qty . '">';
-						print '<input id="qty_dispatched' . $suffix . '" type="hidden" value="' . $alreadyconsumed . '">';
+						print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$line->qty.'">';
+						print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.$alreadyconsumed.'">';
 
-						print '<tr data-line-id="' . $line->id . '">';
+						print '<tr data-line-id="'.$line->id.'">';
 						// Product
-						print '<td>' . $tmpproduct->getNomUrl(1);
-						print '<br><div class="opacitymedium small tdoverflowmax150" title="' . dol_escape_htmltag($tmpproduct->label) . '">' . $tmpproduct->label . '</div>';
+						print '<td>'.$tmpproduct->getNomUrl(1);
+						print '<br><div class="opacitymedium small tdoverflowmax150" title="'.dol_escape_htmltag($tmpproduct->label).'">'.$tmpproduct->label.'</div>';
 						print '</td>';
 						// Qty
 						print '<td class="right nowraponall">';
 						$help = '';
 						$picto = 'help';
 						if ($line->qty_frozen) {
-							$help = ($help ? '<br>' : '') . '<strong>' . $langs->trans("QuantityFrozen") . '</strong>: ' . yn(1) . ' (' . $langs->trans("QuantityConsumedInvariable") . ')';
-							print $form->textwithpicto('', $help, -1, 'lock') . ' ';
+							$help = ($help ? '<br>' : '').'<strong>'.$langs->trans("QuantityFrozen").'</strong>: '.yn(1).' ('.$langs->trans("QuantityConsumedInvariable").')';
+							print $form->textwithpicto('', $help, -1, 'lock').' ';
 						}
 						if ($line->disable_stock_change) {
-							$help = ($help ? '<br>' : '') . '<strong>' . $langs->trans("DisableStockChange") . '</strong>: ' . yn(1) . ' (' . (($tmpproduct->type == Product::TYPE_SERVICE && empty($conf->global->STOCK_SUPPORTS_SERVICES)) ? $langs->trans("NoStockChangeOnServices") : $langs->trans("DisableStockChangeHelp")) . ')';
-							print $form->textwithpicto('', $help, -1, 'help') . ' ';
+							$help = ($help ? '<br>' : '').'<strong>'.$langs->trans("DisableStockChange").'</strong>: '.yn(1).' ('.(($tmpproduct->type == Product::TYPE_SERVICE && empty($conf->global->STOCK_SUPPORTS_SERVICES)) ? $langs->trans("NoStockChangeOnServices") : $langs->trans("DisableStockChangeHelp")).')';
+							print $form->textwithpicto('', $help, -1, 'help').' ';
 						}
 						print price2num($line->qty, 'MS');
 						print '</td>';
@@ -1059,9 +1059,9 @@ 
 						if ($alreadyconsumed) {
 							print '<script>';
 							print 'jQuery(document).ready(function() {
-								jQuery("#expandtoproduce' . $line->id . '").click(function() {
-									console.log("Expand mrp_production line ' . $line->id . '");
-									jQuery(".expanddetail' . $line->id . '").toggle();';
+								jQuery("#expandtoproduce' . $line->id.'").click(function() {
+									console.log("Expand mrp_production line ' . $line->id.'");
+									jQuery(".expanddetail' . $line->id.'").toggle();';
 							if ($nblinetoconsume == $nblinetoconsumecursor) {    // If it is the last line
 								print 'if (jQuery("#tablelines").hasClass("nobottom")) { jQuery("#tablelines").removeClass("nobottom"); } else { jQuery("#tablelines").addClass("nobottom"); }';
 							}
@@ -1070,9 +1070,9 @@ 
 							});';
 							print '</script>';
 							if (empty($conf->use_javascript_ajax)) {
-								print '<a href="' . $_SERVER["PHP_SELF"] . '?collapse=' . $collapse . ',' . $line->id . '">';
+								print '<a href="'.$_SERVER["PHP_SELF"].'?collapse='.$collapse.','.$line->id.'">';
 							}
-							print img_picto($langs->trans("ShowDetails"), "chevron-down", 'id="expandtoproduce' . $line->id . '"');
+							print img_picto($langs->trans("ShowDetails"), "chevron-down", 'id="expandtoproduce'.$line->id.'"');
 							if (empty($conf->use_javascript_ajax)) {
 								print '</a>';
 							}
@@ -1081,12 +1081,12 @@ 
 								print '<script>jQuery("#tablelines").removeClass("nobottom");</script>';
 							}
 						}
-						print ' ' . price2num($alreadyconsumed, 'MS');
+						print ' '.price2num($alreadyconsumed, 'MS');
 						print '</td>';
 						// Warehouse
 						print '<td>';
 						if (!empty($conf->global->STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE) && $tmpwarehouse->id > 0) {
-							print img_picto('', $tmpwarehouse->picto) . " " . $tmpwarehouse->label;
+							print img_picto('', $tmpwarehouse->picto)." ".$tmpwarehouse->label;
 						}
 						print '</td>';
 						// Stock
@@ -1094,7 +1094,7 @@ 
 							print '<td class="nowraponall right">';
 							if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $tmpproduct->type != Product::TYPE_SERVICE) {
 								if (!$line->disable_stock_change && $tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
-									print img_warning($langs->trans('StockTooLow')) . ' ';
+									print img_warning($langs->trans('StockTooLow')).' ';
 								}
 								if (empty($conf->global->STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE) || empty($tmpwarehouse->id)) {
 									print price2num($tmpproduct->stock_reel, 'MS'); // Available
@@ -1124,9 +1124,9 @@ 
 
 						// Action Edit line
 						if ($object->status == Mo::STATUS_DRAFT) {
-							$href = $_SERVER["PHP_SELF"] . '?id=' . ((int) $object->id) . '&action=editline&token=' . newToken() . '&lineid=' . ((int) $line->id);
+							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=editline&token='.newToken().'&lineid='.((int) $line->id);
 							print '<td class="center">';
-							print '<a class="reposition" href="' . $href . '">';
+							print '<a class="reposition" href="'.$href.'">';
 							print img_picto($langs->trans('TooltipEditAndRevertStockMovement'), 'edit');
 							print '</a>';
 							print '</td>';
@@ -1134,9 +1134,9 @@ 
 
 						// Action delete line
 						if ($permissiontodelete) {
-							$href = $_SERVER["PHP_SELF"] . '?id=' . ((int) $object->id) . '&action=deleteline&token=' . newToken() . '&lineid=' . ((int) $line->id);
+							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line->id);
 							print '<td class="center">';
-							print '<a class="reposition" href="' . $href . '">';
+							print '<a class="reposition" href="'.$href.'">';
 							print img_picto($langs->trans('TooltipDeleteAndRevertStockMovement'), 'delete');
 							print '</a>';
 							print '</td>';
@@ -1199,9 +1199,9 @@ 
 
 						// Action Edit line
 						if ($object->status == Mo::STATUS_DRAFT) {
-							$href = $_SERVER["PHP_SELF"] . '?id=' . ((int) $object->id) . '&action=editline&token=' . newToken() . '&lineid=' . ((int) $line->id);
+							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=editline&token='.newToken().'&lineid='.((int) $line->id);
 							print '<td class="center">';
-							print '<a class="reposition" href="' . $href . '">';
+							print '<a class="reposition" href="'.$href.'">';
 							print img_picto($langs->trans('TooltipEditAndRevertStockMovement'), 'edit');
 							print '</a>';
 							print '</td>';
@@ -1241,7 +1241,7 @@ 
 						print '<input type="hidden" name="product-'.$line->id.'-'.$i.'" value="'.$line->fk_product.'">';
 
 						// Qty
-						print '<td class="right"><input type="text" class="width50 right" id="qtytoconsume-' . $line->id . '-' . $i . '" name="qty-' . $line->id . '-' . $i . '" value="' . $preselected . '" ' . $disable . '></td>';
+						print '<td class="right"><input type="text" class="width50 right" id="qtytoconsume-'.$line->id.'-'.$i.'" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'" '.$disable.'></td>';
 
 						// Unit
 						if ($conf->global->PRODUCT_USE_UNITS)  print '<td></td>';
@@ -1742,7 +1742,7 @@ 
 
 					$.ajax({
 						type: "POST",
-						url: "<?php echo DOL_URL_ROOT . '/mrp/ajax/interface.php'; ?>",
+						url: "<?php echo DOL_URL_ROOT.'/mrp/ajax/interface.php'; ?>",
 						data: {
 							action: "updateselectbatchbywarehouse",
 							permissiontoproduce: <?php echo $permissiontoproduce ?>,
@@ -1803,7 +1803,7 @@ 
 
 					$.ajax({
 						type: "POST",
-						url: "<?php echo DOL_URL_ROOT . '/mrp/ajax/interface.php'; ?>",
+						url: "<?php echo DOL_URL_ROOT.'/mrp/ajax/interface.php'; ?>",
 						data: {
 							action: "updateselectwarehousebybatch",
 							permissiontoproduce: <?php echo $permissiontoproduce ?>,

Braces +28 added lines, -9 removed lines

@@ -203,7 +203,9 @@ 
 				$moline->fk_default_workstation = $tmpproduct->fk_default_workstation;
 			}
 			$moline->disable_stock_change = ($tmpproduct->type == Product::TYPE_SERVICE ? 1 : 0);
-			if ($conf->global->PRODUCT_USE_UNITS) $moline->fk_unit = $tmpproduct->fk_unit;
+			if ($conf->global->PRODUCT_USE_UNITS) {
+				$moline->fk_unit = $tmpproduct->fk_unit;
+			}
 		}
 
 		$resultline = $moline->create($user, false); // Never use triggers here
@@ -814,7 +816,9 @@ 
 		// Qty
 		print '<td class="right">'.$langs->trans("Qty").'</td>';
 		// Unit
-		if ($conf->global->PRODUCT_USE_UNITS) print '<td class="right">' . $langs->trans("Unit") . '</td>';
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			print '<td class="right">' . $langs->trans("Unit") . '</td>';
+		}
 		// Cost price
 		if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
 			print '<td class="right">'.$langs->trans("UnitCost").'</td>';
@@ -1244,7 +1248,9 @@ 
 						print '<td class="right"><input type="text" class="width50 right" id="qtytoconsume-' . $line->id . '-' . $i . '" name="qty-' . $line->id . '-' . $i . '" value="' . $preselected . '" ' . $disable . '></td>';
 
 						// Unit
-						if ($conf->global->PRODUCT_USE_UNITS)  print '<td></td>';
+						if ($conf->global->PRODUCT_USE_UNITS) {
+							print '<td></td>';
+						}
 
 						// Cost
 						if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
@@ -1367,7 +1373,9 @@ 
 		// Qty
 		print '<td class="right">'.$langs->trans("Qty").'</td>';
 		/// Unit
-		if ($conf->global->PRODUCT_USE_UNITS) print '<td class="right">'.$langs->trans("Unit").'</td>';
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			print '<td class="right">'.$langs->trans("Unit").'</td>';
+		}
 		// Cost price
 		if ($permissiontoupdatecost) {
 			if (empty($bomcostupdated)) {
@@ -1418,7 +1426,9 @@ 
 			// Qty
 			print '<td class="right"><input type="text" name="qtytoadd" value="1" class="width50 right"></td>';
 			//Unit
-			if ($conf->global->PRODUCT_USE_UNITS) print '<td></td>';
+			if ($conf->global->PRODUCT_USE_UNITS) {
+				print '<td></td>';
+			}
 			// Cost price
 			if ($permissiontoupdatecost) {
 				print '<td></td>';
@@ -1483,7 +1493,9 @@ 
 					// Qty
 					print '<td class="right">'.$line->qty.'</td>';
 					// Unit
-					if ($conf->global->PRODUCT_USE_UNITS) print '<td class="right">'.measuringUnitString($line->fk_unit, '', '', 1).'</td>';
+					if ($conf->global->PRODUCT_USE_UNITS) {
+						print '<td class="right">'.measuringUnitString($line->fk_unit, '', '', 1).'</td>';
+					}
 					// Cost price
 					if ($permissiontoupdatecost) {
 						// Defined $manufacturingcost
@@ -1580,7 +1592,9 @@ 
 						// Qty
 						print '<td></td>';
 						// Unit
-						if ($conf->global->PRODUCT_USE_UNITS) print '<td></td>';
+						if ($conf->global->PRODUCT_USE_UNITS) {
+							print '<td></td>';
+						}
 						// Cost price
 						if ($permissiontoupdatecost) {
 							print '<td></td>';
@@ -1631,7 +1645,9 @@ 
 						// Qty
 						print '<td class="right"><input type="text" class="width50 right" id="qtytoproduce-'.$line->id.'-'.$i.'" name="qtytoproduce-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
 						//Unit
-						if ($conf->global->PRODUCT_USE_UNITS) print '<td class="right"></td>';
+						if ($conf->global->PRODUCT_USE_UNITS) {
+							print '<td class="right"></td>';
+						}
 						// Cost
 						if ($permissiontoupdatecost) {
 							// Defined $manufacturingcost
@@ -1688,7 +1704,10 @@ 
 								print '</td>';
 
 								print '<td align="right"  class="splitall">';
-								if (($action == 'consumeorproduce' || $action == 'consumeandproduceall') && $tmpproduct->status_batch == 2) print img_picto($langs->trans('SplitAllQuantity'), 'split.png', 'class="splitbutton splitallbutton field-error-icon" onClick="addDispatchLine('.$line->id.', \'batch\', \'alltoproduce\')"'); //
+								if (($action == 'consumeorproduce' || $action == 'consumeandproduceall') && $tmpproduct->status_batch == 2) {
+									print img_picto($langs->trans('SplitAllQuantity'), 'split.png', 'class="splitbutton splitallbutton field-error-icon" onClick="addDispatchLine('.$line->id.', \'batch\', \'alltoproduce\')"');
+								}
+								//
 								print '</td>';
 							} else {
 								print '<td></td>';

htdocs/mrp/class/mo.class.php

Braces +35 added lines, -12 removed lines

@@ -738,7 +738,9 @@ 
 							$moline->fk_mo = $this->id;
 							$moline->origin_id = $line->id;
 							$moline->origin_type = 'bomline';
-							if (!empty($line->fk_unit)) $moline->fk_unit = $line->fk_unit;
+							if (!empty($line->fk_unit)) {
+								$moline->fk_unit = $line->fk_unit;
+							}
 							if ($line->qty_frozen) {
 								$moline->qty = $line->qty; // Qty to consume does not depends on quantity to produce
 							} else {
@@ -754,7 +756,9 @@ 
 								$moline->position = $line->position;
 								$moline->qty_frozen = $line->qty_frozen;
 								$moline->disable_stock_change = $line->disable_stock_change;
-								if (!empty($line->fk_default_workstation)) $moline->fk_default_workstation = $line->fk_default_workstation;
+								if (!empty($line->fk_default_workstation)) {
+									$moline->fk_default_workstation = $line->fk_default_workstation;
+								}
 
 								$resultline = $moline->create($user, false); // Never use triggers here
 								if ($resultline <= 0) {
@@ -791,7 +795,9 @@ 
 	{
 		$error = 0;
 
-		if ($this->status != self::STATUS_DRAFT) return 1;
+		if ($this->status != self::STATUS_DRAFT) {
+			return 1;
+		}
 
 		$this->db->begin();
 
@@ -804,14 +810,18 @@ 
 				while ($obj = $this->db->fetch_object($resql)) {
 					$moLine = new MoLine($this->db);
 					$res = $moLine->fetch($obj->rowid);
-					if (!$res) $error++;
+					if (!$res) {
+						$error++;
+					}
 
 					if ($moLine->role == 'toconsume' || $moLine->role == 'toproduce') {
 						if (empty($moLine->qty_frozen)) {
 							$qty = $newQty * $moLine->qty / $oldQty;
 							$moLine->qty = price2num($qty * (!empty($line->efficiency) ? $line->efficiency : 1 ), 'MS'); // Calculate with Qty to produce and efficiency
 							$res = $moLine->update($user);
-							if (!$res) $error++;
+							if (!$res) {
+								$error++;
+							}
 						}
 					}
 				}
@@ -1576,7 +1586,9 @@ 
 		$objectline = new MoLine($this->db);
 
 		$TFilters = array('customsql'=>'fk_mo = '.((int) $this->id));
-		if (!empty($rolefilter)) $TFilters['role'] = $rolefilter;
+		if (!empty($rolefilter)) {
+			$TFilters['role'] = $rolefilter;
+		}
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, $TFilters);
 
 		if (is_numeric($result)) {
@@ -1816,8 +1828,11 @@ 
 				while ($obj = $this->db->fetch_object($resql)) {
 					$MoChild = new Mo($this->db);
 					$res = $MoChild->fetch($obj->rowid);
-					if ($res > 0) $TMoChilds[$MoChild->id] = $MoChild;
-					else $error++;
+					if ($res > 0) {
+						$TMoChilds[$MoChild->id] = $MoChild;
+					} else {
+						$error++;
+					}
 				}
 			}
 		} else {
@@ -1839,16 +1854,22 @@ 
 	 */
 	public function getAllMoChilds($depth = 0)
 	{
-		if ($depth > 1000) return -1;
+		if ($depth > 1000) {
+			return -1;
+		}
 
 		$TMoChilds = array();
 		$error = 0;
 
 		$childMoList = $this->getMoChilds();
 
-		if ($childMoList == -1) return -1;
+		if ($childMoList == -1) {
+			return -1;
+		}
 
-		foreach ($childMoList as $childMo) $TMoChilds[$childMo->id] = $childMo;
+		foreach ($childMoList as $childMo) {
+			$TMoChilds[$childMo->id] = $childMo;
+		}
 
 		foreach ($childMoList as $childMo) {
 			$childMoChildren = $childMo->getAllMoChilds($depth + 1);
@@ -1891,7 +1912,9 @@ 
 			if ($this->db->num_rows($resql) > 0) {
 				$obj = $this->db->fetch_object($resql);
 				$res = $MoParent->fetch($obj->id_moparent);
-				if ($res < 0) $error++;
+				if ($res < 0) {
+					$error++;
+				}
 			} else {
 				return 0;
 			}

htdocs/compta/bank/class/account.class.php

Spacing +11 added lines, -11 removed lines

@@ -179,7 +179,7 @@ 
 	 * Address of the bank account
 	 * @var string
 	 */
-	public $domiciliation;		// deprecated, use now address
+	public $domiciliation; // deprecated, use now address
 	public $address;
 	public $state_id;
 	public $state_code;
@@ -460,13 +460,13 @@ 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_url (";
 		$sql .= "fk_bank";
 		$sql .= ", url_id";
-		$sql .= ", url";		// deprecated
+		$sql .= ", url"; // deprecated
 		$sql .= ", label";
 		$sql .= ", type";
 		$sql .= ") VALUES (";
 		$sql .= " ".((int) $line_id);
 		$sql .= ", ".((int) $url_id);
-		$sql .= ", '".$this->db->escape($url)."'";		// dperecated
+		$sql .= ", '".$this->db->escape($url)."'"; // dperecated
 		$sql .= ", '".$this->db->escape($label)."'";
 		$sql .= ", '".$this->db->escape($type)."'";
 		$sql .= ")";
@@ -1075,7 +1075,7 @@ 
 
 				$this->date_creation  = $this->db->jdate($obj->date_creation);
 				$this->date_modification = $this->db->jdate($obj->date_modification);
-				$this->date_update    = $this->date_modification;	// For compatibility
+				$this->date_update    = $this->date_modification; // For compatibility
 
 				$this->ics           = $obj->ics;
 				$this->ics_transfer  = $obj->ics_transfer;
@@ -1448,9 +1448,9 @@ 
 		}
 		// show categories for this record only in ajax to not overload lists
 		if (isModEnabled('categorie') && !$nofetch) {
-			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$form = new Form($this->db);
-			$datas['categories'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_ACCOUNT, 1);
+			$datas['categories'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_ACCOUNT, 1);
 		}
 
 		return $datas;
@@ -1518,7 +1518,7 @@ 
 				$label = $langs->trans("BankAccount");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -1574,7 +1574,7 @@ 
 			$this->error = 'SwiftNotValid';
 		}
 
-		if (! $error) {
+		if (!$error) {
 			return 1;
 		} else {
 			return 0;
@@ -1953,8 +1953,8 @@ 
 	 */
 	public $datev;
 
-	public $amount;					/* Amount of payment in the bank account currency */
-	public $amount_main_currency;	/* Amount in the currency of company if bank account use another currency */
+	public $amount; /* Amount of payment in the bank account currency */
+	public $amount_main_currency; /* Amount in the currency of company if bank account use another currency */
 
 	/**
 	 * @var int ID
@@ -2346,7 +2346,7 @@ 
 
 		// Check statement field
 		if (!empty($conf->global->BANK_STATEMENT_REGEX_RULE)) {
-			if (!preg_match('/' . getDolGlobalString('BANK_STATEMENT_REGEX_RULE').'/', $this->num_releve)) {
+			if (!preg_match('/'.getDolGlobalString('BANK_STATEMENT_REGEX_RULE').'/', $this->num_releve)) {
 				$this->errors[] = $langs->trans("ErrorBankStatementNameMustFollowRegex", $conf->global->BANK_STATEMENT_REGEX_RULE);
 				return -1;
 			}