Dolibarr / dolibarr

htdocs/compta/sociales/card.php

Braces +29 added lines, -16 removed lines

@@ -54,7 +54,9 @@ 
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', $id, 'chargesociales', 'charges');
 
 $object = new ChargeSociales($db);
@@ -98,17 +100,19 @@ 
 {
 	$object->fetch($id);
 	$result = $object->setValueFrom('libelle', GETPOST('lib'), '', '', 'text', '', $user, 'TAX_MODIFY');
-	if ($result < 0)
-		setEventMessages($object->error, $object->errors, 'errors');
-}
+	if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+	}
+	}
 
 // payment mode
 if ($action == 'setmode' && $user->rights->tax->charges->creer) {
 	$object->fetch($id);
 	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-	if ($result < 0)
-		setEventMessages($object->error, $object->errors, 'errors');
-}
+	if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+	}
+	}
 
 // bank account
 if ($action == 'setbankaccount' && $user->rights->tax->charges->creer) {
@@ -242,8 +246,12 @@ 
 		} else {
 			$newdateperiod = dol_mktime(0, 0, 0, GETPOST('clone_periodmonth', 'int'), GETPOST('clone_periodday', 'int'), GETPOST('clone_periodyear', 'int'));
 			$newdateech = dol_mktime(0, 0, 0, GETPOST('clone_date_echmonth', 'int'), GETPOST('clone_date_echday', 'int'), GETPOST('clone_date_echyear', 'int'));
-			if ($newdateperiod) $object->periode = $newdateperiod;
-			if ($newdateech) $object->date_ech = $newdateech;
+			if ($newdateperiod) {
+				$object->periode = $newdateperiod;
+			}
+			if ($newdateech) {
+				$object->date_ech = $newdateech;
+			}
 		}
 
 		if ($object->check())
@@ -534,8 +542,9 @@ 
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('PaymentMode');
 		print '</td>';
-		if ($action != 'editmode')
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		if ($action != 'editmode') {
+					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editmode') {
@@ -552,8 +561,9 @@ 
 			print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 			print $langs->trans('BankAccount');
 			print '<td>';
-			if ($action != 'editbankaccount' && $user->rights->tax->charges->creer)
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+			if ($action != 'editbankaccount' && $user->rights->tax->charges->creer) {
+							print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+			}
 			print '</tr></table>';
 			print '</td><td>';
 			if ($action == 'editbankaccount') {
@@ -641,8 +651,9 @@ 
 						}
 
 						print '<td class="right">';
-						if ($bankaccountstatic->id)
-							print $bankaccountstatic->getNomUrl(1, 'transactions');
+						if ($bankaccountstatic->id) {
+													print $bankaccountstatic->getNomUrl(1, 'transactions');
+						}
 						print '</td>';
 					}
 					print '<td class="right">'.price($objp->amount)."</td>\n";
@@ -690,7 +701,9 @@ 
 			print '</div>';
 		}
 
-		if ($action == 'edit') print "</form>\n";
+		if ($action == 'edit') {
+			print "</form>\n";
+		}
 
 
 

htdocs/compta/localtax/card.php

Braces +10 added lines, -3 removed lines

@@ -34,13 +34,17 @@ 
 $id = GETPOST("id", 'int');
 $action = GETPOST("action", "alpha");
 $refund = GETPOST("refund", "int");
-if (empty($refund)) $refund = 0;
+if (empty($refund)) {
+	$refund = 0;
+}
 
 $lttype = GETPOST('localTaxType', 'int');
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 $object = new Localtax($db);
@@ -103,7 +107,10 @@ 
 			{
 				$accountline = new AccountLine($db);
 				$result = $accountline->fetch($object->fk_bank);
-				if ($result > 0) $result = $accountline->delete($user); // $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
+				if ($result > 0) {
+					$result = $accountline->delete($user);
+				}
+				// $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
 			}
 
 			if ($result >= 0)

htdocs/compta/localtax/index.php

Braces +18 added lines, -6 removed lines

