From 9220fca807449cd392141eabdda17e60f747bbac Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 27 Jan 2009 18:41:37 +0000
Subject: [PATCH] BUG import bank : fortis

---
 html/admin/sql/patch/upgrade55.sql |  6 ++++++
 include/constant.php               |  2 +-
 include/fortis_be.inc.php          | 18 ++++++++++++------
 3 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 html/admin/sql/patch/upgrade55.sql

diff --git a/html/admin/sql/patch/upgrade55.sql b/html/admin/sql/patch/upgrade55.sql
new file mode 100644
index 000000000..447fe32ca
--- /dev/null
+++ b/html/admin/sql/patch/upgrade55.sql
@@ -0,0 +1,6 @@
+begin;
+alter table import_tmp alter bq_account type text;
+
+update version set val=56;
+
+commit;
diff --git a/include/constant.php b/include/constant.php
index a4d26e9f8..348558afc 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -25,7 +25,7 @@
  */
 require_once ('config.inc.php');
 
-define ("DBVERSION",55);
+define ("DBVERSION",56);
 
 define ("MAX_COMPTE",4);
 define ('MAX_BUD_DETAIL',20);
diff --git a/include/fortis_be.inc.php b/include/fortis_be.inc.php
index 04f54b798..263b1367c 100644
--- a/include/fortis_be.inc.php
+++ b/include/fortis_be.inc.php
@@ -27,15 +27,20 @@
 // Fortis Bank
 //-----------------------------------------------------
 $row=1;
+$must_field=7; // The mandatory number of fields
 while (($data = fgetcsv($handle, 2000,'@')) !== FALSE) {
 	$num = count($data);
+	
 	for ($c=0; $c < $num; $c++) {
-
+	$nb_field=substr_count($data[$c],";");
 // first line is skipped
-		if ( $row>1) {
+	if ( $row>1  &&  $nb_field == $must_field) {
 			
-			$code=""; $date_exec=""; $date_valeur=""; $montant=""; $devise=""; $compte_ordre=""; $detail=""; $num_compte=""; $iduser="";
+	$code=""; $date_exec=""; 
+	$date_valeur=""; $montant=""; $devise=""; $compte_ordre=""; $detail=""; $num_compte=""; $iduser="";
 			
+			
+				
 			list($code, $date_exec, $date_valeur, $montant, $devise, $compte_ordre, $detail, $num_compte) = split(";", $data[$c]);
 			echo "line : $row > ".$data[$c]."<hr>";
 		
@@ -76,10 +81,10 @@ while (($data = fgetcsv($handle, 2000,'@')) !== FALSE) {
 			$Res=ExecSql($p_cn,$sql);
 			$Num=pg_NumRows($Res);
 			
-			if($Num > 0) {
+			if($Num > 0 ) {
 				echo "Op&eacute;ration FORTIS ".$code." d&eacute;j&eagrave; import&eacute;e.<br/>";
 			} else {
-				$Sql="insert into import_tmp (code ,
+			 $Sql="insert into import_tmp (code ,
 					date_exec ,
 					date_valeur,
 					montant,
@@ -102,7 +107,8 @@ while (($data = fgetcsv($handle, 2000,'@')) !== FALSE) {
 					$p_jrn,
 					'n')";
 			
-				$Res=ExecSql($p_cn,$Sql,'latin1');
+				$Res=ExecSql($p_cn,$Sql);
+				
 			}
 		}