alxarafe / alixar

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

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

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

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

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, ...)

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

Indentation +35 added lines, -35 removed lines

@@ -27,15 +27,15 @@ 
  */
 class InfoBox
 {
-	/**
-	 * Name of positions 0=Home, 1=...
-	 *
-	 * @return	string[]		Array with list of zones
-	 */
-	static function getListOfPagesForBoxes()
-	{
-		return array(0=>'Home');
-	}
+    /**
+     * Name of positions 0=Home, 1=...
+     *
+     * @return	string[]		Array with list of zones
+     */
+    static function getListOfPagesForBoxes()
+    {
+        return array(0=>'Home');
+    }
 
     /**
      *  Return array of boxes qualified for area and user
@@ -68,10 +68,10 @@ 
             $sql.= " ORDER BY b.box_order";
         }
         else	// available
-		{
+        {
             $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
             $sql.= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
-           	$sql.= " WHERE d.entity IN (0,".$conf->entity.")";
+                $sql.= " WHERE d.entity IN (0,".$conf->entity.")";
         }
 
         dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user)?$user->id:'')."", LOG_DEBUG);
@@ -97,17 +97,17 @@ 
                     {
                         $boxname=preg_replace('/\.php$/i','',$obj->file);
                         $relsourcefile = "/core/boxes/".$boxname.".php";
-					}
+                    }
 
-					//print $obj->box_id.'-'.$boxname.'-'.$relsourcefile.'<br>';
+                    //print $obj->box_id.'-'.$boxname.'-'.$relsourcefile.'<br>';
 
-					// TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then
+                    // TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then
                     // the "enabled" condition for modules forbidden for external users and the depends condition can be done.
                     // Goal is to avoid making a "new" done for each boxes returned by select.
                     dol_include_once($relsourcefile);
                     if (class_exists($boxname))
                     {
-                    	$box=new $boxname($db,$obj->note);		// Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
+                        $box=new $boxname($db,$obj->note);		// Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
                         //$box=new stdClass();
 
                         // box properties
@@ -117,9 +117,9 @@ 
                         $box->box_order	= (empty($obj->box_order) ? '' : $obj->box_order);
                         $box->fk_user	= (empty($obj->fk_user) ? 0 : $obj->fk_user);
                         $box->sourcefile= $relsourcefile;
-                    	$box->class     = $boxname;
+                        $box->class     = $boxname;
 
-                    	if ($mode == 'activated' && ! is_object($user))	// List of activated box was not yet personalized into database
+                        if ($mode == 'activated' && ! is_object($user))	// List of activated box was not yet personalized into database
                         {
                             if (is_numeric($box->box_order))
                             {
@@ -138,19 +138,19 @@ 
                         {
                             foreach($box->depends as $moduleelem)
                             {
-                            	$arrayelem=explode('|',$moduleelem);
-                            	$tmpenabled=0;	// $tmpenabled is used for the '|' test (OR)
-                            	foreach($arrayelem as $module)
-                            	{
-    	                        	$tmpmodule=preg_replace('/@[^@]+/','',$module);
-    	                        	if (! empty($conf->$tmpmodule->enabled)) $tmpenabled=1;
-                            		//print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'<br>';
-                            	}
-                            	if (empty($tmpenabled))	// We found at least one module required that is disabled
-        	                    {
-        	                    	$enabled=0;
-        	                    	break;
-        	                    }
+                                $arrayelem=explode('|',$moduleelem);
+                                $tmpenabled=0;	// $tmpenabled is used for the '|' test (OR)
+                                foreach($arrayelem as $module)
+                                {
+                                    $tmpmodule=preg_replace('/@[^@]+/','',$module);
+                                    if (! empty($conf->$tmpmodule->enabled)) $tmpenabled=1;
+                                    //print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'<br>';
+                                }
+                                if (empty($tmpenabled))	// We found at least one module required that is disabled
+                                {
+                                    $enabled=0;
+                                    break;
+                                }
                             }
                         }
                         //print '=>'.$boxname.'-enabled='.$enabled.'<br>';
@@ -160,16 +160,16 @@ 
                         else unset($box);
                     }
                     else
-					{
-                    	dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);
-					}
+                    {
+                        dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);
+                    }
                 }
                 $j++;
             }
         }
         else
-		{
-			dol_syslog($db->lasterror(),LOG_ERR);
+        {
+            dol_syslog($db->lasterror(),LOG_ERR);
             return array('error'=>$db->lasterror());
         }
 

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

Indentation +92 added lines, -92 removed lines

@@ -33,9 +33,9 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     /**
@@ -50,99 +50,99 @@ 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Show a combo list with contracts qualified for a third party
-	 *
-	 *	@param	int		$socid      Id third party (-1=all, 0=only interventions not linked to a third party, id=intervention not linked or linked to third party id)
-	 *	@param  int		$selected   Id intervention preselected
-	 *	@param  string	$htmlname   Nom de la zone html
-	 *	@param	int		$maxlength	Maximum length of label
-	 *	@param	int		$showempty	Show empty line
-	 *	@return int         		Nbre of project if OK, <0 if KO
-	 */
-	function select_interventions($socid=-1, $selected='', $htmlname='interventionid', $maxlength=16, $showempty=1)
-	{
+    /**
+     *	Show a combo list with contracts qualified for a third party
+     *
+     *	@param	int		$socid      Id third party (-1=all, 0=only interventions not linked to a third party, id=intervention not linked or linked to third party id)
+     *	@param  int		$selected   Id intervention preselected
+     *	@param  string	$htmlname   Nom de la zone html
+     *	@param	int		$maxlength	Maximum length of label
+     *	@param	int		$showempty	Show empty line
+     *	@return int         		Nbre of project if OK, <0 if KO
+     */
+    function select_interventions($socid=-1, $selected='', $htmlname='interventionid', $maxlength=16, $showempty=1)
+    {
         // phpcs:enable
-		global $db,$user,$conf,$langs;
+        global $db,$user,$conf,$langs;
 
-		$out='';
+        $out='';
 
-		$hideunselectables=false;
+        $hideunselectables=false;
 
-		// Search all contacts
-		$sql = 'SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'fichinter as f';
-		$sql.= " WHERE f.entity = ".$conf->entity;
-		if ($socid != '')
-		{
-			if ($socid == '0') $sql.= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
-			else $sql.= " AND f.fk_soc = ".$socid;
-		}
+        // Search all contacts
+        $sql = 'SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut';
+        $sql.= ' FROM '.MAIN_DB_PREFIX .'fichinter as f';
+        $sql.= " WHERE f.entity = ".$conf->entity;
+        if ($socid != '')
+        {
+            if ($socid == '0') $sql.= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
+            else $sql.= " AND f.fk_soc = ".$socid;
+        }
 
-		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$out.='<select id="interventionid" class="flat" name="'.$htmlname.'">';
-			if ($showempty) $out.='<option value="0">&nbsp;</option>';
-			$num = $db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $db->fetch_object($resql);
-					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
-					{
-						// Do nothing
-					}
-					else
-					{
-						$labeltoshow=dol_trunc($obj->ref,18);
-						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
-						{
-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
-						{
-							$disabled=0;
-							if (! $obj->fk_statut > 0)
-							{
-								$disabled=1;
-								$labeltoshow.=' ('.$langs->trans("Draft").')';
-							}
-							if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
-							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
-							}
+        dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $out.='<select id="interventionid" class="flat" name="'.$htmlname.'">';
+            if ($showempty) $out.='<option value="0">&nbsp;</option>';
+            $num = $db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $db->fetch_object($resql);
+                    // If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
+                    if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+                    {
+                        // Do nothing
+                    }
+                    else
+                    {
+                        $labeltoshow=dol_trunc($obj->ref,18);
+                        if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
+                        {
+                            $out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+                        }
+                        else
+                        {
+                            $disabled=0;
+                            if (! $obj->fk_statut > 0)
+                            {
+                                $disabled=1;
+                                $labeltoshow.=' ('.$langs->trans("Draft").')';
+                            }
+                            if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+                            {
+                                $disabled=1;
+                                $labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+                            }
 
-							if ($hideunselectables && $disabled)
-							{
-								$resultat='';
-							}
-							else
-							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
-								$resultat.='>'.$labeltoshow;
-								$resultat.='</option>';
-							}
-							$out.=$resultat;
-						}
-					}
-					$i++;
-				}
-			}
-			$out.='</select>';
-			$db->free($resql);
-			return $out;
-		}
-		else
-		{
-			dol_print_error($db);
-			return '';
-		}
-	}
+                            if ($hideunselectables && $disabled)
+                            {
+                                $resultat='';
+                            }
+                            else
+                            {
+                                $resultat='<option value="'.$obj->rowid.'"';
+                                if ($disabled) $resultat.=' disabled';
+                                $resultat.='>'.$labeltoshow;
+                                $resultat.='</option>';
+                            }
+                            $out.=$resultat;
+                        }
+                    }
+                    $i++;
+                }
+            }
+            $out.='</select>';
+            $db->free($resql);
+            return $out;
+        }
+        else
+        {
+            dol_print_error($db);
+            return '';
+        }
+    }
 }

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

