diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index b3791acf42f..1d8dd65ae02 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -701,7 +701,7 @@ if ($step == 4 && $datatoexport) print ''; print ''.$langs->trans("AvailableFormats").''; print ''.$langs->trans("LibraryUsed").''; - print ''.$langs->trans("LibraryVersion").''; + print ''.$langs->trans("LibraryVersion").''; print ''; $liste=$objmodelexport->liste_modeles($db); @@ -709,8 +709,8 @@ if ($step == 4 && $datatoexport) { $var=!$var; print ''; - print ''.img_picto_common($key,$objmodelexport->getPicto($key)).''; - print ''.$objmodelexport->getDriverLabel($key).''.$objmodelexport->getLibLabel($key).''.$objmodelexport->getLibVersion($key).''; + print ''.img_picto_common($key,$objmodelexport->getPicto($key)).''; + print ''.$objmodelexport->getDriverLabel($key).''.$objmodelexport->getLibLabel($key).''.$objmodelexport->getLibVersion($key).''; } print ''; diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index 757b67f6188..cada2467e95 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2009 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,12 +17,12 @@ */ /** - \file htdocs/exports/index.php - \ingroup core - \brief Page accueil de la zone export - \version $Id$ -*/ - + * \file htdocs/exports/index.php + * \ingroup core + * \brief Page accueil de la zone export + * \version $Id$ + */ + require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/exports/export.class.php"); @@ -31,7 +31,7 @@ $langs->load("exports"); if (! $user->societe_id == 0) accessforbidden(); - + $export=new Export($db); $export->load_arrays($user); @@ -59,9 +59,9 @@ print ''; $var=true; print ''; print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; print ''; include_once(DOL_DOCUMENT_ROOT.'/includes/modules/export/modules_export.php'); @@ -72,9 +72,10 @@ foreach($liste as $key) { $var=!$var; print ''; - print ''; + print ''; + print ''; print ''; - print ''; + print ''; print ''; } @@ -122,7 +123,7 @@ else { print ''; } -print '
'.$langs->trans("AvailableFormats").''.$langs->trans("LibraryUsed").''.$langs->trans("LibraryVersion").''.$langs->trans("AvailableFormats").''.$langs->trans("LibraryShort").''.$langs->trans("LibraryVersion").'
'.$model->getDriverLabel($key).''.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).''.dol_trunc($model->getDriverLabel($key),24).''.$model->getLibLabel($key).''.$model->getLibVersion($key).''.$model->getLibVersion($key).'
'.$langs->trans("NoExportableData").'
'; +print ''; print ''; print ''; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 6362a45030d..8866a407b79 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -381,7 +381,7 @@ if ($step == 2 && $datatoimport) { $var=!$var; print ''; - print ''.img_picto_common($key,$objmodelimport->getPicto($key)).''; + print ''.img_picto_common($key,$objmodelimport->getPicto($key)).''; print ''.$objmodelimport->getDriverLabel($key).''; //print ''.$objmodelimport->getLibLabel($key).''.$objmodelimport->getLibVersion($key).''; print ''; @@ -759,16 +759,18 @@ if ($step == 4 && $datatoimport) $var=true; print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; $liste=$objmodelimport->liste_modeles($db); foreach($liste as $key) { $var=!$var; - print ''; + print ''; + print ''; + print ''; } print '
'.$langs->trans("AvailableFormats").''.$langs->trans("AvailableFormats").''.$langs->trans("LibraryUsed").''.$langs->trans("LibraryVersion").''.$langs->trans("LibraryVersion").'
'.$objmodelimport->getDriverLabel($key).''.$objmodelimport->getLibLabel($key).''.$objmodelimport->getLibVersion($key).'
'.img_picto_common($key,$objmodelexport->getPicto($key)).''.$objmodelimport->getDriverLabel($key).''.$objmodelimport->getLibLabel($key).''.$objmodelimport->getLibVersion($key).'
'; diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index a900fbebbbd..a2579d7480e 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -14,18 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** - \file htdocs/admin/imports/index.php - \ingroup core - \brief Page accueil de la zone import - \version $Revision$ -*/ - + * \file htdocs/admin/imports/index.php + * \ingroup core + * \brief Page accueil de la zone import + * \version $Id$ + */ + require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/imports/import.class.php"); @@ -34,12 +31,14 @@ $langs->load("exports"); if (! $user->societe_id == 0) accessforbidden(); - - $import=new Import($db); -//$import->load_arrays($user); +$import->load_arrays($user); + + +/* + * View + */ - llxHeader('',$langs->trans("ImportArea")); print_fiche_titre($langs->trans("ImportArea")); @@ -57,9 +56,9 @@ print ''; $var=true; print ''; print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; print ''; include_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php'); @@ -70,9 +69,10 @@ foreach($liste as $key) { $var=!$var; print ''; - print ''; + print ''; + print ''; print ''; - print ''; + print ''; print ''; } @@ -115,14 +115,14 @@ else { print ''; } -print '
'.$langs->trans("AvailableFormats").''.$langs->trans("LibraryUsed").''.$langs->trans("LibraryVersion").''.$langs->trans("AvailableFormats").''.$langs->trans("LibraryShort").''.$langs->trans("LibraryVersion").'
'.$model->getDriverLabel($key).''.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).''.dol_trunc($model->getDriverLabel($key),24).''.$model->getLibLabel($key).''.$model->getLibVersion($key).''.$model->getLibVersion($key).'
'.$langs->trans("NoImportableData").'
'; +print ''; // Affiche les profils d'exports $sql = "SELECT rowid, label, public, fk_user, ".$db->pdate("datec"); $sql .= " FROM ".MAIN_DB_PREFIX."export as e"; $result=$db->query($sql); -if ($result) +if ($result) { print '
'; print ''; diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index 4526983912c..386c72878d5 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -29,7 +29,8 @@ FieldsTitle=Fields title ChooseExportFormat=Choose export format NowClickToGenerateToBuildExportFile=Now, click on "Generate" to build export file... AvailableFormats=Formats disponibles -LibraryUsed=Librairie +LibraryShort=Library +LibraryUsed=Library used LibraryVersion=Version Step=Step FormatedImport=Import assistant diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang index 11dd945d070..f9c73cf8e30 100644 --- a/htdocs/langs/fr_FR/exports.lang +++ b/htdocs/langs/fr_FR/exports.lang @@ -29,6 +29,7 @@ FieldsTitle=Titre champs ChooseExportFormat=Choisissez le format d'export NowClickToGenerateToBuildExportFile=Maintenant, cliquez sur "Générer" pour générer le fichier export... AvailableFormats=Formats dispo. +LibraryShort=Librairie LibraryUsed=Librairie utilisée LibraryVersion=Version Step=Etape