Dolibarr / dolibarr

htdocs/accountancy/class/bookkeeping.class.php

Indentation +4 added lines, -4 removed lines

@@ -825,10 +825,10 @@
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.credit' || $key == 't.debit') {
 					$sqlwhere[] = natural_search($key, $value, 1, 1);
-                } elseif ($key == 't.reconciled_option') {
-                    $sqlwhere[] = 't.lettering_code IS NULL';
-                } elseif ($key == 't.code_journal' && !empty($value)) {
-                    $sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
+				} elseif ($key == 't.reconciled_option') {
+					$sqlwhere[] = 't.lettering_code IS NULL';
+				} elseif ($key == 't.code_journal' && !empty($value)) {
+					$sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
 				} else {
 					$sqlwhere[] = natural_search($key, $value, 0, 1);
 				}

htdocs/accountancy/class/accountancyexport.class.php

Indentation +13 added lines, -13 removed lines

@@ -537,17 +537,17 @@ 
 			$Tab['libelle_ecriture'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref).' '.dol_string_unaccent($data->label_operation), 20), 20);
 
 			// Credit invoice - invert sens
-            if ($data->montant < 0) {
-                if ($data->sens == 'C') {
-                    $Tab['sens'] = 'D';
-                } else {
-                    $Tab['sens'] = 'C';
-                }
-                $Tab['signe_montant'] = '-';
-            } else {
-                $Tab['sens'] = $data->sens; // C or D
-                $Tab['signe_montant'] = '+';
-            }
+			if ($data->montant < 0) {
+				if ($data->sens == 'C') {
+					$Tab['sens'] = 'D';
+				} else {
+					$Tab['sens'] = 'C';
+				}
+				$Tab['signe_montant'] = '-';
+			} else {
+				$Tab['sens'] = $data->sens; // C or D
+				$Tab['signe_montant'] = '+';
+			}
 
 			// The amount must be in centimes without decimal points.
 			$Tab['montant'] = str_pad(abs($data->montant * 100), 12, '0', STR_PAD_LEFT);
