This commit is contained in:
Laurent Destailleur 2021-09-19 21:18:30 +02:00
parent 3dc3214047
commit 6af9f3b142
2 changed files with 20 additions and 20 deletions

View File

@ -806,7 +806,7 @@ while ($i < min($num, $limit)) {
} }
// Zip // Zip
if (!empty($arrayfields['s.zip']['checked'])) { if (!empty($arrayfields['s.zip']['checked'])) {
print '<td class="nocellnopadd">'; print '<td class="nocellnopadd center">';
print $obj->zip; print $obj->zip;
print '</td>'; print '</td>';
if (!$i) { if (!$i) {
@ -815,7 +815,7 @@ while ($i < min($num, $limit)) {
} }
// State // State
if (!empty($arrayfields['state.nom']['checked'])) { if (!empty($arrayfields['state.nom']['checked'])) {
print "<td>".$obj->state_name."</td>\n"; print '<td class="center">'.$obj->state_name."</td>\n";
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }

View File

@ -573,43 +573,43 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
$param .= '&limit='.urlencode($limit); $param .= '&limit='.urlencode($limit);
} }
if ($sall) { if ($sall) {
$param .= "&amp;sall=".urlencode($sall); $param .= "&sall=".urlencode($sall);
} }
if ($search_ref_rcp) { if ($search_ref_rcp) {
$param .= "&amp;search_ref_rcp=".urlencode($search_ref_rcp); $param .= "&search_ref_rcp=".urlencode($search_ref_rcp);
} }
if ($search_ref_liv) { if ($search_ref_liv) {
$param .= "&amp;search_ref_liv=".urlencode($search_ref_liv); $param .= "&search_ref_liv=".urlencode($search_ref_liv);
} }
if ($search_company) { if ($search_company) {
$param .= "&amp;search_company=".urlencode($search_company); $param .= "&search_company=".urlencode($search_company);
} }
if ($optioncss != '') { if ($optioncss != '') {
$param .= '&amp;optioncss='.urlencode($optioncss); $param .= '&optioncss='.urlencode($optioncss);
} }
if ($search_billed != '' && $search_billed >= 0) { if ($search_billed != '' && $search_billed >= 0) {
$param .= "&amp;search_billed=".urlencode($search_billed); $param .= "&search_billed=".urlencode($search_billed);
} }
if ($search_town) { if ($search_town) {
$param .= "&amp;search_town=".urlencode($search_town); $param .= "&search_town=".urlencode($search_town);
} }
if ($search_zip) { if ($search_zip) {
$param .= "&amp;search_zip=".urlencode($search_zip); $param .= "&search_zip=".urlencode($search_zip);
} }
if ($search_state) { if ($search_state) {
$param .= "&amp;search_state=".urlencode($search_state); $param .= "&search_state=".urlencode($search_state);
} }
if ($search_status != '') { if ($search_status != '') {
$param .= "&amp;search_status=".urlencode($search_status); $param .= "&search_status=".urlencode($search_status);
} }
if ($search_country) { if ($search_country) {
$param .= "&amp;search_country=".urlencode($search_country); $param .= "&search_country=".urlencode($search_country);
} }
if ($search_type_thirdparty) { if ($search_type_thirdparty) {
$param .= "&amp;search_type_thirdparty=".urlencode($search_type_thirdparty); $param .= "&search_type_thirdparty=".urlencode($search_type_thirdparty);
} }
if ($search_ref_supplier) { if ($search_ref_supplier) {
$param .= "&amp;search_ref_supplier=".urlencode($search_ref_supplier); $param .= "&search_ref_supplier=".urlencode($search_ref_supplier);
} }
// Add $param from extra fields // Add $param from extra fields
foreach ($search_array_options as $key => $val) { foreach ($search_array_options as $key => $val) {
@ -885,7 +885,7 @@ while ($i < min($num, $limit)) {
// Ref // Ref
if (!empty($arrayfields['e.ref']['checked'])) { if (!empty($arrayfields['e.ref']['checked'])) {
print "<td>"; print '<td class="nowraponall">';
print $reception->getNomUrl(1); print $reception->getNomUrl(1);
$filename = dol_sanitizeFileName($reception->ref); $filename = dol_sanitizeFileName($reception->ref);
$filedir = $conf->reception->dir_output.'/'.dol_sanitizeFileName($reception->ref); $filedir = $conf->reception->dir_output.'/'.dol_sanitizeFileName($reception->ref);
@ -900,8 +900,8 @@ while ($i < min($num, $limit)) {
// Ref customer // Ref customer
if (!empty($arrayfields['e.ref_supplier']['checked'])) { if (!empty($arrayfields['e.ref_supplier']['checked'])) {
print "<td>"; print '<td title="'.dol_escape_htmltag($obj->ref_supplier).'>';
print $obj->ref_supplier; print dol_escape_htmltag($obj->ref_supplier);
print "</td>\n"; print "</td>\n";
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;
@ -910,7 +910,7 @@ while ($i < min($num, $limit)) {
// Third party // Third party
if (!empty($arrayfields['s.nom']['checked'])) { if (!empty($arrayfields['s.nom']['checked'])) {
print '<td>'; print '<td class="tdoverflowmax150">';
print $companystatic->getNomUrl(1); print $companystatic->getNomUrl(1);
print '</td>'; print '</td>';
if (!$i) { if (!$i) {
@ -928,7 +928,7 @@ while ($i < min($num, $limit)) {
} }
// Zip // Zip
if (!empty($arrayfields['s.zip']['checked'])) { if (!empty($arrayfields['s.zip']['checked'])) {
print '<td class="nocellnopadd">'; print '<td class="nocellnopadd center"">';
print $obj->zip; print $obj->zip;
print '</td>'; print '</td>';
if (!$i) { if (!$i) {