Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix label in export

Browse Source
This commit is contained in:
Laurent Destailleur 2024-09-27 14:49:29 +02:00
parent 7db9a5afb7
commit 5e41287ebc
1 changed files with 65 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
htdocs/exports/export.php
View File

@ -524,7 +524,7 @@ if ($step == 2 && $datatoexport) {
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';
print '<table width="100%" class="border tableforfield">';
print '<table class="border tableforfield centpercent">';
// Module
print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
@ -569,9 +569,17 @@ if ($step == 2 && $datatoexport) {
print '<td>'.$langs->trans("Object").'</td>';
print '<td>'.$langs->trans("ExportableFields").'</td>';
print '<td width="100" class="center">';
print '<a class="liste_titre commonlink" title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field=all&token='.newToken().'">'.$langs->trans("All")."</a>";
$morecss = '';
$moretitle = '';
if (!$user->hasRight('export', 'creer')) {
$morecss = ' disabled';
$moretitle = $langs->trans("NotAllowed");
}
print '<a class="liste_titre commonlink'.$morecss;
print '" title="'.$langs->trans("All").($moretitle ? ' - '.$moretitle : '').'" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.urlencode($datatoexport).'&action=selectfield&field=all&token='.newToken().'">'.$langs->trans("All")."</a>";
print ' / ';
print '<a class="liste_titre commonlink" title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=unselectfield&field=all&token='.newToken().'">'.$langs->trans("None")."</a>";
print '<a class="liste_titre commonlink'.$morecss;
print '" title="'.$langs->trans("None").($moretitle ? ' - '.$moretitle : '').'" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.urlencode($datatoexport).'&action=unselectfield&field=all&token='.newToken().'">'.$langs->trans("None")."</a>";
print '</td>';
print '<td width="44%">'.$langs->trans("ExportedFields").'</td>';
print '</tr>';
@ -612,7 +620,14 @@ if ($step == 2 && $datatoexport) {
print img_object('', $entityicon).' '.$langs->trans($entitylang);
print '</td>';
$text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>').$langs->trans($label).(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
$text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>');
$tmplabelarray = explode(':', $label);
if (!empty($tmplabelarray[1])) {
$text .= $langs->trans($tmplabelarray[0]).' - '.$langs->trans($tmplabelarray[1]);
} else {
$text .= $langs->trans($label);
}
$text .=(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
$tablename = getablenamefromfield($code, $sqlmaxforexport);
$htmltext = '<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
@ -634,7 +649,7 @@ if ($step == 2 && $datatoexport) {
if (isset($array_selected[$code]) && $array_selected[$code]) {
// Selected fields
print '<td>&nbsp;</td>';
print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=unselectfield&field='.$code.'">'.img_left('default', 0, 'style="max-width: 20px"').'</a></td>';
print '<td class="center"><a class="reposition'.$morecss.'" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.urlencode($datatoexport).'&action=unselectfield&token='.newToken().'&field='.urlencode($code).'">'.img_left($moretitle, 0, 'style="max-width: 20px"').'</a></td>';
print '<td>';
//print $text.'-'.$htmltext."<br>";
print $form->textwithpicto($text, $htmltext);
@ -647,7 +662,7 @@ if ($step == 2 && $datatoexport) {
print $form->textwithpicto($text, $htmltext);
//print ' ('.$code.')';
print '</td>';
print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field='.$code.'">'.img_right('default', 0, 'style="max-width: 20px"').'</a></td>';
print '<td class="center"><a class="reposition'.$morecss.'" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.urlencode($datatoexport).'&action=selectfield&token='.newToken().'&field='.urlencode($code).'">'.img_right($moretitle, 0, 'style="max-width: 20px"').'</a></td>';
print '<td>&nbsp;</td>';
}
@ -731,8 +746,16 @@ if ($step == 3 && $datatoexport) {
print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
$list = '';
foreach ($array_selected as $code => $value) {
$list .= (!empty($list) ? ', ' : '');
$list .= (isset($objexport->array_export_fields[0][$code]) ? $langs->trans($objexport->array_export_fields[0][$code]) : '');
if (isset($objexport->array_export_fields[0][$code])) {
$list .= (!empty($list) ? ', ' : '');
$tmplabelarray = explode(':', $objexport->array_export_fields[0][$code]);
if (!empty($tmplabelarray[1])) {
$list .= $langs->trans($tmplabelarray[0]).' - '.$langs->trans($tmplabelarray[1]);
} else {
$list .= $langs->trans($objexport->array_export_fields[0][$code]);
}
}
}
print '<td>'.$list.'</td></tr>';
@ -792,7 +815,15 @@ if ($step == 3 && $datatoexport) {
// Field name
$labelName = (!empty($fieldsarray[$code]) ? $fieldsarray[$code] : '');
$ValueFilter = (!empty($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
$text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
$text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>');
$tmplabelarray = explode(':', $label);
if (!empty($tmplabelarray[1])) {
$text .= $langs->trans($tmplabelarray[0]).' - '.$langs->trans($tmplabelarray[1]);
} else {
$text .= $langs->trans($label);
}
$text .=(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
$tablename = getablenamefromfield($code, $sqlmaxforexport);
$htmltext = '<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
@ -911,8 +942,16 @@ if ($step == 4 && $datatoexport) {
print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
$list = '';
foreach ($array_selected as $code => $value) {
$list .= (!empty($list) ? ', ' : '');
$list .= $langs->trans($objexport->array_export_fields[0][$code]);
if (isset($objexport->array_export_fields[0][$code])) {
$list .= (!empty($list) ? ', ' : '');
$tmplabelarray = explode(':', $objexport->array_export_fields[0][$code]);
if (!empty($tmplabelarray[1])) {
$list .= $langs->trans($tmplabelarray[0]).' - '.$langs->trans($tmplabelarray[1]);
} else {
$list .= $langs->trans($objexport->array_export_fields[0][$code]);
}
}
}
print '<td>'.$list.'</td>';
print '</tr>';
@ -986,7 +1025,14 @@ if ($step == 4 && $datatoexport) {
$labelName = $objexport->array_export_fields[0][$code];
$text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
$text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>');
$tmplabelarray = explode(':', $labelName);
if (!empty($tmplabelarray[1])) {
$text .= $langs->trans($tmplabelarray[0]).' - '.$langs->trans($tmplabelarray[1]);
} else {
$text .= $langs->trans($labelName);
}
$text .=(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
$tablename = getablenamefromfield($code, $sqlmaxforexport);
$htmltext = '<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
@ -1203,7 +1249,13 @@ if ($step == 5 && $datatoexport) {
foreach ($array_selected as $code => $label) {
if (isset($objexport->array_export_fields[0][$code])) {
$list .= (!empty($list) ? ', ' : '');
$list .= $langs->trans($objexport->array_export_fields[0][$code]);
$tmplabelarray = explode(':', $objexport->array_export_fields[0][$code]);
if (!empty($tmplabelarray[1])) {
$list .= $langs->trans($tmplabelarray[0]).' - '.$langs->trans($tmplabelarray[1]);
} else {
$list .= $langs->trans($objexport->array_export_fields[0][$code]);
}
}
}
print '<td>'.$list.'</td></tr>';