alxarafe / alixar

dolibarr/htdocs/margin/productMargins.php

Indentation +155 added lines, -155 removed lines

@@ -57,24 +57,24 @@ 
 $pagenext = $page + 1;
 if (! $sortfield)
 {
-	if ($id > 0)
-	{
-		$sortfield="f.datef";
-		$sortorder="DESC";
-	}
-	else
-	{
-	    $sortfield="p.ref";
-	    $sortorder="ASC";
-	}
+    if ($id > 0)
+    {
+        $sortfield="f.datef";
+        $sortorder="DESC";
+    }
+    else
+    {
+        $sortfield="p.ref";
+        $sortorder="ASC";
+    }
 }
 
 $startdate=$enddate='';
 
 if (!empty($_POST['startdatemonth']))
-  $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']);
+    $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']);
 if (!empty($_POST['enddatemonth']))
-  $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
+    $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
 
 
 /*
@@ -104,19 +104,19 @@ 
 
 if ($id > 0) {
 
-  print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
-  print '<td class="maxwidthonsmartpone" colspan="4">';
-  print $form->select_produits($id,'id','',20,0,1,2,'',1, array(), 0, 'All');
-  print '</td></tr>';
+    print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
+    print '<td class="maxwidthonsmartpone" colspan="4">';
+    print $form->select_produits($id,'id','',20,0,1,2,'',1, array(), 0, 'All');
+    print '</td></tr>';
 
-  if (! $sortorder) $sortorder="DESC";
-  if (! $sortfield) $sortfield="f.datef";
+    if (! $sortorder) $sortorder="DESC";
+    if (! $sortfield) $sortfield="f.datef";
 }
 else {
-	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
-	print '<td class="maxwidthonsmartphone" colspan="4">';
-	print $form->select_produits('','id','',20,0,1,2,'',1, array(), 0, 'All');
-	print '</td></tr>';
+    print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
+    print '<td class="maxwidthonsmartphone" colspan="4">';
+    print $form->select_produits('','id','',20,0,1,2,'',1, array(), 0, 'All');
+    print '</td></tr>';
 }
 
 // Categories
@@ -156,16 +156,16 @@ 
 
 // Margin Rate
 if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
-	print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="4">';
-	print '<span id="marginRate"></span>'; // set by jquery (see below)
-	print '</td></tr>';
+    print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="4">';
+    print '<span id="marginRate"></span>'; // set by jquery (see below)
+    print '</td></tr>';
 }
 
 // Mark Rate
 if (! empty($conf->global->DISPLAY_MARK_RATES)) {
-	print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="4">';
-	print '<span id="markRate"></span>'; // set by jquery (see below)
-	print '</td></tr>';
+    print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="4">';
+    print '<span id="markRate"></span>'; // set by jquery (see below)
+    print '</td></tr>';
 }
 
 print "</table>";
@@ -186,24 +186,24 @@ 
 $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = d.fk_product";
 if (! empty($TSelectedCats)) {
-	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=p.rowid';
+    $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=p.rowid';
 }
 $sql.= " WHERE f.fk_soc = s.rowid";
 $sql.= ' AND f.entity IN ('.getEntity('invoice').')';
 $sql.= " AND f.fk_statut > 0";
 $sql.= " AND d.fk_facture = f.rowid";
 if ($id > 0)
-	$sql.= " AND d.fk_product =".$id;
+    $sql.= " AND d.fk_product =".$id;
 if (! empty($TSelectedCats)) {
-	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
+    $sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
 }
 if (!empty($startdate))
-  $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
+    $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
 if (!empty($enddate))
-  $sql.= " AND f.datef <= '".$db->idate($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";
+    $sql .= " AND d.buy_price_ht <> 0";
 if ($id > 0) $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity, d.fk_product, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut";
 else $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity";
 $sql.=$db->order($sortfield,$sortorder);
@@ -214,137 +214,137 @@ 
 $result = $db->query($sql);
 if ($result)
 {
-	$num = $db->num_rows($result);
+    $num = $db->num_rows($result);
 
-	print '<br>';
-	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;id=".$id, $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
+    print '<br>';
+    print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;id=".$id, $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
-	//var_dump($conf->global->MARGIN_TYPE);
-	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice='BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
-	    $labelcostprice='CostPrice';
+    //var_dump($conf->global->MARGIN_TYPE);
+    if ($conf->global->MARGIN_TYPE == "1")
+        $labelcostprice='BuyingPrice';
+    else   // value is 'costprice' or 'pmp'
+        $labelcostprice='CostPrice';
 
-	$moreforfilter='';
+    $moreforfilter='';
 
-	$i = 0;
+    $i = 0;
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-	print '<tr class="liste_titre">';
-	if ($id > 0) {
-  		print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
-  		print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$id,'align="center"',$sortfield,$sortorder);
-  	}
-  	else
-  	{
-  		print_liste_field_titre("ProductService",$_SERVER["PHP_SELF"],"p.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
-  	}
-	print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	print "</tr>\n";
-
-	$cumul_achat = 0;
-	$cumul_vente = 0;
-	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
-
-	if ($num > 0)
-	{
-		while ($i < $num /*&& $i < $conf->liste_limit*/)
-		{
-			$objp = $db->fetch_object($result);
-			$pa = $objp->buying_price;
-			$pv = $objp->selling_price;
-			$marge = $objp->marge;
-
-			if ($marge < 0)
-			{
-				$marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
-			}
-			else
-			{
-				$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
-			}
-
-			print '<tr class="oddeven">';
-			if ($id > 0) {
-				print '<td>';
-				$invoicestatic->id=$objp->facid;
-				$invoicestatic->ref=$objp->ref;
-				print $invoicestatic->getNomUrl(1);
-				print "</td>\n";
-				print "<td align=\"center\">";
-				print dol_print_date($db->jdate($objp->datef),'day')."</td>";
-			}
-			else {
-				print '<td>';
-				if ($objp->rowid > 0)
-				{
-    				$product_static->type=$objp->fk_product_type;
-    				$product_static->id=$objp->rowid;
-    				$product_static->ref=$objp->ref;
-    				$product_static->label=$objp->label;
-    				$product_static->entity=$objp->pentity;
-    				$text=$product_static->getNomUrl(1);
-    				print $text.= ' - '.$objp->label;
-				}
-				else
-				{
-				    print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
-				}
-				print "</td>\n";
-				//print "<td>".$product_static->getNomUrl(1)."</td>\n";
-			}
-			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";
-			print "</tr>\n";
-
-			$i++;
-			$cumul_achat += $objp->buying_price;
-			$cumul_vente += $objp->selling_price;
-		}
-	}
-
-	// affichage totaux marges
-
-	$totalMargin = $cumul_vente - $cumul_achat;
-
-	$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
-	$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
-
-	print '<tr class="liste_total">';
-	if ($id > 0)
-		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";
-	print "</tr>\n";
-
-	print "</table>";
-	print '</div>';
+    print '<tr class="liste_titre">';
+    if ($id > 0) {
+            print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
+            print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$id,'align="center"',$sortfield,$sortorder);
+        }
+        else
+        {
+            print_liste_field_titre("ProductService",$_SERVER["PHP_SELF"],"p.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
+        }
+    print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+    if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+        print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+    if (! empty($conf->global->DISPLAY_MARK_RATES))
+        print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+    print "</tr>\n";
+
+    $cumul_achat = 0;
+    $cumul_vente = 0;
+    $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+
+    if ($num > 0)
+    {
+        while ($i < $num /*&& $i < $conf->liste_limit*/)
+        {
+            $objp = $db->fetch_object($result);
+            $pa = $objp->buying_price;
+            $pv = $objp->selling_price;
+            $marge = $objp->marge;
+
+            if ($marge < 0)
+            {
+                $marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
+                $markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
+            }
+            else
+            {
+                $marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
+                $markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
+            }
+
+            print '<tr class="oddeven">';
+            if ($id > 0) {
+                print '<td>';
+                $invoicestatic->id=$objp->facid;
+                $invoicestatic->ref=$objp->ref;
+                print $invoicestatic->getNomUrl(1);
+                print "</td>\n";
+                print "<td align=\"center\">";
+                print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+            }
+            else {
+                print '<td>';
+                if ($objp->rowid > 0)
+                {
+                    $product_static->type=$objp->fk_product_type;
+                    $product_static->id=$objp->rowid;
+                    $product_static->ref=$objp->ref;
+                    $product_static->label=$objp->label;
+                    $product_static->entity=$objp->pentity;
+                    $text=$product_static->getNomUrl(1);
+                    print $text.= ' - '.$objp->label;
+                }
+                else
+                {
+                    print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
+                }
+                print "</td>\n";
+                //print "<td>".$product_static->getNomUrl(1)."</td>\n";
+            }
+            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";
+            print "</tr>\n";
+
+            $i++;
+            $cumul_achat += $objp->buying_price;
+            $cumul_vente += $objp->selling_price;
+        }
+    }
+
+    // affichage totaux marges
+
+    $totalMargin = $cumul_vente - $cumul_achat;
+
+    $marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
+    $markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
+
+    print '<tr class="liste_total">';
+    if ($id > 0)
+        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";
+    print "</tr>\n";
+
+    print "</table>";
+    print '</div>';
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 $db->free($result);
 

Braces +67 added lines, -46 removed lines

@@ -40,7 +40,9 @@ 
 // Security check
 $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
 $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->societe_id)) {
+    $socid=$user->societe_id;
+}
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 $result=restrictedArea($user,'margins');
 
@@ -61,8 +63,7 @@ 
 	{
 		$sortfield="f.datef";
 		$sortorder="DESC";
-	}
-	else
+	} else
 	{
 	    $sortfield="p.ref";
 	    $sortorder="ASC";
@@ -71,10 +72,12 @@ 
 
 $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']);
+}
 
 
 /*
@@ -109,10 +112,13 @@ 
   print $form->select_produits($id,'id','',20,0,1,2,'',1, array(), 0, 'All');
   print '</td></tr>';
 
-  if (! $sortorder) $sortorder="DESC";
-  if (! $sortfield) $sortfield="f.datef";
-}
-else {
+  if (! $sortorder) {
+      $sortorder="DESC";
+  }
+  if (! $sortfield) {
+      $sortfield="f.datef";
+  }
+  } else {
 	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
 	print $form->select_produits('','id','',20,0,1,2,'',1, array(), 0, 'All');
@@ -175,8 +181,12 @@ 
 print '</form>';
 
 $sql = "SELECT p.label, p.rowid, p.fk_product_type, p.ref, p.entity as pentity,";
-if ($id > 0) $sql.= " d.fk_product,";
-if ($id > 0) $sql.= " f.rowid as facid, f.ref, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
+if ($id > 0) {
+    $sql.= " d.fk_product,";
+}
+if ($id > 0) {
+    $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,";
@@ -192,20 +202,27 @@ 
 $sql.= ' AND f.entity IN ('.getEntity('invoice').')';
 $sql.= " AND f.fk_statut > 0";
 $sql.= " AND d.fk_facture = f.rowid";
-if ($id > 0)
+if ($id > 0) {
 	$sql.= " AND d.fk_product =".$id;
+}
 if (! empty($TSelectedCats)) {
 	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
 }
-if (!empty($startdate))
+if (!empty($startdate)) {
   $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
-if (!empty($enddate))
+}
+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)
+if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) {
 	$sql .= " AND d.buy_price_ht <> 0";
-if ($id > 0) $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity, d.fk_product, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut";
-else $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity";
+}
+if ($id > 0) {
+    $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity, d.fk_product, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut";
+} else {
+    $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity";
+}
 $sql.=$db->order($sortfield,$sortorder);
 // TODO: calculate total to display then restore pagination
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
@@ -220,10 +237,12 @@ 
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;id=".$id, $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	//var_dump($conf->global->MARGIN_TYPE);
-	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='';
 
@@ -235,18 +254,19 @@ 
 	if ($id > 0) {
   		print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
   		print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$id,'align="center"',$sortfield,$sortorder);
-  	}
-  	else
+  	} else
   	{
   		print_liste_field_titre("ProductService",$_SERVER["PHP_SELF"],"p.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
   	}
 	print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+	}
+	if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+			print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+	}
 	print "</tr>\n";
 
 	$cumul_achat = 0;
@@ -266,8 +286,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):'' ;
@@ -282,8 +301,7 @@ 
 				print "</td>\n";
 				print "<td align=\"center\">";
 				print dol_print_date($db->jdate($objp->datef),'day')."</td>";
-			}
-			else {
+			} else {
 				print '<td>';
 				if ($objp->rowid > 0)
 				{
@@ -294,8 +312,7 @@ 
     				$product_static->entity=$objp->pentity;
     				$text=$product_static->getNomUrl(1);
     				print $text.= ' - '.$objp->label;
-				}
-				else
+				} else
 				{
 				    print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
 				}
@@ -305,10 +322,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++;
@@ -325,24 +344,26 @@ 
 	$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
 
 	print '<tr class="liste_total">';
-	if ($id > 0)
-		print '<td colspan=2>';
-	else
-		print '<td>';
+	if ($id > 0) {
+			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>";
 	print '</div>';
-}
-else
+} else
 {
 	dol_print_error($db);
 }

Spacing +97 added lines, -97 removed lines

@@ -25,7 +25,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -37,48 +37,48 @@ 
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action=GETPOST('action','alpha');
-$confirm=GETPOST('confirm','alpha');
-$TSelectedCats=GETPOST('categories', 'array');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$TSelectedCats = GETPOST('categories', 'array');
 
 // Security check
-$fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
-$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
-$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
-$result=restrictedArea($user,'margins');
+$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
+$fieldtype = (!empty($ref) ? 'ref' : 'rowid');
+if (!empty($user->societe_id)) $socid = $user->societe_id;
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+$result = restrictedArea($user, 'margins');
 
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield)
+if (!$sortfield)
 {
 	if ($id > 0)
 	{
-		$sortfield="f.datef";
-		$sortorder="DESC";
+		$sortfield = "f.datef";
+		$sortorder = "DESC";
 	}
 	else
 	{
-	    $sortfield="p.ref";
-	    $sortorder="ASC";
+	    $sortfield = "p.ref";
+	    $sortorder = "ASC";
 	}
 }
 
-$startdate=$enddate='';
+$startdate = $enddate = '';
 
 if (!empty($_POST['startdatemonth']))
-  $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']);
+  $startdate = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']);
 if (!empty($_POST['enddatemonth']))
-  $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
+  $enddate = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
 
 
 /*
@@ -86,19 +86,19 @@ 
  */
 
 $product_static = new Product($db);
-$invoicestatic=new Facture($db);
+$invoicestatic = new Facture($db);
 
 $form = new Form($db);
 
