diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index e9f19f49ef401aaeb03998aeddf1a8507b22e733..43453041dfd21f9cca9d44ad66db0aeed783a2a8 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -439,7 +439,7 @@ if ($step == 1 || ! $datatoexport) $h++; */ - dol_fiche_head($head, $hselected, $langs->trans("NewExport")); + dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1); print '<table class="notopnoleftnoright" width="100%">'; @@ -609,7 +609,14 @@ if ($step == 2 && $datatoexport) $text=$langs->trans($label); $tablename=getablenamefromfield($code,$sqlmaxforexport); $htmltext ='<b>'.$langs->trans("Name").":</b> ".$text.'<br>'; - $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>"; + if (! empty($objexport->array_export_special[0][$code])) + { + $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>"; + } + else + { + $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>"; + } if (! empty($objexport->array_export_examplevalues[0][$code])) { $htmltext.=$langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>'; @@ -645,9 +652,8 @@ if ($step == 2 && $datatoexport) /* * Barre d'action - * */ - print '<div class="tabsAction">'; + print '<div class="tabsAction tabsActionNoBottom">'; if (count($array_selected)) { @@ -828,7 +834,7 @@ if ($step == 3 && $datatoexport) /* * Barre d'action */ - print '<div class="tabsAction">'; + print '<div class="tabsAction tabsActionNoBottom">'; // il n'est pas obligatoire de filtrer les champs print '<a class="butAction" href="javascript:FilterField.submit();">'.$langs->trans("NextStep").'</a>'; print '</div>'; @@ -883,14 +889,14 @@ if ($step == 4 && $datatoexport) print '<table width="100%" class="border">'; // Module - print '<tr><td width="25%">'.$langs->trans("Module").'</td>'; + print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>'; print '<td>'; //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' '; print $objexport->array_export_module[0]->getName(); print '</td></tr>'; // Lot de donnees a exporter - print '<tr><td width="25%">'.$langs->trans("DatasetToExport").'</td>'; + print '<tr><td>'.$langs->trans("DatasetToExport").'</td>'; print '<td>'; $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]); print img_object($objexport->array_export_module[0]->getName(), $icon).' '; @@ -898,7 +904,7 @@ if ($step == 4 && $datatoexport) print '</td></tr>'; // List of exported fields - print '<tr><td width="25%">'.$langs->trans("ExportedFields").'</td>'; + print '<tr><td>'.$langs->trans("ExportedFields").'</td>'; $list=''; foreach($array_selected as $code=>$value) { diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index a2e208673bd40d3d010bafb91e0a8f672c475dae..4a1152e658127ff24e22f5e14adb82e1f4cdca92 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -120,6 +120,7 @@ SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert) NoUpdateAttempt=No update attempt was performed, only insert ImportDataset_user_1=Users (employees or not) and properties +ComputedField=Computed field ## filters SelectFilterFields=If you want to filter on some values, just input values here. FilteredFields=Filtered fields diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 4672d99b8ec8acfb2f5032aac6dc4dc6f983ee20..9de83c3bd97f561dd5128c7154ab7e561dfe7363 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2006,6 +2006,9 @@ div.tabsAction { padding: 0em 0em; text-align: right; } +div.tabsActionNoBottom { + margin-bottom: 0px; +} div.tabsAction > a { margin-bottom: 16px !important; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 7818422d1922f24469c795d071230d5d3615100e..e6809a2c574a39cf0193fc5a654bb81f10e1d8c9 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2011,6 +2011,9 @@ div.tabsAction { padding: 0em 0em; text-align: right; } +div.tabsActionNoBottom { + margin-bottom: 0px; +} div.tabsAction > a { margin-bottom: 16px !important; }