alxarafe / alixar

dolibarr/htdocs/margin/tabs/thirdpartyMargins.php

Braces +48 added lines, -27 removed lines

@@ -30,7 +30,9 @@ 
 
 // Security check
 $socid = GETPOST('socid','int');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->societe_id)) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe','','');
 
 
@@ -43,11 +45,17 @@ 
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="f.datef";
+if (! $sortorder) {
+    $sortorder="DESC";
+}
+if (! $sortfield) {
+    $sortfield="f.datef";
+}
 
 $object = new Societe($db);
-if ($socid > 0) $object->fetch($socid);
+if ($socid > 0) {
+    $object->fetch($socid);
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartymargins','globalcard'));
@@ -59,7 +67,9 @@ 
 
 $parameters=array('id'=>$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');
+}
 
 
 
@@ -71,7 +81,9 @@ 
 $form = new Form($db);
 
 $title=$langs->trans("ThirdParty").' - '.$langs->trans("Margins");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Files");
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+    $title=$object->name.' - '.$langs->trans("Files");
+}
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
@@ -102,7 +114,9 @@ 
         print '<tr><td class="titlefield">';
         print $langs->trans('CustomerCode').'</td><td colspan="3">';
         print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        if ($object->check_codeclient() <> 0) {
+            print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        }
         print '</td></tr>';
     }
 
@@ -111,7 +125,9 @@ 
         print '<tr><td class="titlefield">';
         print $langs->trans('SupplierCode').'</td><td colspan="3">';
         print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        if ($object->check_codefournisseur() <> 0) {
+            print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        }
         print '</td></tr>';
     }
 
@@ -158,7 +174,9 @@ 
     $sql.= " AND d.fk_facture = f.rowid";
     $sql.= " AND f.fk_soc = $socid";
     $sql.= " AND d.buy_price_ht IS NOT NULL";
-    if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
+    if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) {
+        $sql .= " AND d.buy_price_ht <> 0";
+    }
     $sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut, f.type";
     $sql.= $db->order($sortfield,$sortorder);
     // TODO: calculate total to display then restore pagination
@@ -182,10 +200,12 @@ 
     	print_liste_field_titre("SoldAmount",$_SERVER["PHP_SELF"],"selling_price","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
     	print_liste_field_titre("PurchasedAmount",$_SERVER["PHP_SELF"],"buying_price","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
     	print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
-    	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-    		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
-    	if (! empty($conf->global->DISPLAY_MARK_RATES))
-    		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
+    	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+    	    		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
+    	}
+    	if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+    	    		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
+    	}
     	print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
     	print "</tr>\n";
 
@@ -219,10 +239,12 @@ 
     			print "<td align=\"right\">".price($objp->selling_price, null, null, null, null, $rounding)."</td>\n";
     			print "<td align=\"right\">".price(($objp->type == 2 ? -1 : 1) * $objp->buying_price, null, null, null, null, $rounding)."</td>\n";
     			print "<td align=\"right\">".$sign.price($objp->marge, null, null, null, null, $rounding)."</td>\n";
-    			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-    			    print "<td align=\"right\">".(($marginRate === '')?'n/a':$sign.price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-    			if (! empty($conf->global->DISPLAY_MARK_RATES))
-    			    print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+    			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+    			    			    print "<td align=\"right\">".(($marginRate === '')?'n/a':$sign.price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+    			}
+    			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+    			    			    print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+    			}
     			print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
     			print "</tr>\n";
     			$i++;
@@ -238,8 +260,7 @@ 
     	{
     		$marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
     		$markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
-    	}
-    	else
+    	} else
     	{
     		$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
     		$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
@@ -251,14 +272,15 @@ 
     	print "<td align=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
     	print "<td align=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
     	print "<td align=\"right\">".price($totalMargin, null, null, null, null, $rounding)."</td>\n";
-    	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-    		print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-    	if (! empty($conf->global->DISPLAY_MARK_RATES))
-    		print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+    	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+    	    		print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+    	}
+    	if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+    	    		print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+    	}
     	print '<td align="right">&nbsp;</td>';
     	print "</tr>\n";
-    }
-    else
+    } else
     {
     	dol_print_error($db);
     }
@@ -267,8 +289,7 @@ 
 
     print '<br>';
     $db->free($result);
-}
-else
+} else
 {
 	dol_print_error('', 'Parameter socid not defined');
 }

dolibarr/htdocs/margin/admin/margin.php

Braces +22 added lines, -26 removed lines

@@ -31,7 +31,9 @@ 
 
 $langs->loadLangs(array("admin", "bills", "margins", "stocks"));
 
-if (! $user->admin) accessforbidden();
+if (! $user->admin) {
+    accessforbidden();
+}
 
 $action=GETPOST('action','alpha');
 
@@ -46,8 +48,7 @@ 
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
+    } else
     {
         dol_print_error($db);
     }
@@ -60,8 +61,7 @@ 
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
+    } else
     {
         dol_print_error($db);
     }
@@ -72,8 +72,7 @@ 
     if (dolibarr_set_const($db, 'MARGIN_METHODE_FOR_DISCOUNT', $_POST['MARGIN_METHODE_FOR_DISCOUNT'], 'chaine', 0, '', $conf->entity) > 0)
     {
           setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-    }