-llxHeader('',$langs->trans("Margins").' - '.$langs->trans("Products"));
+llxHeader('', $langs->trans("Margins").' - '.$langs->trans("Products"));
 
-$text=$langs->trans("Margins");
+$text = $langs->trans("Margins");
 //print load_fiche_titre($text);
 
 // Show tabs
-$head=marges_prepare_head($user);
-$titre=$langs->trans("Margins");
-$picto='margin';
+$head = marges_prepare_head($user);
+$titre = $langs->trans("Margins");
+$picto = 'margin';
 
 print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">';
 
@@ -110,16 +110,16 @@ 
 
   print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
   print '<td class="maxwidthonsmartpone" colspan="4">';
-  print $form->select_produits($id,'id','',20,0,1,2,'',1, array(), 0, 'All');
+  print $form->select_produits($id, 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All');
   print '</td></tr>';
 
-  if (! $sortorder) $sortorder="DESC";
-  if (! $sortfield) $sortfield="f.datef";
+  if (!$sortorder) $sortorder = "DESC";
+  if (!$sortfield) $sortfield = "f.datef";
 }
 else {
 	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
-	print $form->select_produits('','id','',20,0,1,2,'',1, array(), 0, 'All');
+	print $form->select_produits('', 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All');
 	print '</td></tr>';
 }
 
@@ -159,14 +159,14 @@ 
 print '</td></tr>';
 
 // Margin Rate
-if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
 	print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="4">';
 	print '<span id="marginRate"></span>'; // set by jquery (see below)
 	print '</td></tr>';
 }
 
 // Mark Rate
-if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+if (!empty($conf->global->DISPLAY_MARK_RATES)) {
 	print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="4">';
 	print '<span id="markRate"></span>'; // set by jquery (see below)
 	print '</td></tr>';
@@ -179,38 +179,38 @@ 
 print '</form>';
 
 $sql = "SELECT p.label, p.rowid, p.fk_product_type, p.ref, p.entity as pentity,";
-if ($id > 0) $sql.= " d.fk_product,";
-if ($id > 0) $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,";
+if ($id > 0) $sql .= " d.fk_product,";
+if ($id > 0) $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,";
-$sql.= " SUM(".$db->ifsql('d.total_ht < 0','-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))','d.total_ht - (d.buy_price_ht * d.qty)').") as marge";
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql.= ", ".MAIN_DB_PREFIX."facture as f";
-$sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = d.fk_product";
-if (! empty($TSelectedCats)) {
-	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=p.rowid';
+$sql .= " SUM(".$db->ifsql('d.total_ht < 0', 'd.qty * d.buy_price_ht * -1', 'd.qty * d.buy_price_ht').") as buying_price,";
+$sql .= " SUM(".$db->ifsql('d.total_ht < 0', '-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))', 'd.total_ht - (d.buy_price_ht * d.qty)').") as marge";
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+$sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = d.fk_product";
+if (!empty($TSelectedCats)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=p.rowid';
 }
-$sql.= " WHERE f.fk_soc = s.rowid";
-$sql.= ' AND f.entity IN ('.getEntity('invoice').')';
-$sql.= " AND f.fk_statut > 0";
-$sql.= " AND d.fk_facture = f.rowid";
+$sql .= " WHERE f.fk_soc = s.rowid";
+$sql .= ' AND f.entity IN ('.getEntity('invoice').')';
+$sql .= " AND f.fk_statut > 0";
+$sql .= " AND d.fk_facture = f.rowid";
 if ($id > 0)
-	$sql.= " AND d.fk_product =".$id;
-if (! empty($TSelectedCats)) {
-	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
+	$sql .= " AND d.fk_product =".$id;
+if (!empty($TSelectedCats)) {
+	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats).')';
 }
 if (!empty($startdate))
-  $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
+  $sql .= " AND f.datef >= '".$db->idate($startdate)."'";
 if (!empty($enddate))
-  $sql.= " AND f.datef <= '".$db->idate($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 ($id > 0) $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity, d.fk_product, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut";
-else $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity";
-$sql.=$db->order($sortfield,$sortorder);
+if ($id > 0) $sql .= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity, d.fk_product, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut";
+else $sql .= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity";
+$sql .= $db->order($sortfield, $sortorder);
 // TODO: calculate total to display then restore pagination
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
@@ -225,37 +225,37 @@ 
 
 	//var_dump($conf->global->MARGIN_TYPE);
 	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice='BuyingPrice';
+	    $labelcostprice = 'BuyingPrice';
 	else   // value is 'costprice' or 'pmp'
-	    $labelcostprice='CostPrice';
+	    $labelcostprice = 'CostPrice';
 
-	$moreforfilter='';
+	$moreforfilter = '';
 
 	$i = 0;
     print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre">';
 	if ($id > 0) {
-  		print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
-  		print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$id,'align="center"',$sortfield,$sortorder);
+  		print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;id=".$id, '', $sortfield, $sortorder);
+  		print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;id=".$id, 'align="center"', $sortfield, $sortorder);
   	}
   	else
   	{
-  		print_liste_field_titre("ProductService",$_SERVER["PHP_SELF"],"p.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
+  		print_liste_field_titre("ProductService", $_SERVER["PHP_SELF"], "p.ref", "", "&amp;id=".$id, '', $sortfield, $sortorder);
   	}
-	print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
+	if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+		print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
+	if (!empty($conf->global->DISPLAY_MARK_RATES))
+		print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
 	print "</tr>\n";
 
 	$cumul_achat = 0;
 	$cumul_vente = 0;
-	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
 
 	if ($num > 0)
 	{
@@ -268,36 +268,36 @@ 
 
 			if ($marge < 0)
 			{
-				$marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
+				$marginRate = ($pa != 0) ?-1 * (100 * $marge / $pa) : '';
+				$markRate = ($pv != 0) ?-1 * (100 * $marge / $pv) : '';
 			}
 			else
 			{
-				$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
+				$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
+				$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
 			}
 
 			print '<tr class="oddeven">';
 			if ($id > 0) {
 				print '<td>';
-				$invoicestatic->id=$objp->facid;
-				$invoicestatic->ref=$objp->ref;
+				$invoicestatic->id = $objp->facid;
+				$invoicestatic->ref = $objp->ref;
 				print $invoicestatic->getNomUrl(1);
 				print "</td>\n";
 				print "<td align=\"center\">";
-				print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+				print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
 			}
 			else {
 				print '<td>';
 				if ($objp->rowid > 0)
 				{
-    				$product_static->type=$objp->fk_product_type;
-    				$product_static->id=$objp->rowid;
-    				$product_static->ref=$objp->ref;
-    				$product_static->label=$objp->label;
-    				$product_static->entity=$objp->pentity;
-    				$text=$product_static->getNomUrl(1);
-    				print $text.= ' - '.$objp->label;
+    				$product_static->type = $objp->fk_product_type;
+    				$product_static->id = $objp->rowid;
+    				$product_static->ref = $objp->ref;
+    				$product_static->label = $objp->label;
+    				$product_static->entity = $objp->pentity;
+    				$text = $product_static->getNomUrl(1);
+    				print $text .= ' - '.$objp->label;
 				}
 				else
 				{
@@ -309,10 +309,10 @@ 
 			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++;
@@ -325,8 +325,8 @@ 
 
 	$totalMargin = $cumul_vente - $cumul_achat;
 
-	$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
-	$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
+	$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
+	$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
 
 	print '<tr class="liste_total">';
 	if ($id > 0)
@@ -337,10 +337,10 @@ 
 	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>";
@@ -362,8 +362,8 @@ 
   });
 
   $("#totalMargin").html("'.price($totalMargin, null, null, null, null, $rounding).'");
-  $("#marginRate").html("'.(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%").'");
-  $("#markRate").html("'.(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%").'");
+  $("#marginRate").html("'.(($marginRate === '') ? 'n/a' : price($marginRate, null, null, null, null, $rounding)."%").'");
+  $("#markRate").html("'.(($markRate === '') ? 'n/a' : price($markRate, null, null, null, null, $rounding)."%").'");
 
 });
 </script>

dolibarr/htdocs/margin/lib/margins.lib.php

Indentation +91 added lines, -91 removed lines

@@ -30,25 +30,25 @@ 
  */
 function marges_admin_prepare_head()
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT."/margin/admin/margin.php";
-	$head[$h][1] = $langs->trans("Parameters");
-	$head[$h][2] = 'parameters';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/margin/admin/margin.php";
+    $head[$h][1] = $langs->trans("Parameters");
+    $head[$h][2] = 'parameters';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,'',$head,$h,'margesadmin');
+    complete_head_from_modules($conf,$langs,'',$head,$h,'margesadmin');
 
-	complete_head_from_modules($conf,$langs,'',$head,$h,'margesadmin','remove');
+    complete_head_from_modules($conf,$langs,'',$head,$h,'margesadmin','remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -58,45 +58,45 @@ 
  */
 function marges_prepare_head()
 {
-	global $langs, $conf, $user;
-	$langs->load("margins");
-
-	$h = 0;
-	$head = array();
-
-	if ($user->rights->produit->lire) {
-		$head[$h][0] = DOL_URL_ROOT."/margin/productMargins.php";
-		$head[$h][1] = $langs->trans("ProductMargins");
-		$head[$h][2] = 'productMargins';
-		$h++;
-	}
-
-	if ($user->rights->societe->lire) {
-		$head[$h][0] = DOL_URL_ROOT."/margin/customerMargins.php";
-		$head[$h][1] = $langs->trans("CustomerMargins");
-		$head[$h][2] = 'customerMargins';
-		$h++;
-	}
-
-	if ($user->rights->margins->read->all) {
-		$title = 'UserMargins';
-	} else {
-		$title = 'SalesRepresentativeMargins';
-	}
-
-	$head[$h][0] = DOL_URL_ROOT."/margin/agentMargins.php";
-	$head[$h][1] = $langs->trans($title);
-	$head[$h][2] = 'agentMargins';
+    global $langs, $conf, $user;
+    $langs->load("margins");
+
+    $h = 0;
+    $head = array();
+
+    if ($user->rights->produit->lire) {
+        $head[$h][0] = DOL_URL_ROOT."/margin/productMargins.php";
+        $head[$h][1] = $langs->trans("ProductMargins");
+        $head[$h][2] = 'productMargins';
+        $h++;
+    }
+
+    if ($user->rights->societe->lire) {
+        $head[$h][0] = DOL_URL_ROOT."/margin/customerMargins.php";
+        $head[$h][1] = $langs->trans("CustomerMargins");
+        $head[$h][2] = 'customerMargins';
+        $h++;
+    }
+
+    if ($user->rights->margins->read->all) {
+        $title = 'UserMargins';
+    } else {
+        $title = 'SalesRepresentativeMargins';
+    }
+
+    $head[$h][0] = DOL_URL_ROOT."/margin/agentMargins.php";
+    $head[$h][1] = $langs->trans($title);
+    $head[$h][2] = 'agentMargins';
 
 	
-	if ($user->rights->margins->creer) {
-		$h++;
-		$head[$h][0] = DOL_URL_ROOT."/margin/checkMargins.php";
-		$head[$h][1] = $langs->trans('CheckMargins');
-		$head[$h][2] = 'checkMargins';
-	}
-
-	return $head;
+    if ($user->rights->margins->creer) {
+        $h++;
+        $head[$h][0] = DOL_URL_ROOT."/margin/checkMargins.php";
+        $head[$h][1] = $langs->trans('CheckMargins');
+        $head[$h][2] = 'checkMargins';
+    }
+
+    return $head;
 }
 
 /**
@@ -113,46 +113,46 @@ 
  */
 function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localtax2_tx, $fk_pa, $paht)
 {
-	global $db, $conf;
-
-	$marge_tx_ret='';
-	$marque_tx_ret='';
-
-	if ($fk_pa > 0 && empty($paht)) {
-		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-		$product = new ProductFournisseur($db);
-		if ($product->fetch_product_fournisseur_price($fk_pa))
-		{
-			$paht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
-		}
-		else
-		{
-			$paht_ret = $paht;
-		}
-	}
-	else
-	{
-		$paht_ret = $paht;
-	}
-
-	// Calculate selling unit price including line discount
-	// We don't use calculate_price, because this function is dedicated to calculation of total with accuracy of total. We need an accuracy of a unit price.
-	// Also we must not apply rounding on non decimal rule defined by option MAIN_ROUNDING_RULE_TOT
-	$pu_ht_remise = $pvht * (1 - ($remise_percent / 100));
-	$pu_ht_remise = price2num($pu_ht_remise, 'MU');
-
-	// calcul marge
-	if ($pu_ht_remise < 0)
-		$marge = -1 * (abs($pu_ht_remise) - $paht_ret);
-	else
-		$marge = $pu_ht_remise - $paht_ret;
-
-	// calcul taux marge
-	if ($paht_ret != 0)
-		$marge_tx_ret = (100 * $marge) / $paht_ret;
-	// calcul taux marque
-	if ($pu_ht_remise != 0)
-		$marque_tx_ret = (100 * $marge) / $pu_ht_remise;
-
-	return array($paht_ret, $marge_tx_ret, $marque_tx_ret);
+    global $db, $conf;
+
+    $marge_tx_ret='';
+    $marque_tx_ret='';
+
+    if ($fk_pa > 0 && empty($paht)) {
+        require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+        $product = new ProductFournisseur($db);
+        if ($product->fetch_product_fournisseur_price($fk_pa))
+        {
+            $paht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
+        }
+        else
+        {
+            $paht_ret = $paht;
+        }
+    }
+    else
+    {
+        $paht_ret = $paht;
+    }
+
+    // Calculate selling unit price including line discount
+    // We don't use calculate_price, because this function is dedicated to calculation of total with accuracy of total. We need an accuracy of a unit price.
+    // Also we must not apply rounding on non decimal rule defined by option MAIN_ROUNDING_RULE_TOT
+    $pu_ht_remise = $pvht * (1 - ($remise_percent / 100));
+    $pu_ht_remise = price2num($pu_ht_remise, 'MU');
+
+    // calcul marge
+    if ($pu_ht_remise < 0)
+        $marge = -1 * (abs($pu_ht_remise) - $paht_ret);
+    else
+        $marge = $pu_ht_remise - $paht_ret;
+
+    // calcul taux marge
+    if ($paht_ret != 0)
+        $marge_tx_ret = (100 * $marge) / $paht_ret;
+    // calcul taux marque
+    if ($pu_ht_remise != 0)
+        $marque_tx_ret = (100 * $marge) / $pu_ht_remise;
+
+    return array($paht_ret, $marge_tx_ret, $marque_tx_ret);
 }

Spacing +4 added lines, -4 removed lines

@@ -44,9 +44,9 @@ 
 	// Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,'',$head,$h,'margesadmin');
+	complete_head_from_modules($conf, $langs, '', $head, $h, 'margesadmin');
 
-	complete_head_from_modules($conf,$langs,'',$head,$h,'margesadmin','remove');
+	complete_head_from_modules($conf, $langs, '', $head, $h, 'margesadmin', 'remove');
 
 	return $head;
 }