@@ -845,8 +845,8 @@ 
 
 		foreach ($objectLines as $line) {
 			if ($line->debit == 0 && $line->credit == 0) {
-                unset($array[$line]);
-            } else {
+				unset($array[$line]);
+			} else {
 				$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
 				$date_document = dol_print_date($line->doc_date, '%Y%m%d');
 				$date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');

Spacing +41 added lines, -41 removed lines

@@ -952,55 +952,55 @@ 
 				$date_validation = dol_print_date($line->date_validated, '%Y%m%d');
 
 				// FEC:JournalCode
-				print $line->code_journal . $separator;
+				print $line->code_journal.$separator;
 
 				// FEC:JournalLib
-				print $line->journal_label . $separator;
+				print $line->journal_label.$separator;
 
 				// FEC:EcritureNum
-				print $line->piece_num . $separator;
+				print $line->piece_num.$separator;
 
 				// FEC:EcritureDate
-				print $date_creation . $separator;
+				print $date_creation.$separator;
 
 				// FEC:CompteNum
-				print $line->numero_compte . $separator;
+				print $line->numero_compte.$separator;
 
 				// FEC:CompteLib
-				print dol_string_unaccent($line->label_compte) . $separator;
+				print dol_string_unaccent($line->label_compte).$separator;
 
 				// FEC:CompAuxNum
-				print $line->subledger_account . $separator;
+				print $line->subledger_account.$separator;
 
 				// FEC:CompAuxLib
-				print dol_string_unaccent($line->subledger_label) . $separator;
+				print dol_string_unaccent($line->subledger_label).$separator;
 
 				// FEC:PieceRef
-				print $line->doc_ref . $separator;
+				print $line->doc_ref.$separator;
 
 				// FEC:PieceDate
-				print $date_document . $separator;
+				print $date_document.$separator;
 
 				// FEC:EcritureLib
-				print dol_string_unaccent($line->label_operation) . $separator;
+				print dol_string_unaccent($line->label_operation).$separator;
 
 				// FEC:Debit
-				print price2fec($line->debit) . $separator;
+				print price2fec($line->debit).$separator;
 
 				// FEC:Credit
-				print price2fec($line->credit) . $separator;
+				print price2fec($line->credit).$separator;
 
 				// FEC:EcritureLet
-				print $line->lettering_code . $separator;
+				print $line->lettering_code.$separator;
 
 				// FEC:DateLet
-				print $date_lettering . $separator;
+				print $date_lettering.$separator;
 
 				// FEC:ValidDate
-				print $date_validation . $separator;
+				print $date_validation.$separator;
 
 				// FEC:Montantdevise
-				print $line->multicurrency_amount . $separator;
+				print $line->multicurrency_amount.$separator;
 
 				// FEC:Idevise
 				print $line->multicurrency_code;
@@ -1634,9 +1634,9 @@ 
 					($line->doc_type == 'supplier_invoice' && !isset($supplier_invoices_infos[$line->fk_doc]))) {
 					if ($line->doc_type == 'customer_invoice') {
 						// Get new customer invoice ref and company name
-						$sql = 'SELECT f.facnumber, s.nom FROM ' . MAIN_DB_PREFIX . 'facture as f';
-						$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON f.fk_soc = s.rowid';
-						$sql .= ' WHERE f.rowid = ' . $line->fk_doc;
+						$sql = 'SELECT f.facnumber, s.nom FROM '.MAIN_DB_PREFIX.'facture as f';
+						$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON f.fk_soc = s.rowid';
+						$sql .= ' WHERE f.rowid = '.$line->fk_doc;
 						$resql = $this->db->query($sql);
 						if ($resql) {
 							if ($obj = $this->db->fetch_object($resql)) {
@@ -1648,9 +1648,9 @@ 
 						}
 					} else {
 						// Get new supplier invoice ref and company name
-						$sql = 'SELECT ff.ref, s.nom FROM ' . MAIN_DB_PREFIX . 'facture_fourn as ff';
-						$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON ff.fk_soc = s.rowid';
-						$sql .= ' WHERE ff.rowid = ' . $line->fk_doc;
+						$sql = 'SELECT ff.ref, s.nom FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
+						$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON ff.fk_soc = s.rowid';
+						$sql .= ' WHERE ff.rowid = '.$line->fk_doc;
 						$resql = $this->db->query($sql);
 						if ($resql) {
 							if ($obj = $this->db->fetch_object($resql)) {
@@ -1672,28 +1672,28 @@ 
 				}
 			}
 
-			print $line->id . $this->separator;
-			print $date . $this->separator;
-			print substr($line->code_journal, 0, 4) . $this->separator;
+			print $line->id.$this->separator;
+			print $date.$this->separator;
+			print substr($line->code_journal, 0, 4).$this->separator;
 
 			if ((substr($line->numero_compte, 0, 3) == '411') || (substr($line->numero_compte, 0, 3) == '401')) {
-				print length_accountg($line->subledger_account) . $this->separator;
+				print length_accountg($line->subledger_account).$this->separator;
 			} else {
-				print substr(length_accountg($line->numero_compte), 0, 15) . $this->separator;
+				print substr(length_accountg($line->numero_compte), 0, 15).$this->separator;
 			}
 			//Libellé Auto
 			print $this->separator;
 			//print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"' . $this->separator;
 			//Libellé manuel
-			print dol_trunc(str_replace('"', '', $invoice_ref . (!empty($company_name) ? ' - ' : '') . $company_name), 40, 'right', 'UTF-8', 1) . $this->separator;
+			print dol_trunc(str_replace('"', '', $invoice_ref.(!empty($company_name) ? ' - ' : '').$company_name), 40, 'right', 'UTF-8', 1).$this->separator;
 			//Numéro de pièce
-			print dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1) . $this->separator;
+			print dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1).$this->separator;
 			//Devise
-			print 'EUR' . $this->separator;
+			print 'EUR'.$this->separator;
 			//Montant
-			print price2num(abs($line->montant)) . $this->separator;
+			print price2num(abs($line->montant)).$this->separator;
 			//Sens
-			print $line->sens . $this->separator;
+			print $line->sens.$this->separator;
 			//Code lettrage
 			print $this->separator;
 			//Date Echéance
@@ -1717,21 +1717,21 @@ 
 		foreach ($objectLines as $line) {
 			$date = dol_print_date($line->doc_date, '%d%m%Y');
 
-			print $line->id . $this->separator;
-			print $date . $this->separator;
-			print substr($line->code_journal, 0, 4) . $this->separator;
-			if ((substr($line->numero_compte, 0, 3) == '411') || (substr($line->numero_compte, 0, 3) == '401'))  {
-				print length_accountg($line->subledger_account) . $this->separator;
+			print $line->id.$this->separator;
+			print $date.$this->separator;
+			print substr($line->code_journal, 0, 4).$this->separator;
+			if ((substr($line->numero_compte, 0, 3) == '411') || (substr($line->numero_compte, 0, 3) == '401')) {
+				print length_accountg($line->subledger_account).$this->separator;
 			} else {
-				print substr(length_accountg($line->numero_compte), 0, 15) . $this->separator;
+				print substr(length_accountg($line->numero_compte), 0, 15).$this->separator;
 			}
 			print $this->separator;
 			//print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"' . $this->separator;
-			print '"'.dol_trunc(str_replace('"', '', $line->doc_ref), 40, 'right', 'UTF-8', 1).'"' . $this->separator;
+			print '"'.dol_trunc(str_replace('"', '', $line->doc_ref), 40, 'right', 'UTF-8', 1).'"'.$this->separator;
 			print '"'.dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1).'"'.$this->separator;
 			print price2num($line->montant).$this->separator;
 			print $line->sens.$this->separator;
-			print $date . $this->separator;
+			print $date.$this->separator;
 			print $this->separator;
 			print $this->separator;
 			print 'EUR';

Braces +12 added lines, -8 removed lines

@@ -479,8 +479,9 @@ 
 		$date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be yyyymmdd
 		foreach ($TData as $data) {
 			$code_compta = $data->numero_compte;
-			if (!empty($data->subledger_account))
-				$code_compta = $data->subledger_account;
+			if (!empty($data->subledger_account)) {
+							$code_compta = $data->subledger_account;
+			}
 
 			$Tab = array();
 			$Tab['num_ecriture'] = str_pad($i, 5);
@@ -520,8 +521,9 @@ 
 		// $date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
 		foreach ($TData as $data) {
 			$code_compta = $data->numero_compte;
-			if (!empty($data->subledger_account))
-				$code_compta = $data->subledger_account;
+			if (!empty($data->subledger_account)) {
+							$code_compta = $data->subledger_account;
+			}
 
 			$Tab = array();
 			$Tab['type_ligne'] = 'M';
@@ -614,8 +616,9 @@ 
 		//$date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
 		foreach ($TData as $data) {
 			$code_compta = $data->numero_compte;
-			if (!empty($data->subledger_account))
-				$code_compta = $data->subledger_account;
+			if (!empty($data->subledger_account)) {
+							$code_compta = $data->subledger_account;
+			}
 
 			$Tab = array();
 			//$Tab['type_ligne'] = 'M';
@@ -1587,8 +1590,9 @@ 
 
 			print self::trunc($line->code_journal, 6).$separator; //Journal code
 
-			if (!empty($line->subledger_account)) $account = $line->subledger_account;
-			else {
+			if (!empty($line->subledger_account)) {
+				$account = $line->subledger_account;
+			} else {
 				$account = $line->numero_compte;
 			}
 			print self::trunc($account, 15).$separator; //Account number

htdocs/accountancy/bookkeeping/listbysubaccount.php

Indentation +13 added lines, -13 removed lines

@@ -546,15 +546,15 @@ 
 
 	// Is it a break ?
 	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
-        if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-            $colnumber = 3;
-            $colnumberend = 7;
-        } else {
-            $colnumber = 4;
-            $colnumberend = 7;
-        }
-        $colspan = $totalarray['nbfield'] - $colnumber;
-        $colspanend = $totalarray['nbfield'] - $colnumberend;
+		if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
+			$colnumber = 3;
+			$colnumberend = 7;
+		} else {
+			$colnumber = 4;
+			$colnumberend = 7;
+		}
+		$colspan = $totalarray['nbfield'] - $colnumber;
+		$colspanend = $totalarray['nbfield'] - $colnumberend;
 		// Show a subtotal by accounting account
 		if (isset($displayed_account_number)) {
 			print '<tr class="liste_total">';
@@ -763,11 +763,11 @@ 
 
 // Show sub-total of last shown account
 if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-    $colnumber = 3;
-    $colnumberend = 7;
+	$colnumber = 3;
+	$colnumberend = 7;
 } else {
-    $colnumber = 4;
-    $colnumberend = 7;
+	$colnumber = 4;
+	$colnumberend = 7;
 }
 $colspan = $totalarray['nbfield'] - $colnumber;
 $colspanend = $totalarray['nbfield'] - $colnumberend;

Braces +101 added lines, -34 removed lines

@@ -81,8 +81,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if ($sortorder == "") $sortorder = "ASC";
-if ($sortfield == "") $sortfield = "t.doc_date,t.rowid";
+if ($sortorder == "") {
+	$sortorder = "ASC";
+}
+if ($sortfield == "") {
+	$sortfield = "t.doc_date,t.rowid";
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new BookKeeping($db);
@@ -105,7 +109,10 @@ 
 	} else {
 		$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		$year_start = dol_print_date(dol_now(), '%Y');
-		if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+		if (dol_print_date(dol_now(), '%m') < $month_start) {
+			$year_start--;
+		}
+		// If current month is lower that starting fiscal month, we start last year
 		$year_end = $year_start + 1;
 		$month_end = $month_start - 1;
 		if ($month_end < 1)
@@ -130,7 +137,9 @@ 
 	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
 );
 
-if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
+if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
+	unset($arrayfields['t.lettering_code']);
+}
 
 if ($search_date_start && empty($search_date_startyear)) {
 	$tmparray = dol_getdate($search_date_start);
@@ -154,15 +163,19 @@ 
 
 $parameters = array('socid'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		// All tests are required to be compatible with all browsers
 	{
 		$search_doc_date = '';
+	}
 		$search_accountancy_code = '';
 		$search_accountancy_code_start = '';
 		$search_accountancy_code_end = '';
@@ -391,7 +404,9 @@ 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="list">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
@@ -407,8 +422,12 @@ 
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
 }
 
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -416,11 +435,16 @@ 
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+if ($massactionbutton) {
+	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+}
 
 // Reverse sort order
-if (preg_match('/^asc/i', $sortorder)) $sortorder = "asc";
-else $sortorder = "desc";
+if (preg_match('/^asc/i', $sortorder)) {
+	$sortorder = "asc";
+} else {
+	$sortorder = "desc";
+}
 
 $moreforfilter = '';
 
@@ -437,8 +461,11 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
 
 print '<div class="liste_titre liste_titre_bydiv centpercent">';
 print $moreforfilter;
@@ -508,14 +535,30 @@ 
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (!empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.doc_date']['checked']))				print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.piece_num']['checked']))				print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['t.doc_ref']['checked']))				print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.label_operation']['checked']))		print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.debit']['checked']))					print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['t.credit']['checked']))				print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['t.lettering_code']['checked']))		print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.code_journal']['checked'])) {
+	print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.doc_date']['checked'])) {
+	print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.piece_num']['checked'])) {
+	print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.doc_ref']['checked'])) {
+	print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.label_operation']['checked'])) {
+	print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.debit']['checked'])) {
+	print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['t.credit']['checked'])) {
+	print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['t.lettering_code']['checked'])) {
+	print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -591,7 +634,9 @@ 
 		} else {
 			// Should not happen: subledger account must be null or a non empty value
 			print '<span class="error">'.$langs->trans("Unknown");
-			if ($line->subledger_label) print ' ('.$line->subledger_label.')';
+			if ($line->subledger_label) {
+				print ' ('.$line->subledger_label.')';
+			}
 			$htmltext = 'EmptyStringForSubledgerAccountButSubledgerLabelDefined';
 			print $form->textwithpicto('', $htmltext);
 			print '</span>';
@@ -616,14 +661,18 @@ 
 		$result = $accountingjournal->fetch('', $line->code_journal);
 		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
 		print '<td class="center">'.$journaltoshow.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Document date
 	if (!empty($arrayfields['t.doc_date']['checked']))
 	{
 		print '<td class="center">'.dol_print_date($line->doc_date, 'day').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Piece number
@@ -634,7 +683,9 @@ 
 		$object->piece_num = $line->piece_num;
 		print $object->getNomUrl(1, '', 0, '', 1);
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Document ref
@@ -699,7 +750,9 @@ 
 		print '</td></tr></table>';
 
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Label operation
@@ -707,23 +760,33 @@ 
 		// Affiche un lien vers la facture client/fournisseur
 		$doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
 		print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>'.$line->label_operation.'</td>' : '<td>'.$line->label_operation.'<br><span style="font-size:0.8em">('.length_accounta($line->subledger_account).')</span></td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Amount debit
 	if (!empty($arrayfields['t.debit']['checked']))
 	{
 		print '<td class="nowrap right">'.($line->debit ? price($line->debit) : '').'</td>';
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
+		}
 		$totalarray['val']['totaldebit'] += $line->debit;
 	}
 
 	// Amount credit
 	if (!empty($arrayfields['t.credit']['checked'])) {
 		print '<td class="nowrap right">'.($line->credit ? price($line->credit) : '').'</td>';
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
+		}
 		$totalarray['val']['totalcredit'] += $line->credit;
 	}
 
@@ -731,7 +794,9 @@ 
 	if (!empty($arrayfields['t.lettering_code']['checked']))
 	{
 		print '<td class="center">'.$line->lettering_code.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Fields from hook
@@ -750,7 +815,9 @@ 
 		}
 	}
 	print '</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Comptabilise le sous-total
 	$sous_total_debit += $line->debit;

Spacing +7 added lines, -7 removed lines

@@ -39,12 +39,12 @@ 
 $langs->loadLangs(array("accountancy", "compta"));
 
 $action = GETPOST('action', 'aZ09');