-    else
+    } else
     {
         dol_print_error($db);
     }
@@ -84,8 +83,7 @@ 
     if (dolibarr_set_const($db, 'MARGIN_TYPE', $_POST['MARGIN_TYPE'], 'chaine', 0, '', $conf->entity) > 0)
     {
           setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-    }
-    else
+    } else
     {
         dol_print_error($db);
     }
@@ -96,8 +94,7 @@ 
     if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', $_POST['AGENT_CONTACT_TYPE'], 'chaine', 0, '', $conf->entity) > 0)
     {
           setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-    }
-    else
+    } else
     {
         dol_print_error($db);
     }
@@ -136,18 +133,23 @@ 
 print '<td>'.$langs->trans("MARGIN_TYPE").'</td>';
 print '<td>';
 print ' <input type="radio" name="MARGIN_TYPE" value="1" ';
-if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1')
+if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1') {
 	print 'checked ';
+}
 print '/> ';
 print $langs->trans('MargeType1');
 print '<br>';
 print ' <input type="radio" name="MARGIN_TYPE" value="pmp" ';
-if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp') print 'checked ';
+if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp') {
+    print 'checked ';
+}
 print '/> ';
 print $langs->trans('MargeType2');
 print '<br>';
 print ' <input type="radio" name="MARGIN_TYPE" value="costprice" ';
-if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'costprice') print 'checked ';
+if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'costprice') {
+    print 'checked ';
+}
 print '/> ';
 print $langs->trans('MargeType3');
 print '</td>';
@@ -166,14 +168,12 @@ 
 if (! empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('DISPLAY_MARGIN_RATES');
-}
-else
+} else
 {
 	if (empty($conf->global->DISPLAY_MARGIN_RATES))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Disabled"),'off').'</a>';
-	}
-	else
+	} else
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Enabled"),'on').'</a>';
 	}
@@ -189,14 +189,12 @@ 
 if (! empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('DISPLAY_MARK_RATES');
-}
-else
+} else
 {
 	if (empty($conf->global->DISPLAY_MARK_RATES))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Disabled"),'off').'</a>';
-	}
-	else
+	} else
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Enabled"),'on').'</a>';
 	}
@@ -212,14 +210,12 @@ 
 if (! empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('ForceBuyingPriceIfNull');
-}
-else
+} else
 {
 	if (empty($conf->global->ForceBuyingPriceIfNull))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Disabled"),'off').'</a>';
-	}
-	else
+	} else
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Enabled"),'on').'</a>';
 	}

dolibarr/htdocs/margin/customerMargins.php

Braces +84 added lines, -51 removed lines

@@ -36,7 +36,9 @@ 
 $TSelectedProducts = GETPOST('products', 'array');
 $TSelectedCats = GETPOST('categories', 'array');
 
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->societe_id)) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe','','');
 $result = restrictedArea($user,'margins');
 
@@ -52,15 +54,22 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield="s.nom"; // Set here default search field
-if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) {
+    $sortfield="s.nom";
+}
+// Set here default search field
+if (! $sortorder) {
+    $sortorder="ASC";
+}
 
 $startdate=$enddate='';
 