@@ -115,8 +115,8 @@ 
 {
 	global $db, $conf;
 
-	$marge_tx_ret='';
-	$marque_tx_ret='';
+	$marge_tx_ret = '';
+	$marque_tx_ret = '';
 
 	if ($fk_pa > 0 && empty($paht)) {
 		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';

Braces +13 added lines, -12 removed lines

@@ -124,13 +124,11 @@ 
 		if ($product->fetch_product_fournisseur_price($fk_pa))
 		{
 			$paht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
-		}
-		else
+		} else
 		{
 			$paht_ret = $paht;
 		}
-	}
-	else
+	} else
 	{
 		$paht_ret = $paht;
 	}
@@ -142,17 +140,20 @@ 
 	$pu_ht_remise = price2num($pu_ht_remise, 'MU');
 
 	// calcul marge
-	if ($pu_ht_remise < 0)
-		$marge = -1 * (abs($pu_ht_remise) - $paht_ret);
-	else
-		$marge = $pu_ht_remise - $paht_ret;
+	if ($pu_ht_remise < 0) {
+			$marge = -1 * (abs($pu_ht_remise) - $paht_ret);
+	} else {
+			$marge = $pu_ht_remise - $paht_ret;
+	}
 
 	// calcul taux marge
-	if ($paht_ret != 0)
-		$marge_tx_ret = (100 * $marge) / $paht_ret;
+	if ($paht_ret != 0) {
+			$marge_tx_ret = (100 * $marge) / $paht_ret;
+	}
 	// calcul taux marque
-	if ($pu_ht_remise != 0)
-		$marque_tx_ret = (100 * $marge) / $pu_ht_remise;
+	if ($pu_ht_remise != 0) {
+			$marque_tx_ret = (100 * $marge) / $pu_ht_remise;
+	}
 
 	return array($paht_ret, $marge_tx_ret, $marque_tx_ret);
 }

dolibarr/htdocs/margin/agentMargins.php

Indentation +94 added lines, -94 removed lines

@@ -46,24 +46,24 @@ 
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield)
 {
-	if ($agentid > 0)
-		$sortfield="s.nom";
-	else
-	    $sortfield="u.lastname";
+    if ($agentid > 0)
+        $sortfield="s.nom";
+    else
+        $sortfield="u.lastname";
 }
 
 $startdate=$enddate='';
 
 if (!empty($_POST['startdatemonth']))
-  $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'],  $_POST['startdateday'],  $_POST['startdateyear']);
+    $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'],  $_POST['startdateday'],  $_POST['startdateyear']);
 if (!empty($_POST['enddatemonth']))
-  $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'],  $_POST['enddateday'],  $_POST['enddateyear']);
+    $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'],  $_POST['enddateday'],  $_POST['enddateyear']);
 
 // Security check
 if ($user->rights->margins->read->all) {
-  $agentid = GETPOST('agentid', 'int');
+    $agentid = GETPOST('agentid', 'int');
 } else {
-  $agentid = $user->id;
+    $agentid = $user->id;
 }
 $result=restrictedArea($user,'margins');
 
@@ -143,22 +143,22 @@ 
 $sql.= " AND sc.fk_soc = f.fk_soc";
 $sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
 if (! empty($conf->global->AGENT_CONTACT_TYPE))
-	$sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
+    $sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
 else
-	$sql .= " AND sc.fk_user = u.rowid";
+    $sql .= " AND sc.fk_user = u.rowid";
 $sql.= " AND f.fk_statut > 0";
 $sql.= ' AND s.entity IN ('.getEntity('societe').')';
 $sql.= " AND d.fk_facture = f.rowid";
 if ($agentid > 0) {
-	if (! empty($conf->global->AGENT_CONTACT_TYPE))
-  		$sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
-	else
-	    $sql .= " AND sc.fk_user = ".$agentid;
+    if (! empty($conf->global->AGENT_CONTACT_TYPE))
+            $sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
+    else
+        $sql .= " AND sc.fk_user = ".$agentid;
 }
 if (!empty($startdate))
-  $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
+    $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
 if (!empty($enddate))
-  $sql.= " AND f.datef <= '".$db->idate($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 ($agentid > 0) $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname";
@@ -176,87 +176,87 @@ 
 $result = $db->query($sql);
 if ($result)
 {
-	$num = $db->num_rows($result);
-
-	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'
-	    $labelcostprice='CostPrice';
-
-	$i = 0;
-	print "<table class=\"noborder\" width=\"100%\">";
-
-	print '<tr class="liste_titre">';
-	if ($agentid > 0)
-		print_liste_field_titre("Customer",$_SERVER["PHP_SELF"],"s.nom","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
-	else
-		print_liste_field_titre("SalesRepresentative",$_SERVER["PHP_SELF"],"u.lastname","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
-
-	print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-	print "</tr>\n";
-
-	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
-
-	if ($num > 0)
-	{
-
-		while ($i < $num /*&& $i < $conf->liste_limit*/)
-		{
-			$objp = $db->fetch_object($result);
-
-			$pa = $objp->buying_price;
-			$pv = $objp->selling_price;
-			$marge = $objp->marge;
-
-			if ($marge < 0)
-			{
-				$marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
-			}
-			else
-			{
-				$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
-			}
-
-			print '<tr class="oddeven">';
-			if ($agentid > 0) {
-				$companystatic->id=$objp->socid;
-				$companystatic->name=$objp->name;
-				$companystatic->client=$objp->client;
-				print "<td>".$companystatic->getNomUrl(1,'customer')."</td>\n";
-			}
-			else {
-				$userstatic->fetch($objp->agent);
-				print "<td>".$userstatic->getFullName($langs,0,0,0)."</td>\n";
-			}
-
-			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";
-			print "</tr>\n";
-
-			$i++;
-		}
-	}
-	print "</table>";
+    $num = $db->num_rows($result);
+
+    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'
+        $labelcostprice='CostPrice';
+
+    $i = 0;
+    print "<table class=\"noborder\" width=\"100%\">";
+
+    print '<tr class="liste_titre">';
+    if ($agentid > 0)
+        print_liste_field_titre("Customer",$_SERVER["PHP_SELF"],"s.nom","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
+    else
+        print_liste_field_titre("SalesRepresentative",$_SERVER["PHP_SELF"],"u.lastname","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
+
+    print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
+    if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+        print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
+    if (! empty($conf->global->DISPLAY_MARK_RATES))
+        print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
+    print "</tr>\n";
+
+    $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+
+    if ($num > 0)
+    {
+
+        while ($i < $num /*&& $i < $conf->liste_limit*/)
+        {
+            $objp = $db->fetch_object($result);
+
+            $pa = $objp->buying_price;
+            $pv = $objp->selling_price;
+            $marge = $objp->marge;
+
+            if ($marge < 0)
+            {
+                $marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
+                $markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
+            }
+            else
+            {
+                $marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
+                $markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
+            }
+
+            print '<tr class="oddeven">';
+            if ($agentid > 0) {
+                $companystatic->id=$objp->socid;
+                $companystatic->name=$objp->name;
+                $companystatic->client=$objp->client;
+                print "<td>".$companystatic->getNomUrl(1,'customer')."</td>\n";
+            }
+            else {
+                $userstatic->fetch($objp->agent);
+                print "<td>".$userstatic->getFullName($langs,0,0,0)."</td>\n";
+            }
+
+            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";
+            print "</tr>\n";
+
+            $i++;
+        }
+    }
+    print "</table>";
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 $db->free($result);
 

Braces +62 added lines, -42 removed lines

@@ -43,21 +43,26 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
 if (! $sortfield)
 {
-	if ($agentid > 0)
-		$sortfield="s.nom";
-	else
-	    $sortfield="u.lastname";
-}
+	if ($agentid > 0) {
+			$sortfield="s.nom";
+	} else {
+		    $sortfield="u.lastname";
+	}
+	}
 
 $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']);
+}
 
 // Security check
 if ($user->rights->margins->read->all) {
@@ -126,7 +131,9 @@ 
 print '</form>';
 
 $sql = "SELECT";
-if ($agentid > 0) $sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,";
+if ($agentid > 0) {
+    $sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,";
+}
 $sql.= " u.rowid as agent, u.login, u.lastname, u.firstname,";
 $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)
@@ -142,27 +149,36 @@ 
 $sql.= ' AND f.entity IN ('.getEntity('invoice').')';
 $sql.= " AND sc.fk_soc = f.fk_soc";
 $sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
-if (! empty($conf->global->AGENT_CONTACT_TYPE))
+if (! empty($conf->global->AGENT_CONTACT_TYPE)) {
 	$sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
-else
+} else {
 	$sql .= " AND sc.fk_user = u.rowid";
+}
 $sql.= " AND f.fk_statut > 0";
 $sql.= ' AND s.entity IN ('.getEntity('societe').')';
 $sql.= " AND d.fk_facture = f.rowid";
 if ($agentid > 0) {
-	if (! empty($conf->global->AGENT_CONTACT_TYPE))
-  		$sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
-	else
-	    $sql .= " AND sc.fk_user = ".$agentid;
-}
-if (!empty($startdate))
+	if (! empty($conf->global->AGENT_CONTACT_TYPE)) {
+	  		$sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
+	} else {
+		    $sql .= " AND sc.fk_user = ".$agentid;
+	}
+	}
+if (!empty($startdate)) {
   $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
-if (!empty($enddate))
+}
+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 ($agentid > 0) $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname";
-else $sql.= " GROUP BY u.rowid, u.login, u.lastname, u.firstname";
+if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) {
+    $sql .= " AND d.buy_price_ht <> 0";
+}
+if ($agentid > 0) {
+    $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname";
+} else {
+    $sql.= " GROUP BY u.rowid, u.login, u.lastname, u.firstname";
+}
 $sql.=$db->order($sortfield,$sortorder);
 // TODO: calculate total to display then restore pagination
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
@@ -181,27 +197,32 @@ 
 	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%\">";
 
 	print '<tr class="liste_titre">';
-	if ($agentid > 0)
-		print_liste_field_titre("Customer",$_SERVER["PHP_SELF"],"s.nom","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
-	else
-		print_liste_field_titre("SalesRepresentative",$_SERVER["PHP_SELF"],"u.lastname","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
+	if ($agentid > 0) {
+			print_liste_field_titre("Customer",$_SERVER["PHP_SELF"],"s.nom","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
+	} else {
+			print_liste_field_titre("SalesRepresentative",$_SERVER["PHP_SELF"],"u.lastname","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
+	}
 
 	print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
+	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
+	}
+	if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+			print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
+	}
 	print "</tr>\n";
 
 	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
@@ -221,8 +242,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):'' ;
@@ -234,8 +254,7 @@ 
 				$companystatic->name=$objp->name;
 				$companystatic->client=$objp->client;
 				print "<td>".$companystatic->getNomUrl(1,'customer')."</td>\n";
-			}
-			else {
+			} else {
 				$userstatic->fetch($objp->agent);
 				print "<td>".$userstatic->getFullName($langs,0,0,0)."</td>\n";
 			}
@@ -243,18 +262,19 @@ 
 			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++;
 		}
 	}
 	print "</table>";
-}
-else
+} else
 {
 	dol_print_error($db);
 }

Spacing +72 added lines, -72 removed lines

@@ -26,7 +26,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -39,29 +39,29 @@ 
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield)
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield)
 {
 	if ($agentid > 0)
-		$sortfield="s.nom";
+		$sortfield = "s.nom";
 	else
-	    $sortfield="u.lastname";
+	    $sortfield = "u.lastname";
 }
 
-$startdate=$enddate='';
+$startdate = $enddate = '';
 
 if (!empty($_POST['startdatemonth']))
-  $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'],  $_POST['startdateday'],  $_POST['startdateyear']);
+  $startdate = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']);
 if (!empty($_POST['enddatemonth']))
-  $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'],  $_POST['enddateday'],  $_POST['enddateyear']);
+  $enddate = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
 
 // Security check
 if ($user->rights->margins->read->all) {
@@ -69,7 +69,7 @@ 
 } else {
   $agentid = $user->id;
 }