-$search_date_startyear =  GETPOST('search_date_startyear', 'int');
-$search_date_startmonth =  GETPOST('search_date_startmonth', 'int');
-$search_date_startday =  GETPOST('search_date_startday', 'int');
-$search_date_endyear =  GETPOST('search_date_endyear', 'int');
-$search_date_endmonth =  GETPOST('search_date_endmonth', 'int');
-$search_date_endday =  GETPOST('search_date_endday', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
 $search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
@@ -701,7 +701,7 @@ 
 		} elseif ($line->doc_type == 'bank') {
 			print $objectstatic->getNomUrl(1);
 			$bank_ref = strstr($line->doc_ref, '-');
-			print " " . $bank_ref;
+			print " ".$bank_ref;
 		} else {
 			print $line->doc_ref;
 		}

htdocs/categories/class/categorie.class.php

Indentation +4 added lines, -4 removed lines

@@ -98,7 +98,7 @@ 
 		8 => 'bank_line',
 		9 => 'warehouse',
 		10 => 'actioncomm',
-        11 => 'website_page'
+		11 => 'website_page'
 	);
 
 	/**
@@ -231,9 +231,9 @@ 
 	 * @see Categorie::TYPE_PROJECT
 	 * @see Categorie::TYPE_ACCOUNT
 	 * @see Categorie::TYPE_BANK_LINE
-     * @see Categorie::TYPE_WAREHOUSE
-     * @see Categorie::TYPE_ACTIONCOMM
-     * @see Categorie::TYPE_WEBSITE_PAGE
+	 * @see Categorie::TYPE_WAREHOUSE
+	 * @see Categorie::TYPE_ACTIONCOMM
+	 * @see Categorie::TYPE_WEBSITE_PAGE
 	 */
 	public $type;
 

Braces +97 added lines, -39 removed lines

@@ -313,8 +313,12 @@ 
 		global $conf;
 
 		// Check parameters
-		if (empty($id) && empty($label) && empty($ref_ext)) return -1;
-		if (!is_null($type) && !is_numeric($type)) $type = $this->MAP_ID[$type];
+		if (empty($id) && empty($label) && empty($ref_ext)) {
+			return -1;
+		}
+		if (!is_null($type) && !is_numeric($type)) {
+			$type = $this->MAP_ID[$type];
+		}
 
 		$sql = "SELECT rowid, fk_parent, entity, label, description, color, fk_soc, visible, type, ref_ext";
 		$sql .= ", date_creation, tms, fk_user_creat, fk_user_modif";
