lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2021-12-09 18:03:38 +01:00
commit 9624b9aa59
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/compta/prelevement/card.php
View File

@ -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 '<form method="get" action="'.$_SERVER ['PHP_SELF'].'" name="search_form">'."\n";
print '<input type="hidden" name="id" value="'.$id.'"/>';
@ -388,6 +391,12 @@ if ($id > 0 || $ref) {
if (!empty($limit)) {
print '<input type="hidden" name="limit" value="'.$limit.'"/>';
}
if (!empty($sortfield)) {
print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
}
if (!empty($sortorder)) {
print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
}
print_barre_liste($langs->trans("Lines"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table

4
htdocs/core/lib/pdf.lib.php
View File

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