-$result=restrictedArea($user,'margins');
+$result = restrictedArea($user, 'margins');
 
 
 /*
@@ -86,19 +86,19 @@ 
 
 $userstatic = new User($db);
 $companystatic = new Societe($db);
-$invoicestatic=new Facture($db);
+$invoicestatic = new Facture($db);
 
 $form = new Form($db);
 
-llxHeader('',$langs->trans("Margins").' - '.$langs->trans("Agents"));
+llxHeader('', $langs->trans("Margins").' - '.$langs->trans("Agents"));
 
-$text=$langs->trans("Margins");
+$text = $langs->trans("Margins");
 //print load_fiche_titre($text);
 
 // Show tabs
-$head=marges_prepare_head($user);
-$titre=$langs->trans("Margins");
-$picto='margin';
+$head = marges_prepare_head($user);
+$titre = $langs->trans("Margins");
+$picto = 'margin';
 
 print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">';
 
@@ -130,44 +130,44 @@ 
 print '</form>';
 
 $sql = "SELECT";
-if ($agentid > 0) $sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,";
-$sql.= " u.rowid as agent, u.login, u.lastname, u.firstname,";
-$sql.= " sum(d.total_ht) as selling_price,";
+if ($agentid > 0) $sql .= " s.rowid as socid, s.nom as name, s.code_client, s.client,";
+$sql .= " u.rowid as agent, u.login, u.lastname, u.firstname,";
+$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,";
-$sql.= " sum(".$db->ifsql('d.total_ht < 0','-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))','d.total_ht - (d.buy_price_ht * d.qty)').") as marge" ;
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql.= ", ".MAIN_DB_PREFIX."facture as f";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact e ON e.element_id = f.rowid and e.statut = 4 and e.fk_c_type_contact = ".(empty($conf->global->AGENT_CONTACT_TYPE)?-1:$conf->global->AGENT_CONTACT_TYPE);
-$sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
-$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= ", ".MAIN_DB_PREFIX."user as u";
-$sql.= " WHERE f.fk_soc = s.rowid";
-$sql.= ' AND f.entity IN ('.getEntity('invoice').')';
-$sql.= " AND sc.fk_soc = f.fk_soc";
-$sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
-if (! empty($conf->global->AGENT_CONTACT_TYPE))
-	$sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
+$sql .= " sum(".$db->ifsql('d.total_ht < 0', 'd.qty * d.buy_price_ht * -1', 'd.qty * d.buy_price_ht').") as buying_price,";
+$sql .= " sum(".$db->ifsql('d.total_ht < 0', '-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))', 'd.total_ht - (d.buy_price_ht * d.qty)').") as marge";
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact e ON e.element_id = f.rowid and e.statut = 4 and e.fk_c_type_contact = ".(empty($conf->global->AGENT_CONTACT_TYPE) ?-1 : $conf->global->AGENT_CONTACT_TYPE);
+$sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
+$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= ", ".MAIN_DB_PREFIX."user as u";
+$sql .= " WHERE f.fk_soc = s.rowid";
+$sql .= ' AND f.entity IN ('.getEntity('invoice').')';
+$sql .= " AND sc.fk_soc = f.fk_soc";
+$sql .= " AND (d.product_type = 0 OR d.product_type = 1)";
+if (!empty($conf->global->AGENT_CONTACT_TYPE))
+	$sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
 else
 	$sql .= " AND sc.fk_user = u.rowid";
-$sql.= " AND f.fk_statut > 0";
-$sql.= ' AND s.entity IN ('.getEntity('societe').')';
-$sql.= " AND d.fk_facture = f.rowid";
+$sql .= " AND f.fk_statut > 0";
+$sql .= ' AND s.entity IN ('.getEntity('societe').')';
+$sql .= " AND d.fk_facture = f.rowid";
 if ($agentid > 0) {
-	if (! empty($conf->global->AGENT_CONTACT_TYPE))
-  		$sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
+	if (!empty($conf->global->AGENT_CONTACT_TYPE))
+  		$sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
 	else
 	    $sql .= " AND sc.fk_user = ".$agentid;
 }
 if (!empty($startdate))
-  $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
+  $sql .= " AND f.datef >= '".$db->idate($startdate)."'";
 if (!empty($enddate))
-  $sql.= " AND f.datef <= '".$db->idate($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 ($agentid > 0) $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname";
-else $sql.= " GROUP BY u.rowid, u.login, u.lastname, u.firstname";
-$sql.=$db->order($sortfield,$sortorder);
+if ($agentid > 0) $sql .= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname";
+else $sql .= " GROUP BY u.rowid, u.login, u.lastname, u.firstname";
+$sql .= $db->order($sortfield, $sortorder);
 // TODO: calculate total to display then restore pagination
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
@@ -186,29 +186,29 @@ 
 	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';
+	    $labelcostprice = 'BuyingPrice';
 	else   // value is 'costprice' or 'pmp'
-	    $labelcostprice='CostPrice';
+	    $labelcostprice = 'CostPrice';
 
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
 
 	print '<tr class="liste_titre">';
 	if ($agentid > 0)
-		print_liste_field_titre("Customer",$_SERVER["PHP_SELF"],"s.nom","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
+		print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "s.nom", "", "&amp;agentid=".$agentid, '', $sortfield, $sortorder);
 	else
-		print_liste_field_titre("SalesRepresentative",$_SERVER["PHP_SELF"],"u.lastname","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
-
-	print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
+		print_liste_field_titre("SalesRepresentative", $_SERVER["PHP_SELF"], "u.lastname", "", "&amp;agentid=".$agentid, '', $sortfield, $sortorder);
+
+	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;agentid=".$agentid, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", "&amp;agentid=".$agentid, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;agentid=".$agentid, 'align="right"', $sortfield, $sortorder);
+	if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+		print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;agentid=".$agentid, 'align="right"', $sortfield, $sortorder);
+	if (!empty($conf->global->DISPLAY_MARK_RATES))
+		print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;agentid=".$agentid, 'align="right"', $sortfield, $sortorder);
 	print "</tr>\n";
 
-	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
 
 	if ($num > 0)
 	{
@@ -223,34 +223,34 @@ 
 
 			if ($marge < 0)
 			{
-				$marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
+				$marginRate = ($pa != 0) ?-1 * (100 * $marge / $pa) : '';
+				$markRate = ($pv != 0) ?-1 * (100 * $marge / $pv) : '';
 			}
 			else
 			{
-				$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
+				$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
+				$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
 			}
 
 			print '<tr class="oddeven">';
 			if ($agentid > 0) {
-				$companystatic->id=$objp->socid;
-				$companystatic->name=$objp->name;
-				$companystatic->client=$objp->client;
-				print "<td>".$companystatic->getNomUrl(1,'customer')."</td>\n";
+				$companystatic->id = $objp->socid;
+				$companystatic->name = $objp->name;
+				$companystatic->client = $objp->client;
+				print "<td>".$companystatic->getNomUrl(1, 'customer')."</td>\n";
 			}
 			else {
 				$userstatic->fetch($objp->agent);
-				print "<td>".$userstatic->getFullName($langs,0,0,0)."</td>\n";
+				print "<td>".$userstatic->getFullName($langs, 0, 0, 0)."</td>\n";
 			}
 
 			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++;

dolibarr/htdocs/margin/tabs/productMargins.php

Indentation +54 added lines, -54 removed lines

@@ -67,32 +67,32 @@ 
     $result = $object->fetch($id, $ref);
 
     $title = $langs->trans('ProductServiceCard');
-	$helpurl = '';
-	$shortlabel = dol_trunc($object->label,16);
-	if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT))
-	{
-		$title = $langs->trans('Product')." ". $shortlabel ." - ".$langs->trans('Card');
-		$helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos';
-	}
-	if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE))
-	{
-		$title = $langs->trans('Service')." ". $shortlabel ." - ".$langs->trans('Card');
-		$helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios';
-	}
-
-	llxHeader('', $title, $helpurl);
-
-	/*
+    $helpurl = '';
+    $shortlabel = dol_trunc($object->label,16);
+    if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT))
+    {
+        $title = $langs->trans('Product')." ". $shortlabel ." - ".$langs->trans('Card');
+        $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos';
+    }
+    if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE))
+    {
+        $title = $langs->trans('Service')." ". $shortlabel ." - ".$langs->trans('Card');
+        $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios';
+    }
+
+    llxHeader('', $title, $helpurl);
+
+    /*
 	 *  En mode visu
 	 */
-	if ($result > 0)
-	{
-		$head=product_prepare_head($object);
-		$titre=$langs->trans("CardProduct".$object->type);
-		$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-		dol_fiche_head($head, 'margin', $titre, -1, $picto);
+    if ($result > 0)
+    {
+        $head=product_prepare_head($object);
+        $titre=$langs->trans("CardProduct".$object->type);
+        $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
+        dol_fiche_head($head, 'margin', $titre, -1, $picto);
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
         dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
 
@@ -102,31 +102,31 @@ 
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
-		// Total Margin
-		print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="3">';
-		print '<span id="totalMargin"></span>'; // set by jquery (see below)
-		print '</td></tr>';
+        // Total Margin
+        print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="3">';
+        print '<span id="totalMargin"></span>'; // set by jquery (see below)
+        print '</td></tr>';
 
-		// Margin Rate
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
-			print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
-			print '<span id="marginRate"></span>'; // set by jquery (see below)
-			print '</td></tr>';
-		}
+        // Margin Rate
+        if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+            print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
+            print '<span id="marginRate"></span>'; // set by jquery (see below)
+            print '</td></tr>';
+        }
 
-		// Mark Rate
-		if (! empty($conf->global->DISPLAY_MARK_RATES)) {
-			print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
-			print '<span id="markRate"></span>'; // set by jquery (see below)
-			print '</td></tr>';
-		}
+        // Mark Rate
+        if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+            print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
+            print '<span id="markRate"></span>'; // set by jquery (see below)
+            print '</td></tr>';
+        }
 
-		print "</table>";
+        print "</table>";
 
         print '</div>';
         print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+        dol_fiche_end();
 
 
         if ($user->rights->facture->lire) {
@@ -193,8 +193,8 @@ 
                     while ($i < $num /*&& $i < $conf->liste_limit*/) {
                         $objp = $db->fetch_object($result);
 
-						$marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
-						$markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
+                        $marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
+                        $markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
 
                         print '<tr class="oddeven">';
                         print '<td>';
@@ -204,17 +204,17 @@ 
                         print "</td>\n";
                         print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
                         print "<td>".$objp->code_client."</td>\n";
-						print "<td align=\"center\">";
-						print dol_print_date($db->jdate($objp->datef),'day')."</td>";
-						print "<td align=\"right\">".price($objp->selling_price, null, null, null, null, $rounding)."</td>\n";
-						print "<td align=\"right\">".price($objp->buying_price, null, null, null, null, $rounding)."</td>\n";
-						print "<td align=\"right\">".price($objp->qty, null, null, null, null, $rounding)."</td>\n";
-						print "<td align=\"right\">".price($objp->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";
-						print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
+                        print "<td align=\"center\">";
+                        print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+                        print "<td align=\"right\">".price($objp->selling_price, null, null, null, null, $rounding)."</td>\n";
+                        print "<td align=\"right\">".price($objp->buying_price, null, null, null, null, $rounding)."</td>\n";
+                        print "<td align=\"right\">".price($objp->qty, null, null, null, null, $rounding)."</td>\n";
+                        print "<td align=\"right\">".price($objp->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";
+                        print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
                         print "</tr>\n";
                         $i++;
                         $cumul_achat += $objp->buying_price;

Braces +46 added lines, -23 removed lines

@@ -36,7 +36,9 @@ 
 // Security check
 $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
 $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->societe_id)) {
+    $socid=$user->societe_id;
+}
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 
 $object = new Product($db);
@@ -50,8 +52,12 @@ 
 $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";
+}
 
 
 /*
@@ -133,7 +139,9 @@ 
             $sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,";
             $sql.= " f.rowid as facid, f.ref, f.total as total_ht,";
             $sql.= " f.datef, f.paye, f.fk_statut as statut, f.type,";
-            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.= " sum(d.total_ht) as selling_price,";							// may be negative or positive
             $sql.= " IF(f.type = 2, -1, 1) * sum(d.qty) as qty,";						// not always positive in case of Credit note
             $sql.= " IF(f.type = 2, -1, 1) * sum(d.qty * d.buy_price_ht) as buying_price,";			// not always positive in case of Credit note
@@ -141,18 +149,28 @@ 
             $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
             $sql.= ", ".MAIN_DB_PREFIX."facture as f";
             $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
-            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";
             $sql.= " AND f.fk_statut > 0";
             $sql.= " AND s.entity = ".$conf->entity;
             $sql.= " AND d.fk_facture = f.rowid";
             $sql.= " AND d.fk_product =".$object->id;
-            if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if (! empty($socid)) $sql.= " AND f.fk_soc = $socid";
+            if (!$user->rights->societe->client->voir && !$socid) {
+                $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            }
+            if (! empty($socid)) {
+                $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";
-            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.= $db->order($sortfield,$sortorder);
             // TODO: calculate total to display then restore pagination
             //$sql.= $db->plimit($conf->liste_limit +1, $offset);
@@ -177,10 +195,12 @@ 
                 print_liste_field_titre("BuyingPrice",$_SERVER["PHP_SELF"],"buying_price","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
                 print_liste_field_titre("Qty",$_SERVER["PHP_SELF"],"d.qty","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
                 print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-                if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-                    print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-                if (! empty($conf->global->DISPLAY_MARK_RATES))
-                    print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
+                if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+                                    print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
+                }
+                if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+                                    print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
+                }
                 print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
                 print "</tr>\n";
 
@@ -210,10 +230,12 @@ 
 						print "<td align=\"right\">".price($objp->buying_price, null, null, null, null, $rounding)."</td>\n";
 						print "<td align=\"right\">".price($objp->qty, null, null, null, null, $rounding)."</td>\n";
 						print "<td align=\"right\">".price($objp->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 '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
                         print "</tr>\n";
                         $i++;
@@ -230,8 +252,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):'';
@@ -242,10 +263,12 @@ 
                 print '<td align="right">'.price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
                 print '<td align="right">'.price($cumul_qty, 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";
                 print "</table>";

Spacing +82 added lines, -82 removed lines

@@ -24,7 +24,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -33,54 +33,54 @@ 
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action=GETPOST('action','alpha');
-$confirm=GETPOST('confirm','alpha');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 
 // Security check
-$fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
-$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
-$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
+$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
+$fieldtype = (!empty($ref) ? 'ref' : 'rowid');
+if (!empty($user->societe_id)) $socid = $user->societe_id;
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 $object = new Product($db);
 
 $mesg = '';
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $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";
 
 
 /*
  * View
  */
 
-$invoicestatic=new Facture($db);
+$invoicestatic = new Facture($db);
 
 $form = new Form($db);
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
     $result = $object->fetch($id, $ref);
 
     $title = $langs->trans('ProductServiceCard');
 	$helpurl = '';
-	$shortlabel = dol_trunc($object->label,16);
+	$shortlabel = dol_trunc($object->label, 16);
 	if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT))
 	{
-		$title = $langs->trans('Product')." ". $shortlabel ." - ".$langs->trans('Card');
-		$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+		$title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Card');
+		$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
 	}
 	if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE))
 	{
-		$title = $langs->trans('Service')." ". $shortlabel ." - ".$langs->trans('Card');
-		$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+		$title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Card');
+		$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 	}
 
 	llxHeader('', $title, $helpurl);
@@ -90,14 +90,14 @@ 
 	 */
 	if ($result > 0)
 	{
-		$head=product_prepare_head($object);
-		$titre=$langs->trans("CardProduct".$object->type);
-		$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
+		$head = product_prepare_head($object);
+		$titre = $langs->trans("CardProduct".$object->type);
+		$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 		dol_fiche_head($head, 'margin', $titre, -1, $picto);
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
+        dol_banner_tab($object, 'ref', $linkback, ($user->societe_id ? 0 : 1), 'ref');
 
 
         print '<div class="fichecenter">';
@@ -111,14 +111,14 @@ 
 		print '</td></tr>';
 
 		// Margin Rate
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+		if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
 			print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
 			print '<span id="marginRate"></span>'; // set by jquery (see below)
 			print '</td></tr>';
 		}
 
 		// Mark Rate