@@ -325,7 +329,9 @@ 
 			$sql .= " WHERE ref_ext LIKE '".$this->db->escape($ref_ext)."'";
 		} else {
 			$sql .= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category').")";
-			if (!is_null($type)) $sql .= " AND type = ".((int) $type);
+			if (!is_null($type)) {
+				$sql .= " AND type = ".((int) $type);
+			}
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -357,7 +363,9 @@ 
 				$this->db->free($resql);
 
 				// multilangs
-				if (!empty($conf->global->MAIN_MULTILANGS)) $this->getMultiLangs();
+				if (!empty($conf->global->MAIN_MULTILANGS)) {
+					$this->getMultiLangs();
+				}
 
 				return 1;
 			} else {
@@ -385,7 +393,9 @@ 
 
 		$type = $this->type;
 
-		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
+		if (!is_numeric($type)) {
+			$type = $this->MAP_ID[$type];
+		}
 
 		$error = 0;
 
@@ -397,7 +407,9 @@ 
 		$this->color = trim($this->color);
 		$this->import_key = trim($this->import_key);
 		$this->ref_ext = trim($this->ref_ext);
-		if (empty($this->visible)) $this->visible = 0;
+		if (empty($this->visible)) {
+			$this->visible = 0;
+		}
 		$this->fk_parent = ($this->fk_parent != "" ? intval($this->fk_parent) : 0);
 
 		if ($this->already_exists()) {
@@ -577,7 +589,9 @@ 
 		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('CATEGORY_DELETE', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -647,9 +661,13 @@ 
 
 		$error = 0;
 
-		if ($this->id == -1) return -2;
+		if ($this->id == -1) {
+			return -2;
+		}
 
-		if (empty($type)) $type = $obj->element;
+		if (empty($type)) {
+			$type = $obj->element;
+		}
 
 		$this->db->begin();
 
@@ -803,7 +821,9 @@ 
 		if (($type == 'customer' || $type == 'supplier') && $user->socid > 0) {
 			$sql .= " AND o.rowid = ".$user->socid;
 		}
-		if ($limit > 0 || $offset > 0)  $sql .= $this->db->plimit($limit + 1, $offset);
+		if ($limit > 0 || $offset > 0) {
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 
 		dol_syslog(get_class($this)."::getObjectsInCateg", LOG_DEBUG);
@@ -1035,7 +1055,9 @@ 
 		// phpcs:enable
 		global $conf, $langs;
 
-		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
+		if (!is_numeric($type)) {
+			$type = $this->MAP_ID[$type];
+		}
 		if (is_null($type)) {
 			$this->error = 'BadValueForParameterType';
 			return -1;
@@ -1061,9 +1083,13 @@ 
 
 		// Init $this->cats array
 		$sql = "SELECT DISTINCT c.rowid, c.label, c.ref_ext, c.description, c.color, c.fk_parent, c.visible"; // Distinct reduce pb with old tables with duplicates
-		if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= ", t.label as label_trans, t.description as description_trans";
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			$sql .= ", t.label as label_trans, t.description as description_trans";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as c";
-		if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " LEFT  JOIN ".MAIN_DB_PREFIX."categorie_lang as t ON t.fk_category=c.rowid AND t.lang='".$this->db->escape($current_lang)."'";
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			$sql .= " LEFT  JOIN ".MAIN_DB_PREFIX."categorie_lang as t ON t.fk_category=c.rowid AND t.lang='".$this->db->escape($current_lang)."'";
+		}
 		$sql .= " WHERE c.entity IN (".getEntity('category').")";
 		$sql .= " AND c.type = ".(int) $type;
 
@@ -1200,14 +1226,18 @@ 
 	public function get_all_categories($type = null, $parent = false)
 	{
 		// phpcs:enable
-		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
+		if (!is_numeric($type)) {
+			$type = $this->MAP_ID[$type];
+		}
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";
 		$sql .= " WHERE entity IN (".getEntity('category').")";
-		if (!is_null($type))
-			$sql .= " AND type = ".(int) $type;
-		if ($parent)
-			$sql .= " AND fk_parent = 0";
+		if (!is_null($type)) {
+					$sql .= " AND type = ".(int) $type;
+		}
+		if ($parent) {
+					$sql .= " AND fk_parent = 0";
+		}
 
 		$res = $this->db->query($sql);
 		if ($res) {
@@ -1248,7 +1278,9 @@ 
 		// phpcs:enable
 		$type = $this->type;
 
-		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
+		if (!is_numeric($type)) {
+			$type = $this->MAP_ID[$type];
+		}
 
 		/* We have to select any rowid from llx_categorie which category's mother and label
 		 * are equals to those of the calling category
@@ -1314,7 +1346,9 @@ 
 						// Check contrast with background and correct text color
 						$forced_color = 'categtextwhite';
 						if ($cat->color) {
-							if (colorIsLight($cat->color)) $forced_color = 'categtextblack';
+							if (colorIsLight($cat->color)) {
+								$forced_color = 'categtextblack';
+							}
 						}
 					}
 				}
@@ -1395,8 +1429,9 @@ 
 			}
 		}
 
-		if (count($ways) == 0)
-			$ways[0][0] = $this;
+		if (count($ways) == 0) {
+					$ways[0][0] = $this;
+		}
 
 		return $ways;
 	}
@@ -1415,7 +1450,9 @@ 
 	{
 		$cats = array();
 
-		if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type];
+		if (is_numeric($type)) {
+			$type = Categorie::$MAP_ID_TO_CODE[$type];
+		}
 
 		if ($type === Categorie::TYPE_BANK_LINE) {   // TODO Remove this with standard category code after migration of llx_bank_categ into llx_categorie
 			// Load bank categories
@@ -1505,11 +1542,14 @@ 
 		$sql .= " WHERE type = ".$this->MAP_ID[$type];
 		$sql .= " AND entity IN (".getEntity('category').")";
 		if ($nom) {
-			if (!$exact)
-				$nom = '%'.str_replace('*', '%', $nom).'%';
-			if (!$case)
-				$sql .= " AND label LIKE '".$this->db->escape($nom)."'";
-			else $sql .= " AND label LIKE BINARY '".$this->db->escape($nom)."'";
+			if (!$exact) {
+							$nom = '%'.str_replace('*', '%', $nom).'%';
+			}
+			if (!$case) {
+							$sql .= " AND label LIKE '".$this->db->escape($nom)."'";
+			} else {
+				$sql .= " AND label LIKE BINARY '".$this->db->escape($nom)."'";
+			}
 		}
 		if ($id) {
 			$sql .= " AND rowid = '".$id."'";
@@ -1550,7 +1590,9 @@ 
 		// Check contrast with background and correct text color
 		$forced_color = 'categtextwhite';
 		if ($this->color) {
-			if (colorIsLight($this->color)) $forced_color = 'categtextblack';
+			if (colorIsLight($this->color)) {
+				$forced_color = 'categtextblack';
+			}
 		}
 
 		$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.$moreparam.'&backtopage='.urlencode($_SERVER['PHP_SELF'].($moreparam ? '?'.$moreparam : '')).'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip '.$forced_color.'">';
@@ -1559,9 +1601,15 @@ 
 		$picto = 'category';
 
 
-		if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result .= ' ';
-		if ($withpicto != 2) $result .= $link.dol_trunc(($this->ref ? $this->ref : $this->label), $maxlength).$linkend;
+		if ($withpicto) {
+			$result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		}
+		if ($withpicto && $withpicto != 2) {
+			$result .= ' ';
+		}
+		if ($withpicto != 2) {
+			$result .= $link.dol_trunc(($this->ref ? $this->ref : $this->label), $maxlength).$linkend;
+		}
 		return $result;
 	}
 
@@ -1649,13 +1697,18 @@ 
 						// Objet
 						$obj = array();
 						$obj['photo'] = $photo;
-						if ($photo_vignette && is_file($dirthumb.$photo_vignette)) $obj['photo_vignette'] = 'thumbs/'.$photo_vignette;
-						else $obj['photo_vignette'] = "";
+						if ($photo_vignette && is_file($dirthumb.$photo_vignette)) {
+							$obj['photo_vignette'] = 'thumbs/'.$photo_vignette;
+						} else {
+							$obj['photo_vignette'] = "";
+						}
 
 						$tabobj[$nbphoto - 1] = $obj;
 
 						// On continue ou on arrete de boucler
-						if ($nbmax && $nbphoto >= $nbmax) break;
+						if ($nbmax && $nbphoto >= $nbmax) {
+							break;
+						}
 					}
 				}
 
@@ -1760,8 +1813,9 @@ 
 				}
 
 				// on ne sauvegarde pas des champs vides
-				if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"])
-					dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
+				if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"]) {
+									dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
+				}
 				if (!$this->db->query($sql2)) {
 					$this->error = $this->db->lasterror();
 					return -1;
@@ -1872,7 +1926,9 @@ 
 	 */
 	public static function getFilterJoinQuery($type, $rowIdName)
 	{
-		if ($type == 'bank_account') $type = 'account';
+		if ($type == 'bank_account') {
+			$type = 'account';
+		}
 
 		return " LEFT JOIN ".MAIN_DB_PREFIX."categorie_".$type." as cp ON ".$rowIdName." = cp.fk_".$type;
 	}
@@ -1887,7 +1943,9 @@ 
 	 */
 	public static function getFilterSelectQuery($type, $rowIdName, $searchList)
 	{
-		if ($type == 'bank_account') $type = 'account';
+		if ($type == 'bank_account') {
+			$type = 'account';
+		}
 
 		if (empty($searchList) && !is_array($searchList)) {
 			return "";

htdocs/install/upgrade2.php

Braces +168 added lines, -64 removed lines

@@ -64,9 +64,11 @@ 
 // Ne fonctionne que si on est pas en safe_mode.
 $err = error_reporting();
 error_reporting(0);
-if (!empty($conf->global->MAIN_OVERRIDE_TIME_LIMIT))
+if (!empty($conf->global->MAIN_OVERRIDE_TIME_LIMIT)) {
 	@set_time_limit((int) $conf->global->MAIN_OVERRIDE_TIME_LIMIT);
-else @set_time_limit(600);
+} else {
+	@set_time_limit(600);
+}
 error_reporting($err);
 
 $setuplang = GETPOST("selectlang", 'aZ09', 3) ?GETPOST("selectlang", 'aZ09', 3) : 'auto';
@@ -77,13 +79,21 @@ 
 
 $langs->loadLangs(array("admin", "install", "bills", "suppliers"));
 
-if ($dolibarr_main_db_type == 'mysqli') $choix = 1;
-if ($dolibarr_main_db_type == 'pgsql')  $choix = 2;
-if ($dolibarr_main_db_type == 'mssql')  $choix = 3;
+if ($dolibarr_main_db_type == 'mysqli') {
+	$choix = 1;
+}
+if ($dolibarr_main_db_type == 'pgsql') {
+	$choix = 2;
+}
+if ($dolibarr_main_db_type == 'mssql') {
+	$choix = 3;
+}
 
 
 dolibarr_install_syslog("--- upgrade2: entering upgrade2.php page ".$versionfrom." ".$versionto." ".$enablemodules);
-if (!is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized", LOG_ERR);
+if (!is_object($conf)) {
+	dolibarr_install_syslog("upgrade2: conf file not initialized", LOG_ERR);
+}
 
 
 
@@ -124,7 +134,9 @@ 
 			$dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
 			$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
 			$dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
-		} else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+		} else {
+			$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+		}
 	}
 
 	// $conf is already instancied inside inc.php
@@ -159,9 +171,13 @@ 
 		}
 	}
 
-	if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0;
+	if (empty($dolibarr_main_db_encryption)) {
+		$dolibarr_main_db_encryption = 0;
+	}
 	$conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
-	if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = '';
+	if (empty($dolibarr_main_db_cryptkey)) {
+		$dolibarr_main_db_cryptkey = '';
+	}
 	$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
 
 	// Chargement config
@@ -169,7 +185,9 @@ 
 	{
 		$conf->setValues($db);
 		// Reset forced setup after the setValues
-		if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
+		if (defined('SYSLOG_FILE')) {
+			$conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
+		}
 		$conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
 	}
 
@@ -541,9 +559,11 @@ 
 			}
 		} else {
 			//if (! empty($conf->modules))
-			if (!empty($conf->modules_parts['hooks']))     // If there is at least one module with one hook, we show message to say nothing was done
+			if (!empty($conf->modules_parts['hooks'])) {
+				// If there is at least one module with one hook, we show message to say nothing was done
 			{
 				print '<tr><td colspan="4">';
+			}
 				print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("None");
 				print '</td></tr>';
 			}
@@ -584,16 +604,22 @@ 
 }
 
 $ret = 0;
-if ($error && isset($argv[1])) $ret = 1;
+if ($error && isset($argv[1])) {
+	$ret = 1;
+}
 dolibarr_install_syslog("Exit ".$ret);
 
 dolibarr_install_syslog("--- upgrade2: end");
 pFooter($error ? 2 : 0, $setuplang);
 
-if ($db->connected) $db->close();
+if ($db->connected) {
+	$db->close();
+}
 
 // Return code if ran from command line
-if ($ret) exit($ret);
+if ($ret) {
+	exit($ret);
+}
 
 
 
@@ -724,9 +750,12 @@ 
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				if ($obj->pamount == $obj->bamount && $obj->socid)	// Pour etre sur d'avoir bon cas
+				if ($obj->pamount == $obj->bamount && $obj->socid) {
+					// Pour etre sur d'avoir bon cas
 				{
-					$row[$j]['paymentid'] = $obj->rowid; // paymentid
+					$row[$j]['paymentid'] = $obj->rowid;
+				}
+				// paymentid
 					$row[$j]['pamount'] = $obj->pamount;
 					$row[$j]['fk_bank'] = $obj->fk_bank;
 					$row[$j]['bamount'] = $obj->bamount;
@@ -749,7 +778,9 @@ 
 			$num = count($row);
 			for ($i = 0; $i < $num; $i++)
 			{
-				if ($conf->global->MAIN_FEATURES_LEVEL == 2) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' pamount='.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' bamount='.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
+				if ($conf->global->MAIN_FEATURES_LEVEL == 2) {
+					print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' pamount='.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' bamount='.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
+				}
 
 				// On cherche facture sans lien paiement et du meme montant et pour meme societe.
 				$sql = " SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";
@@ -840,9 +871,12 @@ 
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				if ($obj->pamount == $obj->bamount && $obj->socid)	// Pour etre sur d'avoir bon cas
+				if ($obj->pamount == $obj->bamount && $obj->socid) {
+					// Pour etre sur d'avoir bon cas
 				{
-					$row[$j]['paymentid'] = $obj->rowid; // paymentid
+					$row[$j]['paymentid'] = $obj->rowid;
+				}
+				// paymentid
 					$row[$j]['pamount'] = $obj->pamount;
 					$row[$j]['fk_bank'] = $obj->fk_bank;
 					$row[$j]['bamount'] = $obj->bamount;
@@ -867,7 +901,9 @@ 
 			$res = 0;
 			for ($i = 0; $i < $num; $i++)
 			{
-				if ($conf->global->MAIN_FEATURES_LEVEL == 2) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' '.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' '.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
+				if ($conf->global->MAIN_FEATURES_LEVEL == 2) {
+					print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' '.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' '.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
+				}
 
 				// On cherche facture sans lien paiement et du meme montant et pour meme societe.
 				$sql = " SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";
@@ -1118,18 +1154,26 @@ 
 	$sql = "update ".MAIN_DB_PREFIX."contrat set date_contrat=tms where date_contrat is null";
 	dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
 	$resql = $db->query($sql);
-	if (!$resql) dol_print_error($db);
-	if ($db->affected_rows($resql) > 0)
-	print $langs->trans('MigrationContractsEmptyDatesUpdateSuccess')."<br>\n";
-	else print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."<br>\n";
+	if (!$resql) {
+		dol_print_error($db);
+	}
+	if ($db->affected_rows($resql) > 0) {
+		print $langs->trans('MigrationContractsEmptyDatesUpdateSuccess')."<br>\n";
+	} else {
+		print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."<br>\n";
+	}
 
 	$sql = "update ".MAIN_DB_PREFIX."contrat set datec=tms where datec is null";
 	dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
 	$resql = $db->query($sql);
-	if (!$resql) dol_print_error($db);
-	if ($db->affected_rows($resql) > 0)
-	print $langs->trans('MigrationContractsEmptyCreationDatesUpdateSuccess')."<br>\n";
-	else print $langs->trans('MigrationContractsEmptyCreationDatesNothingToUpdate')."<br>\n";
+	if (!$resql) {
+		dol_print_error($db);
+	}
+	if ($db->affected_rows($resql) > 0) {
+		print $langs->trans('MigrationContractsEmptyCreationDatesUpdateSuccess')."<br>\n";
+	} else {
+		print $langs->trans('MigrationContractsEmptyCreationDatesNothingToUpdate')."<br>\n";
+	}
 
 	print '</td></tr>';
 }
@@ -1182,7 +1226,9 @@ 
 					$sql .= " SET date_contrat='".$db->idate($datemin)."'";
 					$sql .= " WHERE rowid=".$obj->cref;
 					$resql2 = $db->query($sql);
-					if (!$resql2) dol_print_error($db);
+					if (!$resql2) {
+						dol_print_error($db);
+					}
 
 					$nbcontratsmodifie++;
 				}
@@ -1191,9 +1237,11 @@ 
 
 			$db->commit();
 
-			if ($nbcontratsmodifie)
-			print $langs->trans('MigrationContractsInvalidDatesNumber', $nbcontratsmodifie)."<br>\n";
-			else print  $langs->trans('MigrationContractsInvalidDatesNothingToUpdate')."<br>\n";
+			if ($nbcontratsmodifie) {
+						print $langs->trans('MigrationContractsInvalidDatesNumber', $nbcontratsmodifie)."<br>\n";
+			} else {
+				print  $langs->trans('MigrationContractsInvalidDatesNothingToUpdate')."<br>\n";
+			}
 		}
 	} else {
 		dol_print_error($db);
@@ -1220,10 +1268,14 @@ 
 	$sql = "update ".MAIN_DB_PREFIX."contrat set datec=date_contrat where datec is null or datec > date_contrat";
 	dolibarr_install_syslog("upgrade2::migrate_contracts_date3");
 	$resql = $db->query($sql);
-	if (!$resql) dol_print_error($db);
-	if ($db->affected_rows($resql) > 0)
-	print $langs->trans('MigrationContractsIncoherentCreationDateUpdateSuccess')."<br>\n";
-	else print $langs->trans('MigrationContractsIncoherentCreationDateNothingToUpdate')."<br>\n";
+	if (!$resql) {
+		dol_print_error($db);
+	}
+	if ($db->affected_rows($resql) > 0) {
+		print $langs->trans('MigrationContractsIncoherentCreationDateUpdateSuccess')."<br>\n";
+	} else {
+		print $langs->trans('MigrationContractsIncoherentCreationDateNothingToUpdate')."<br>\n";
+	}
 
 	print '</td></tr>';
 }
@@ -1247,7 +1299,9 @@ 
 	$sql .= " WHERE cd.statut = 4 AND c.statut=2 AND c.rowid=cd.fk_contrat";
 	dolibarr_install_syslog("upgrade2::migrate_contracts_open");
 	$resql = $db->query($sql);
-	if (!$resql) dol_print_error($db);
+	if (!$resql) {
+		dol_print_error($db);
+	}
 	if ($db->affected_rows($resql) > 0) {
 		$i = 0;
 		$row = array();
@@ -1267,7 +1321,9 @@ 
 				$sql .= " SET statut=1";
 				$sql .= " WHERE rowid=".$obj->cref;
 				$resql2 = $db->query($sql);
-				if (!$resql2) dol_print_error($db);
+				if (!$resql2) {
+					dol_print_error($db);
+				}
 
 				$nbcontratsmodifie++;
 
@@ -1276,11 +1332,15 @@ 
 
 			$db->commit();
 
-			if ($nbcontratsmodifie)
-			print $langs->trans('MigrationReopenedContractsNumber', $nbcontratsmodifie)."<br>\n";
-			else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
+			if ($nbcontratsmodifie) {
+						print $langs->trans('MigrationReopenedContractsNumber', $nbcontratsmodifie)."<br>\n";
+			} else {
+				print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
+			}
 		}
-	} else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
+	} else {
+		print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
+	}
 
 	print '</td></tr>';
 }
