Dolibarr / dolibarr

htdocs/core/boxes/box_accountancy_last_manual_entries.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
 				while ($line < $num) {
 					$objp		= $this->db->fetch_object($result);
 					$date		= $this->db->jdate($objp->date_movement);
-					$journal	= $objp->code_journal;
+					$journal = $objp->code_journal;
 					$label = $objp->label_operation;
 					$amount = $objp->amount;
 

htdocs/product/stock/productlot_list.php

Braces +3 added lines, -1 removed lines

@@ -110,7 +110,9 @@
 	accessforbidden();
 }
 //$result = restrictedArea($user, 'productbatch');
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Spacing +4 added lines, -4 removed lines

@@ -216,7 +216,7 @@ 
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if ( !empty($extrafields->attributes[$object->table_element]['label']) && ($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label']) && ($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
 if ($object->ismultientitymanaged == 1) {
@@ -247,7 +247,7 @@ 
 					$sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$columnName." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}
@@ -449,9 +449,9 @@ 
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
 			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		} elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, !empty($search[$key])?$search[$key]:0, '', '', 'search_', 'maxwidth150', 1);
+			print $object->showInputField($val, $key, !empty($search[$key]) ? $search[$key] : 0, '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(!empty($search[$key])?$search[$key]:'').'">';
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(!empty($search[$key]) ? $search[$key] : '').'">';
 		}
 		print '</td>';
 	}

htdocs/product/stock/productlot_card.php

Braces +3 added lines, -1 removed lines

@@ -110,7 +110,9 @@
 	accessforbidden();
 }
 //$result = restrictedArea($user, 'productbatch');
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Spacing +6 added lines, -6 removed lines

@@ -139,7 +139,7 @@ 
 
 	$backurlforlist = dol_buildpath('/product/stock/productlot_list.php', 1);
 