-		if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+		if (!empty($conf->global->DISPLAY_MARK_RATES)) {
 			print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
 			print '<span id="markRate"></span>'; // set by jquery (see below)
 			print '</td></tr>';
@@ -134,29 +134,29 @@ 
 
         if ($user->rights->facture->lire) {
             $sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,";
-            $sql.= " f.rowid as facid, f.ref, f.total as total_ht,";
-            $sql.= " f.datef, f.paye, f.fk_statut as statut, f.type,";
-            if (!$user->rights->societe->client->voir && !$socid) $sql.= " sc.fk_soc, sc.fk_user,";
-            $sql.= " sum(d.total_ht) as selling_price,";							// may be negative or positive
-            $sql.= " IF(f.type = 2, -1, 1) * sum(d.qty) as qty,";						// not always positive in case of Credit note
-            $sql.= " IF(f.type = 2, -1, 1) * sum(d.qty * d.buy_price_ht) as buying_price,";			// not always positive in case of Credit note
-            $sql.= " IF(f.type = 2, -1, 1) * sum(abs(d.total_ht) - (d.buy_price_ht * d.qty)) as marge" ;	// not always positive in case of Credit note
-            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-            $sql.= ", ".MAIN_DB_PREFIX."facture as f";
-            $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
-            if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql.= " WHERE f.fk_soc = s.rowid";
-            $sql.= " AND f.fk_statut > 0";
-            $sql.= " AND s.entity = ".$conf->entity;
-            $sql.= " AND d.fk_facture = f.rowid";
-            $sql.= " AND d.fk_product =".$object->id;
-            if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if (! empty($socid)) $sql.= " AND f.fk_soc = $socid";
+            $sql .= " f.rowid as facid, f.ref, f.total as total_ht,";
+            $sql .= " f.datef, f.paye, f.fk_statut as statut, f.type,";
+            if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,";
+            $sql .= " sum(d.total_ht) as selling_price,"; // may be negative or positive
+            $sql .= " IF(f.type = 2, -1, 1) * sum(d.qty) as qty,"; // not always positive in case of Credit note
+            $sql .= " IF(f.type = 2, -1, 1) * sum(d.qty * d.buy_price_ht) as buying_price,"; // not always positive in case of Credit note
+            $sql .= " IF(f.type = 2, -1, 1) * sum(abs(d.total_ht) - (d.buy_price_ht * d.qty)) as marge"; // not always positive in case of Credit note
+            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+            $sql .= ", ".MAIN_DB_PREFIX."facture as f";
+            $sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
+            if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql .= " WHERE f.fk_soc = s.rowid";
+            $sql .= " AND f.fk_statut > 0";
+            $sql .= " AND s.entity = ".$conf->entity;
+            $sql .= " AND d.fk_facture = f.rowid";
+            $sql .= " AND d.fk_product =".$object->id;
+            if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+            if (!empty($socid)) $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";
-            $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";
-            if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user";
-            $sql.= $db->order($sortfield,$sortorder);
+            $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";
+            if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
+            $sql .= $db->order($sortfield, $sortorder);
             // TODO: calculate total to display then restore pagination
             //$sql.= $db->plimit($conf->liste_limit +1, $offset);
             dol_syslog('margin:tabs:productMargins.php', LOG_DEBUG);
@@ -164,7 +164,7 @@ 
             if ($result) {
                 $num = $db->num_rows($result);
 
-                print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&amp;id=$object->id",$sortfield,$sortorder,'',0,0,'');
+                print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;id=$object->id", $sortfield, $sortorder, '', 0, 0, '');
 
                 $i = 0;
 
@@ -172,52 +172,52 @@ 
                 print '<table class="noborder" width="100%">';
 
                 print '<tr class="liste_titre">';
-                print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;id=".$object->id,'',$sortfield,$sortorder);
-                print_liste_field_titre("Company",$_SERVER["PHP_SELF"],"s.nom","","&amp;id=".$object->id,'',$sortfield,$sortorder);
-                print_liste_field_titre("CustomerCode",$_SERVER["PHP_SELF"],"s.code_client","","&amp;id=".$object->id,'',$sortfield,$sortorder);
-                print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$object->id,'align="center"',$sortfield,$sortorder);
-                print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-                print_liste_field_titre("BuyingPrice",$_SERVER["PHP_SELF"],"buying_price","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-                print_liste_field_titre("Qty",$_SERVER["PHP_SELF"],"d.qty","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-                print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-                if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-                    print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-                if (! empty($conf->global->DISPLAY_MARK_RATES))
-                    print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-                print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
+                print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;id=".$object->id, '', $sortfield, $sortorder);
+                print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "&amp;id=".$object->id, '', $sortfield, $sortorder);
+                print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", "", "&amp;id=".$object->id, '', $sortfield, $sortorder);
+                print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;id=".$object->id, 'align="center"', $sortfield, $sortorder);
+                print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;id=".$object->id, 'align="right"', $sortfield, $sortorder);
+                print_liste_field_titre("BuyingPrice", $_SERVER["PHP_SELF"], "buying_price", "", "&amp;id=".$object->id, 'align="right"', $sortfield, $sortorder);
+                print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", "&amp;id=".$object->id, 'align="right"', $sortfield, $sortorder);
+                print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;id=".$object->id, 'align="right"', $sortfield, $sortorder);
+                if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+                    print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$object->id, 'align="right"', $sortfield, $sortorder);
+                if (!empty($conf->global->DISPLAY_MARK_RATES))
+                    print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$object->id, 'align="right"', $sortfield, $sortorder);
+                print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", "&amp;id=".$object->id, 'align="right"', $sortfield, $sortorder);
                 print "</tr>\n";
 
                 $cumul_achat = 0;
                 $cumul_vente = 0;
                 $cumul_qty = 0;
-                $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+                $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
 
                 if ($num > 0) {
                     while ($i < $num /*&& $i < $conf->liste_limit*/) {
                         $objp = $db->fetch_object($result);
 
-						$marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
-						$markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
+						$marginRate = ($objp->buying_price != 0) ? (100 * $objp->marge / $objp->buying_price) : '';
+						$markRate = ($objp->selling_price != 0) ? (100 * $objp->marge / $objp->selling_price) : '';
 
                         print '<tr class="oddeven">';
                         print '<td>';
-                        $invoicestatic->id=$objp->facid;
-                        $invoicestatic->ref=$objp->ref;
+                        $invoicestatic->id = $objp->facid;
+                        $invoicestatic->ref = $objp->ref;
                         print $invoicestatic->getNomUrl(1);
                         print "</td>\n";
-                        print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
+                        print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"), "company").' '.dol_trunc($objp->name, 44).'</a></td>';
                         print "<td>".$objp->code_client."</td>\n";
 						print "<td align=\"center\">";
-						print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+						print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
 						print "<td align=\"right\">".price($objp->selling_price, null, null, null, null, $rounding)."</td>\n";
 						print "<td align=\"right\">".price($objp->buying_price, null, null, null, null, $rounding)."</td>\n";
 						print "<td align=\"right\">".price($objp->qty, null, null, null, null, $rounding)."</td>\n";
 						print "<td align=\"right\">".price($objp->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";
-						print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
+						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">'.$invoicestatic->LibStatut($objp->paye, $objp->statut, 5).'</td>';
                         print "</tr>\n";
                         $i++;
                         $cumul_achat += $objp->buying_price;
@@ -231,13 +231,13 @@ 
                 $totalMargin = $cumul_vente - $cumul_achat;
                 if ($totalMargin < 0)
                 {
-                    $marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
-                    $markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
+                    $marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
+                    $markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
                 }
                 else
                 {
-                    $marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
-                    $markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
+                    $marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
+                    $markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
                 }
                 print '<tr class="liste_total">';
                 print '<td colspan=4>'.$langs->trans('TotalMargin')."</td>";
@@ -245,10 +245,10 @@ 
                 print '<td align="right">'.price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
                 print '<td align="right">'.price($cumul_qty, 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";
                 print "</table>";
@@ -267,8 +267,8 @@ 
     <script type="text/javascript">
     $(document).ready(function() {
         $("#totalMargin").html("'. price($totalMargin, null, null, null, null, $rounding).'");
-        $("#marginRate").html("'.(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%").'");
-        $("#markRate").html("'.(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%").'");
+        $("#marginRate").html("'.(($marginRate === '') ? 'n/a' : price($marginRate, null, null, null, null, $rounding)."%").'");
+        $("#markRate").html("'.(($markRate === '') ? 'n/a' : price($markRate, null, null, null, null, $rounding)."%").'");
     });
     </script>
 ';

dolibarr/htdocs/margin/tabs/thirdpartyMargins.php

Indentation +97 added lines, -97 removed lines

@@ -122,16 +122,16 @@ 
 
     // Margin Rate
     if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
-    	print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
-    	print '<span id="marginRate"></span>'; // set by jquery (see below)
-    	print '</td></tr>';
+        print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
+        print '<span id="marginRate"></span>'; // set by jquery (see below)
+        print '</td></tr>';
     }
 
     // Mark Rate
     if (! empty($conf->global->DISPLAY_MARK_RATES)) {
-    	print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
-    	print '<span id="markRate"></span>'; // set by jquery (see below)
-    	print '</td></tr>';
+        print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
+        print '<span id="markRate"></span>'; // set by jquery (see below)
+        print '</td></tr>';
     }
 
     print "</table>";
@@ -168,99 +168,99 @@ 
     $result = $db->query($sql);
     if ($result)
     {
-    	$num = $db->num_rows($result);
-
-    	print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&amp;socid=".$object->id,$sortfield,$sortorder,'',0,0,'');
-
-    	$i = 0;
-    	print '<div class="div-table-responsive">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
-    	print "<table class=\"noborder\" width=\"100%\">";
-
-    	print '<tr class="liste_titre">';
-    	print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;socid=".$_REQUEST["socid"],'',$sortfield,$sortorder);
-    	print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;socid=".$_REQUEST["socid"],'align="center"',$sortfield,$sortorder);
-    	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);
-    	print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
-    	print "</tr>\n";
-
-    	$cumul_achat = 0;
-    	$cumul_vente = 0;
-
-    	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
-
-    	if ($num > 0)
-    	{
-    		while ($i < $num /*&& $i < $conf->liste_limit*/)
-    		{
-    			$objp = $db->fetch_object($result);
-
-    			$marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
-    			$markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
-
-    			$sign = '';
-    			if ($objp->type == Facture::TYPE_CREDIT_NOTE){
-    			    $sign = '-';
-    			}
-
-    			print '<tr class="oddeven">';
-    			print '<td>';
-    			$invoicestatic->id=$objp->facid;
-    			$invoicestatic->ref=$objp->ref;
-    			print $invoicestatic->getNomUrl(1);
-    			print "</td>\n";
-    			print "<td align=\"center\">";
-    			print dol_print_date($db->jdate($objp->datef),'day')."</td>";
-    			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";
-    			print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
-    			print "</tr>\n";
-    			$i++;
-    			$cumul_vente += $objp->selling_price;
-    			$cumul_achat += ($objp->type == 2 ? -1 : 1) * $objp->buying_price;
-    		}
-    	}
-
-    	// affichage totaux marges
-
-    	$totalMargin = $cumul_vente - $cumul_achat;
-    	if ($totalMargin < 0)
-    	{
-    		$marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
-    		$markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
-    	}
-    	else
-    	{
-    		$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
-    		$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
-    	}
-
-    	// Total
-    	print '<tr class="liste_total">';
-    	print '<td colspan=2>'.$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";
-    	print '<td align="right">&nbsp;</td>';
-    	print "</tr>\n";
+        $num = $db->num_rows($result);
+
+        print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&amp;socid=".$object->id,$sortfield,$sortorder,'',0,0,'');
+
+        $i = 0;
+        print '<div class="div-table-responsive">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
+        print "<table class=\"noborder\" width=\"100%\">";
+
+        print '<tr class="liste_titre">';
+        print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;socid=".$_REQUEST["socid"],'',$sortfield,$sortorder);
+        print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;socid=".$_REQUEST["socid"],'align="center"',$sortfield,$sortorder);
+        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);
+        print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
+        print "</tr>\n";
+
+        $cumul_achat = 0;
+        $cumul_vente = 0;
+
+        $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+
+        if ($num > 0)
+        {
+            while ($i < $num /*&& $i < $conf->liste_limit*/)
+            {
+                $objp = $db->fetch_object($result);
+
+                $marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
+                $markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
+
+                $sign = '';
+                if ($objp->type == Facture::TYPE_CREDIT_NOTE){
+                    $sign = '-';
+                }
+
+                print '<tr class="oddeven">';
+                print '<td>';
+                $invoicestatic->id=$objp->facid;
+                $invoicestatic->ref=$objp->ref;
+                print $invoicestatic->getNomUrl(1);
+                print "</td>\n";
+                print "<td align=\"center\">";
+                print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+                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";
+                print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
+                print "</tr>\n";
+                $i++;
+                $cumul_vente += $objp->selling_price;
+                $cumul_achat += ($objp->type == 2 ? -1 : 1) * $objp->buying_price;
+            }
+        }
+
+        // affichage totaux marges
+
+        $totalMargin = $cumul_vente - $cumul_achat;
+        if ($totalMargin < 0)
+        {
+            $marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
+            $markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
+        }
+        else
+        {
+            $marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
+            $markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
+        }
+
+        // Total
+        print '<tr class="liste_total">';
+        print '<td colspan=2>'.$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";
+        print '<td align="right">&nbsp;</td>';
+        print "</tr>\n";
     }
     else
     {
-    	dol_print_error($db);
+        dol_print_error($db);
     }
     print "</table>";
     print '</div>';
@@ -270,7 +270,7 @@ 
 }
 else
 {
-	dol_print_error('', 'Parameter socid not defined');
+    dol_print_error('', 'Parameter socid not defined');
 }
 
 

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');
 }

Spacing +72 added lines, -72 removed lines

@@ -25,7 +25,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -33,36 +33,36 @@ 
 $langs->loadLangs(array("companies", "bills", "products", "margins"));
 
 // Security check
-$socid = GETPOST('socid','int');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe','','');
+$socid = GETPOST('socid', 'int');
+if (!empty($user->societe_id)) $socid = $user->societe_id;
+$result = restrictedArea($user, 'societe', '', '');
 
 
 $mesg = '';
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $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);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('thirdpartymargins','globalcard'));
+$hookmanager->initHooks(array('thirdpartymargins', 'globalcard'));
 
 
 /*
  * Actions
  */
 
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$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');
 
 
@@ -71,13 +71,13 @@ 
  * View
  */
 
-$invoicestatic=new Facture($db);
+$invoicestatic = new Facture($db);
 $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");
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$title,$help_url);
+$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");
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
 
 if ($socid > 0)
 {
@@ -93,9 +93,9 @@ 
     dol_fiche_head($head, 'margin', $langs->trans("ThirdParty"), -1, 'company');
 
     // $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-    $linkback = '<a href="' . BASE_URI . '?controller=societe&method=list&restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
+    $linkback = '<a href="'.BASE_URI.'?controller=societe&method=list&restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     print '<div class="fichecenter">';
 
@@ -111,7 +111,7 @@ 
         print '</td></tr>';
     }
 
-    if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire))
+    if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
     {
         print '<tr><td class="titlefield">';
         print $langs->trans('SupplierCode').'</td><td colspan="3">';
@@ -126,14 +126,14 @@ 
     print '</td></tr>';
 
     // Margin Rate
-    if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+    if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
     	print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
     	print '<span id="marginRate"></span>'; // set by jquery (see below)
     	print '</td></tr>';
     }
 
     // Mark Rate