@@ -1621,7 +1681,10 @@ 
 
    	$tmpmysoc = new Societe($db);
 	$tmpmysoc->setMysoc($conf);
-	if (empty($tmpmysoc->country_id)) $tmpmysoc->country_id = 0; // Ti not have this set to '' or will make sql syntax error.
+	if (empty($tmpmysoc->country_id)) {
+		$tmpmysoc->country_id = 0;
+	}
+	// Ti not have this set to '' or will make sql syntax error.
 
 	print '<tr><td colspan="4">';
 
@@ -1942,7 +2005,9 @@ 
 			// Aucun model par defaut.
 			$sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('crabe','invoice')";
 			$resql = $db->query($sql);
-			if (!$resql) dol_print_error($db);
+			if (!$resql) {
+				dol_print_error($db);
+			}
 		}
 	}
 
@@ -1955,7 +2020,9 @@ 
 			// Aucun model par defaut.
 			$sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('einstein','order')";
 			$resql = $db->query($sql);
-			if (!$resql) dol_print_error($db);
+			if (!$resql) {
+				dol_print_error($db);
+			}
 		}
 	}
 
@@ -1968,7 +2035,9 @@ 
 			// Aucun model par defaut.
 			$sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('rouget','shipping')";
 			$resql = $db->query($sql);
-			if (!$resql) dol_print_error($db);
+			if (!$resql) {
+				dol_print_error($db);
+			}
 		}
 	}
 
@@ -2528,7 +2597,9 @@ 
 				//print ". ";
 				$i++;
 			}
-		} else print $langs->trans('AlreadyDone')."<br>\n";
+		} else {
+			print $langs->trans('AlreadyDone')."<br>\n";
+		}
 
 		if ($error == 0)
 		{
@@ -2929,11 +3000,17 @@ 
 					}
 					print ". ";
 					$oldtime++;
-					if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $newtime;
-					else $totaltime[$obj->fk_task] = $newtime;
+					if (!empty($totaltime[$obj->fk_task])) {
+						$totaltime[$obj->fk_task] += $newtime;
+					} else {
+						$totaltime[$obj->fk_task] = $newtime;
+					}
 				} else {
-					if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $obj->task_duration;
-					else $totaltime[$obj->fk_task] = $obj->task_duration;
+					if (!empty($totaltime[$obj->fk_task])) {
+						$totaltime[$obj->fk_task] += $obj->task_duration;
+					} else {
+						$totaltime[$obj->fk_task] = $obj->task_duration;
+					}
 				}
 
 				$i++;
@@ -3400,7 +3477,9 @@ 
 		}
 	}
 