-if (!empty($_POST['startdatemonth']))
+if (!empty($_POST['startdatemonth'])) {
   $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'],  $_POST['startdateday'],  $_POST['startdateyear']);
-if (!empty($_POST['enddatemonth']))
+}
+if (!empty($_POST['enddatemonth'])) {
   $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'],  $_POST['enddateday'],  $_POST['enddateyear']);
+}
 
 
 /*
@@ -104,11 +113,14 @@ 
 		print '</td></tr>';
 
 		$client = true;
-		if (! $sortorder) $sortorder="DESC";
-		if (! $sortfield) $sortfield="f.datef";
+		if (! $sortorder) {
+		    $sortorder="DESC";
+		}
+		if (! $sortfield) {
+		    $sortfield="f.datef";
+		}
 	}
-}
-else {
+} else {
 	print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
 	print $form->select_company(null, 'socid', 'client=1 OR client=3', 1, 0, 0);
@@ -118,15 +130,16 @@ 
 
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
-if (! $sortorder) $sortorder="ASC";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
 if (! $sortfield)
 {
 	if ($client)
 	{
 		$sortfield="f.datef";
 		$sortorder="DESC";
-	}
-	else
+	} else
 	{
 	    $sortfield="s.nom";
 	    $sortorder="ASC";
@@ -202,7 +215,9 @@ 
 
 $sql = "SELECT";
 $sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,";
-if ($client) $sql.= " f.rowid as facid, f.ref, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
+if ($client) {
+    $sql.= " f.rowid as facid, f.ref, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
+}
 $sql.= " sum(d.total_ht) as selling_price,";
 // Note: qty and buy_price_ht is always positive (if not, your database may be corrupted, you can update this)
 $sql.= " sum(".$db->ifsql('d.total_ht < 0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,";
@@ -214,10 +229,16 @@ 
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=d.fk_product';
 }
 
-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 f.fk_soc = s.rowid";
-if ($socid > 0) $sql.= ' AND s.rowid = '.$socid;
-if (!$user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid > 0) {
+    $sql.= ' AND s.rowid = '.$socid;
+}
+if (!$user->rights->societe->client->voir && ! $socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
 $sql.= " AND f.fk_statut > 0";
 $sql.= ' AND s.entity IN ('.getEntity('societe').')';
 $sql.= " AND d.fk_facture = f.rowid";
@@ -228,15 +249,21 @@ 
 if(! empty($TSelectedCats)) {
 	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
 }
-if (!empty($startdate))
-$sql.= " AND f.datef >= '".$db->idate($startdate)."'";
-if (!empty($enddate))
-$sql.= " AND f.datef <= '".$db->idate($enddate)."'";
+if (!empty($startdate)) {
+    $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
+}
+if (!empty($enddate)) {
+    $sql.= " AND f.datef <= '".$db->idate($enddate)."'";
+}
 $sql .= " AND d.buy_price_ht IS NOT NULL";
-if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)
-$sql .= " AND d.buy_price_ht <> 0";
-if ($client) $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut";
-else $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client";
+if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) {
+    $sql .= " AND d.buy_price_ht <> 0";
+}
+if ($client) {
+    $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut";
+} else {
+    $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client";
+}
 $sql.=$db->order($sortfield,$sortorder);
 // TODO: calculate total to display then restore pagination
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
@@ -250,10 +277,12 @@ 
   	print '<br>';
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
-	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice='BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	if ($conf->global->MARGIN_TYPE == "1") {
+		    $labelcostprice='BuyingPrice';
+	} else {
+	    // value is 'costprice' or 'pmp'
 	    $labelcostprice='CostPrice';
+	}
 
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
@@ -262,16 +291,18 @@ 
 	if (! empty($client)) {
   		print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;socid=".$socid,'',$sortfield,$sortorder);
   		print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;socid=".$socid,'align="center"',$sortfield,$sortorder);
+	} else {
+	  		print_liste_field_titre("Customer",$_SERVER["PHP_SELF"],"s.nom","","&amp;socid=".$socid,'',$sortfield,$sortorder);
 	}
-	else
-  		print_liste_field_titre("Customer",$_SERVER["PHP_SELF"],"s.nom","","&amp;socid=".$socid,'',$sortfield,$sortorder);
 	print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
+	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
+	}
+	if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+			print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
+	}
 	print "</tr>\n";
 
 	$cumul_achat = 0;
@@ -293,8 +324,7 @@ 
 			{
 				$marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
 				$markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
-			}
-			else
+			} else
 			{
 				$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
 				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
@@ -309,8 +339,7 @@ 
 				print "</td>\n";
 				print "<td align=\"center\">";
 				print dol_print_date($db->jdate($objp->datef),'day')."</td>";
-		  	}
-		  	else {
+		  	} else {
 				$companystatic->id=$objp->socid;
 				$companystatic->name=$objp->name;
 				$companystatic->client=$objp->client;
@@ -320,10 +349,12 @@ 
 			print "<td align=\"right\">".price($pv, null, null, null, null, $rounding)."</td>\n";
 			print "<td align=\"right\">".price($pa, null, null, null, null, $rounding)."</td>\n";
 			print "<td align=\"right\">".price($marge, null, null, null, null, $rounding)."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+							print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+							print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+			}
 			print "</tr>\n";
 
 			$i++;
@@ -347,23 +378,25 @@ 
 	//}
 
 	print '<tr class="liste_total">';
-	if ($client)
-	    print '<td colspan=2>';
-  	else
-    	print '<td>';
+	if ($client) {
+		    print '<td colspan=2>';
+	} else {
+  	    	print '<td>';
+  	}
   	print $langs->trans('TotalMargin')."</td>";
 	print "<td align=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
 	print "<td align=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
 	print "<td align=\"right\">".price($totalMargin, null, null, null, null, $rounding)."</td>\n";
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+	}
+	if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+			print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+	}
 	print "</tr>\n";
 
   print "</table>";
-}
-else
+} else
 {
 	dol_print_error($db);
 }

dolibarr/htdocs/margin/checkMargins.php

Braces +47 added lines, -17 removed lines

@@ -48,8 +48,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder = "DESC";
-if (! $sortfield) $sortfield = 'f.ref';
+if (! $sortorder) {
+    $sortorder = "DESC";
+}
+if (! $sortfield) {
+    $sortfield = 'f.ref';
+}
 
 $startdate = $enddate = '';
 
@@ -78,7 +82,9 @@ 
 
 $parameters=array();
 $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))
 {
@@ -108,9 +114,11 @@ 
     }
 
     // Purge search criteria
-    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_ref='';
+    }
         $search_array_options=array();
     }
 
@@ -146,12 +154,24 @@ 
 // print_fiche_titre($text);
 
 $param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($search_ref != '')   $param.='&search_ref='.urlencode($search_ref);
-if (! empty($startdate)) $param .= '&startdatemonth=' . GETPOST('startdatemonth', 'int') . '&startdateday=' . GETPOST('startdateday', 'int') . '&startdateyear=' . GETPOST('startdateyear', 'int');
-if (! empty($enddate))   $param .= '&enddatemonth=' . GETPOST('enddatemonth', 'int') . '&enddateday=' . GETPOST('enddateday', 'int') . '&enddateyear=' . GETPOST('enddateyear', 'int');
-if ($optioncss != '')    $param.='&optioncss='.$optioncss;
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+    $param.='&contextpage='.$contextpage;
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+    $param.='&limit='.$limit;
+}
+if ($search_ref != '') {
+    $param.='&search_ref='.urlencode($search_ref);
+}
+if (! empty($startdate)) {
+    $param .= '&startdatemonth=' . GETPOST('startdatemonth', 'int') . '&startdateday=' . GETPOST('startdateday', 'int') . '&startdateyear=' . GETPOST('startdateyear', 'int');
+}
+if (! empty($enddate)) {
+    $param .= '&enddatemonth=' . GETPOST('enddatemonth', 'int') . '&enddateday=' . GETPOST('enddateday', 'int') . '&enddateyear=' . GETPOST('enddateyear', 'int');
+}
+if ($optioncss != '') {
+    $param.='&optioncss='.$optioncss;
+}
 
 // Show tabs
 $head = marges_prepare_head($user);
@@ -192,9 +212,15 @@ 
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON d.fk_product = p.rowid";
 $sql .= " WHERE f.fk_statut > 0";
 $sql .= " AND f.entity IN (" . getEntity('invoice') . ") ";
-if (! empty($startdate)) $sql .= " AND f.datef >= '" . $db->idate($startdate) . "'";
-if (! empty($enddate))   $sql .= " AND f.datef <= '" . $db->idate($enddate) . "'";
-if ($search_ref) $sql.=natural_search('f.ref', $search_ref);
+if (! empty($startdate)) {
+    $sql .= " AND f.datef >= '" . $db->idate($startdate) . "'";
+}
+if (! empty($enddate)) {
+    $sql .= " AND f.datef <= '" . $db->idate($enddate) . "'";
+}
+if ($search_ref) {
+    $sql.=natural_search('f.ref', $search_ref);
+}
 $sql .= " AND d.buy_price_ht IS NOT NULL";
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -204,9 +230,11 @@ 
 	dol_syslog(__FILE__, LOG_DEBUG);
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+	    // if total resultset is smaller then paging size (filtering), goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }
@@ -220,10 +248,12 @@ 
 	print '<br>';
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
-	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice='BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	if ($conf->global->MARGIN_TYPE == "1") {
+		    $labelcostprice='BuyingPrice';
+	} else {
+	    // value is 'costprice' or 'pmp'
 	    $labelcostprice='CostPrice';
+	}
 
 	$moreforfilter='';
 

dolibarr/htdocs/core/actions_setmoduleoptions.inc.php

Braces +26 added lines, -13 removed lines

@@ -45,12 +45,15 @@ 
 	if (! $error)
 	{
 		$db->commit();
-		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
+		if (empty($nomessageinupdate)) {
+		    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		}
+	} else
 	{
 		$db->rollback();
-		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+		if (empty($nomessageinupdate)) {
+		    setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+		}
 	}
 }
 
@@ -64,14 +67,18 @@ 
     {
         foreach($_POST as $key => $val)
         {
-            if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
+            if (preg_match('/^param(\d*)$/', $key, $reg)) {
+                // Works for POST['param'], POST['param1'], POST['param2'], ...
             {
                 $param=GETPOST("param".$reg[1],'alpha');
+            }
                 $value=GETPOST("value".$reg[1],'alpha');
                 if ($param)
                 {
                     $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-                    if (! $res > 0) $error++;
+                    if (! $res > 0) {
+                        $error++;
+                    }
                 }
             }
         }
@@ -90,8 +97,9 @@ 
             if (! $tmpdir) {
                 unset($listofdir[$key]); continue;
             }
-            if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-            else
+            if (! is_dir($tmpdir)) {
+                $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+            } else
             {
                 $upload_dir=$tmpdir;
             }
@@ -99,19 +107,24 @@ 
         if ($upload_dir)
         {
             $result = dol_add_file_process($upload_dir, 0, 1, 'uploadfile', '');
-            if ($result <= 0) $error++;
+            if ($result <= 0) {
+                $error++;
+            }
         }
     }
 
     if (! $error)
     {
         $db->commit();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
+        if (empty($nomessageinsetmoduleoptions)) {
+            setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+        }
+    } else
     {
         $db->rollback();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+        if (empty($nomessageinsetmoduleoptions)) {
+            setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+        }
     }
 }
 

dolibarr/htdocs/core/class/infobox.class.php

Braces +36 added lines, -23 removed lines

@@ -55,19 +55,25 @@ 
         $boxes=array();
 
         $confuserzone='MAIN_BOXES_'.$zone;
-        if ($mode == 'activated')	// activated
+        if ($mode == 'activated') {
+            // activated
         {
             $sql = "SELECT b.rowid, b.position, b.box_order, b.fk_user,";
+        }
             $sql.= " d.rowid as box_id, d.file, d.note, d.tms";
             $sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
             $sql.= " WHERE b.box_id = d.rowid";
             $sql.= " AND b.entity IN (0,".$conf->entity.")";
-            if ($zone >= 0) $sql.= " AND b.position = ".$zone;
-            if (is_object($user)) $sql.= " AND b.fk_user IN (0,".$user->id.")";
-            else $sql.= " AND b.fk_user = 0";
+            if ($zone >= 0) {
+                $sql.= " AND b.position = ".$zone;
+            }
+            if (is_object($user)) {
+                $sql.= " AND b.fk_user IN (0,".$user->id.")";
+            } else {
+                $sql.= " AND b.fk_user = 0";
+            }
             $sql.= " ORDER BY b.box_order";
-        }
-        else	// available
+        } else	// available
 		{
             $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
             $sql.= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
@@ -92,8 +98,7 @@ 
                         $boxname = preg_replace('/\.php$/i','',$regs[1]);
                         $module = $regs[2];
                         $relsourcefile = "/".$module."/core/boxes/".$boxname.".php";
-                    }
-                    else
+                    } else
                     {
                         $boxname=preg_replace('/\.php$/i','',$obj->file);
                         $relsourcefile = "/core/boxes/".$boxname.".php";
@@ -119,12 +124,15 @@ 
                         $box->sourcefile= $relsourcefile;
                     	$box->class     = $boxname;
 
-                    	if ($mode == 'activated' && ! is_object($user))	// List of activated box was not yet personalized into database
+                    	if ($mode == 'activated' && ! is_object($user)) {
+                    	    // List of activated box was not yet personalized into database
                         {
                             if (is_numeric($box->box_order))
                             {
                                 if ($box->box_order % 2 == 1) $box->box_order='A'.$box->box_order;
-                                elseif ($box->box_order % 2 == 0) $box->box_order='B'.$box->box_order;
+                    	} elseif ($box->box_order % 2 == 0) {
+                                    $box->box_order='B'.$box->box_order;
+                                }
                             }
                         }
                         // box_def properties
@@ -143,12 +151,16 @@ 
                             	foreach($arrayelem as $module)
                             	{
     	                        	$tmpmodule=preg_replace('/@[^@]+/','',$module);
-    	                        	if (! empty($conf->$tmpmodule->enabled)) $tmpenabled=1;
+    	                        	if (! empty($conf->$tmpmodule->enabled)) {
+    	                        	    $tmpenabled=1;
+    	                        	}
                             		//print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'<br>';
                             	}
-                            	if (empty($tmpenabled))	// We found at least one module required that is disabled
+                            	if (empty($tmpenabled)) {
+                            	    // We found at least one module required that is disabled
         	                    {
         	                    	$enabled=0;
+                            	}
         	                    	break;
         	                    }
                             }
@@ -156,18 +168,19 @@ 
                         //print '=>'.$boxname.'-enabled='.$enabled.'<br>';
 
                         //print 'xx module='.$module.' enabled='.$enabled;
-                        if ($enabled && ($includehidden || empty($box->hidden))) $boxes[]=$box;
-                        else unset($box);
-                    }
-                    else
+                        if ($enabled && ($includehidden || empty($box->hidden))) {
+                            $boxes[]=$box;
+                        } else {
+                            unset($box);
+                        }
+                    } else
 					{
                     	dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);
 					}
                 }
                 $j++;
             }
-        }
-        else
+        } else
 		{
 			dol_syslog($db->lasterror(),LOG_ERR);
             return array('error'=>$db->lasterror());
@@ -196,7 +209,9 @@ 
 
         dol_syslog(get_class()."::saveboxorder zone=".$zone." userid=".$userid);
 
-        if (! $userid || $userid == 0) return 0;
+        if (! $userid || $userid == 0) {
+            return 0;
+        }
 
         $user = new User($db);
         $user->id=$userid;
@@ -266,14 +281,12 @@ 
                 $error=$db->error();
                 $db->rollback();
                 return -2;
-            }
-            else
+            } else
             {
                 $db->commit();
                 return 1;
             }
-        }
-        else
+        } else
         {
             $error=$db->lasterror();
             $db->rollback();

dolibarr/htdocs/core/class/html.formintervention.class.php

Braces +15 added lines, -12 removed lines

@@ -75,8 +75,11 @@ 
 		$sql.= " WHERE f.entity = ".$conf->entity;
 		if ($socid != '')
 		{
-			if ($socid == '0') $sql.= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
-			else $sql.= " AND f.fk_soc = ".$socid;
+			if ($socid == '0') {
+			    $sql.= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
+			} else {
+			    $sql.= " AND f.fk_soc = ".$socid;
+			}
 		}
 
 		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
@@ -84,7 +87,9 @@ 
 		if ($resql)
 		{
 			$out.='<select id="interventionid" class="flat" name="'.$htmlname.'">';
-			if ($showempty) $out.='<option value="0">&nbsp;</option>';
+			if ($showempty) {
+			    $out.='<option value="0">&nbsp;</option>';
+			}
 			$num = $db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -96,15 +101,13 @@ 
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else
+					} else
 					{
 						$labeltoshow=dol_trunc($obj->ref,18);
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
 						{
 							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							$disabled=0;
 							if (! $obj->fk_statut > 0)
@@ -121,11 +124,12 @@ 
 							if ($hideunselectables && $disabled)
 							{
 								$resultat='';
-							}
-							else
+							} else
 							{
 								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								if ($disabled) {
+								    $resultat.=' disabled';
+								}
 								$resultat.='>'.$labeltoshow;
 								$resultat.='</option>';
 							}
@@ -138,8 +142,7 @@ 
 			$out.='</select>';
 			$db->free($resql);
 			return $out;
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 			return '';

dolibarr/htdocs/core/class/interfaces.class.php

Braces +72 added lines, -35 removed lines

@@ -69,20 +69,26 @@ 
     {
         // phpcs:enable
         // Check parameters
-        if (! is_object($object) || ! is_object($conf))	// Error
+        if (! is_object($object) || ! is_object($conf)) {
+            // Error
         {
         	$this->error='function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
+        }
             dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);
         	$this->errors[]=$this->error;
             return -1;
         }
-        if (! is_object($langs))	// Warning
+        if (! is_object($langs)) {
+            // Warning
         {
             dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
         }
-        if (! is_object($user))	    // Warning
+        }
+        if (! is_object($user)) {
+            // Warning
         {
             dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
+        }
             global $db;
             $user = new User($db);
         }
@@ -102,7 +108,9 @@ 
             //print "xx".$dir;exit;
 
             // Check if directory exists (we do not use dol_is_dir to avoir loading files.lib.php at each call)
-            if (! is_dir($newdir)) continue;
+            if (! is_dir($newdir)) {
+                continue;
+            }
 
             $handle=opendir($newdir);
             if (is_resource($handle))
@@ -118,14 +126,18 @@ 
                         $nbfile++;
 
                         // Check if trigger file is disabled by name
-                        if (preg_match('/NORUN$/i',$file)) continue;
+                        if (preg_match('/NORUN$/i',$file)) {
+                            continue;
+                        }
                         // Check if trigger file is for a particular module
                         $qualified=true;
                         if (strtolower($reg[2]) != 'all')
                         {
                             $module=preg_replace('/^mod/i','',$reg[2]);
                             $constparam='MAIN_MODULE_'.strtoupper($module);
-                            if (empty($conf->global->$constparam)) $qualified=false;
+                            if (empty($conf->global->$constparam)) {
+                                $qualified=false;
+                            }
                         }
 
                         if (! $qualified)
@@ -136,9 +148,11 @@ 
 
                         $modName = "Interface".ucfirst($reg[3]);
                         //print "file=$file - modName=$modName\n";
-                        if (in_array($modName,$modules))    // $modules = list of modName already loaded
+                        if (in_array($modName,$modules)) {
+                            // $modules = list of modName already loaded
                         {
                             $langs->load("errors");
+                        }
                             dol_syslog(get_class($this)."::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger", $newdir."/".$file, $fullpathfiles[$modName]), LOG_WARNING);
                             continue;
                         }
@@ -147,8 +161,7 @@ 
                             //print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";
                             include_once $newdir.'/'.$file;
                             //print 'Done for '.$modName."\n";
-                        }
-                        catch(Exception $e)
+                        } catch(Exception $e)
                         {
                             dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);
                         }
@@ -170,24 +183,28 @@ 
         foreach ($orders as $key => $value)
         {
             $modName = $modules[$key];
-            if (empty($modName)) continue;
+            if (empty($modName)) {
+                continue;
+            }
 
             $objMod = new $modName($this->db);
             if ($objMod)
             {
             	$result=0;
 
-				if (method_exists($objMod, 'runTrigger'))	// New method to implement
+				if (method_exists($objMod, 'runTrigger')) {
+				    // New method to implement
 				{
 	                //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
 	                $result=$objMod->runTrigger($action,$object,$user,$langs,$conf);
 				}
-				elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
+				} elseif (method_exists($objMod, 'run_trigger')) {
+				    // Deprecated method
 				{
 	                dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
-					$result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
 				}
-				else
+					$result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
+				} else
 				{
 	                dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
 				}
@@ -209,12 +226,14 @@ 
                     //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($objMod->errors), LOG_ERR);
                     $nbtotal++;
                     $nbko++;
-                    if (! empty($objMod->errors)) $this->errors=array_merge($this->errors,$objMod->errors);
-                    else if (! empty($objMod->error))  $this->errors[]=$objMod->error;
+                    if (! empty($objMod->errors)) {
+                        $this->errors=array_merge($this->errors,$objMod->errors);
+                    } else if (! empty($objMod->error)) {
+                        $this->errors[]=$objMod->error;
+                    }
                     //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($this->errors), LOG_ERR);
                 }
-            }
-            else
+            } else
 			{
                 dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);
             }
@@ -224,8 +243,7 @@ 
         {
             dol_syslog(get_class($this)."::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko." - Nb of error string returned in this->errors = ".count($this->errors), LOG_ERR);
             return -$nbko;
-        }
-        else
+        } else
         {
             //dol_syslog(get_class($this)."::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);
             return $nbok;
@@ -263,7 +281,9 @@ 
             $newdir=dol_osencode($dir);
 
             // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
-            if (! is_dir($newdir)) continue;
+            if (! is_dir($newdir)) {
+                continue;
+            }
 
             $handle=opendir($newdir);
             if (is_resource($handle))
@@ -272,7 +292,9 @@ 
                 {
                     if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/',$file,$reg))
                     {
-                        if (preg_match('/\.back$/',$file)) continue;
+                        if (preg_match('/\.back$/',$file)) {
+                            continue;
+                        }
 
 						$part1=$reg[1];
 						$part2=$reg[2];
@@ -284,8 +306,7 @@ 
                         {
                             $langs->load("errors");
                             print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger",$modName,"/htdocs/core/triggers/").'</div>';
-                        }
-                        else
+                        } else
                         {
                             include_once $newdir.'/'.$file;
                         }
@@ -313,7 +334,9 @@ 
         foreach ($orders as $key => $value)
         {
             $modName = $modules[$key];
-            if (empty($modName)) continue;
+            if (empty($modName)) {
+                continue;
+            }
 
             if (! class_exists($modName))
             {
@@ -329,14 +352,19 @@ 
             $module='';
 
             // Check if trigger file is disabled by name
-            if (preg_match('/NORUN$/i',$files[$key])) $disabledbyname=1;
+            if (preg_match('/NORUN$/i',$files[$key])) {
+                $disabledbyname=1;
+            }
             // Check if trigger file is for a particular module
             if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i',$files[$key],$reg))
             {
                 $module=preg_replace('/^mod/i','',$reg[2]);
                 $constparam='MAIN_MODULE_'.strtoupper($module);
-                if (strtolower($module) == 'all') $disabledbymodule=0;
-                else if (empty($conf->global->$constparam)) $disabledbymodule=2;
+                if (strtolower($module) == 'all') {
+                    $disabledbymodule=0;
+                } else if (empty($conf->global->$constparam)) {
+                    $disabledbymodule=2;
+                }
                 $triggers[$j]['module']=strtolower($module);
             }
 
@@ -348,7 +376,9 @@ 
             $triggers[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
             $triggers[$j]['version'] = $objMod->getVersion();
             $triggers[$j]['status'] = img_picto($langs->trans("Active"),'tick');
-            if ($disabledbyname > 0 || $disabledbymodule > 1) $triggers[$j]['status'] = '';
+            if ($disabledbyname > 0 || $disabledbymodule > 1) {
+                $triggers[$j]['status'] = '';
+            }
 
             $text ='<b>'.$langs->trans("Description").':</b><br>';
             $text.=$objMod->getDesc().'<br>';
@@ -356,13 +386,20 @@ 
             if ($disabledbyname == 1)
             {
                 $text.=$langs->trans("TriggerDisabledByName").'<br>';
-                if ($disabledbymodule == 2) $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>';
-            }
-            else
+                if ($disabledbymodule == 2) {
+                    $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>';
+                }
+            } else
             {
-                if ($disabledbymodule == 0) $text.=$langs->trans("TriggerAlwaysActive").'<br>';
-                if ($disabledbymodule == 1) $text.=$langs->trans("TriggerActiveAsModuleActive",$module).'<br>';
-                if ($disabledbymodule == 2) $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>';
+                if ($disabledbymodule == 0) {
+                    $text.=$langs->trans("TriggerAlwaysActive").'<br>';
+                }
+                if ($disabledbymodule == 1) {
+                    $text.=$langs->trans("TriggerActiveAsModuleActive",$module).'<br>';
+                }
+                if ($disabledbymodule == 2) {
+                    $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>';
+                }
             }
 
             $triggers[$j]['info'] = $text;

dolibarr/htdocs/core/class/html.formactions.class.php

Braces +87 added lines, -41 removed lines

@@ -128,9 +128,13 @@ 
         if (! empty($conf->use_javascript_ajax) || $onlyselect)
         {
         	//var_dump($selected);
-        	if ($selected == 'done') $selected='100';
+        	if ($selected == 'done') {
+        	    $selected='100';
+        	}
             print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'">';
-            if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>';
+            if ($showempty) {
+                print '<option value=""'.($selected == ''?' selected':'').'></option>';
+            }
             foreach($listofstatus as $key => $val)
             {
                 print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
@@ -140,15 +144,16 @@ 
                 }
             }
             print '</select>';
-            if ($selected == 0 || $selected == 100) $canedit=0;
+            if ($selected == 0 || $selected == 100) {
+                $canedit=0;
+            }
 
             if (empty($onlyselect))
             {
 	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled').'>';
     	        print '<span class="hideonsmartphone hideifna">%</span>';
             }
-        }
-        else
+        } else
 		{
             print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit?'':' disabled').'>%';
         }
@@ -179,28 +184,45 @@ 
         $sortorder='DESC,DESC';
 
         $listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max?($max+1):0));
-		if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions');
+		if (! is_array($listofactions)) {
+		    dol_print_error($this->db,'FailedToGetActions');
+		}
 
         $num = count($listofactions);
         if ($num || $forceshowtitle)
         {
-        	if ($typeelement == 'invoice')               $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'propal')            $title=$langs->trans('ActionsOnPropal');
-        	elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
-        	elseif ($typeelement == 'order')             $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'shipping')          $title=$langs->trans('ActionsOnShipping');
-            elseif ($typeelement == 'fichinter')         $title=$langs->trans('ActionsOnFicheInter');
-            elseif ($typeelement == 'project')           $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'task')              $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'member')            $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            else $title=$langs->trans("LatestLinkedEvents", $max?$max:'');
+        	if ($typeelement == 'invoice') {
+        	    $title=$langs->trans('ActionsOnBill');
+        	} elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') {
+        	    $title=$langs->trans('ActionsOnBill');
+        	} elseif ($typeelement == 'propal') {
+        	    $title=$langs->trans('ActionsOnPropal');
+        	} elseif ($typeelement == 'supplier_proposal') {
+        	    $title=$langs->trans('ActionsOnSupplierProposal');
+        	} elseif ($typeelement == 'order') {
+        	    $title=$langs->trans('ActionsOnOrder');
+        	} elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order') {
+        	    $title=$langs->trans('ActionsOnOrder');
+        	} elseif ($typeelement == 'shipping') {
+        	    $title=$langs->trans('ActionsOnShipping');
+        	} elseif ($typeelement == 'fichinter') {
+                $title=$langs->trans('ActionsOnFicheInter');
+            } elseif ($typeelement == 'project') {
+                $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+            } elseif ($typeelement == 'task') {
+                $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+            } elseif ($typeelement == 'member') {
+                $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+            } else {
+                $title=$langs->trans("LatestLinkedEvents", $max?$max:'');
+            }
 
             $urlbacktopage=$_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage?'&'.$moreparambacktopage:'');
 
             $projectid = $object->fk_project;
-            if ($typeelement == 'project') $projectid = $object->id;
+            if ($typeelement == 'project') {
+                $projectid = $object->id;
+            }
 
             $newcardbutton='';
 			if (! empty($conf->agenda->enabled))
@@ -236,7 +258,9 @@ 
 	        	$cursorevent = 0;
 	        	foreach($listofactions as $action)
 	        	{
-	        		if ($max && $cursorevent >= $max) break;
+	        		if ($max && $cursorevent >= $max) {
+	        		    break;
+	        		}
 
 	        		$ref=$action->getNomUrl(1,-1);
 	        		$label=$action->getNomUrl(0,38);
@@ -257,14 +281,22 @@ 
 					$imgpicto='';
 					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 					{
-						if ($action->type_picto) $imgpicto=img_picto('', $action->type_picto);
-						else {
-							if ($action->type_code == 'AC_RDV')       $imgpicto=img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_TEL')   $imgpicto=img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_FAX')   $imgpicto=img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_EMAIL') $imgpicto=img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_INT')   $imgpicto=img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
-							elseif (! preg_match('/_AUTO/', $action->type_code)) $imgpicto=img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+						if ($action->type_picto) {
+						    $imgpicto=img_picto('', $action->type_picto);
+						} else {
+							if ($action->type_code == 'AC_RDV') {
+							    $imgpicto=img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
+							} elseif ($action->type_code == 'AC_TEL') {
+							    $imgpicto=img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
+							} elseif ($action->type_code == 'AC_FAX') {
+							    $imgpicto=img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
+							} elseif ($action->type_code == 'AC_EMAIL') {
+							    $imgpicto=img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
+							} elseif ($action->type_code == 'AC_INT') {
+							    $imgpicto=img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
+							} elseif (! preg_match('/_AUTO/', $action->type_code)) {
+							    $imgpicto=img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+							}
 						}
 					}
 					print $imgpicto;
@@ -280,9 +312,12 @@ 
 		        		$tmpb=dol_getdate($action->datef);
 		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
 		        		{
-		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
+		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) {
+		        			    print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
+		        			}
+		        		} else {
+		        		    print '-'.dol_print_date($action->datef, 'dayhour', 'tzuserrel');
 		        		}
-		        		else print '-'.dol_print_date($action->datef, 'dayhour', 'tzuserrel');
 	        		}
 	        		print '</td>';
 	        		print '<td align="right">';
@@ -295,8 +330,7 @@ 
 
 	        		$cursorevent++;
 	        	}
-        	}
-        	else
+        	} else
         	{
         		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         	}
@@ -332,7 +366,9 @@ 
         // phpcs:enable
         global $langs,$user,$form,$conf;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (! is_object($form)) {
+            $form=new Form($this->db);
+        }
 
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
         require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -343,19 +379,26 @@ 
        	array_unshift($arraylist,'&nbsp;');     // Add empty line at start
        	//asort($arraylist);
 
-       	if ($selected == 'manual') $selected='AC_OTH';
-       	if ($selected == 'auto')   $selected='AC_OTH_AUTO';
+       	if ($selected == 'manual') {
+       	    $selected='AC_OTH';
+       	}
+       	if ($selected == 'auto') {
+       	    $selected='AC_OTH_AUTO';
+       	}
 
-       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
+       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) {
+       	    unset($arraylist['AC_OTH_AUTO']);
+       	}
 
        	$out='';
 
 		if (! empty($multiselect))
 		{
-	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
+	        if (!is_array($selected) && !empty($selected)) {
+	            $selected = explode(',', $selected);
+	        }
 			$out.=$form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
-		}
-		else
+		} else
 		{
 			$out.=$form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
 		}
@@ -365,8 +408,11 @@ 
             $out.=info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''),1);
         }
 
-        if ($nooutput) return $out;
-        else print $out;
+        if ($nooutput) {
+            return $out;
+        } else {
+            print $out;
+        }
         return '';
     }
 }