-    if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+    if (!empty($conf->global->DISPLAY_MARK_RATES)) {
     	print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
     	print '<span id="markRate"></span>'; // set by jquery (see below)
     	print '</td></tr>';
@@ -149,23 +149,23 @@ 
     print '<br>';
 
     $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,";
-    $sql.= " f.rowid as facid, f.ref, f.total as total_ht,";
-    $sql.= " f.datef, f.paye, f.fk_statut as statut, f.type,";
-    $sql.= " sum(d.total_ht) as selling_price,";						// may be negative or positive
-    $sql.= " sum(d.qty * d.buy_price_ht) as buying_price,";				// always positive
-    $sql.= " sum(abs(d.total_ht) - (d.buy_price_ht * d.qty)) as marge";	// always positive
-    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-    $sql.= ", ".MAIN_DB_PREFIX."facture as f";
-    $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
-    $sql.= " WHERE f.fk_soc = s.rowid";
-    $sql.= " AND f.fk_statut > 0";
-    $sql.= " AND f.entity = ".$conf->entity;
-    $sql.= " AND d.fk_facture = f.rowid";
-    $sql.= " AND f.fk_soc = $socid";
-    $sql.= " AND d.buy_price_ht IS NOT NULL";
+    $sql .= " f.rowid as facid, f.ref, f.total as total_ht,";
+    $sql .= " f.datef, f.paye, f.fk_statut as statut, f.type,";
+    $sql .= " sum(d.total_ht) as selling_price,"; // may be negative or positive
+    $sql .= " sum(d.qty * d.buy_price_ht) as buying_price,"; // always positive
+    $sql .= " sum(abs(d.total_ht) - (d.buy_price_ht * d.qty)) as marge"; // always positive
+    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+    $sql .= ", ".MAIN_DB_PREFIX."facture as f";
+    $sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
+    $sql .= " WHERE f.fk_soc = s.rowid";
+    $sql .= " AND f.fk_statut > 0";
+    $sql .= " AND f.entity = ".$conf->entity;
+    $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";
-    $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);
+    $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
     //$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
@@ -175,29 +175,29 @@ 
     {
     	$num = $db->num_rows($result);
 
-    	print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&amp;socid=".$object->id,$sortfield,$sortorder,'',0,0,'');
+    	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;socid=".$object->id, $sortfield, $sortorder, '', 0, 0, '');
 
     	$i = 0;
-    	print '<div class="div-table-responsive">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
+    	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
     	print "<table class=\"noborder\" width=\"100%\">";
 
     	print '<tr class="liste_titre">';
-    	print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;socid=".$_REQUEST["socid"],'',$sortfield,$sortorder);
-    	print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;socid=".$_REQUEST["socid"],'align="center"',$sortfield,$sortorder);
-    	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);
-    	print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
+    	print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder);
+    	print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;socid=".$_REQUEST["socid"], 'align="center"', $sortfield, $sortorder);
+    	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);
+    	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", "&amp;socid=".$_REQUEST["socid"], 'align="right"', $sortfield, $sortorder);
     	print "</tr>\n";
 
     	$cumul_achat = 0;
     	$cumul_vente = 0;
 
-    	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+    	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
 
     	if ($num > 0)
     	{
@@ -205,30 +205,30 @@ 
     		{
     			$objp = $db->fetch_object($result);
 
-    			$marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
-    			$markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
+    			$marginRate = ($objp->buying_price != 0) ? (100 * $objp->marge / $objp->buying_price) : '';
+    			$markRate = ($objp->selling_price != 0) ? (100 * $objp->marge / $objp->selling_price) : '';
 
     			$sign = '';
-    			if ($objp->type == Facture::TYPE_CREDIT_NOTE){
+    			if ($objp->type == Facture::TYPE_CREDIT_NOTE) {
     			    $sign = '-';
     			}
 
     			print '<tr class="oddeven">';
     			print '<td>';
-    			$invoicestatic->id=$objp->facid;
-    			$invoicestatic->ref=$objp->ref;
+    			$invoicestatic->id = $objp->facid;
+    			$invoicestatic->ref = $objp->ref;
     			print $invoicestatic->getNomUrl(1);
     			print "</td>\n";
     			print "<td align=\"center\">";
-    			print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+    			print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
     			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";
-    			print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
+    			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++;
     			$cumul_vente += $objp->selling_price;
@@ -241,13 +241,13 @@ 
     	$totalMargin = $cumul_vente - $cumul_achat;
     	if ($totalMargin < 0)
     	{
-    		$marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
-    		$markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
+    		$marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
+    		$markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
     	}
     	else
     	{
-    		$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
-    		$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
+    		$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
+    		$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
     	}
 
     	// Total
@@ -256,10 +256,10 @@ 
     	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";
     }
@@ -283,8 +283,8 @@ 
     <script type="text/javascript">
     $(document).ready(function() {
         $("#totalMargin").html("'. price($totalMargin, null, null, null, null, $rounding).'");
-        $("#marginRate").html("'.(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%").'");
-        $("#markRate").html("'.(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%").'");
+        $("#marginRate").html("'.(($marginRate === '') ? 'n/a' : price($marginRate, null, null, null, null, $rounding)."%").'");
+        $("#markRate").html("'.(($markRate === '') ? 'n/a' : price($markRate, null, null, null, null, $rounding)."%").'");
     });
     </script>
 ';

dolibarr/htdocs/margin/admin/margin.php

Indentation +34 added lines, -34 removed lines

@@ -71,7 +71,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');
+            setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
     }
     else
     {
@@ -83,7 +83,7 @@ 
 {
     if (dolibarr_set_const($db, 'MARGIN_TYPE', $_POST['MARGIN_TYPE'], 'chaine', 0, '', $conf->entity) > 0)
     {
-          setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
+            setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
     }
     else
     {
@@ -95,7 +95,7 @@ 
 {
     if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', $_POST['AGENT_CONTACT_TYPE'], 'chaine', 0, '', $conf->entity) > 0)
     {
-          setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
+            setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
     }
     else
     {
@@ -137,7 +137,7 @@ 
 print '<td>';
 print ' <input type="radio" name="MARGIN_TYPE" value="1" ';
 if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1')
-	print 'checked ';
+    print 'checked ';
 print '/> ';
 print $langs->trans('MargeType1');
 print '<br>';
@@ -165,18 +165,18 @@ 
 print '<td colspan="2" align="center">';
 if (! empty($conf->use_javascript_ajax))
 {
-	print ajax_constantonoff('DISPLAY_MARGIN_RATES');
+    print ajax_constantonoff('DISPLAY_MARGIN_RATES');
 }
 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
-	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Enabled"),'on').'</a>';
-	}
+    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
+    {
+        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+    }
 }
 print '</td>';
 print '<td>'.$langs->trans('MarginRate').' = '.$langs->trans('Margin').' / '.$langs->trans('BuyingPrice').'</td>';
@@ -188,18 +188,18 @@ 
 print '<td colspan="2" align="center">';
 if (! empty($conf->use_javascript_ajax))
 {
-	print ajax_constantonoff('DISPLAY_MARK_RATES');
+    print ajax_constantonoff('DISPLAY_MARK_RATES');
 }
 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
-	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Enabled"),'on').'</a>';
-	}
+    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
+    {
+        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+    }
 }
 print '</td>';
 print '<td>'.$langs->trans('MarkRate').' = '.$langs->trans('Margin').' / '.$langs->trans('SellingPrice').'</td>';
@@ -211,18 +211,18 @@ 
 print '<td colspan="2" align="center">';
 if (! empty($conf->use_javascript_ajax))
 {
-	print ajax_constantonoff('ForceBuyingPriceIfNull');
+    print ajax_constantonoff('ForceBuyingPriceIfNull');
 }
 else
 {
-	if (empty($conf->global->ForceBuyingPriceIfNull))
-	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Disabled"),'off').'</a>';
-	}
-	else
-	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Enabled"),'on').'</a>';
-	}
+    if (empty($conf->global->ForceBuyingPriceIfNull))
+    {
+        print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+    }
+    else
+    {
+        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+    }
 }
 print '</td>';
 print '<td>'.$langs->trans('ForceBuyingPriceIfNullDetails').'</td>';
@@ -230,9 +230,9 @@ 
 
 // GLOBAL DISCOUNT MANAGEMENT
 $methods = array(
-	1 => $langs->trans('UseDiscountAsProduct'),
-	2 => $langs->trans('UseDiscountAsService'),
-	3 => $langs->trans('UseDiscountOnTotal')
+    1 => $langs->trans('UseDiscountAsProduct'),
+    2 => $langs->trans('UseDiscountAsService'),
+    3 => $langs->trans('UseDiscountOnTotal')
 );
 
 

Spacing +20 added lines, -20 removed lines

@@ -31,17 +31,17 @@ 
 
 $langs->loadLangs(array("admin", "bills", "margins", "stocks"));
 
-if (! $user->admin) accessforbidden();
+if (!$user->admin) accessforbidden();
 
-$action=GETPOST('action','alpha');
+$action = GETPOST('action', 'alpha');
 
 
 /*
  * Action
  */
-if (preg_match('/set_([a-z0-9_\-]+)/i',$action,$reg))
+if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code=$reg[1];
+    $code = $reg[1];
     if (dolibarr_set_const($db, $code, 1, 'yesno', 0, '', $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
@@ -53,9 +53,9 @@ 
     }
 }
 
-if (preg_match('/del_([a-z0-9_\-]+)/i',$action,$reg))
+if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code=$reg[1];
+    $code = $reg[1];
     if (dolibarr_del_const($db, $code, $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
@@ -107,18 +107,18 @@ 
  * View
  */
 
-llxHeader('',$langs->trans("margesSetup"));
+llxHeader('', $langs->trans("margesSetup"));
 
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("margesSetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("margesSetup"), $linkback, 'title_setup');
 
 
 $head = marges_admin_prepare_head();
 
 dol_fiche_head($head, 'parameters', $langs->trans("Margins"), -1, 'margin');
 
-print load_fiche_titre($langs->trans("MemberMainOptions"),'','');
+print load_fiche_titre($langs->trans("MemberMainOptions"), '', '');
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td width=300>'.$langs->trans("Description").'</td>';
@@ -163,7 +163,7 @@ 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DisplayMarginRates").'</td>';
 print '<td colspan="2" align="center">';
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('DISPLAY_MARGIN_RATES');
 }
@@ -171,11 +171,11 @@ 
 {
 	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>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
 	else
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td>';
@@ -186,7 +186,7 @@ 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DisplayMarkRates").'</td>';
 print '<td colspan="2" align="center">';
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('DISPLAY_MARK_RATES');
 }
@@ -194,11 +194,11 @@ 
 {
 	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>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
 	else
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td>';
@@ -209,7 +209,7 @@ 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ForceBuyingPriceIfNull").'</td>';
 print '<td colspan="2" align="center">';
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('ForceBuyingPriceIfNull');
 }
@@ -217,11 +217,11 @@ 
 {
 	if (empty($conf->global->ForceBuyingPriceIfNull))
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
 	else
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td>';
@@ -260,7 +260,7 @@ 
 print '<td align="left">';
 $formcompany = new FormCompany($db);
 $facture = new Facture($db);
-print $formcompany->selectTypeContact($facture, $conf->global->AGENT_CONTACT_TYPE, "AGENT_CONTACT_TYPE","internal","code",1);
+print $formcompany->selectTypeContact($facture, $conf->global->AGENT_CONTACT_TYPE, "AGENT_CONTACT_TYPE", "internal", "code", 1);
 print '</td>';
 print '<td>';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';

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

Indentation +154 added lines, -154 removed lines

@@ -58,9 +58,9 @@ 
 $startdate=$enddate='';
 
 if (!empty($_POST['startdatemonth']))
-  $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'],  $_POST['startdateday'],  $_POST['startdateyear']);
+    $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'],  $_POST['startdateday'],  $_POST['startdateyear']);
 if (!empty($_POST['enddatemonth']))
-  $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'],  $_POST['enddateday'],  $_POST['enddateyear']);
+    $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'],  $_POST['enddateday'],  $_POST['enddateyear']);
 
 
 /*
@@ -92,28 +92,28 @@ 
 $client = false;
 if ($socid > 0) {
 
-	$soc = new Societe($db);
-	$soc->fetch($socid);
-
-	if ($soc->client)
-	{
-		print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
-		print '<td class="maxwidthonsmartphone" colspan="4">';
-		print $form->select_company($socid, 'socid', 'client=1 OR client=3', 1, 0, 0);
-		//$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$socid,$socid,'socid','client=1 OR client=3',1,0,1);
-		print '</td></tr>';
-
-		$client = true;
-		if (! $sortorder) $sortorder="DESC";
-		if (! $sortfield) $sortfield="f.datef";
-	}
+    $soc = new Societe($db);
+    $soc->fetch($socid);
+
+    if ($soc->client)
+    {
+        print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
+        print '<td class="maxwidthonsmartphone" colspan="4">';
+        print $form->select_company($socid, 'socid', 'client=1 OR client=3', 1, 0, 0);
+        //$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$socid,$socid,'socid','client=1 OR client=3',1,0,1);
+        print '</td></tr>';
+
+        $client = true;
+        if (! $sortorder) $sortorder="DESC";
+        if (! $sortfield) $sortfield="f.datef";
+    }
 }
 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);
-	//$form->form_thirdparty($_SERVER['PHP_SELF'],null,'socid','client=1 OR client=3',1,0,1);
-	print '</td></tr>';
+    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);
+    //$form->form_thirdparty($_SERVER['PHP_SELF'],null,'socid','client=1 OR client=3',1,0,1);
+    print '</td></tr>';
 }
 
 $sortfield = GETPOST("sortfield",'alpha');
@@ -121,16 +121,16 @@ 
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield)
 {
-	if ($client)
-	{
-		$sortfield="f.datef";
-		$sortorder="DESC";
-	}
-	else
-	{
-	    $sortfield="s.nom";
-	    $sortorder="ASC";
-	}
+    if ($client)
+    {
+        $sortfield="f.datef";
+        $sortorder="DESC";
+    }
+    else
+    {
+        $sortfield="s.nom";
+        $sortorder="ASC";
+    }
 }
 
 // Products
@@ -138,7 +138,7 @@ 
 
 $TProducts = array();
 foreach($TRes as $prod) {
-	$TProducts[$prod['key']] = $prod['label'];
+    $TProducts[$prod['key']] = $prod['label'];
 }
 
 print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
@@ -182,16 +182,16 @@ 
 
 // Margin Rate
 if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
-	print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="4">';
-	print '<span id="marginRate"></span>'; // set by jquery (see below)
-	print '</td></tr>';
+    print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="4">';
+    print '<span id="marginRate"></span>'; // set by jquery (see below)
+    print '</td></tr>';
 }
 
 // Mark Rate
 if (! empty($conf->global->DISPLAY_MARK_RATES)) {
-	print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="4">';
-	print '<span id="markRate"></span>'; // set by jquery (see below)
-	print '</td></tr>';
+    print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="4">';
+    print '<span id="markRate"></span>'; // set by jquery (see below)
+    print '</td></tr>';
 }
 
 print "</table>";
@@ -211,7 +211,7 @@ 
 $sql.= ", ".MAIN_DB_PREFIX."facture as f";
 $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
 if(! empty($TSelectedCats)) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=d.fk_product';
+    $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";
@@ -223,10 +223,10 @@ 
 $sql.= " AND d.fk_facture = f.rowid";
 $sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
 if(! empty($TSelectedProducts)) {
-	$sql .= ' AND d.fk_product IN ('.implode(',', $TSelectedProducts) . ')';
+    $sql .= ' AND d.fk_product IN ('.implode(',', $TSelectedProducts) . ')';
 }
 if(! empty($TSelectedCats)) {
-	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
+    $sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
 }
 if (!empty($startdate))
 $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
@@ -245,127 +245,127 @@ 
 $result = $db->query($sql);
 if ($result)
 {
-	$num = $db->num_rows($result);
-
-  	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'
-	    $labelcostprice='CostPrice';
-
-	$i = 0;
-	print "<table class=\"noborder\" width=\"100%\">";
-
-	print '<tr class="liste_titre">';
-	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);
-	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);
-	print "</tr>\n";
-
-	$cumul_achat = 0;
-	$cumul_vente = 0;
-
-	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
-
-	if ($num > 0)
-	{
-		while ($i < $num /*&& $i < $conf->liste_limit*/)
-		{
-			$objp = $db->fetch_object($result);
-
-			$pa = $objp->buying_price;
-			$pv = $objp->selling_price;
-			$marge = $objp->marge;
-
-			if ($marge < 0)
-			{
-				$marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
-			}
-			else
-			{
-				$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
-			}
-
-			print '<tr class="oddeven">';
-			if ($client) {
-		        print '<td>';
-				$invoicestatic->id=$objp->facid;
-				$invoicestatic->ref=$objp->ref;
-				print $invoicestatic->getNomUrl(1);
-				print "</td>\n";
-				print "<td align=\"center\">";
-				print dol_print_date($db->jdate($objp->datef),'day')."</td>";
-		  	}
-		  	else {
-				$companystatic->id=$objp->socid;
-				$companystatic->name=$objp->name;
-				$companystatic->client=$objp->client;
-		   		print "<td>".$companystatic->getNomUrl(1,'margin')."</td>\n";
-		  	}
-
-			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";
-			print "</tr>\n";
-
-			$i++;
-			$cumul_achat += $objp->buying_price;
-			$cumul_vente += $objp->selling_price;
-		}
-	}
-
-	// affichage totaux marges
-
-	$totalMargin = $cumul_vente - $cumul_achat;
-	/*if ($totalMargin < 0)
+    $num = $db->num_rows($result);
+
+        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'
+        $labelcostprice='CostPrice';
+
+    $i = 0;
+    print "<table class=\"noborder\" width=\"100%\">";
+
+    print '<tr class="liste_titre">';
+    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);
+    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);
+    print "</tr>\n";
+
+    $cumul_achat = 0;
+    $cumul_vente = 0;
+
+    $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+
+    if ($num > 0)
+    {
+        while ($i < $num /*&& $i < $conf->liste_limit*/)
+        {
+            $objp = $db->fetch_object($result);
+
+            $pa = $objp->buying_price;
+            $pv = $objp->selling_price;
+            $marge = $objp->marge;
+
+            if ($marge < 0)
+            {
+                $marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
+                $markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
+            }
+            else
+            {
+                $marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
+                $markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
+            }
+
+            print '<tr class="oddeven">';
+            if ($client) {
+                print '<td>';
+                $invoicestatic->id=$objp->facid;
+                $invoicestatic->ref=$objp->ref;
+                print $invoicestatic->getNomUrl(1);
+                print "</td>\n";
+                print "<td align=\"center\">";
+                print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+                }
+                else {
+                $companystatic->id=$objp->socid;
+                $companystatic->name=$objp->name;
+                $companystatic->client=$objp->client;
+                    print "<td>".$companystatic->getNomUrl(1,'margin')."</td>\n";
+                }
+
+            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";
+            print "</tr>\n";
+
+            $i++;
+            $cumul_achat += $objp->buying_price;
+            $cumul_vente += $objp->selling_price;
+        }
+    }
+
+    // affichage totaux marges
+
+    $totalMargin = $cumul_vente - $cumul_achat;
+    /*if ($totalMargin < 0)
 	{
 		$marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
 		$markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
 	}
 	else
 	{*/