-	if ($count == 0) print $langs->trans('AlreadyDone')."<br>\n";
+	if ($count == 0) {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
 
 
 	print '</td></tr>';
@@ -3418,12 +3497,16 @@ 
 function migrate_clean_association($db, $langs, $conf)
 {
 	$result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association");
-	if ($result)	// result defined for version 3.2 or -
+	if ($result) {
+		// result defined for version 3.2 or -
 	{
 		$obj = $db->fetch_object($result);
-		if ($obj)	// It table categorie_association exists
+	}
+		if ($obj) {
+			// It table categorie_association exists
 		{
 			$couples = array();
+		}
 			$filles = array();
 			$sql = "SELECT fk_categorie_mere, fk_categorie_fille";
 			$sql .= " FROM ".MAIN_DB_PREFIX."categorie_association";
@@ -3434,11 +3517,14 @@ 
 				$num = $db->num_rows($resql);
 				while ($obj = $db->fetch_object($resql))
 				{
-					if (!isset($filles[$obj->fk_categorie_fille]))	// Only one record as child (a child has only on parent).
+					if (!isset($filles[$obj->fk_categorie_fille])) {
+						// Only one record as child (a child has only on parent).
 					{
 						if ($obj->fk_categorie_mere != $obj->fk_categorie_fille)
 						{
-							$filles[$obj->fk_categorie_fille] = 1; // Set record for this child
+							$filles[$obj->fk_categorie_fille] = 1;
+					}
+					// Set record for this child
 							$couples[$obj->fk_categorie_mere.'_'.$obj->fk_categorie_fille] = array('mere'=>$obj->fk_categorie_mere, 'fille'=>$obj->fk_categorie_fille);
 						}
 					}
@@ -3466,7 +3552,9 @@ 
 							$sql .= " VALUES(".$val['mere'].", ".$val['fille'].")";
 							dolibarr_install_syslog("upgrade: insert association");
 							$resqli = $db->query($sql);
-							if (!$resqli) $error++;
+							if (!$resqli) {
+								$error++;
+							}
 						}
 					}
 
@@ -4291,12 +4379,17 @@ 
  */
 function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $force = 0)
 {
-	if (count($listofmodule) == 0) return;
+	if (count($listofmodule) == 0) {
+		return;
+	}
 
 	dolibarr_install_syslog("upgrade2::migrate_reload_modules force=".$force.", listofmodule=".join(',', array_keys($listofmodule)));
 
 	foreach ($listofmodule as $moduletoreload => $reloadmode) {	// reloadmodule can be 'noboxes', 'newboxdefonly', 'forceactivate'
-		if (empty($moduletoreload) || (empty($conf->global->$moduletoreload) && !$force)) continue; // Discard reload if module not enabled
+		if (empty($moduletoreload) || (empty($conf->global->$moduletoreload) && !$force)) {
+			continue;
+		}
+		// Discard reload if module not enabled
 
 		$mod = null;
 
@@ -4465,9 +4558,11 @@ 
 			$tmp = preg_match('/MAIN_MODULE_([a-zA-Z0-9]+)/', $moduletoreload, $reg);
 			if (!empty($reg[1]))
 			{
-				if (strtoupper($moduletoreload) == $moduletoreload)	// If key is un uppercase
+				if (strtoupper($moduletoreload) == $moduletoreload) {
+					// If key is un uppercase
 				{
 					$moduletoreloadshort = ucfirst(strtolower($reg[1]));
+				}
 				} else // If key is a mix of up and low case
 				{
 					$moduletoreloadshort = $reg[1];
@@ -4574,7 +4669,10 @@ 
 	include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 	$fuser = new User($db);
 
-	if (!is_object($user)) $user = $fuser; // To avoid error during migration
+	if (!is_object($user)) {
+		$user = $fuser;
+	}
+	// To avoid error during migration
 
 	$sql = "SELECT rowid as uid from ".MAIN_DB_PREFIX."user"; // Get list of all users
 	$resql = $db->query($sql);
@@ -4609,11 +4707,15 @@ 
 					{
 						while (($file = readdir($handle)) !== false)
 						{
-							if ($file == '.' || $file == '..') continue;
+							if ($file == '.' || $file == '..') {
+								continue;
+							}
 
-				 			if (dol_is_dir($origin.'/'.$file))	// it is a dir (like 'thumbs')
+				 			if (dol_is_dir($origin.'/'.$file)) {
+				 				// it is a dir (like 'thumbs')
 							{
 								$thumbs = opendir($origin_osencoded.'/'.$file);
+				 			}
 								if (is_resource($thumbs))
 								{
 					 				dol_mkdir($destin.'/'.$file);
@@ -4621,7 +4723,9 @@ 
 									{
 										if (!dol_is_file($destin.'/'.$file.'/'.$thumb))
 										{
-											if ($thumb == '.' || $thumb == '..') continue;
+											if ($thumb == '.' || $thumb == '..') {
+												continue;
+											}
 
 											//print $origin.'/'.$file.'/'.$thumb.' -> '.$destin.'/'.$file.'/'.$thumb.'<br>'."\n";
 											print '.';

htdocs/compta/sociales/class/chargesociales.class.php

Braces +67 added lines, -26 removed lines

@@ -140,8 +140,11 @@ 
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_chargesociales as c ON cs.fk_type = c.id";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id';
 		$sql .= ' WHERE cs.entity IN ('.getEntity('tax').')';
-		if ($ref) $sql .= " AND cs.rowid = ".$ref;
-		else $sql .= " AND cs.rowid = ".$id;
+		if ($ref) {
+			$sql .= " AND cs.rowid = ".$ref;
+		} else {
+			$sql .= " AND cs.rowid = ".$id;
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -243,7 +246,9 @@ 
 
 			//dol_syslog("ChargesSociales::create this->id=".$this->id);
 			$result = $this->call_trigger('SOCIALCONTRIBUTION_CREATE', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 
 			if (empty($error)) {
 				$this->db->commit();
@@ -362,7 +367,9 @@ 
 			{
 				// Call trigger
 				$result = $this->call_trigger('SOCIALCHARGES_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
@@ -433,8 +440,11 @@ 
 		$sql .= " paye = 1";
 		$sql .= " WHERE rowid = ".$this->id;
 		$return = $this->db->query($sql);
-		if ($return) return 1;
-		else return -1;
+		if ($return) {
+			return 1;
+		} else {
+			return -1;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -451,8 +461,11 @@ 
 		$sql .= " paye = 0";
 		$sql .= " WHERE rowid = ".$this->id;
 		$return = $this->db->query($sql);
-		if ($return) return 1;
-		else return -1;
+		if ($return) {
+			return 1;
+		} else {
+			return -1;
+		}
 	}
 
 	/**
@@ -494,15 +507,23 @@ 
 			//$langs->load("mymodule");
 			$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('Unpaid');
 			$this->labelStatus[self::STATUS_PAID] = $langs->trans('Paid');
-			if ($status == self::STATUS_UNPAID && $alreadypaid > 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			if ($status == self::STATUS_UNPAID && $alreadypaid > 0) {
+				$this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			}
 			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('Unpaid');
 			$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('Paid');
-			if ($status == self::STATUS_UNPAID && $alreadypaid > 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			if ($status == self::STATUS_UNPAID && $alreadypaid > 0) {
+				$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			}
 		}
 
 		$statusType = 'status1';
-		if ($status == 0 && $alreadypaid > 0) $statusType = 'status3';
-		if ($status == 1) $statusType = 'status6';
+		if ($status == 0 && $alreadypaid > 0) {
+			$statusType = 'status3';
+		}
+		if ($status == 1) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -522,34 +543,48 @@ 
 	{
 		global $langs, $conf, $user, $form;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1;
+		}
+		// Force disable tooltips
 
 		$result = '';
 
 		$url = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$this->id;
 
-		if ($short) return $url;
+		if ($short) {
+			return $url;
+		}
 
 		if ($option !== 'nolink')
 		{
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
-		if (empty($this->ref)) $this->ref = $this->label;
+		if (empty($this->ref)) {
+			$this->ref = $this->label;
+		}
 
 		$label = img_picto('', 'tax').'<u class="paddingrightonly">'.$langs->trans("SocialContribution").'</u>';
 		if (isset($this->paye)) {
 			$label .= ' '.$this->getLibStatut(5);
 		}
-		if (!empty($this->ref))
-			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (!empty($this->label))
-			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
-		if (!empty($this->type_label))
-			$label .= '<br><b>'.$langs->trans('Type').':</b> '.$this->type_label;
+		if (!empty($this->ref)) {
+					$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		}
+		if (!empty($this->label)) {
+					$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
+		}
+		if (!empty($this->type_label)) {
+					$label .= '<br><b>'.$langs->trans('Type').':</b> '.$this->type_label;
+		}
 
 		$linkclose = '';
 		if (empty($notooltip) && $user->rights->facture->lire)
@@ -568,8 +603,12 @@ 
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -595,7 +634,9 @@ 
 			$amount = 0;
 
 			$obj = $this->db->fetch_object($resql);
-			if ($obj) $amount = $obj->amount ? $obj->amount : 0;
+			if ($obj) {
+				$amount = $obj->amount ? $obj->amount : 0;
+			}
 
 			$this->db->free($resql);
 			return $amount;

htdocs/compta/facture/class/facture-rec.class.php

Braces +138 added lines, -49 removed lines

@@ -218,7 +218,9 @@ 
 		$this->titre = trim(isset($this->titre) ? $this->titre : $this->title); // deprecated
 		$this->title = trim($this->title);
 		$this->usenewprice = empty($this->usenewprice) ? 0 : $this->usenewprice;
-		if (empty($this->suspended)) $this->suspended = 0;
+		if (empty($this->suspended)) {
+			$this->suspended = 0;
+		}
 
 		// No frequency defined then no next date to execution
 		if (empty($this->frequency))
@@ -315,7 +317,9 @@ 
 				for ($i = 0; $i < $num; $i++)
 				{
 					$tva_tx = $facsrc->lines[$i]->tva_tx;
-					if (!empty($facsrc->lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$facsrc->lines[$i]->vat_src_code.')';
+					if (!empty($facsrc->lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) {
+						$tva_tx .= ' ('.$facsrc->lines[$i]->vat_src_code.')';
+					}
 
 					$result_insert = $this->addline(
 						$facsrc->lines[$i]->desc,
@@ -360,9 +364,12 @@ 
 					}
 				}
 
-				if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
+				if (!empty($this->linkedObjectsIds) && empty($this->linked_objects)) {
+					// To use new linkedObjectsIds instead of old linked_objects
 				{
-					$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
+					$this->linked_objects = $this->linkedObjectsIds;
+				}
+				// TODO Replace linked_objects with linkedObjectsIds
 				}
 
 				// Add object linked
@@ -370,11 +377,13 @@ 
 				{
 					foreach ($this->linked_objects as $origin => $tmp_origin_id)
 					{
-						if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+						if (is_array($tmp_origin_id)) {
+							// New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
 						{
 							foreach ($tmp_origin_id as $origin_id)
 							{
 								$ret = $this->add_object_linked($origin, $origin_id);
+						}
 								if (!$ret)
 								{
 									$this->error = $this->db->lasterror();
@@ -512,8 +521,11 @@ 
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
 		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = f.rowid AND el.targettype = 'facture'";
 		$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')';
-		if ($rowid) $sql .= ' AND f.rowid='.$rowid;
-		elseif ($ref) $sql .= " AND f.titre='".$this->db->escape($ref)."'";
+		if ($rowid) {
+			$sql .= ' AND f.rowid='.$rowid;
+		} elseif ($ref) {
+			$sql .= " AND f.titre='".$this->db->escape($ref)."'";
+		}
 		/* This field are not used for template invoice
 		if ($ref_ext) $sql.= " AND f.ref_ext='".$this->db->escape($ref_ext)."'";
 		if ($ref_int) $sql.= " AND f.ref_int='".$this->db->escape($ref_int)."'";
@@ -584,7 +596,9 @@ 
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-				if ($this->statut == self::STATUS_DRAFT)	$this->brouillon = 1;
+				if ($this->statut == self::STATUS_DRAFT) {
+					$this->brouillon = 1;
+				}
 
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels
@@ -772,10 +786,14 @@ 
 			{
 				// Delete linked object
 				$res = $this->deleteObjectLinked();
-				if ($res < 0) $error = -3;
+				if ($res < 0) {
+					$error = -3;
+				}
 				// Delete extrafields
 				$res = $this->deleteExtraFields();
-				if ($res < 0) $error = -4;
+				if ($res < 0) {
+					$error = -4;
+				}
 			} else {
 				$this->error = $this->db->lasterror();
 				$error = -1;
@@ -833,7 +851,9 @@ 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		// Check parameters
-		if ($type < 0) return -1;
+		if ($type < 0) {
+			return -1;
+		}
 
 		$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
@@ -849,17 +869,27 @@ 
 		{
 			// Clean parameters
 			$remise_percent = price2num($remise_percent);
-			if (empty($remise_percent)) $remise_percent = 0;
+			if (empty($remise_percent)) {
+				$remise_percent = 0;
+			}
 			$qty = price2num($qty);
 			$pu_ht = price2num($pu_ht);
 			$pu_ttc = price2num($pu_ttc);
 			$txtva = price2num($txtva);
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
-			if (empty($txtva)) $txtva = 0;
-			if (empty($txlocaltax1)) $txlocaltax1 = 0;
-			if (empty($txlocaltax2)) $txlocaltax2 = 0;
-			if (empty($info_bits)) $info_bits = 0;
+			if (empty($txtva)) {
+				$txtva = 0;
+			}
+			if (empty($txlocaltax1)) {
+				$txlocaltax1 = 0;
+			}
+			if (empty($txlocaltax2)) {
+				$txlocaltax2 = 0;
+			}
+			if (empty($info_bits)) {
+				$info_bits = 0;
+			}
 
 			if ($price_base_type == 'HT')
 			{
@@ -1017,30 +1047,48 @@ 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		// Clean parameters
-		if (empty($remise_percent)) $remise_percent = 0;
+		if (empty($remise_percent)) {
+			$remise_percent = 0;
+		}
 
 		// Check parameters
-		if ($type < 0) return -1;
+		if ($type < 0) {
+			return -1;
+		}
 
 		if ($this->brouillon)
 		{
 			// Clean parameters
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
-			if (empty($info_bits)) $info_bits = 0;
+			if (empty($info_bits)) {
+				$info_bits = 0;
+			}
 			$pu_ht          = price2num($pu_ht);
 			$pu_ttc         = price2num($pu_ttc);
 			$pu_ht_devise = price2num($pu_ht_devise);
 			$txtva = price2num($txtva);
 			$txlocaltax1	= price2num($txlocaltax1);
 			$txlocaltax2	= price2num($txlocaltax2);
-			if (empty($txlocaltax1)) $txlocaltax1 = 0;
-			if (empty($txlocaltax2)) $txlocaltax2 = 0;
+			if (empty($txlocaltax1)) {
+				$txlocaltax1 = 0;
+			}
+			if (empty($txlocaltax2)) {
+				$txlocaltax2 = 0;
+			}
 
-			if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice = 0;
-			if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht = 0;
-			if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
-			if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
+			if (empty($this->multicurrency_subprice)) {
+				$this->multicurrency_subprice = 0;
+			}
+			if (empty($this->multicurrency_total_ht)) {
+				$this->multicurrency_total_ht = 0;
+			}
+			if (empty($this->multicurrency_total_tva)) {
+				$this->multicurrency_total_tva = 0;
+			}
+			if (empty($this->multicurrency_total_ttc)) {
+				$this->multicurrency_total_ttc = 0;
+			}
 
 			if ($price_base_type == 'HT')
 			{
@@ -1144,7 +1192,9 @@ 
 	 */
 	public function getNextDate()
 	{
-		if (empty($this->date_when)) return false;
+		if (empty($this->date_when)) {
+			return false;
+		}
 		return dol_time_plus_duree($this->date_when, $this->frequency, $this->unit_frequency);
 	}
 
@@ -1156,7 +1206,9 @@ 
 	public function isMaxNbGenReached()
 	{
 		$ret = false;
-		if ($this->nb_gen_max > 0 && ($this->nb_gen_done >= $this->nb_gen_max)) $ret = true;
+		if ($this->nb_gen_max > 0 && ($this->nb_gen_done >= $this->nb_gen_max)) {
+			$ret = true;
+		}
 		return $ret;
 	}
 
@@ -1204,8 +1256,9 @@ 
 		$sql .= ' AND (nb_gen_done < nb_gen_max OR nb_gen_max = 0)';
 		$sql .= ' AND suspended = 0';
 		$sql .= ' AND entity = '.$conf->entity; // MUST STAY = $conf->entity here
-		if ($restrictioninvoiceid > 0)
-			$sql .= ' AND rowid = '.$restrictioninvoiceid;
+		if ($restrictioninvoiceid > 0) {
+					$sql .= ' AND rowid = '.$restrictioninvoiceid;
+		}
 		$sql .= $this->db->order('entity', 'ASC');
 		//print $sql;exit;
 		$parameters = array(
@@ -1220,15 +1273,19 @@ 
 			$i = 0;
 			$num = $this->db->num_rows($resql);
 
-			if ($num)
-				$this->output .= $langs->trans("FoundXQualifiedRecurringInvoiceTemplate", $num)."\n";
-			else $this->output .= $langs->trans("NoQualifiedRecurringInvoiceTemplateFound");
+			if ($num) {
+							$this->output .= $langs->trans("FoundXQualifiedRecurringInvoiceTemplate", $num)."\n";
+			} else {
+				$this->output .= $langs->trans("NoQualifiedRecurringInvoiceTemplateFound");
+			}
 
 			$saventity = $conf->entity;
 
-			while ($i < $num)     // Loop on each template invoice. If $num = 0, test is false at first pass.
+			while ($i < $num) {
+				// Loop on each template invoice. If $num = 0, test is false at first pass.
 			{
 				$line = $this->db->fetch_object($resql);
+			}
 
 				$this->db->begin();
 
@@ -1314,7 +1371,9 @@ 
 			}
 
 			$conf->entity = $saventity; // Restore entity context
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		$this->output = trim($this->output);
 
@@ -1353,28 +1412,40 @@ 
 			if (!empty($this->date_when)) {
 				$label .= '<br><b>'.$langs->trans('NextDateToExecution').':</b> ';
 				$label .= (empty($this->suspended) ? '' : '<strike>').dol_print_date($this->date_when, 'day').(empty($this->suspended) ? '' : '</strike>'); // No hour for this property
-				if (!empty($this->suspended)) $label .= ' ('.$langs->trans("Disabled").')';
+				if (!empty($this->suspended)) {
+					$label .= ' ('.$langs->trans("Disabled").')';
+				}
 			}
 		}
 
 		$url = DOL_URL_ROOT.'/compta/facture/card-rec.php?facid='.$this->id;
 
-		if ($short) return $url;
+		if ($short) {
+			return $url;
+		}
 
 		if ($option != 'nolink')
 		{
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -1512,7 +1583,9 @@ 
 		} elseif ($mode == 5 || $mode == 6)
 		{
 			$prefix = '';
-			if ($mode == 5) $prefix = 'Short';
+			if ($mode == 5) {
+				$prefix = 'Short';
+			}
 			if ($recur)
 			{
 				if ($status == self::STATUS_SUSPENDED) {
@@ -1533,7 +1606,9 @@ 
 			}
 		}
 
-		if (empty($labelStatusShort)) $labelStatusShort = $labelStatus;
+		if (empty($labelStatusShort)) {
+			$labelStatusShort = $labelStatus;
+		}
 
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
@@ -1609,24 +1684,30 @@ 
 				$line->localtax1_tx = 0;
 				$line->localtax2_tx = 0;
 				$line->remise_percent = 0;
-				if ($xnbp == 1)        // Qty is negative (product line)
+				if ($xnbp == 1) {
+					// Qty is negative (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
+				}
 					$line->fk_product = $prodids[$prodid];
 					$line->qty = -1;
 					$line->total_ht = -100;
 					$line->total_ttc = -119.6;
 					$line->total_tva = -19.6;
-				} elseif ($xnbp == 2)    // UP is negative (free line)
+				} elseif ($xnbp == 2) {
+					// UP is negative (free line)
 				{
 					$line->subprice = -100;
+				}
 					$line->total_ht = -100;
 					$line->total_ttc = -119.6;
 					$line->total_tva = -19.6;
 					$line->remise_percent = 0;
-				} elseif ($xnbp == 3)    // Discount is 50% (product line)
+				} elseif ($xnbp == 3) {
+					// Discount is 50% (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
+				}
 					$line->fk_product = $prodids[$prodid];
 					$line->total_ht = 50;
 					$line->total_ttc = 59.8;
@@ -1719,7 +1800,9 @@ 
 		dol_syslog(get_class($this)."::setFrequencyAndUnit", LOG_DEBUG);
 		if ($this->db->query($sql)) {
 			$this->frequency = $frequency;
-			if (!empty($unit)) $this->unit_frequency = $unit;
+			if (!empty($unit)) {
+				$this->unit_frequency = $unit;
+			}
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -1743,14 +1826,18 @@ 
 		}
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " SET date_when = ".($date ? "'".$this->db->idate($date)."'" : "null");
-		if ($increment_nb_gen_done > 0) $sql .= ', nb_gen_done = nb_gen_done + 1';
+		if ($increment_nb_gen_done > 0) {
+			$sql .= ', nb_gen_done = nb_gen_done + 1';
+		}
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		dol_syslog(get_class($this)."::setNextDate", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
 			$this->date_when = $date;
-			if ($increment_nb_gen_done > 0) $this->nb_gen_done++;
+			if ($increment_nb_gen_done > 0) {
+				$this->nb_gen_done++;
+			}
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -1772,7 +1859,9 @@ 
 			return -1;
 		}
 
-		if (empty($nb)) $nb = 0;
+		if (empty($nb)) {
+			$nb = 0;
+		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		$sql .= ' SET nb_gen_max = '.$nb;

htdocs/admin/ticket.php

Braces +15 added lines, -8 removed lines

@@ -78,7 +78,9 @@ 
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-		if ($conf->global->TICKET_ADDON_PDF == "$value") dolibarr_del_const($db, 'TICKET_ADDON_PDF', $conf->entity);
+		if ($conf->global->TICKET_ADDON_PDF == "$value") {
+			dolibarr_del_const($db, 'TICKET_ADDON_PDF', $conf->entity);
+		}
 	}
 }
 
@@ -97,9 +99,7 @@ 
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod') {
+} elseif ($action == 'setmod') {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
@@ -399,16 +399,23 @@ 
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+								$modulequalified = 0;
+							}
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+								$modulequalified = 0;
+							}
 
 							if ($modulequalified)
 							{
 								print '<tr class="oddeven"><td width="100">';
 								print (empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
-								if (method_exists($module, 'info')) print $module->info($langs);
-								else print $module->description;
+								if (method_exists($module, 'info')) {
+									print $module->info($langs);
+								} else {
+									print $module->description;
+								}
 								print '</td>';
 
 								// Active

htdocs/api/class/api_documents.class.php

Braces +39 added lines, -49 removed lines

@@ -201,8 +201,7 @@ 
 			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
 			}
-		}
-		elseif ($modulepart == 'commande' || $modulepart == 'order')
+		} elseif ($modulepart == 'commande' || $modulepart == 'order')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 			$this->order = new Commande($this->db);
@@ -215,8 +214,7 @@ 
 			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
 			}
-		}
-		elseif ($modulepart == 'propal' || $modulepart == 'proposal')
+		} elseif ($modulepart == 'propal' || $modulepart == 'proposal')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$this->propal = new Propal($this->db);
@@ -293,8 +291,7 @@ 
 			}
 
 			$upload_dir = $conf->societe->multidir_output[$object->entity]."/".$object->id;
-		}
-		elseif ($modulepart == 'user')
+		} elseif ($modulepart == 'user')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
@@ -310,8 +307,7 @@ 
 			}
 
 			$upload_dir = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id;
-		}
-		elseif ($modulepart == 'adherent' || $modulepart == 'member')
+		} elseif ($modulepart == 'adherent' || $modulepart == 'member')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
@@ -326,8 +322,7 @@ 
 			}
 
 			$upload_dir = $conf->adherent->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'member');