Indentation +35 added lines, -35 removed lines

@@ -36,12 +36,12 @@ 
      */
     public $db;
 
-	var $dir;				// Directory with all core and external triggers files
+    var $dir;				// Directory with all core and external triggers files
 
     /**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
     /**
      *	Constructor
@@ -71,9 +71,9 @@ 
         // Check parameters
         if (! is_object($object) || ! is_object($conf))	// Error
         {
-        	$this->error='function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
+            $this->error='function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
             dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);
-        	$this->errors[]=$this->error;
+            $this->errors[]=$this->error;
             return -1;
         }
         if (! is_object($langs))	// Warning
@@ -92,9 +92,9 @@ 
         $files = array();
         $modules = array();
         $orders = array();
-		$i=0;
+        $i=0;
 
-		$dirtriggers=array_merge(array('/core/triggers'),$conf->modules_parts['triggers']);
+        $dirtriggers=array_merge(array('/core/triggers'),$conf->modules_parts['triggers']);
         foreach($dirtriggers as $reldir)
         {
             $dir=dol_buildpath($reldir,0);
@@ -111,9 +111,9 @@ 
                 {
                     if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i',$file,$reg))
                     {
-						$part1=$reg[1];
-						$part2=$reg[2];
-						$part3=$reg[3];
+                        $part1=$reg[1];
+                        $part2=$reg[2];
+                        $part3=$reg[3];
 
                         $nbfile++;
 
@@ -175,22 +175,22 @@ 
             $objMod = new $modName($this->db);
             if ($objMod)
             {
-            	$result=0;
-
-				if (method_exists($objMod, 'runTrigger'))	// New method to implement
-				{
-	                //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
-	                $result=$objMod->runTrigger($action,$object,$user,$langs,$conf);
-				}
-				elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
-				{
-	                dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
-					$result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
-				}
-				else
-				{
-	                dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
-				}
+                $result=0;
+
+                if (method_exists($objMod, 'runTrigger'))	// New method to implement
+                {
+                    //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
+                    $result=$objMod->runTrigger($action,$object,$user,$langs,$conf);
+                }
+                elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
+                {
+                    dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
+                    $result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
+                }
+                else
+                {
+                    dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
+                }
 
                 if ($result > 0)
                 {
@@ -215,7 +215,7 @@ 
                 }
             }
             else
-			{
+            {
                 dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);
             }
         }
@@ -254,7 +254,7 @@ 
         $dirtriggers=array_merge(array('/core/triggers/'),$conf->modules_parts['triggers']);
         if (is_array($forcedirtriggers))
         {
-        	$dirtriggers=$forcedirtriggers;
+            $dirtriggers=$forcedirtriggers;
         }
 
         foreach($dirtriggers as $reldir)
@@ -274,9 +274,9 @@ 
                     {
                         if (preg_match('/\.back$/',$file)) continue;
 
-						$part1=$reg[1];
-						$part2=$reg[2];
-						$part3=$reg[3];
+                        $part1=$reg[1];
+                        $part2=$reg[2];
+                        $part3=$reg[3];
 
                         $modName = 'Interface'.ucfirst($reg[3]);
                         //print "file=$file"; print "modName=$modName"; exit;
@@ -317,8 +317,8 @@ 
 
             if (! class_exists($modName))
             {
-				print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";
-            	continue;
+                print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";
+                continue;
             }
 
             $objMod = new $modName($db);
@@ -340,7 +340,7 @@ 
                 $triggers[$j]['module']=strtolower($module);
             }
 
-			// We set info of modules
+            // We set info of modules
             $triggers[$j]['picto'] = $objMod->picto?img_object('',$objMod->picto):img_object('','generic');
             $triggers[$j]['file'] = $files[$key];
             $triggers[$j]['fullpath'] = $fullpath[$key];

dolibarr/htdocs/core/class/google.class.php

Indentation +45 added lines, -45 removed lines

@@ -26,63 +26,63 @@
  */
 class GoogleAPI
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	public $key;
+    public $key;
 