-		$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
-		$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
-	//}
-
-	print '<tr class="liste_total">';
-	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";
-	print "</tr>\n";
-
-  print "</table>";
+        $marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
+        $markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
+    //}
+
+    print '<tr class="liste_total">';
+    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";
+    print "</tr>\n";
+
+    print "</table>";
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 $db->free($result);
 

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);
 }

Spacing +97 added lines, -97 removed lines

@@ -25,7 +25,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -36,35 +36,35 @@ 
 $langs->loadLangs(array('companies', 'bills', 'products', 'margins'));
 
 // Security check
-$socid = GETPOST('socid','int');
+$socid = GETPOST('socid', 'int');
 $TSelectedProducts = GETPOST('products', 'array');
 $TSelectedCats = GETPOST('categories', 'array');
 
-if (! empty($user->societe_id)) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe','','');
-$result = restrictedArea($user,'margins');
+if (!empty($user->societe_id)) $socid = $user->societe_id;
+$result = restrictedArea($user, 'societe', '', '');
+$result = restrictedArea($user, 'margins');
 
 
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $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='';
+$startdate = $enddate = '';
 
 if (!empty($_POST['startdatemonth']))
-  $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'],  $_POST['startdateday'],  $_POST['startdateyear']);
+  $startdate = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']);
 if (!empty($_POST['enddatemonth']))
-  $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'],  $_POST['enddateday'],  $_POST['enddateyear']);
+  $enddate = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
 
 
 /*
@@ -72,19 +72,19 @@ 
  */
 
 $companystatic = new Societe($db);
-$invoicestatic=new Facture($db);
+$invoicestatic = new Facture($db);
 
 $form = new Form($db);
 
-llxHeader('',$langs->trans("Margins").' - '.$langs->trans("Clients"));
+llxHeader('', $langs->trans("Margins").' - '.$langs->trans("Clients"));
 
-$text=$langs->trans("Margins");
+$text = $langs->trans("Margins");
 //print load_fiche_titre($text);
 
 // Show tabs
-$head=marges_prepare_head($user);
-$titre=$langs->trans("Margins");
-$picto='margin';
+$head = marges_prepare_head($user);
+$titre = $langs->trans("Margins");
+$picto = 'margin';
 
 
 print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">';
@@ -108,8 +108,8 @@ 
 		print '</td></tr>';
 
 		$client = true;
-		if (! $sortorder) $sortorder="DESC";
-		if (! $sortfield) $sortfield="f.datef";
+		if (!$sortorder) $sortorder = "DESC";
+		if (!$sortfield) $sortfield = "f.datef";
 	}
 }
 else {
@@ -120,28 +120,28 @@ 
 	print '</td></tr>';
 }
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield)
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield)
 {
 	if ($client)
 	{
-		$sortfield="f.datef";
-		$sortorder="DESC";
+		$sortfield = "f.datef";
+		$sortorder = "DESC";
 	}
 	else
 	{
-	    $sortfield="s.nom";
-	    $sortorder="ASC";
+	    $sortfield = "s.nom";
+	    $sortorder = "ASC";
 	}
 }
 
 // Products
-$TRes = $form->select_produits_list('','','',20,0,'',1,2,1,0,'', 1);
+$TRes = $form->select_produits_list('', '', '', 20, 0, '', 1, 2, 1, 0, '', 1);
 
 $TProducts = array();
-foreach($TRes as $prod) {
+foreach ($TRes as $prod) {
 	$TProducts[$prod['key']] = $prod['label'];
 }
 
@@ -185,14 +185,14 @@ 
 print '</td></tr>';
 
 // Margin Rate
-if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
 	print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="4">';
 	print '<span id="marginRate"></span>'; // set by jquery (see below)
 	print '</td></tr>';
 }
 
 // Mark Rate
-if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+if (!empty($conf->global->DISPLAY_MARK_RATES)) {
 	print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="4">';
 	print '<span id="markRate"></span>'; // set by jquery (see below)
 	print '</td></tr>';
@@ -205,43 +205,43 @@ 
 print '</form>';
 
 $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,";
-$sql.= " sum(d.total_ht) as selling_price,";
+$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,";
+$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,";
-$sql.= " sum(".$db->ifsql('d.total_ht < 0','-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))','d.total_ht - (d.buy_price_ht * d.qty)').") as marge";
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql.= ", ".MAIN_DB_PREFIX."facture as f";
-$sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
-if(! empty($TSelectedCats)) {
+$sql .= " sum(".$db->ifsql('d.total_ht < 0', 'd.qty * d.buy_price_ht * -1', 'd.qty * d.buy_price_ht').") as buying_price,";
+$sql .= " sum(".$db->ifsql('d.total_ht < 0', '-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))', 'd.total_ht - (d.buy_price_ht * d.qty)').") as marge";
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+$sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
+if (!empty($TSelectedCats)) {
 	$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";
-$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;
-$sql.= " AND f.fk_statut > 0";
-$sql.= ' AND s.entity IN ('.getEntity('societe').')';
-$sql.= " AND d.fk_facture = f.rowid";
-$sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
-if(! empty($TSelectedProducts)) {
-	$sql .= ' AND d.fk_product IN ('.implode(',', $TSelectedProducts) . ')';
+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;
+$sql .= " AND f.fk_statut > 0";
+$sql .= ' AND s.entity IN ('.getEntity('societe').')';
+$sql .= " AND d.fk_facture = f.rowid";
+$sql .= " AND (d.product_type = 0 OR d.product_type = 1)";
+if (!empty($TSelectedProducts)) {
+	$sql .= ' AND d.fk_product IN ('.implode(',', $TSelectedProducts).')';
 }
-if(! empty($TSelectedCats)) {
-	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
+if (!empty($TSelectedCats)) {
+	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats).')';
 }
 if (!empty($startdate))
-$sql.= " AND f.datef >= '".$db->idate($startdate)."'";
+$sql .= " AND f.datef >= '".$db->idate($startdate)."'";
 if (!empty($enddate))
-$sql.= " AND f.datef <= '".$db->idate($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";
-$sql.=$db->order($sortfield,$sortorder);
+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);
 
@@ -255,33 +255,33 @@ 
 	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';
+	    $labelcostprice = 'BuyingPrice';
 	else   // value is 'costprice' or 'pmp'
-	    $labelcostprice='CostPrice';
+	    $labelcostprice = 'CostPrice';
 
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
 
 	print '<tr class="liste_titre">';
-	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);
+	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);
-	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);
+  		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);
 	print "</tr>\n";
 
 	$cumul_achat = 0;
 	$cumul_vente = 0;
 
-	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
 
 	if ($num > 0)
 	{
@@ -295,39 +295,39 @@ 
 
 			if ($marge < 0)
 			{
-				$marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
+				$marginRate = ($pa != 0) ?-1 * (100 * $marge / $pa) : '';
+				$markRate = ($pv != 0) ?-1 * (100 * $marge / $pv) : '';
 			}
 			else
 			{
-				$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
+				$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
+				$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
 			}
 
 			print '<tr class="oddeven">';
 			if ($client) {
 		        print '<td>';
-				$invoicestatic->id=$objp->facid;
-				$invoicestatic->ref=$objp->ref;
+				$invoicestatic->id = $objp->facid;
+				$invoicestatic->ref = $objp->ref;
 				print $invoicestatic->getNomUrl(1);
 				print "</td>\n";
 				print "<td align=\"center\">";
-				print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+				print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
 		  	}
 		  	else {
-				$companystatic->id=$objp->socid;
-				$companystatic->name=$objp->name;
-				$companystatic->client=$objp->client;
-		   		print "<td>".$companystatic->getNomUrl(1,'margin')."</td>\n";
+				$companystatic->id = $objp->socid;
+				$companystatic->name = $objp->name;
+				$companystatic->client = $objp->client;
+		   		print "<td>".$companystatic->getNomUrl(1, 'margin')."</td>\n";
 		  	}
 
 			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++;
@@ -346,8 +346,8 @@ 
 	}
 	else
 	{*/
-		$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
-		$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
+		$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
+		$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
 	//}
 
 	print '<tr class="liste_total">';
@@ -359,10 +359,10 @@ 
 	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>";
@@ -381,8 +381,8 @@ 
 	});*/
 
 	$("#totalMargin").html("'.price($totalMargin, null, null, null, null, $rounding).'");
-	$("#marginRate").html("'.(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%").'");
-	$("#markRate").html("'.(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%").'");
+	$("#marginRate").html("'.(($marginRate === '') ? 'n/a' : price($marginRate, null, null, null, null, $rounding)."%").'");
+	$("#markRate").html("'.(($markRate === '') ? 'n/a' : price($markRate, null, null, null, null, $rounding)."%").'");
 });
 </script>
 ';

dolibarr/htdocs/margin/checkMargins.php

Indentation +88 added lines, -88 removed lines