@@ -47,9 +47,11 @@ 
 }
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+if (empty($date_start) || empty($date_end)) {
+	// We define date_start and date_end
 {
 	$q = GETPOST("q", "int");
+}
 	if (empty($q))
 	{
 		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
@@ -67,12 +69,18 @@ 
 // Define modetax (0 or 1)
 // 0=normal, 1=option vat for services is on debit, 2=option on payments for products
 $modetax = $conf->global->TAX_MODE;
-if (GETPOSTISSET("modetax")) $modetax = GETPOST("modetax", 'int');
-if (empty($modetax)) $modetax = 0;
+if (GETPOSTISSET("modetax")) {
+	$modetax = GETPOST("modetax", 'int');
+}
+if (empty($modetax)) {
+	$modetax = 0;
+}
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 
@@ -281,11 +289,15 @@ 
 
 $total = 0; $subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
 $i = 0; $mcursor = 0;
-while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mcursor is to avoid too large loop
+while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) {
+	// $mcursor is to avoid too large loop
 {
 	//$m = $conf->global->SOCIETE_FISCAL_MONTH_START + ($mcursor % 12);
 	if ($m == 13) $y++;
-	if ($m > 12) $m -= 12;
+}
+	if ($m > 12) {
+		$m -= 12;
+	}
 	$mcursor++;
 
 	// Get array with details of each line

htdocs/compta/clients.php

Braces +18 added lines, -7 removed lines

@@ -36,8 +36,9 @@ 
 	$socid = $user->socid;
 }
 
-if (!$user->rights->facture->lire)
-accessforbidden();
+if (!$user->rights->facture->lire) {
+	accessforbidden();
+}
 
 // Load translation files required by the page
 $langs->load("companies");
@@ -52,8 +53,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "nom";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "nom";
+}
 
 
 /*
@@ -90,12 +95,18 @@ 
 
 $sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea";
 $sql .= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta ";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", sc.fk_soc, sc.fk_user ";
+}
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE s.fk_stcomm = st.id AND s.client in (1, 3)";
 $sql .= " AND s.entity IN (".getEntity('societe').")";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
 if (dol_strlen($stcomm))
 {
 	$sql .= " AND s.fk_stcomm=".$stcomm;

htdocs/compta/resultat/result.php

Braces +61 added lines, -27 removed lines

@@ -71,9 +71,11 @@ 
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
 // We define date_start and date_end
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+if (empty($date_start) || empty($date_end)) {
+	// We define date_start and date_end
 {
 	$q = GETPOST("q") ?GETPOST("q") : 0;
+}
 	if ($q == 0)
 	{
 		// We define date_start and date_end
@@ -88,9 +90,14 @@ 
 				$year_end--;
 			}
 			$month_end = $month_start - 1;
-			if ($month_end < 1) $month_end = 12;
-			else $year_end++;
-		} else $month_end = $month_start;
+			if ($month_end < 1) {
+				$month_end = 12;
+			} else {
+				$year_end++;
+			}
+		} else {
+			$month_end = $month_start;
+		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
 	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
@@ -125,14 +132,20 @@ 
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (!empty($conf->accounting->enabled)) $modecompta = 'BOOKKEEPING';
-if (GETPOST("modecompta")) $modecompta = GETPOST("modecompta", 'alpha');
+if (!empty($conf->accounting->enabled)) {
+	$modecompta = 'BOOKKEEPING';
+}
+if (GETPOST("modecompta")) {
+	$modecompta = GETPOST("modecompta", 'alpha');
+}
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->comptarapport->lire)
+}
+if (!$user->rights->accounting->comptarapport->lire) {
 	accessforbidden();
+}
 
 $AccCat = new AccountancyCategory($db);
 
@@ -172,19 +185,26 @@ 
 	$name = $langs->trans("AnnualByAccountDueDebtMode");
 	$calcmode = $langs->trans("CalcModeDebt");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$start_year.(GETPOST("month") > 0 ? '&month='.GETPOST("month") : '').'&modecompta=RECETTES-DEPENSES">', '</a>').')';
-	if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$start_year.'&modecompta=BOOKKEEPING">', '</a>').')';
+	if (!empty($conf->accounting->enabled)) {
+		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$start_year.'&modecompta=BOOKKEEPING">', '</a>').')';
+	}
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	//$periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
 	$description = $langs->trans("RulesResultDue");
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else $description .= $langs->trans("DepositsAreIncluded");
+	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$description .= $langs->trans("DepositsAreNotIncluded");
+	} else {
+		$description .= $langs->trans("DepositsAreIncluded");
+	}
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
 } elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("AnnualByAccountInputOutputMode");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.(GETPOST("month") > 0 ? '&month='.GETPOST("month") : '').'&modecompta=CREANCES-DETTES">', '</a>').')';
-	if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=BOOKKEEPING">', '</a>').')';
+	if (!empty($conf->accounting->enabled)) {
+		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=BOOKKEEPING">', '</a>').')';
+	}
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	//$periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
 	$description = $langs->trans("RulesResultInOut");
@@ -386,10 +406,12 @@ 
 				$cpts = $AccCat->getCptsCat($cat['rowid']);
 
 				$arrayofaccountforfilter = array();
-				foreach ($cpts as $i => $cpt)    // Loop on each account.
+				foreach ($cpts as $i => $cpt) {
+					// Loop on each account.
 				{
 					$arrayofaccountforfilter[] = $cpt['account_number'];
 				}
+				}
 
 				// N-1
 				if (!empty($arrayofaccountforfilter)) {
@@ -399,9 +421,11 @@ 
 						setEventMessages(null, $AccCat->errors, 'errors');
 						$resultNP = 0;
 					} else {
-						foreach ($cpts as $i => $cpt)    // Loop on each account.
+						foreach ($cpts as $i => $cpt) {
+							// Loop on each account.
 						{
 							$resultNP = empty($AccCat->sdcperaccount[$cpt['account_number']]) ? 0 : $AccCat->sdcperaccount[$cpt['account_number']];
+						}
 
 							$totCat['NP'] += $resultNP;
 							$sommes[$code]['NP'] += $resultNP;
@@ -412,18 +436,21 @@ 
 
 				// Set value into column N and month M ($totCat)
 				// This make 12 calls for each accountancy account (12 monthes M)
-				foreach ($cpts as $i => $cpt)    // Loop on each account.
+				foreach ($cpts as $i => $cpt) {
+					// Loop on each account.
 				{
 					// We make 1 loop for each account because we may want detail per account.
 					// @todo Optimize to ask a 'group by' account and a filter with account in (..., ...) in request
 
 					// Each month
 					$resultN = 0;
+				}
 					foreach ($months as $k => $v) {
 						$monthtoprocess = $k + 1; // ($k+1) is month 1, 2, ..., 12
 						$yeartoprocess = $start_year;
-						if (($k + 1) < $start_month)
-							$yeartoprocess++;
+						if (($k + 1) < $start_month) {
+													$yeartoprocess++;
+						}
 
 						//var_dump($monthtoprocess.'_'.$yeartoprocess);
 						$return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start, $date_end, $cat['dc'] ? $cat['dc'] : 0, 'nofilter', $monthtoprocess, $yeartoprocess);
@@ -458,22 +485,27 @@ 
 				// Label of group
 				print '<td>';
 				print $cat['label'];
-				if (count($cpts) > 0)    // Show example of 5 first accounting accounts
+				if (count($cpts) > 0) {
+					// Show example of 5 first accounting accounts
 				{
 					$i = 0;
+				}
 					foreach ($cpts as $cpt) {
 						if ($i > 5) {
 							print '...)';
 							break;
 						}
-						if ($i > 0)
-							print ', ';
-						else print ' (';
+						if ($i > 0) {
+													print ', ';
+						} else {
+							print ' (';
+						}
 						print $cpt['account_number'];
 						$i++;
 					}
-					if ($i <= 5)
-						print ')';
+					if ($i <= 5) {
+											print ')';
+					}
 				} else {
 					print ' - <span class="warning">'.$langs->trans("GroupIsEmptyCheckSetup").'</span>';
 				}
@@ -484,12 +516,14 @@ 
 
 				// Each month
 				foreach ($totCat['M'] as $k => $v) {
-					if (($k + 1) >= $date_startmonth)
-						print '<td class="right">'.price($v).'</td>';
+					if (($k + 1) >= $date_startmonth) {
+											print '<td class="right">'.price($v).'</td>';
+					}
 				}
 				foreach ($totCat['M'] as $k => $v) {
-					if (($k + 1) < $date_startmonth)
-						print '<td class="right">'.price($v).'</td>';
+					if (($k + 1) < $date_startmonth) {
+											print '<td class="right">'.price($v).'</td>';
+					}
 				}
 
 				print "</tr>\n";

htdocs/compta/facture/class/paymentterm.class.php

Braces +51 added lines, -17 removed lines

@@ -88,14 +88,30 @@ 
 
 		// Clean parameters
 
-		if (isset($this->code)) $this->code = trim($this->code);
-		if (isset($this->sortorder)) $this->sortorder = trim($this->sortorder);
-		if (isset($this->active)) $this->active = trim($this->active);
-		if (isset($this->libelle)) $this->libelle = trim($this->libelle);
-		if (isset($this->libelle_facture)) $this->libelle_facture = trim($this->libelle_facture);
-		if (isset($this->type_cdr)) $this->type_cdr = trim($this->type_cdr);
-		if (isset($this->nbjour)) $this->nbjour = trim($this->nbjour);
-		if (isset($this->decalage)) $this->decalage = trim($this->decalage);
+		if (isset($this->code)) {
+			$this->code = trim($this->code);
+		}
+		if (isset($this->sortorder)) {
+			$this->sortorder = trim($this->sortorder);
+		}
+		if (isset($this->active)) {
+			$this->active = trim($this->active);
+		}
+		if (isset($this->libelle)) {
+			$this->libelle = trim($this->libelle);
+		}
+		if (isset($this->libelle_facture)) {
+			$this->libelle_facture = trim($this->libelle_facture);
+		}
+		if (isset($this->type_cdr)) {
+			$this->type_cdr = trim($this->type_cdr);
+		}
+		if (isset($this->nbjour)) {
+			$this->nbjour = trim($this->nbjour);
+		}
+		if (isset($this->decalage)) {
+			$this->decalage = trim($this->decalage);
+		}
 
 
 		// Check parameters
@@ -231,7 +247,9 @@ 
 			if ($this->db->num_rows($resql))
 			{
 				$obj = $this->db->fetch_object($resql);
-				if ($obj) $ret = $obj->rowid;
+				if ($obj) {
+					$ret = $obj->rowid;
+				}
 			}
 			$this->db->free($resql);
 			return $ret;
@@ -257,14 +275,30 @@ 
 
 		// Clean parameters
 
-		if (isset($this->code)) $this->code = trim($this->code);
-		if (isset($this->sortorder)) $this->sortorder = trim($this->sortorder);
-		if (isset($this->active)) $this->active = trim($this->active);
-		if (isset($this->libelle)) $this->libelle = trim($this->libelle);
-		if (isset($this->libelle_facture)) $this->libelle_facture = trim($this->libelle_facture);
-		if (isset($this->type_cdr)) $this->type_cdr = trim($this->type_cdr);
-		if (isset($this->nbjour)) $this->nbjour = trim($this->nbjour);
-		if (isset($this->decalage)) $this->decalage = trim($this->decalage);
+		if (isset($this->code)) {
+			$this->code = trim($this->code);
+		}
+		if (isset($this->sortorder)) {
+			$this->sortorder = trim($this->sortorder);
+		}
+		if (isset($this->active)) {
+			$this->active = trim($this->active);
+		}
+		if (isset($this->libelle)) {
+			$this->libelle = trim($this->libelle);
+		}
+		if (isset($this->libelle_facture)) {
+			$this->libelle_facture = trim($this->libelle_facture);
+		}
+		if (isset($this->type_cdr)) {
+			$this->type_cdr = trim($this->type_cdr);
+		}
+		if (isset($this->nbjour)) {
+			$this->nbjour = trim($this->nbjour);
+		}
+		if (isset($this->decalage)) {
+			$this->decalage = trim($this->decalage);
+		}
 
 
 

htdocs/compta/journal/sellsjournal.php

Braces +48 added lines, -17 removed lines

@@ -47,9 +47,15 @@ 
 $date_endyear = GETPOST('date_endyear');
 
 // Security check
-if ($user->socid > 0) $socid = $user->socid;
-if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
-if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
+if (!empty($conf->comptabilite->enabled)) {
+	$result = restrictedArea($user, 'compta', '', '', 'resultat');
+}
+if (!empty($conf->accounting->enabled)) {
+	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+}
 
 /*
  * Actions
@@ -82,9 +88,12 @@ 
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+if (empty($date_start) || empty($date_end)) {
+	// We define date_start and date_end
 {
-	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false); $date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
+	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
+}
+$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
 $name = $langs->trans("SellsJournal");
@@ -92,8 +101,11 @@ 
 $exportlink = '';
 $builddate = dol_now();
 $description = $langs->trans("DescSellsJournal").'<br>';
-if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-else $description .= $langs->trans("DepositsAreIncluded");
+if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$description .= $langs->trans("DepositsAreNotIncluded");
+} else {
+	$description .= $langs->trans("DepositsAreIncluded");
+}
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink);
 
@@ -119,11 +131,15 @@ 
 }
 
 $sql .= " AND fd.product_type IN (0,1)";
-if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+if ($date_start && $date_end) {
+	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+}
 $sql .= " ORDER BY f.rowid";
 
 // TODO Find a better trick to avoid problem with some mysql installations
-if (in_array($db->type, array('mysql', 'mysqli'))) $db->query('SET SQL_BIG_SELECTS=1');
+if (in_array($db->type, array('mysql', 'mysqli'))) {
+	$db->query('SET SQL_BIG_SELECTS=1');
+}
 
 $result = $db->query($sql);
 if ($result)
@@ -150,8 +166,11 @@ 
 		$compta_prod = $obj->accountancy_code_sell;
 		if (empty($compta_prod))
 		{
-			if ($obj->product_type == 0) $compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
-			else $compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+			if ($obj->product_type == 0) {
+				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+			} else {
+				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+			}
 		}
 		$cpttva = (!empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 		$compta_tva = (!empty($obj->account_tva) ? $obj->account_tva : $cpttva);
@@ -181,14 +200,26 @@ 
    		$tabfac[$obj->rowid]["date"] = $obj->datef;
    		$tabfac[$obj->rowid]["ref"] = $obj->ref;
    		$tabfac[$obj->rowid]["type"] = $obj->type;
-   		if (!isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
-   		if (!isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
-   		if (!isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
-   		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
-   		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+   		if (!isset($tabttc[$obj->rowid][$compta_soc])) {
+   			$tabttc[$obj->rowid][$compta_soc] = 0;
+   		}
+   		if (!isset($tabht[$obj->rowid][$compta_prod])) {
+   			$tabht[$obj->rowid][$compta_prod] = 0;
+   		}
+   		if (!isset($tabtva[$obj->rowid][$compta_tva])) {
+   			$tabtva[$obj->rowid][$compta_tva] = 0;
+   		}
+   		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) {
+   			$tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
+   		}
+   		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) {
+   			$tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+   		}
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
-		if ($obj->recuperableonly != 1) $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
+		if ($obj->recuperableonly != 1) {
+			$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
+		}
    		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1;
    		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2;
    		$tabcompany[$obj->rowid] = array('id'=>$obj->socid, 'name'=>$obj->name, 'client'=>$obj->client);

htdocs/compta/paiement_charge.php

Braces +3 added lines, -2 removed lines

@@ -296,8 +296,9 @@
 		{
 			$namef = "amount_".$objp->id;
 			$nameRemain = "remain_".$objp->id;
-			if (!empty($conf->use_javascript_ajax))
-					print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmount' data-rowid='".$namef."' data-value='".($objp->amount - $sumpaid)."'");
+			if (!empty($conf->use_javascript_ajax)) {
+								print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmount' data-rowid='".$namef."' data-value='".($objp->amount - $sumpaid)."'");
+			}
 			$remaintopay = $objp->amount - $sumpaid;
 			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
 			print '<input type="text" size="8" name="'.$namef.'" id="'.$namef.'">';

htdocs/compta/stats/byratecountry.php

Braces +83 added lines, -29 removed lines

@@ -56,25 +56,32 @@ 
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
 // Quarter
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+if (empty($date_start) || empty($date_end)) {
+	// We define date_start and date_end
 {
 	$q = GETPOST("q", "int");
+}
 	if (empty($q))
 	{
 		// We define date_start and date_end
 		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		$year_end = $year_start;
 		$month_end = $month_start;
-		if (!GETPOST("month"))	// If month not forced
+		if (!GETPOST("month")) {
+			// If month not forced
 		{
 			if (!GETPOST('year') && $month_start > $month_current)
 			{
 				$year_start--;
+		}
 				$year_end--;
 			}
 			$month_end = $month_start - 1;
-			if ($month_end < 1) $month_end = 12;
-			else $year_end++;
+			if ($month_end < 1) {
+				$month_end = 12;
+			} else {
+				$year_end++;
+			}
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	} else {
@@ -92,20 +99,30 @@ 
 $year_end = $tmpe['year'];
 
 $tmp_date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-if ($tmp_date_end < $date_end || $date_end < $date_start) $date_end = $tmp_date_end;
+if ($tmp_date_end < $date_end || $date_end < $date_start) {
+	$date_end = $tmp_date_end;
+}
 
 $min = price2num(GETPOST("min", "alpha"));
-if (empty($min)) $min = 0;
+if (empty($min)) {
+	$min = 0;
+}
 
 // Define modetax (0 or 1)
 // 0=normal, 1=option vat for services is on debit, 2=option on payments for products
 $modetax = $conf->global->TAX_MODE;
-if (GETPOSTISSET("modetax")) $modetax = GETPOST("modetax", 'int');
-if (empty($modetax)) $modetax = 0;
+if (GETPOSTISSET("modetax")) {
+	$modetax = GETPOST("modetax", 'int');
+}
+if (empty($modetax)) {
+	$modetax = 0;
+}
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 
@@ -128,8 +145,10 @@ 
 $listofparams = array('date_startmonth', 'date_startyear', 'date_startday', 'date_endmonth', 'date_endyear', 'date_endday');
 foreach ($listofparams as $param)
 {
-	if (GETPOST($param) != '') $morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
-}
+	if (GETPOST($param) != '') {
+		$morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
+	}
+	}
 
 llxHeader('', $langs->trans("TurnoverReport"), '', '', 0, 0, '', '', $morequerystring);
 
@@ -146,9 +165,15 @@ 
 // Show report header
 $name = $langs->trans("xxx");
 $calcmode = '';
-if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault');
-if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption');
-if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices');
+if ($modetax == 0) {
+	$calcmode = $langs->trans('OptionVATDefault');
+}
+if ($modetax == 1) {
+	$calcmode = $langs->trans('OptionVATDebitOption');
+}
+if ($modetax == 2) {
+	$calcmode = $langs->trans('OptionPaymentForProductAndServices');
+}
 $calcmode .= '<br>('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')';
 // Set period
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
@@ -167,14 +192,24 @@ 
 $description .= $fsearch;
 $builddate = dol_now();
 
-if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') $description .= $langs->trans("RulesVATDueProducts");
-if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') $description .= $langs->trans("RulesVATInProducts");
-if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') $description .= '<br>'.$langs->trans("RulesVATDueServices");
-if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') $description .= '<br>'.$langs->trans("RulesVATInServices");
+if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') {
+	$description .= $langs->trans("RulesVATDueProducts");
+}
+if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') {
+	$description .= $langs->trans("RulesVATInProducts");
+}
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') {
+	$description .= '<br>'.$langs->trans("RulesVATDueServices");
+}
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
+	$description .= '<br>'.$langs->trans("RulesVATInServices");
+}
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$description .= '<br>'.$langs->trans("DepositsAreNotIncluded");
 }
-if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description .= '<br>'.$langs->trans("ThisIsAnEstimatedValue");
+if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) {
+	$description .= '<br>'.$langs->trans("ThisIsAnEstimatedValue");
+}
 
 // Customers invoices
 $elementcust = $langs->trans("CustomersInvoices");
@@ -190,8 +225,12 @@ 
 
 
 // TODO Report from bookkeeping not yet available, so we switch on report on business events
-if ($modecompta == "BOOKKEEPING") $modecompta = "CREANCES-DETTES";
-if ($modecompta == "BOOKKEEPINGCOLLECTED") $modecompta = "RECETTES-DEPENSES";
+if ($modecompta == "BOOKKEEPING") {
+	$modecompta = "CREANCES-DETTES";
+}
+if ($modecompta == "BOOKKEEPINGCOLLECTED") {
+	$modecompta = "RECETTES-DEPENSES";
+}
 
 // Show report header
 if ($modecompta == "CREANCES-DETTES") {
@@ -223,8 +262,11 @@ 
 {
 }
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start - 1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start + 1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
-else $periodlink = '';
+if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) {
+	$periodlink = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start - 1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start + 1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
+} else {
+	$periodlink = '';
+}
 
 $description .= '  <input type="hidden" name="modecompta" value="'.$modecompta.'">';
 
@@ -244,7 +286,9 @@ 
 	$i = 0;
 	while ($i < 12) {
 		$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 		$i++;
 	}
@@ -290,7 +334,9 @@ 
 			print '</td>';
 			for ($i = 0; $i < 12; $i++) {
 				$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
-				if ($j > 12) $j -= 12;
+				if ($j > 12) {
+					$j -= 12;
+				}
 				$monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT);
 				print '<td class="right" width="6%">'.price($obj->$monthj).'</td>';
 				$totalpermonth[$j] = (empty($totalpermonth[$j]) ? 0 : $totalpermonth[$j]) + $obj->$monthj;
@@ -307,7 +353,9 @@ 
 		print '<td></td>';
 		for ($i = 0; $i < 12; $i++) {
 			$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
-			if ($j > 12) $j -= 12;
+			if ($j > 12) {
+				$j -= 12;
+			}
 			$monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT);
 			print '<td class="right" width="6%">'.price($totalpermonth[$j]).'</td>';
 		}
@@ -325,7 +373,9 @@ 
 	while ($i < 12)
 	{
 		$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 		$i++;
 	}
@@ -371,7 +421,9 @@ 
 			print '</td>';
 			for ($i = 0; $i < 12; $i++) {
 				$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
-				if ($j > 12) $j -= 12;
+				if ($j > 12) {
+					$j -= 12;
+				}
 				$monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT);
 				print '<td class="right" width="6%">'.price($obj->$monthj).'</td>';
 				$totalpermonth[$j] = (empty($totalpermonth[$j]) ? 0 : $totalpermonth[$j]) + $obj->$monthj;
@@ -388,7 +440,9 @@ 
 		print '<td></td>';
 		for ($i = 0; $i < 12; $i++) {
 			$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
-			if ($j > 12) $j -= 12;
+			if ($j > 12) {
+				$j -= 12;
+			}
 			$monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT);
 			print '<td class="right" width="6%">'.price($totalpermonth[$j]).'</td>';
 		}