diff --git a/dev/skeletons/skeleton_list.php b/dev/skeletons/skeleton_list.php index 77485c6d6381f8c0875e5288125621679be0e443..4453f2d83022dea960d6bd914d183709fe4c3c14 100644 --- a/dev/skeletons/skeleton_list.php +++ b/dev/skeletons/skeleton_list.php @@ -523,7 +523,7 @@ if (isset($totalarray['totalhtfield'])) $i++; if ($i == 1) { - if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; + if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; } elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>'; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index d85448397de64c9b22928a8f34f9f798e8ea19a2..efb72afb7b79b45c81a43d72439339439a65f764 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -991,7 +991,7 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; + if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; } elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>'; diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 80601ec972736d38e4024123e81d8f4cc65618f7..e62ae11d5cda5cd06bd3c2630d944e9a51d6f2c2 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -1412,7 +1412,7 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; + if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; } elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>'; diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php index 72e82dd0dd73ea68c405c5cd8cee557dfceae04c..4845012a3e0e552d580eb53233b676a1ade2f019 100644 --- a/htdocs/compta/bank/bankentries.php +++ b/htdocs/compta/bank/bankentries.php @@ -1307,7 +1307,7 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; + if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; } elseif ($totalarray['totaldebfield'] == $i) print '<td align="right">'.price(-1 * $totalarray['totaldeb']).'</td>'; diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index 012dfe42175236e5a7c5d21db552704098d8f651..5f6e30016d4595f5b67d86999ec711718d17f92d 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -607,7 +607,7 @@ if (isset($totalarray['totalbalancefield']) && $lastcurrencycode != 'various') / $i++; if ($i == 1) { - if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; + if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; } elseif ($totalarray['totalbalancefield'] == $i) print '<td align="right">'.price($totalarray['totalbalance'], 0, $langs, 0, 0, -1, $lastcurrencycode).'</td>'; diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 693a6f39f97121a6aa0c950249ad059a90e3e2c9..c5fd9b8048255bc9c0acd765f9d1a20666c7547e 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -1117,7 +1117,7 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; + if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; } elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>'; diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 66d6a65dd563b032786d7494c90ea70e680fd489..e3f4a0b9b4d2936e0fbcad6edf785f05f35beacd 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -274,7 +274,7 @@ if ($resql) if (isset($totalarray['totalttcfield'])) { print '<tr class="liste_total">'; - if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; + if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; print '<td></td>'; print '<td></td>'; diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 58541330c83a52994a4de06e97e85cc7c91b04bc..ca7a52ad2932430b9fca789d17820be4d66528b3 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -694,7 +694,7 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; + if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; } elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>'; diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 9ef7d22ad1057c045ce8a067386572166da6fd4a..bafafb40dd16351df43dc4822b085c2eace6f1ff 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -518,7 +518,7 @@ if ($result) $i++; if ($i == 1) { - if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; + if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; } elseif ($totalarray['totaldurationfield'] == $i) print '<td align="right">'.convertSecondToTime($totalarray['totalduration'], 'allhourmin').'</td>'; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 396d5ffd8a5496c81799908fb19dc53a66a66801..77064191d2474e6b72901aab30cec133db1dca29 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -970,7 +970,7 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; + if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; } elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>'; diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php index 2910103e3807c12dd0f52f4a33231754f4d36a07..3d89aee0013264ce8772cde17a43953457daa000 100644 --- a/htdocs/product/stock/productlot_list.php +++ b/htdocs/product/stock/productlot_list.php @@ -570,7 +570,7 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; + if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; } elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>'; diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 51f260cac6f5ab1f76598228e89833db951ef65d..408031a9ed274599baf2b3569dd20c23429c6b60 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -854,7 +854,7 @@ if (isset($totalarray['totaloppfield']) || isset($totalarray['totalbudgetfield'] $i++; if ($i == 1) { - if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; + if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; } elseif ($totalarray['totaloppfield'] == $i) print '<td align="right">'.price($totalarray['totalopp']).'</td>'; diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index 30a89109115d409c1f596c3780448565f50aebb4..482c7b6f446cfcf37e20130443d85a8c372e1a8e 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -811,7 +811,7 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota $i++; if ($i == 1) { - if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; + if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; } elseif ($totalarray['totalplannedworkloadfield'] == $i) print '<td align="center">'.convertSecondToTime($totalarray['totalplannedworkload'],$plannedworkloadoutputformat).'</td>'; diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 6cb52588a89d6f5520a34bc09498d9f453d9dfe9..4c5d58dab7d52f09e573a7cf739f778b906238c3 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -971,7 +971,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) $i++; if ($i == 1) { - if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; + if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; } elseif ($totalarray['totaldurationfield'] == $i) print '<td align="right">'.convertSecondToTime($totalarray['totalduration'],'allhourmin').'</td>';