@@ -201,115 +201,115 @@
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 
-	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
-	{
-		$page = 0;
-		$offset = 0;
-	}
+    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
+    {
+        $page = 0;
+        $offset = 0;
+    }
 }
 
 $sql .= $db->plimit($limit+1, $offset);
 
 $result = $db->query($sql);
 if ($result) {
-	$num = $db->num_rows($result);
+    $num = $db->num_rows($result);
 
-	print '<br>';
-	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
+    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'
-	    $labelcostprice='CostPrice';
+    if ($conf->global->MARGIN_TYPE == "1")
+        $labelcostprice='BuyingPrice';
+    else   // value is 'costprice' or 'pmp'
+        $labelcostprice='CostPrice';
 
-	$moreforfilter='';
+    $moreforfilter='';
 
-	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-	//$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	//if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-	$selectedfields='';
+    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+    //$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+    //if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+    $selectedfields='';
 
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-	print '<tr class="liste_titre liste_titre_search">';
-	print '<td><input type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
-	print '<td></td>';
-	print '<td></td>';
-	print '<td></td>';
-	print '<td></td>';
-	print '<td></td>';
+    print '<tr class="liste_titre liste_titre_search">';
+    print '<td><input type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
+    print '<td></td>';
+    print '<td></td>';
+    print '<td></td>';
+    print '<td></td>';
+    print '<td></td>';
     print '<td class="liste_titre" align="middle">';
     $searchpitco=$form->showFilterButtons();
     print $searchpitco;
     print '</td>';
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", $param, 'width=20%', $sortfield, $sortorder);
-	print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "d.subprice", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "d.buy_price_ht", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "d.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'',$param,'align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
+    print "</tr>\n";
+
+    print '<tr class="liste_titre">';
+    print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
+    print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", $param, 'width=20%', $sortfield, $sortorder);
+    print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "d.subprice", "", $param, 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "d.buy_price_ht", "", $param, 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", $param, 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "d.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'',$param,'align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+    print "</tr>\n";
 
     $i=0;
-	while ($i < min($num, $limit))
-	{
-	    $objp = $db->fetch_object($result);
-
-		print '<tr class="oddeven">';
-		print '<td>';
-		$result_inner = $invoicestatic->fetch($objp->invoiceid);
-		if ($result_inner < 0) {
-			setEventMessages($invoicestatic->error, null, 'errors');
-		} else {
-			print $invoicestatic->getNomUrl(1);
-		}
-		print '</td>';
-		print '<td>';
-		if (! empty($objp->fk_product)) {
-			$result_inner = $productstatic->fetch($objp->fk_product);
-			if ($result_inner < 0) {
-				setEventMessages($productstatic->error, null, 'errors');
-			} else {
-				print $productstatic->getNomUrl(1);
-			}
-		} else {
-			print $objp->label;
-			print '&nbsp;';
-			print $objp->description;
-		}
-		print '</td>';
-		print '<td align="right">';
-		print price($objp->subprice);
-		print '</td>';
-		print '<td align="right">';
-		print '<input type="text" name="buyingprice_' . $objp->invoicedetid . '" id="buyingprice_' . $objp->invoicedetid . '" size="6" value="' . price($objp->buy_price_ht) . '" class="right flat">';
-		print '</td>';
-		print '<td align="right">';
-		print $objp->qty;
-		print '</td>';
-		print '<td align="right">';
-		print price($objp->total_ht);
-		print '</td>';
-		print '<td></td>';
-
-		print "</tr>\n";
-
-		$i ++;
-	}
-
-	print "</table>";
-
-	print "</div>";
+    while ($i < min($num, $limit))
+    {
+        $objp = $db->fetch_object($result);
+
+        print '<tr class="oddeven">';
+        print '<td>';
+        $result_inner = $invoicestatic->fetch($objp->invoiceid);
+        if ($result_inner < 0) {
+            setEventMessages($invoicestatic->error, null, 'errors');
+        } else {
+            print $invoicestatic->getNomUrl(1);
+        }
+        print '</td>';
+        print '<td>';
+        if (! empty($objp->fk_product)) {
+            $result_inner = $productstatic->fetch($objp->fk_product);
+            if ($result_inner < 0) {
+                setEventMessages($productstatic->error, null, 'errors');
+            } else {
+                print $productstatic->getNomUrl(1);
+            }
+        } else {
+            print $objp->label;
+            print '&nbsp;';
+            print $objp->description;
+        }
+        print '</td>';
+        print '<td align="right">';
+        print price($objp->subprice);
+        print '</td>';
+        print '<td align="right">';
+        print '<input type="text" name="buyingprice_' . $objp->invoicedetid . '" id="buyingprice_' . $objp->invoicedetid . '" size="6" value="' . price($objp->buy_price_ht) . '" class="right flat">';
+        print '</td>';
+        print '<td align="right">';
+        print $objp->qty;
+        print '</td>';
+        print '<td align="right">';
+        print price($objp->total_ht);
+        print '</td>';
+        print '<td></td>';
+
+        print "</tr>\n";
+
+        $i ++;
+    }
+
+    print "</table>";
+
+    print "</div>";
 } else {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 

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='';
 

Spacing +65 added lines, -65 removed lines

@@ -26,44 +26,44 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT . '/margin/lib/margins.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'products', 'margins'));
 
-$action     = GETPOST('action','alpha');
-$massaction = GETPOST('massaction','alpha');
+$action     = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
-$contextpage= GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'margindetail';   // To manage different context of search
-$backtopage = GETPOST('backtopage','alpha');
-$optioncss  = GETPOST('optioncss','alpha');
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'margindetail'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$optioncss  = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $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 = '';
 
 $startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'), GETPOST('startdateday', 'int'), GETPOST('startdateyear', 'int'));
 $enddate = dol_mktime(23, 59, 59, GETPOST('enddatemonth', 'int'), GETPOST('enddateday', 'int'), GETPOST('enddateyear', 'int'));
 
-$search_ref = GETPOST('search_ref','alpha');
+$search_ref = GETPOST('search_ref', 'alpha');
 
 // Security check
-$result=restrictedArea($user,'margins');
+$result = restrictedArea($user, 'margins');
 
 // Both test are required to be compatible with all browsers
 if (GETPOST("button_search_x") || GETPOST("button_search")) {
@@ -77,11 +77,11 @@ 
  * Actions
  */
 
-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$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 (empty($reshook))
@@ -92,15 +92,15 @@ 
     if ($action == 'update') {
         $datapost = $_POST;
 
-        foreach ( $datapost as $key => $value ) {
+        foreach ($datapost as $key => $value) {
             if (strpos($key, 'buyingprice_') !== false) {
                 $tmp_array = explode('_', $key);
                 if (count($tmp_array) > 0) {
                     $invoicedet_id = $tmp_array[1];
-                    if (! empty($invoicedet_id)) {
-                        $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facturedet';
-                        $sql .= ' SET buy_price_ht=\'' . price2num($value) . '\'';
-                        $sql .= ' WHERE rowid=' . $invoicedet_id;
+                    if (!empty($invoicedet_id)) {
+                        $sql = 'UPDATE '.MAIN_DB_PREFIX.'facturedet';
+                        $sql .= ' SET buy_price_ht=\''.price2num($value).'\'';
+                        $sql .= ' WHERE rowid='.$invoicedet_id;
                         $result = $db->query($sql);
                         if (!$result) {
                             setEventMessages($db->lasterror, null, 'errors');
@@ -112,10 +112,10 @@ 
     }
 
     // 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();
+        $search_ref = '';
+        $search_array_options = array();
     }
 
     // Mass actions
@@ -149,34 +149,34 @@ 
 
 // 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;
+$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;
 
 // Show tabs
 $head = marges_prepare_head($user);
 $picto = 'margin';
 
-print '<form method="post" name="sel" action="' . $_SERVER['PHP_SELF'] . '">';
+print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">';
 
 dol_fiche_head($head, $langs->trans('checkMargins'), $title, 0, $picto);
 
 print '<table class="border" width="100%">';
 
-print '<tr><td class="titlefield">' . $langs->trans('DateStart') . ' (' . $langs->trans("DateValidation") . ')</td>';
+print '<tr><td class="titlefield">'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')</td>';
 print '<td>';
 print $form->selectDate($startdate, 'startdate', '', '', 1, "sel", 1, 1);
 print '</td>';
-print '<td>' . $langs->trans('DateEnd') . ' (' . $langs->trans("DateValidation") . ')</td>';
+print '<td>'.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").')</td>';
 print '<td>';
 print $form->selectDate($enddate, 'enddate', '', '', 1, "sel", 1, 1);
 print '</td>';
 print '<td style="text-align: center;">';
-print '<input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans('Refresh')) . '" name="button_search" />';
+print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Refresh')).'" name="button_search" />';
 print '</td>';
 print '</tr>';
 print "</table>";
@@ -184,21 +184,21 @@ 
 dol_fiche_end();
 
 
-$arrayfields=array();
-$massactionbutton='';
+$arrayfields = array();
+$massactionbutton = '';
 
 
 $sql = "SELECT";
 $sql .= " f.ref, f.rowid as invoiceid, d.rowid as invoicedetid, d.buy_price_ht, d.total_ht, d.subprice, d.label, d.description , d.qty";
 $sql .= " ,d.fk_product";
-$sql .= " FROM " . MAIN_DB_PREFIX . "facture as f ";
-$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facturedet as d  ON d.fk_facture = f.rowid";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON d.fk_product = p.rowid";
+$sql .= " FROM ".MAIN_DB_PREFIX."facture as f ";
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facturedet as d  ON d.fk_facture = f.rowid";
+$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);
+$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);
 $sql .= " AND d.buy_price_ht IS NOT NULL";
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -215,7 +215,7 @@ 
 	}
 }
 
-$sql .= $db->plimit($limit+1, $offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql);
 if ($result) {
@@ -225,19 +225,19 @@ 
 	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';
+	    $labelcostprice = 'BuyingPrice';
 	else   // value is 'costprice' or 'pmp'
-	    $labelcostprice='CostPrice';
+	    $labelcostprice = 'CostPrice';
 
-	$moreforfilter='';
+	$moreforfilter = '';
 
-	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	//$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
 	//if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-	$selectedfields='';
+	$selectedfields = '';
 
     print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre liste_titre_search">';
 	print '<td><input type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
@@ -247,7 +247,7 @@ 
 	print '<td></td>';
 	print '<td></td>';
     print '<td class="liste_titre" align="middle">';
-    $searchpitco=$form->showFilterButtons();
+    $searchpitco = $form->showFilterButtons();
     print $searchpitco;
     print '</td>';
 	print "</tr>\n";
@@ -259,10 +259,10 @@ 
 	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "d.buy_price_ht", "", $param, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", $param, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "d.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'',$param,'align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
 
-    $i=0;
+    $i = 0;
 	while ($i < min($num, $limit))
 	{
 	    $objp = $db->fetch_object($result);
@@ -277,7 +277,7 @@ 
 		}
 		print '</td>';
 		print '<td>';
-		if (! empty($objp->fk_product)) {
+		if (!empty($objp->fk_product)) {
 			$result_inner = $productstatic->fetch($objp->fk_product);
 			if ($result_inner < 0) {
 				setEventMessages($productstatic->error, null, 'errors');
@@ -294,7 +294,7 @@ 
 		print price($objp->subprice);
 		print '</td>';
 		print '<td align="right">';
-		print '<input type="text" name="buyingprice_' . $objp->invoicedetid . '" id="buyingprice_' . $objp->invoicedetid . '" size="6" value="' . price($objp->buy_price_ht) . '" class="right flat">';
+		print '<input type="text" name="buyingprice_'.$objp->invoicedetid.'" id="buyingprice_'.$objp->invoicedetid.'" size="6" value="'.price($objp->buy_price_ht).'" class="right flat">';
 		print '</td>';
 		print '<td align="right">';
 		print $objp->qty;
@@ -306,7 +306,7 @@ 
 
 		print "</tr>\n";
 
-		$i ++;
+		$i++;
 	}
 
 	print "</table>";
@@ -317,8 +317,8 @@ 
 }
 
 
-print '<div class="center">' . "\n";
-print '<input type="submit" class="button" name="button_updatemagins" id="button_updatemagins" value="' . $langs->trans("Update") . '">';
+print '<div class="center">'."\n";
+print '<input type="submit" class="button" name="button_updatemagins" id="button_updatemagins" value="'.$langs->trans("Update").'">';
 print '</div>';
 
 print '</form>';

dolibarr/htdocs/core/actions_setmoduleoptions.inc.php

Indentation +21 added lines, -21 removed lines

@@ -29,29 +29,29 @@
 
 if ($action == 'update' && is_array($arrayofparameters))
 {
-	$db->begin();
+    $db->begin();
 
-	$ok=true;
-	foreach($arrayofparameters as $key => $val)
-	{
-		$result=dolibarr_set_const($db,$key,GETPOST($key, 'alpha'),'chaine',0,'',$conf->entity);
-		if ($result < 0)
-		{
-			$ok=false;
-			break;
-		}
-	}
+    $ok=true;
+    foreach($arrayofparameters as $key => $val)
+    {
+        $result=dolibarr_set_const($db,$key,GETPOST($key, 'alpha'),'chaine',0,'',$conf->entity);
+        if ($result < 0)
+        {
+            $ok=false;
+            break;
+        }
+    }
 
-	if (! $error)
-	{
-		$db->commit();
-		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
-	}
+    if (! $error)
+    {
+        $db->commit();
+        if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        $db->rollback();
+        if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+    }
 }
 
 // Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)

Spacing +20 added lines, -20 removed lines

@@ -31,18 +31,18 @@ 
 {
 	$db->begin();
 
-	$ok=true;
-	foreach($arrayofparameters as $key => $val)
+	$ok = true;
+	foreach ($arrayofparameters as $key => $val)
 	{
-		$result=dolibarr_set_const($db,$key,GETPOST($key, 'alpha'),'chaine',0,'',$conf->entity);
+		$result = dolibarr_set_const($db, $key, GETPOST($key, 'alpha'), 'chaine', 0, '', $conf->entity);
 		if ($result < 0)
 		{
-			$ok=false;
+			$ok = false;
 			break;
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$db->commit();
 		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -62,38 +62,38 @@ 
     // Process common param fields
     if (is_array($_POST))
     {
-        foreach($_POST as $key => $val)
+        foreach ($_POST as $key => $val)
         {
             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');
+                $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++;
+                    $res = dolibarr_set_const($db, $param, $value, 'chaine', 0, '', $conf->entity);
+                    if (!$res > 0) $error++;
                 }
             }
         }
     }
 
     // Process upload fields
-    if (GETPOST('upload','alpha') && GETPOST('keyforuploaddir','aZ09'))
+    if (GETPOST('upload', 'alpha') && GETPOST('keyforuploaddir', 'aZ09'))
     {
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        $keyforuploaddir=GETPOST('keyforuploaddir','aZ09');
-        $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->$keyforuploaddir)));
-        foreach($listofdir as $key=>$tmpdir)
+        $keyforuploaddir = GETPOST('keyforuploaddir', 'aZ09');
+        $listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->$keyforuploaddir)));
+        foreach ($listofdir as $key=>$tmpdir)
         {
-            $tmpdir=trim($tmpdir);
-            $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-            if (! $tmpdir) {
+            $tmpdir = trim($tmpdir);
+            $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+            if (!$tmpdir) {
                 unset($listofdir[$key]); continue;
             }
-            if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+            if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
             else
             {
-                $upload_dir=$tmpdir;
+                $upload_dir = $tmpdir;
             }
         }
         if ($upload_dir)
@@ -103,7 +103,7 @@ 
         }
     }
 
-    if (! $error)
+    if (!$error)
     {
         $db->commit();
         if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');

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');
+        }
     }
 }