diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php index 2ec611e99c2..2dce916af2f 100644 --- a/htdocs/compta/prelevement/card.php +++ b/htdocs/compta/prelevement/card.php @@ -378,6 +378,9 @@ if ($id > 0 || $ref) { $i = 0; $urladd = "&id=".urlencode($id); + if ($limit > 0 && $limit != $conf->liste_limit) { + $urladd .= '&limit='.urlencode($limit); + } print '
'."\n"; print ''; @@ -388,6 +391,12 @@ if ($id > 0 || $ref) { if (!empty($limit)) { print ''; } + if (!empty($sortfield)) { + print ''; + } + if (!empty($sortorder)) { + print ''; + } print_barre_liste($langs->trans("Lines"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit); print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 587bcdcdfbc..668ba11b58e 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -1460,12 +1460,12 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, if (!empty($conf->global->HIDE_LABEL_VARIANT_PDF) && $prodser->isVariant()) { $libelleproduitservice = $desc; } else { - $libelleproduitservice .= $desc; + $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc); } } } } else { - $libelleproduitservice .= $desc; + $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc); } } }