-	if ($action == 'seteatby' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
+	if ($action == 'seteatby' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
 		$newvalue = dol_mktime(12, 0, 0, GETPOST('eatbymonth', 'int'), GETPOST('eatbyday', 'int'), GETPOST('eatbyyear', 'int'));
 		$result = $object->setValueFrom('eatby', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
@@ -150,7 +150,7 @@ 
 		}
 	}
 
-	if ($action == 'setsellby' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
+	if ($action == 'setsellby' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
 		$newvalue = dol_mktime(12, 0, 0, GETPOST('sellbymonth', 'int'), GETPOST('sellbyday', 'int'), GETPOST('sellbyyear', 'int'));
 		$result = $object->setValueFrom('sellby', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
@@ -161,7 +161,7 @@ 
 		}
 	}
 
-	if ($action == 'seteol_date' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
+	if ($action == 'seteol_date' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
 		$newvalue = dol_mktime(12, 0, 0, GETPOST('eol_datemonth', 'int'), GETPOST('eol_dateday', 'int'), GETPOST('eol_dateyear', 'int'));
 		$result = $object->setValueFrom('eol_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
@@ -172,7 +172,7 @@ 
 		}
 	}
 
-	if ($action == 'setmanufacturing_date' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
+	if ($action == 'setmanufacturing_date' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
 		$newvalue = dol_mktime(12, 0, 0, GETPOST('manufacturing_datemonth', 'int'), GETPOST('manufacturing_dateday', 'int'), GETPOST('manufacturing_dateyear', 'int'));
 		$result = $object->setValueFrom('manufacturing_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
@@ -183,7 +183,7 @@ 
 		}
 	}
 
-	if ($action == 'setscrapping_date' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
+	if ($action == 'setscrapping_date' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
 		$newvalue = dol_mktime(12, 0, 0, GETPOST('scrapping_datemonth', 'int'), GETPOST('scrapping_dateday', 'int'), GETPOST('scrapping_dateyear', 'int'));
 		$result = $object->setValueFrom('scrapping_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
@@ -205,7 +205,7 @@ 
 		}
 	} */
 
-	if ($action == 'setqc_frequency' && $user->rights->stock->creer && ! GETPOST('cancel', 'alpha')) {
+	if ($action == 'setqc_frequency' && $user->rights->stock->creer && !GETPOST('cancel', 'alpha')) {
 		$result = $object->setValueFrom('qc_frequency', GETPOST('qc_frequency'), '', null, 'int', '', $user, 'PRODUCT_MODIFY');
 		if ($result < 0) { // Prévoir un test de format de durée
 			setEventMessages($object->error, null, 'errors');

htdocs/compta/sociales/card.php

Spacing +3 added lines, -3 removed lines

@@ -166,7 +166,7 @@ 
 		$object->date_ech = $dateech;
 		$object->periode = $dateperiod;
 		$object->amount = $amount;
-		$object->fk_user			= $fk_user;
+		$object->fk_user = $fk_user;
 		$object->mode_reglement_id = (int) GETPOST('mode_reglement_id', 'int');
 		$object->fk_account = (int) GETPOST('fk_account', 'int');
 		$object->fk_project = (int) GETPOST('fk_project', 'int');
@@ -449,10 +449,10 @@ 
 				$userstatic = new User($db);
 				$result = $userstatic->fetch($object->fk_user);
 				if ($result > 0) {
-					$morehtmlref .= '<br>' .$langs->trans('Employee').' : '.$userstatic->getNomUrl(1);
+					$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(1);
 				}
 			} else {
-				$morehtmlref .= '<br>' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1);
+				$morehtmlref .= '<br>'.$form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1);
 				if (!empty($object->fk_user)) {
 					$userstatic = new User($db);
 					$result = $userstatic->fetch($object->fk_user);

htdocs/zapier/admin/about.php

Braces +6 added lines, -2 removed lines

@@ -42,8 +42,12 @@
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-if (empty($conf->zapier->enabled)) accessforbidden();
-if (empty($user->admin)) accessforbidden();
+if (empty($conf->zapier->enabled)) {
+	accessforbidden();
+}
+if (empty($user->admin)) {
+	accessforbidden();
+}
 
 
 /*

htdocs/zapier/admin/setup.php

Braces +6 added lines, -2 removed lines

@@ -46,8 +46,12 @@
 //	'ZAPIERFORDOLIBARR_MYPARAM2'=>array('css'=>'minwidth500', 'enabled'=>1)
 );
 
-if (empty($conf->zapier->enabled)) accessforbidden();
-if (empty($user->admin)) accessforbidden();
+if (empty($conf->zapier->enabled)) {
+	accessforbidden();
+}
+if (empty($user->admin)) {
+	accessforbidden();
+}
 
 
 /*

htdocs/compta/tva/quadri_detail.php

Braces +10 added lines, -4 removed lines

@@ -489,8 +489,11 @@ 
 					print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
 
 					// Payment date
-					if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
-					else print '<td></td>';
+					if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
+						print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
+					} else {
+						print '<td></td>';
+					}
 
 					// Company name
 					print '<td class="tdmaxoverflow150">';
@@ -620,8 +623,11 @@ 
 	print '<tr class="liste_titre liste_titre_topborder">';
 	print '<td class="left">'.$elementsup.'</td>';
 	print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
-	if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
-	else print '<td></td>';
+	if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') {
+		print '<td class="left">'.$langs->trans("DatePayment").'</td>';
+	} else {
+		print '<td></td>';
+	}
 	print '<td class="left">'.$namesup.'</td>';
 	print '<td class="left">'.$productsup.'</td>';
 	if ($modetax != 1) {

Spacing +25 added lines, -25 removed lines

@@ -406,13 +406,13 @@ 
 		if (is_array($x_both[$rate]['coll']['detail'])) {
 			// VAT Rate
 			print "<tr>";
-			print '<td class="tax_rate" colspan="' . ($span+1) . '">';
-			print $langs->trans('Rate') . ' : ' . vatrate($rate) . '%';
+			print '<td class="tax_rate" colspan="'.($span + 1).'">';
+			print $langs->trans('Rate').' : '.vatrate($rate).'%';
 			print ' - <a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?invoice_type=customer';
 			if ($invoice_type != 'customer' || !GETPOSTISSET('vat_rate_show') || GETPOST('vat_rate_show') != $rate) {
 				print '&amp;vat_rate_show='.urlencode($rate);
 			}
-			print '&amp;date_startyear='.urlencode($date_start_year).'&amp;date_startmonth='.urlencode($date_start_month).'&amp;date_startday='.urlencode($date_start_day).'&amp;date_endyear='.urlencode($date_end_year).'&amp;date_endmonth='.urlencode($date_end_month).'&amp;date_endday='.urlencode($date_end_day).'">' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . '</a>';
+			print '&amp;date_startyear='.urlencode($date_start_year).'&amp;date_startmonth='.urlencode($date_start_month).'&amp;date_startday='.urlencode($date_start_day).'&amp;date_endyear='.urlencode($date_end_year).'&amp;date_endmonth='.urlencode($date_end_month).'&amp;date_endday='.urlencode($date_end_day).'">'.img_picto('', 'chevron-down', 'class="paddingrightonly"').$langs->trans('VATReportShowByRateDetails').'</a>';
 			print '</td>';
 			print '</tr>'."\n";
 
@@ -430,22 +430,22 @@ 
 				}
 
 				// Payment
-				$ratiopaymentinvoice=1;
+				$ratiopaymentinvoice = 1;
 				if ($modetax != 1) {
 					if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
 						|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
 					} else {
 						if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-							$ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+							$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
 						}
 					}
 				}
 
 				// Total collected
-				$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+				$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
 
 				// VAT
-				$temp_vat=$fields['vat']*$ratiopaymentinvoice;
+				$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
 
 				$subtot_coll_total_ht += $temp_ht;
 				$subtot_coll_vat      += $temp_vat;
@@ -485,13 +485,13 @@ 
 					print '<tr class="oddeven">';
 
 					// Ref
-					print '<td class="nowrap left">' . $fields['link'] . '</td>';
+					print '<td class="nowrap left">'.$fields['link'].'</td>';
 
 					// Invoice date
-					print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
+					print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
 
 					// Payment date
-					if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
+					if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
 					else print '<td></td>';
 
 					// Company name
@@ -505,10 +505,10 @@ 
 					if ($fields['pid']) {
 						$product_static->id = $fields['pid'];
 						$product_static->ref = $fields['pref'];
-						$product_static->type = $fields['dtype'];        // We force with the type of line to have type how line is registered
+						$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
 						print $product_static->getNomUrl(1);
 						if (dol_string_nohtmltag($fields['descr'])) {
-							print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+							print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 						}
 					} else {
 						if ($type) {
@@ -525,7 +525,7 @@ 
 								$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
 							}
 						}
-						print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 
 						// Show range
 						print_date_range($fields['ddate_start'], $fields['ddate_end']);
@@ -563,7 +563,7 @@ 
 							}
 							print price(price2num($fields['payment_amount'], 'MT'));
 							if (isset($fields['payment_amount'])) {
-								print ' (' . round($ratiopaymentinvoice * 100, 2) . '%)';
+								print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
 							}
 						}
 						print '</td>';
@@ -616,7 +616,7 @@ 
 	}
 
 	// Blank line
-	print '<tr><td colspan="'.($span+2).'">&nbsp;</td></tr>';
+	print '<tr><td colspan="'.($span + 2).'">&nbsp;</td></tr>';
 
 	// Print table headers for this quadri - expenses
 	print '<tr class="liste_titre liste_titre_topborder">';
@@ -640,13 +640,13 @@ 
 
 		if (is_array($x_both[$rate]['paye']['detail'])) {
 			print "<tr>";
-			print '<td class="tax_rate" colspan="' . ($span+1) . '">';
-			print $langs->trans('Rate') . ' : ' . vatrate($rate) . '%';
+			print '<td class="tax_rate" colspan="'.($span + 1).'">';
+			print $langs->trans('Rate').' : '.vatrate($rate).'%';
 			print ' - <a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?invoice_type=supplier';
 			if ($invoice_type != 'supplier' || !GETPOSTISSET('vat_rate_show') || GETPOST('vat_rate_show') != $rate) {
 				print '&amp;vat_rate_show='.urlencode($rate);
 			}
-			print '&amp;date_startyear='.urlencode($date_start_year).'&amp;date_startmonth='.urlencode($date_start_month).'&amp;date_startday='.urlencode($date_start_day).'&amp;date_endyear='.urlencode($date_end_year).'&amp;date_endmonth='.urlencode($date_end_month).'&amp;date_endday='.urlencode($date_end_day).'">' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . '</a>';
+			print '&amp;date_startyear='.urlencode($date_start_year).'&amp;date_startmonth='.urlencode($date_start_month).'&amp;date_startday='.urlencode($date_start_day).'&amp;date_endyear='.urlencode($date_end_year).'&amp;date_endmonth='.urlencode($date_end_month).'&amp;date_endday='.urlencode($date_end_day).'">'.img_picto('', 'chevron-down', 'class="paddingrightonly"').$langs->trans('VATReportShowByRateDetails').'</a>';
 			print '</td>';
 			print '</tr>'."\n";
 
@@ -717,14 +717,14 @@ 
 					print '<tr class="oddeven">';
 
 					// Ref
-					print '<td class="nowrap left">' . $fields['link'] . '</td>';
+					print '<td class="nowrap left">'.$fields['link'].'</td>';
 
 					// Invoice date
-					print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
+					print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
 
 					// Payment date
 					if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') {
-						print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
+						print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
 					} else {
 						print '<td></td>';
 					}
@@ -740,10 +740,10 @@ 
 					if ($fields['pid']) {
 						$product_static->id = $fields['pid'];
 						$product_static->ref = $fields['pref'];
-						$product_static->type = $fields['dtype'];        // We force with the type of line to have type how line is registered
+						$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
 						print $product_static->getNomUrl(1);
 						if (dol_string_nohtmltag($fields['descr'])) {
-							print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+							print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 						}
 					} else {
 						if ($type) {
@@ -760,7 +760,7 @@ 
 								$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
 							}
 						}
-						print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 
 						// Show range
 						print_date_range($fields['ddate_start'], $fields['ddate_end']);
@@ -798,7 +798,7 @@ 
 							}
 							print price(price2num($fields['payment_amount'], 'MT'));
 							if (isset($fields['payment_amount'])) {
-								print ' (' . round($ratiopaymentinvoice * 100, 2) . '%)';
+								print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
 							}
 						}
 						print '</td>';

htdocs/core/modules/product_batch/modules_product_batch.class.php

Braces +12 added lines, -4 removed lines

@@ -92,10 +92,18 @@
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }

htdocs/core/class/notify.class.php

Braces +3 added lines, -1 removed lines

@@ -560,7 +560,9 @@
 						$formmail = new FormMail($this->db);
 						$arraydefaultmessage = null;
 
-						if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($this->db, $object_type.'_send', $user, $outputlangs, 0, 1, $labeltouse);
+						if (!empty($labeltouse)) {
+							$arraydefaultmessage = $formmail->getEMailTemplate($this->db, $object_type.'_send', $user, $outputlangs, 0, 1, $labeltouse);
+						}
 						if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 							$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 							complete_substitutions_array($substitutionarray, $outputlangs, $object);