-	/**
-	 * Constructor
-	 *
-	 * @param 	DoliDB		$db			Database handler
-	 * @param	string		$key		Google key
-	 */
-	function __construct($db,$key)
-	{
-		$this->db=$db;
-		$this->key=$key;
-	}
+    /**
+     * Constructor
+     *
+     * @param 	DoliDB		$db			Database handler
+     * @param	string		$key		Google key
+     */
+    function __construct($db,$key)
+    {
+        $this->db=$db;
+        $this->key=$key;
+    }
 
 
-	/**
-	 *  Return geo coordinates of an address
-	 *
-	 *  @param	string	$address	Address
-	 * 								Example: 68 Grande rue Charles de Gaulle,+94130,+Nogent sur Marne,+France
-	 *								Example: 188, rue de Fontenay,+94300,+Vincennes,+France
-	 *	@return	string				Coordinates
-	 */
-	function getGeoCoordinatesOfAddress($address)
-	{
-		global $conf;
+    /**
+     *  Return geo coordinates of an address
+     *
+     *  @param	string	$address	Address
+     * 								Example: 68 Grande rue Charles de Gaulle,+94130,+Nogent sur Marne,+France
+     *								Example: 188, rue de Fontenay,+94300,+Vincennes,+France
+     *	@return	string				Coordinates
+     */
+    function getGeoCoordinatesOfAddress($address)
+    {
+        global $conf;
 
-		$i=0;
+        $i=0;
 
-		// Desired address
-		$urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
+        // Desired address
+        $urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
 
-		// Retrieve the URL contents
-		$page = file_get_contents($urladdress);
+        // Retrieve the URL contents
+        $page = file_get_contents($urladdress);
 
-		$code = strstr($page, '<coordinates>');
-		$code = strstr($code, '>');
-		$val=strpos($code, "<");
-		$code = substr($code, 1, $val-1);
-		//print $code;
-		//print "<br>";
-		$latitude = substr($code, 0, strpos($code, ","));
-		$longitude = substr($code, strpos($code, ",")+1, dol_strlen(strpos($code, ","))-3);
+        $code = strstr($page, '<coordinates>');
+        $code = strstr($code, '>');
+        $val=strpos($code, "<");
+        $code = substr($code, 1, $val-1);
+        //print $code;
+        //print "<br>";
+        $latitude = substr($code, 0, strpos($code, ","));
+        $longitude = substr($code, strpos($code, ",")+1, dol_strlen(strpos($code, ","))-3);
 
-		// Output the coordinates
-		//echo "Longitude: $longitude ',' Latitude: $latitude";
+        // Output the coordinates
+        //echo "Longitude: $longitude ',' Latitude: $latitude";
 
-		$i++;
-	}
+        $i++;
+    }
 }