From 7dd06a1ae6603a6ea932c75c49aa7b3104d8ac0e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Dec 2016 02:01:27 +0100
Subject: [PATCH] Fix margin pagination
---
htdocs/compta/resultat/index.php | 14 +++++++-------
htdocs/compta/stats/casoc.php | 8 ++++----
htdocs/compta/stats/index.php | 10 +++++-----
htdocs/core/lib/report.lib.php | 5 +----
htdocs/margin/agentMargins.php | 2 +-
htdocs/margin/customerMargins.php | 2 +-
htdocs/margin/productMargins.php | 16 +++++-----------
7 files changed, 24 insertions(+), 33 deletions(-)
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 62ef55fb711..74b80ec0e82 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -646,7 +646,7 @@ print '<tr class="liste_titre"><td class="liste_titre"> </td>';
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
- print '<td align="center" colspan="2" class="borderrightlight">';
+ print '<td align="center" colspan="2" class="liste_titre borderrightlight">';
print '<a href="clientfourn.php?year='.$annee.'">';
print $annee;
if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee+1);
@@ -656,8 +656,8 @@ print '</tr>';
print '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Month").'</td>';
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
- print '<td align="center">'.$langs->trans("Outcome").'</td>';
- print '<td align="center" class="borderrightlight">'.$langs->trans("Income").'</td>';
+ print '<td class="liste_titre" align="center">'.$langs->trans("Outcome").'</td>';
+ print '<td class="liste_titre" align="center" class="borderrightlight">'.$langs->trans("Income").'</td>';
}
print '</tr>';
@@ -678,7 +678,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
if($mois>12) {$annee_decalage=$annee+1;}
$case = strftime("%Y-%m",dol_mktime(12,0,0,$mois_modulo,1,$annee_decalage));
- print '<td align="right"> ';
+ print '<td class="liste_titre" align="right"> ';
if (isset($decaiss_ttc[$case]) && $decaiss_ttc[$case] != 0)
{
print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta?'&modecompta='.$modecompta:'').'">'.price(price2num($decaiss_ttc[$case],'MT')).'</a>';
@@ -687,7 +687,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
}
print "</td>";
- print '<td align="right" class="borderrightlight"> ';
+ print '<td align="right" class="liste_titre borderrightlight"> ';
//if (isset($encaiss_ttc[$case]) && $encaiss_ttc[$case] != 0)
if (isset($encaiss_ttc[$case]))
{
@@ -704,7 +704,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
// Total
$var=!$var;
$nbcols=0;
-print '<tr class="liste_total"><td>'.$langs->trans("TotalTTC").'</td>';
+print '<tr class="liste_total impair"><td>'.$langs->trans("TotalTTC").'</td>';
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
$nbcols+=2;
@@ -714,7 +714,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
print "</tr>\n";
// Empty line
-print '<tr><td> </td>';
+print '<tr class="impair"><td> </td>';
print '<td colspan="'.$nbcols.'"> </td>';
print "</tr>\n";
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 26063587c5d..636c4e29d17 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -456,10 +456,10 @@ print '<td class="liste_titre" align="left">';
print $form->select_country($search_country, 'search_country');
//print '<input class="flat" size="6" type="text" name="search_country" value="'.$search_country.'">';
print '</td>';
-print '<td> </td>';
-print '<td> </td>';
-print '<td> </td>';
-print '<td> </td>';
+print '<td class="liste_titre"> </td>';
+print '<td class="liste_titre"> </td>';
+print '<td class="liste_titre"> </td>';
+print '<td class="liste_titre"> </td>';
print '</tr>';
$var=true;
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 8d1aceeaa77..9d942caf57a 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -197,13 +197,13 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
}
print '</tr>';
-print '<tr class="liste_titre"><td>'.$langs->trans("Month").'</td>';
+print '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Month").'</td>';
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
- if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.$langs->trans("AmountHT").'</td>';
- print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
- print '<td align="right" class="borderrightlight">'.$langs->trans("Delta").'</td>';
- if ($annee != $year_end) print '<td width="15"> </td>';
+ if ($modecompta == 'CREANCES-DETTES') print '<td class="liste_titre" align="right">'.$langs->trans("AmountHT").'</td>';
+ print '<td class="liste_titre" align="right">'.$langs->trans("AmountTTC").'</td>';
+ print '<td class="liste_titre" align="right" class="borderrightlight">'.$langs->trans("Delta").'</td>';
+ if ($annee != $year_end) print '<td class="liste_titre" width="15"> </td>';
}
print '</tr>';
diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index fa05e632983..f58aa180d88 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -110,12 +110,9 @@ function report_header($nom,$variante,$period,$periodlink,$description,$builddat
if ($exportlink) print '</td><td>'.$langs->trans("Export").'</td><td>'.$exportlink;
print '</td></tr>';
- print '<tr>';
- print '<td colspan="4" align="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></td>';
- print '</tr>';
-
print '</table>';
+ print '<br><div class="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></div>';
print '</form>';
dol_fiche_end();
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 2675e3c95b0..a0ca6fc2206 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -168,7 +168,7 @@ if ($result)
$num = $db->num_rows($result);
print '<br>';
- print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',0,0,'');
+ print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num,$num,'');
$i = 0;
print "<table class=\"noborder\" width=\"100%\">";
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 34463db14e2..ec30f23ee98 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -205,7 +205,7 @@ if ($result)
$num = $db->num_rows($result);
print '<br>';
- print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',0,0,'');
+ print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num,$num,'');
$i = 0;
print "<table class=\"noborder\" width=\"100%\">";
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 88570d1c1d4..eb2a2e6d2ee 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -201,7 +201,7 @@ if ($result)
$num = $db->num_rows($result);
print '<br>';
- print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&id=".$id,$sortfield,$sortorder,'',0,0,'');
+ print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&id=".$id,$sortfield,$sortorder,'',$num,$num,'');
$moreforfilter='';
@@ -301,16 +301,10 @@ if ($result)
// affichage totaux marges
$var=!$var;
$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):'';
- //}
+
+ $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>';
--
GitLab