-		}
-		elseif ($modulepart == 'propal' || $modulepart == 'proposal')
+		} elseif ($modulepart == 'propal' || $modulepart == 'proposal')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 
@@ -342,8 +337,7 @@ 
 			}
 
 			$upload_dir = $conf->propal->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object, 'propal');
-		}
-		elseif ($modulepart == 'commande' || $modulepart == 'order')
+		} elseif ($modulepart == 'commande' || $modulepart == 'order')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
@@ -358,8 +352,7 @@ 
 			}
 
 			$upload_dir = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');
-		}
-		elseif ($modulepart == 'shipment' || $modulepart == 'expedition')
+		} elseif ($modulepart == 'shipment' || $modulepart == 'expedition')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
@@ -374,8 +367,7 @@ 
 			}
 
 			$upload_dir = $conf->expedition->dir_output."/sending/".get_exdir(0, 0, 0, 1, $object, 'shipment');
-		}
-		elseif ($modulepart == 'facture' || $modulepart == 'invoice')
+		} elseif ($modulepart == 'facture' || $modulepart == 'invoice')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
@@ -390,8 +382,7 @@ 
 			}
 
 			$upload_dir = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
-		}
-		elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+		} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
 		{
 			$modulepart = 'supplier_invoice';
 
@@ -408,8 +399,7 @@ 
 			}
 
 			$upload_dir = $conf->fournisseur->dir_output."/facture/".get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').dol_sanitizeFileName($object->ref);
