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

Work on import module

Browse Source
This commit is contained in:
Laurent Destailleur 2009-08-23 00:24:56 +00:00
parent d2e3e207a6
commit d06f00da5e
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/imports/import.php
View File

@ -687,7 +687,7 @@ if ($step == 3 && $datatoimport)
} }
else else
{ {
show_elem('','',$var,''); show_elem('','',$var,'none');
} }
print "</div>\n"; print "</div>\n";
@ -945,6 +945,9 @@ $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date$ - $Revision$');
/*
* Function to put the movable box of a source field
*/
function show_elem($fieldssource,$pos,$var,$key) function show_elem($fieldssource,$pos,$var,$key)
{ {
global $langs,$bc; global $langs,$bc;
@ -954,7 +957,15 @@ function show_elem($fieldssource,$pos,$var,$key)
print '<table summary="boxtable'.$pos.'" width="100%" class="nobordernopadding">'."\n"; print '<table summary="boxtable'.$pos.'" width="100%" class="nobordernopadding">'."\n";
print '<tr class="liste_total" height="20">'; print '<tr class="liste_total" height="20">';
if (! empty($key)) if (empty($key))
{
print '<td class="nocellnopadding" colspan="2">&nbsp;</td>';
}
elseif ($key == 'none')
{
print '<td class="nocellnopadding" colspan="2" style="font-weight: normal">'.$langs->trans("NoDiscardedFields").'</td>';
}
else
{ {
//print '<td width="16">'.img_file('','').'</td>'; //print '<td width="16">'.img_file('','').'</td>';
print '<td class="nocellnopadding" width="16">'; print '<td class="nocellnopadding" width="16">';
@ -966,7 +977,6 @@ function show_elem($fieldssource,$pos,$var,$key)
print $fieldssource[$key]['name'].' ('.$fieldssource[$key]['example1'].')'; print $fieldssource[$key]['name'].' ('.$fieldssource[$key]['example1'].')';
print '</td>'; print '</td>';
} }
else print '<td class="nocellnopadding" colspan="2">&nbsp;</td>';
print '</tr>'; print '</tr>';
print "</table>\n"; print "</table>\n";

3
htdocs/langs/en_US/exports.lang
View File

@ -22,7 +22,8 @@ ImportModelSaved=Import profile saved under name <b>%s</b>.
ImportableFields=Importable fields ImportableFields=Importable fields
ImportedFields=Imported fields ImportedFields=Imported fields
DatasetToExport=Dataset to export DatasetToExport=Dataset to export
DatasetToImport=Dataset to import DatasetToImport=Import file into dataset
NoDiscardedFields=No fields in source file are discarded
Dataset=Dataset Dataset=Dataset
ChooseFieldsOrdersAndTitle=Choose fields order... ChooseFieldsOrdersAndTitle=Choose fields order...
FieldsOrder=Fields order FieldsOrder=Fields order

3
htdocs/langs/fr_FR/exports.lang
View File

@ -22,7 +22,8 @@ ImportModelSaved=Profil d'import sauvé sous le nom <b>%s</b>.
ImportableFields=Champs importables ImportableFields=Champs importables
ImportedFields=Champs à importer ImportedFields=Champs à importer
DatasetToExport=Lot de données à exporter DatasetToExport=Lot de données à exporter
DatasetToImport=Lot de données à importer DatasetToImport=Importer fichier dans la base de
NoDiscardedFields=Aucun champ du fichier source écarté
Dataset=Lot de données Dataset=Lot de données
ChooseFieldsOrdersAndTitle=Choisissez l'ordre des champs... ChooseFieldsOrdersAndTitle=Choisissez l'ordre des champs...
FieldsOrder=Ordre des champs FieldsOrder=Ordre des champs