';
// List of source fields
print '';
$pos=1;
$var=true;
- while($pos <= $maxpos)
- {
- $var=!$var;
- print "';
- print '| ';
- if (! empty($fieldssource[$pos]['name'])) print $fieldssource[$pos]['name'].' ('.$fieldssource[$pos]['example1'].')';
- else print ' ';
- print ' | ';
- print ' ';
- $pos++;
- }
-
- print ' ';
-
- print ' | ';
- // Arrows
- print '';
- $pos=1;
- $var=true;
while ($pos <= $maxpos)
{
$var=!$var;
print "';
+ print '| ';
+ // Get name of database field at position $pos into $namefield
+ $namefield='';
+ $posbis=1;
+ foreach($fieldstarget as $key => $val)
+ {
+ if ($posbis < $pos)
+ {
+ $posbis++;
+ continue;
+ }
+ // We found the key of targets that is at position pos
+ $namefield=$key;
+ break;
+ }
+ // Now we check if there is a file field linked to this $namefield database field
+ foreach($fieldssource as $key => $val)
+ {
+ if (! empty($array_match_file_to_database[$key]) && $array_match_file_to_database[$key] == $namefield)
+ {
+ print $langs->trans("Field").' '.$key.': ';
+ print $fieldssource[$key]['name'].' ('.$fieldssource[$key]['example1'].')';
+ break;
+ }
+ }
+ print ' | ';
+
+ // Arrows
print ' ';
- if ($pos <= sizeof($fieldssource)) print img_right();
+ if (sizeof($fieldssource) > 1 && $pos <= sizeof($fieldssource))
+ {
+ if ($pos < $maxpos) print ''.img_down().'';
+ if ($pos > 1) print ''.img_up().'';
+ }
print ' | ';
+
+ print '';
+ if (sizeof($fieldssource) > 1 && $pos <= sizeof($fieldssource)) print ' -> ';
+ print ' | ';
+
print ' ';
$pos++;
}
+
print ' ';
- print ' | ';
+
+ print ' | ';
$i = 0;
$var=true;
@@ -614,7 +658,7 @@ if ($step == 3 && $datatoimport)
*/
print '';
- if (sizeof($array_selected))
+ if (sizeof($array_match_file_to_database))
{
print ' '.$langs->trans("NextStep").'';
}
@@ -623,7 +667,7 @@ if ($step == 3 && $datatoimport)
// Area for profils import
- if (sizeof($array_selected))
+ if (sizeof($array_match_file_to_database))
{
print ' ';
print $langs->trans("SaveImportModel");
@@ -683,7 +727,7 @@ if ($step == 3 && $datatoimport)
if ($step == 4 && $datatoimport)
{
- asort($array_selected);
+ asort($array_match_file_to_database);
llxHeader('',$langs->trans("NewImport"));
@@ -730,7 +774,7 @@ if ($step == 4 && $datatoimport)
// Nbre champs importes
print ' | '.$langs->trans("ImportedFields").' | ';
$list='';
- foreach($array_selected as $code=>$label)
+ foreach($array_match_file_to_database as $code=>$label)
{
$list.=($list?',':'');
$list.=$langs->trans($objimport->array_import_fields[0][$code]);
diff --git a/mysql/migration/2.6.0-2.7.0.sql b/mysql/migration/2.6.0-2.7.0.sql
index dd306c7aa74..9d595334426 100644
--- a/mysql/migration/2.6.0-2.7.0.sql
+++ b/mysql/migration/2.6.0-2.7.0.sql
@@ -6,6 +6,18 @@
-- when current version is 2.6.0 or higher.
--
+-- Create new table for import module
+create table llx_import_model
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ fk_user integer DEFAULT 0 NOT NULL,
+ label varchar(50) NOT NULL,
+ type varchar(20) NOT NULL,
+ field text NOT NULL
+)type=innodb;
+
+ALTER TABLE llx_import_model ADD UNIQUE INDEX uk_import_model (label,type);
+
delete from llx_const where name = 'FACTURE_ENABLE_RECUR';
alter table llx_facturedet_rec add column product_type integer DEFAULT 0 after fk_product;
diff --git a/mysql/tables/llx_import_model.key.sql b/mysql/tables/llx_import_model.key.sql
new file mode 100644
index 00000000000..68b6cd9a315
--- /dev/null
+++ b/mysql/tables/llx_import_model.key.sql
@@ -0,0 +1,22 @@
+-- ===================================================================
+-- Copyright (C) 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
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- 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$
+-- ===================================================================
+
+
+ALTER TABLE llx_import_model ADD UNIQUE INDEX uk_import_model (label,type);
diff --git a/mysql/tables/llx_import_model.sql b/mysql/tables/llx_import_model.sql
new file mode 100644
index 00000000000..facf7546e97
--- /dev/null
+++ b/mysql/tables/llx_import_model.sql
@@ -0,0 +1,30 @@
+-- ===================================================================
+-- Copyright (C) 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
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- 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$
+--
+-- List of tables for available import models
+-- ===================================================================
+
+create table llx_import_model
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ fk_user integer DEFAULT 0 NOT NULL,
+ label varchar(50) NOT NULL,
+ type varchar(20) NOT NULL,
+ field text NOT NULL
+)type=innodb;
\ No newline at end of file
|