-		}
-		elseif ($modulepart == 'produit' || $modulepart == 'product')
+		} elseif ($modulepart == 'produit' || $modulepart == 'product')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -426,8 +416,7 @@ 
 			}
 
 			$upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
-		}
-		elseif ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event')
+		} elseif ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
@@ -442,8 +431,7 @@ 
 			}
 
 			$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref);
-		}
-		elseif ($modulepart == 'expensereport')
+		} elseif ($modulepart == 'expensereport')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 
@@ -458,8 +446,7 @@ 
 			}
 
 			$upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref);
-		}
-		elseif ($modulepart == 'categorie' || $modulepart == 'category')
+		} elseif ($modulepart == 'categorie' || $modulepart == 'category')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
@@ -571,15 +558,21 @@ 
 		}
 
 		$newfilecontent = '';
-		if (empty($fileencoding)) $newfilecontent = $filecontent;
-		if ($fileencoding == 'base64') $newfilecontent = base64_decode($filecontent);
+		if (empty($fileencoding)) {
+			$newfilecontent = $filecontent;
+		}
+		if ($fileencoding == 'base64') {
+			$newfilecontent = base64_decode($filecontent);
+		}
 
 		$original_file = dol_sanitizeFileName($filename);
 
 		// Define $uploadir
 		$object = null;
 		$entity = DolibarrApiAccess::$user->entity;
-		if (empty($entity)) $entity = 1;
+		if (empty($entity)) {
+			$entity = 1;
+		}
 
 		if ($ref)
 		{
@@ -591,20 +584,17 @@ 
 
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$object = new Facture($this->db);
-			}
-			elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+			} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
 			{
 				$modulepart = 'supplier_invoice';
 
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$object = new FactureFournisseur($this->db);
-			}
-			elseif ($modulepart == 'project')
+			} elseif ($modulepart == 'project')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$object = new Project($this->db);
-			}
-			elseif ($modulepart == 'task' || $modulepart == 'project_task')
+			} elseif ($modulepart == 'task' || $modulepart == 'project_task')
 			{
 				$modulepart = 'project_task';
 
@@ -625,24 +615,20 @@ 
 				} else {
 					throw new RestException(500, 'Error while fetching Task '.$ref);
 				}
-			}
-			elseif ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
+			} elseif ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 				$object = new Product($this->db);
-			}
-			elseif ($modulepart == 'expensereport')
+			} elseif ($modulepart == 'expensereport')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 				$object = new ExpenseReport($this->db);
-			}
-			elseif ($modulepart == 'adherent' || $modulepart == 'member')
+			} elseif ($modulepart == 'adherent' || $modulepart == 'member')
 			{
 				$modulepart = 'adherent';
 				require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 				$object = new Adherent($this->db);
-			}
-			elseif ($modulepart == 'proposal' || $modulepart == 'propal' || $modulepart == 'propale')
+			} elseif ($modulepart == 'proposal' || $modulepart == 'propal' || $modulepart == 'propale')
 			{
 				$modulepart = 'propale';
 				require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
@@ -659,8 +645,7 @@ 
 				if ($result == 0)
 				{
 					throw new RestException(404, "Object with ref '".$ref."' was not found.");
-				}
-				elseif ($result < 0)
+				} elseif ($result < 0)
 				{
 					throw new RestException(500, 'Error while fetching object: '.$object->error);
 				}
@@ -686,8 +671,12 @@ 
 				throw new RestException(500, 'This value of modulepart ('.$modulepart.') does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
 			}
 		} else {
-			if ($modulepart == 'invoice') $modulepart = 'facture';
-			if ($modulepart == 'member') $modulepart = 'adherent';
+			if ($modulepart == 'invoice') {
+				$modulepart = 'facture';
+			}
+			if ($modulepart == 'member') {
+				$modulepart = 'adherent';
+			}
 
 			$relativefile = $subdir;
 			$tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, '', 'write');
@@ -825,8 +814,9 @@ 
 		// phpcs:enable
 		$result = array();
 		foreach (Documents::$DOCUMENT_FIELDS as $field) {
-			if (!isset($data[$field]))
-				throw new RestException(400, "$field field missing");
+			if (!isset($data[$field])) {
+							throw new RestException(400, "$field field missing");
+			}
 			$result[$field] = $data[$field];
 		}
 		return $result;