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-05-19 00:33:57 +00:00
parent 8b12e7c07b
commit a588260818
6 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/exports/export.php
View File

@ -701,7 +701,7 @@ if ($step == 4 && $datatoexport)
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
print '<td>'.$langs->trans("LibraryUsed").'</td>';
print '<td>'.$langs->trans("LibraryVersion").'</td>';
print '<td align="right">'.$langs->trans("LibraryVersion").'</td>';
print '</tr>';
$liste=$objmodelexport->liste_modeles($db);
@ -709,8 +709,8 @@ if ($step == 4 && $datatoexport)
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20">'.img_picto_common($key,$objmodelexport->getPicto($key)).'</td>';
print '<td>'.$objmodelexport->getDriverLabel($key).'</td><td>'.$objmodelexport->getLibLabel($key).'</td><td>'.$objmodelexport->getLibVersion($key).'</td></tr>';
print '<td width="16">'.img_picto_common($key,$objmodelexport->getPicto($key)).'</td>';
print '<td>'.$objmodelexport->getDriverLabel($key).'</td><td>'.$objmodelexport->getLibLabel($key).'</td><td align="right">'.$objmodelexport->getLibVersion($key).'</td></tr>';
}
print '</table>';

29
htdocs/exports/index.php
View File

@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2005-2009 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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 '<tr><td valign="top" width="40%" class="notopnoleft">';
$var=true;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("AvailableFormats").'</td>';
print '<td>'.$langs->trans("LibraryUsed").'</td>';
print '<td>'.$langs->trans("LibraryVersion").'</td>';
print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
print '<td>'.$langs->trans("LibraryShort").'</td>';
print '<td align="right">'.$langs->trans("LibraryVersion").'</td>';
print '</tr>';
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/export/modules_export.php');
@ -72,9 +72,10 @@ foreach($liste as $key)
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td>'.$model->getDriverLabel($key).'</td>';
print '<td width="16">'.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).'</td>';
print '<td>'.dol_trunc($model->getDriverLabel($key),24).'</td>';
print '<td>'.$model->getLibLabel($key).'</td>';
print '<td nowrap="nowrap" align="center">'.$model->getLibVersion($key).'</td>';
print '<td nowrap="nowrap" align="right">'.$model->getLibVersion($key).'</td>';
print '</tr>';
}
@ -122,7 +123,7 @@ else
{
print '<tr><td '.$bc[false].' colspan="2">'.$langs->trans("NoExportableData").'</td></tr>';
}
print '</table>';
print '</table>';
print '</td></tr>';
print '</table>';

10
htdocs/imports/import.php
View File

@ -381,7 +381,7 @@ if ($step == 2 && $datatoimport)
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td width="20">'.img_picto_common($key,$objmodelimport->getPicto($key)).'</td>';
print '<td width="16">'.img_picto_common($key,$objmodelimport->getPicto($key)).'</td>';
print '<td>'.$objmodelimport->getDriverLabel($key).'</td>';
//print '<td>'.$objmodelimport->getLibLabel($key).'</td><td>'.$objmodelimport->getLibVersion($key).'</td>';
print '</tr>';
@ -759,16 +759,18 @@ if ($step == 4 && $datatoimport)
$var=true;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("AvailableFormats").'</td>';
print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
print '<td>'.$langs->trans("LibraryUsed").'</td>';
print '<td>'.$langs->trans("LibraryVersion").'</td>';
print '<td alig="right">'.$langs->trans("LibraryVersion").'</td>';
print '</tr>';
$liste=$objmodelimport->liste_modeles($db);
foreach($liste as $key)
{
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$objmodelimport->getDriverLabel($key).'</td><td>'.$objmodelimport->getLibLabel($key).'</td><td>'.$objmodelimport->getLibVersion($key).'</td></tr>';
print '<tr '.$bc[$var].'>';
print '<td width="16">'.img_picto_common($key,$objmodelexport->getPicto($key)).'</td>';
print '<td>'.$objmodelimport->getDriverLabel($key).'</td><td>'.$objmodelimport->getLibLabel($key).'</td><td align="right">'.$objmodelimport->getLibVersion($key).'</td></tr>';
}
print '</table>';

40
htdocs/imports/index.php
View File

@ -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 '<tr><td valign="top" width="40%" class="notopnoleft">';
$var=true;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("AvailableFormats").'</td>';
print '<td>'.$langs->trans("LibraryUsed").'</td>';
print '<td>'.$langs->trans("LibraryVersion").'</td>';
print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
print '<td>'.$langs->trans("LibraryShort").'</td>';
print '<td align="right">'.$langs->trans("LibraryVersion").'</td>';
print '</tr>';
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php');
@ -70,9 +69,10 @@ foreach($liste as $key)
{
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td>'.$model->getDriverLabel($key).'</td>';
print '<td width="16">'.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).'</td>';
print '<td>'.dol_trunc($model->getDriverLabel($key),24).'</td>';
print '<td>'.$model->getLibLabel($key).'</td>';
print '<td nowrap="nowrap" align="center">'.$model->getLibVersion($key).'</td>';
print '<td nowrap="nowrap" align="right">'.$model->getLibVersion($key).'</td>';
print '</tr>';
}
@ -115,14 +115,14 @@ else
{
print '<tr><td '.$bc[false].' colspan="2">'.$langs->trans("NoImportableData").'</td></tr>';
}
print '</table>';
print '</table>';
// 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 '<br>';
print '<table class="noborder" width="100%">';

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

@ -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

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

@ -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