diff --git a/include/cbc_be.inc.php b/include/cbc_be.inc.php index a20bbee52..d46555a54 100644 --- a/include/cbc_be.inc.php +++ b/include/cbc_be.inc.php @@ -1,3 +1,35 @@ diff --git a/include/eub_be.inc.php b/include/eub_be.inc.php index 52cfea869..01bb68194 100644 --- a/include/eub_be.inc.php +++ b/include/eub_be.inc.php @@ -22,46 +22,55 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////// // Bank type = eub ///////////////////////////////////////////////////////////////////////////////////////////////////// -// first line is skipped -if ( $row > 1) { -$code=""; $date_exec=""; $detail=""; $montant=""; -list($code, $date_exec, $detail, $montant) = split(";", $data[$c]); +$row=1; +while (($data = fgetcsv($handle, 2000,'!@')) !== FALSE) { + $num = count($data); + for ($c=0; $c < $num; $c++) { -$date_exec = str_replace("\t", "", $date_exec); -$date_exec = str_replace(" ", "", $date_exec); - -list($annee,$mois,$jour) = explode("-", $date_exec); - -$montant = str_replace(".", "", $montant); -$montant = str_replace(",", ".", $montant); -$montant = str_replace("+", "", $montant); - -if($code < 10) $code = "000".$code; -if($code >= 10 and $code < 100) $code = "00".$code; -if($code >= 100) $code = "0".$code; - -$code = $annee."-".$code; - - -$Sql="insert into import_tmp (code, - date_exec , - date_valeur, - montant, - devise, - detail, - num_compte, - bq_account , - jrn, - ok) -values ('$code', - '$date_exec', - '$date_exec', - '$montant', - 'EUR', - '".addslashes($detail)."', - '$p_bq_account', - $p_jrn, - false)"; -$Res=ExecSql($p_cn,$Sql); -} + // first line is skipped + if ( $row > 1) { + $code=""; $date_exec=""; $detail=""; $montant=""; + list($code, $date_exec, $detail, $montant) = split(";", $data[$c]); + + $date_exec = str_replace("\t", "", $date_exec); + $date_exec = str_replace(" ", "", $date_exec); + + list($annee,$mois,$jour) = explode("-", $date_exec); + + $montant = str_replace(".", "", $montant); + $montant = str_replace(",", ".", $montant); + $montant = str_replace("+", "", $montant); + + if($code < 10) $code = "000".$code; + if($code >= 10 and $code < 100) $code = "00".$code; + if($code >= 100) $code = "0".$code; + + $code = $annee."-".$code; + + + $Sql="insert into import_tmp (code, + date_exec , + date_valeur, + montant, + devise, + detail, + num_compte, + bq_account , + jrn, + ok) + values ('$code', + '$date_exec', + '$date_exec', + '$montant', + 'EUR', + '".addslashes($detail)."', + '$p_bq_account', + $p_jrn, + false)"; + $Res=ExecSql($p_cn,$Sql); + } + } // for ($c=0;$c<$num;$c++) + $row++; +} // file is read +fclose($handle); ?> \ No newline at end of file diff --git a/include/fortis_be.inc.php b/include/fortis_be.inc.php index 2fbc0fe23..c8033544b 100644 --- a/include/fortis_be.inc.php +++ b/include/fortis_be.inc.php @@ -22,78 +22,88 @@ ///////////////////////////////////////////////////////////////////////////////////////////////////// // Fortis Bank ///////////////////////////////////////////////////////////////////////////////////////////////////// +$row=1; +while (($data = fgetcsv($handle, 2000,'!@')) !== FALSE) { + $num = count($data); + for ($c=0; $c < $num; $c++) { + // first line is skipped -if ( $row>1) { - - $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]."
"; - - //corrige un bug de date - $date_exec = str_replace(chr(34),"", $date_exec); - - // Si LTXXXXX ou LT XXXXX dans le détail - if ((ereg ("LT+([0-9]{5})", $detail, $regs)) || (ereg ("LT+[ ]+([0-9]{5})", $detail, $regs))) { - $iduser = $regs[1]; - } - - // Si 00000XXXXXXX - if (ereg ("[0-9]{12}", $detail, $regs)){ - if($regs[0] != "000000000000") { - $id = substr($regs[0], 5, 5); - $check = substr($regs[0], 10, 2); - if (($id % 97) == $check) $iduser = $id; + if ( $row>1) { + + $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]."
"; + + //corrige un bug de date + $date_exec = str_replace(chr(34),"", $date_exec); + + // Si LTXXXXX ou LT XXXXX dans le détail + if ((ereg ("LT+([0-9]{5})", $detail, $regs)) || (ereg ("LT+[ ]+([0-9]{5})", $detail, $regs))) { + $iduser = $regs[1]; + } + + // Si 00000XXXXXXX + if (ereg ("[0-9]{12}", $detail, $regs)){ + if($regs[0] != "000000000000") { + $id = substr($regs[0], 5, 5); + $check = substr($regs[0], 10, 2); + if (($id % 97) == $check) $iduser = $id; + } + } + + if($iduser != "" ) $poste_comptable = "400".$iduser; + else $poste_comptable = ""; + + list($jour,$mois,$annee) = explode("/", $date_exec); $date_exec = $annee."-".$mois."-".$jour; + list($jour,$mois,$annee) = explode("/", $date_valeur); $date_valeur = $annee."-".$mois."-".$jour; + + $montant = str_replace(",", ".", $montant); + $montant = str_replace("+", "", $montant); + $montant = str_replace("\"", "", $montant); + + $detail=str_replace("\"","",$detail); + + $sql = "select * from import_tmp + where + code='".$code."' and + num_compte='".$num_compte."'"; + $Res=ExecSql($p_cn,$sql); + $Num=pg_NumRows($Res); + + if($Num > 0) { + echo "Opération FORTIS ".$code." déj&eagrave; importée.
"; + } else { + // $Sql="insert into import_tmp values ('$code','$date_exec','$date_valeur','$montant','$devise','".addslashes($compte_ordre)."','".addslashes($detail)."','$num_compte','$poste_comptable')"; + $Sql="insert into import_tmp (code , + date_exec , + date_valeur, + montant, + devise, + compte_ordre, + detail, + num_compte, + bq_account , + jrn, + ok) + values ('$code', + '$date_exec', + '$date_exec', + '$montant', + '$devise', + '".addslashes($compte_ordre)."', + '".addslashes($detail)."', + '$num_compte', + $p_bq_account, + $p_jrn, + false)"; + + $Res=ExecSql($p_cn,$Sql); + } } - } - - if($iduser != "" ) $poste_comptable = "400".$iduser; - else $poste_comptable = ""; - - list($jour,$mois,$annee) = explode("/", $date_exec); $date_exec = $annee."-".$mois."-".$jour; - list($jour,$mois,$annee) = explode("/", $date_valeur); $date_valeur = $annee."-".$mois."-".$jour; - - $montant = str_replace(",", ".", $montant); - $montant = str_replace("+", "", $montant); - $montant = str_replace("\"", "", $montant); - - $detail=str_replace("\"","",$detail); - $sql = "select * from import_tmp - where - code='".$code."' and - num_compte='".$num_compte."'"; - $Res=ExecSql($p_cn,$sql); - $Num=pg_NumRows($Res); - - if($Num > 0) { - echo "Opération FORTIS ".$code." déj&eagrave; importée.
"; - } else { - // $Sql="insert into import_tmp values ('$code','$date_exec','$date_valeur','$montant','$devise','".addslashes($compte_ordre)."','".addslashes($detail)."','$num_compte','$poste_comptable')"; - $Sql="insert into import_tmp (code , - date_exec , - date_valeur, - montant, - devise, - compte_ordre, - detail, - num_compte, - bq_account , - jrn, - ok) - values ('$code', - '$date_exec', - '$date_exec', - '$montant', - '$devise', - '".addslashes($compte_ordre)."', - '".addslashes($detail)."', - '$num_compte', - $p_bq_account, - $p_jrn, - false)"; - - $Res=ExecSql($p_cn,$Sql); - } -} + } // for ($c=0;$c<$num;$c++) + $row++; +} // file is read +fclose($handle); ?> \ No newline at end of file diff --git a/include/import_inc.php b/include/import_inc.php index f0ea4817c..7e6b5efac 100644 --- a/include/import_inc.php +++ b/include/import_inc.php @@ -47,18 +47,13 @@ function ImportCSV($p_cn,$file,$p_bq_account,$p_format_csv,$p_jrn) StartSql($p_cn); - $row = 1; - while (($data = fgetcsv($handle, 2000,'!@')) !== FALSE) { - $num = count($data); - for ($c=0; $c < $num; $c++) { -// include the right format for CSV --> given by the
- include($p_format_csv); + +// include the right format for CSV --> given by the 1 ) { +$row=1; +while (($data = fgetcsv($handle, 2000,'!@')) !== FALSE) { + $num = count($data); + for ($c=0; $c < $num; $c++) { - $code=""; $date_exec=""; $date_valeur=""; $montant=""; $devise=""; $compte_ordre=""; $detail=""; $num_compte=""; $iduser=""; - list($num_compte, $code, $date_exec, $date_valeur, $montant, $devise, $montant2, $devise2, $rubriques, $detail, $zzz, $zzz, $date_comptable) = split(";", $data[$c]); - - # Bug CSV ING : "424 au lieu de 424 - $code = str_replace("\"", "", $code); - - # Bug CSV ING : espace après la date - $date_exec = str_replace(" ", "", $date_exec); - $date_valeur = str_replace(" ", "", $date_valeur); - $date_exec = str_replace("\"", "", $date_exec); - $date_valeur = str_replace("\"", "", $date_valeur); - $montant = str_replace("\"", "", $montant); - if ((ereg ("([0-9]{3})-([0-9]{7})-([0-9]{2})", $num_compte, $regs))){ - $num_compte = $regs[0]; - } - - // Si LTXXXXX ou LT XXXXX dans le détail - if ((ereg ("LT+([0-9]{5})", $detail, $regs)) || (ereg ("LT+[ ]+([0-9]{5})", $detail, $regs))) { - $iduser = $regs[1]; - } - - // Si XXXXXXXXXXXX - if (ereg ("[0-9]{12}", $detail, $regs)){ - if($regs[0] != "000000000000") { - $id = substr($regs[0], 2, 5); - $longchiffre = substr($regs[0], 0, 10); - $check = substr($regs[0], 10, 2); - if (($longchiffre % 97) == $check) $iduser = $id; + // first line is skipped + if ( $row > 1 ) { + + $code=""; $date_exec=""; $date_valeur=""; $montant=""; $devise=""; $compte_ordre=""; $detail=""; $num_compte=""; $iduser=""; + list($num_compte, $code, $date_exec, $date_valeur, $montant, $devise, $montant2, $devise2, $rubriques, $detail, $zzz, $zzz, $date_comptable) = split(";", $data[$c]); + + # Bug CSV ING : "424 au lieu de 424 + $code = str_replace("\"", "", $code); + + # Bug CSV ING : espace après la date + $date_exec = str_replace(" ", "", $date_exec); + $date_valeur = str_replace(" ", "", $date_valeur); + $date_exec = str_replace("\"", "", $date_exec); + $date_valeur = str_replace("\"", "", $date_valeur); + $montant = str_replace("\"", "", $montant); + if ((ereg ("([0-9]{3})-([0-9]{7})-([0-9]{2})", $num_compte, $regs))){ + $num_compte = $regs[0]; + } + + // Si LTXXXXX ou LT XXXXX dans le détail + if ((ereg ("LT+([0-9]{5})", $detail, $regs)) || (ereg ("LT+[ ]+([0-9]{5})", $detail, $regs))) { + $iduser = $regs[1]; + } + + // Si XXXXXXXXXXXX + if (ereg ("[0-9]{12}", $detail, $regs)){ + if($regs[0] != "000000000000") { + $id = substr($regs[0], 2, 5); + $longchiffre = substr($regs[0], 0, 10); + $check = substr($regs[0], 10, 2); + if (($longchiffre % 97) == $check) $iduser = $id; + } + } + + if($iduser != "" ) $poste_comptable = "400".$iduser; + else $poste_comptable = ""; + + list($jour,$mois,$annee) = explode("/", $date_valeur); $date_valeur = $annee."-".$mois."-".$jour; + list($jour,$mois,$annee) = explode("/", $date_exec); $date_exec = $annee."-".$mois."-".$jour; + + $montant = str_replace(",", ".", $montant); + $montant = str_replace("+", "", $montant); + + if($code < 10) $code = "000".$code; + if($code >= 10 and $code < 100) $code = "00".$code; + if($code >= 100) $code = "0".$code; + + $code = $annee."-".$code; + + $sql = "select * from import_tmp where code='".$code."' and num_compte='".$num_compte."'"; + $Res=ExecSql($p_cn,$sql); + $Num=pg_NumRows($Res); + + if($Num > 0) { + echo "Opération FORTIS ".$code." déj&eagrave; importée.
"; + } else { + echo $code." ".$date_exec." ".$date_valeur." ".$montant." ".$devise." ".$compte_ordre." detail ".$num_compte." ".$poste_comptable."
"; + //$Sql="insert into import_tmp values ('$code','$date_exec','$date_valeur','$montant','$devise','".addslashes($compte_ordre)."','".addslashes($detail)."','$num_compte','$poste_comptable')"; + $Sql="insert into import_tmp (code, + date_exec , + date_valeur, + montant, + devise, + compte_ordre, + detail, + bq_account , + jrn, + ok) + values ('$code', + '$date_exec', + '$date_exec', + $montant, + '$devise', + '".addslashes($compte_ordre)."', + '".addslashes($detail).$num_compte." ', + '$p_bq_account', + $p_jrn, + false)"; + echo $sql; + $Res=ExecSql($p_cn,$Sql); } } - - if($iduser != "" ) $poste_comptable = "400".$iduser; - else $poste_comptable = ""; - - list($jour,$mois,$annee) = explode("/", $date_valeur); $date_valeur = $annee."-".$mois."-".$jour; - list($jour,$mois,$annee) = explode("/", $date_exec); $date_exec = $annee."-".$mois."-".$jour; - - $montant = str_replace(",", ".", $montant); - $montant = str_replace("+", "", $montant); - - if($code < 10) $code = "000".$code; - if($code >= 10 and $code < 100) $code = "00".$code; - if($code >= 100) $code = "0".$code; - - $code = $annee."-".$code; - - $sql = "select * from import_tmp where code='".$code."' and num_compte='".$num_compte."'"; - $Res=ExecSql($p_cn,$sql); - $Num=pg_NumRows($Res); - - if($Num > 0) { - echo "Opération FORTIS ".$code." déj&eagrave; importée.
"; - } else { - echo $code." ".$date_exec." ".$date_valeur." ".$montant." ".$devise." ".$compte_ordre." detail ".$num_compte." ".$poste_comptable."
"; - //$Sql="insert into import_tmp values ('$code','$date_exec','$date_valeur','$montant','$devise','".addslashes($compte_ordre)."','".addslashes($detail)."','$num_compte','$poste_comptable')"; - $Sql="insert into import_tmp (code, - date_exec , - date_valeur, - montant, - devise, - compte_ordre, - detail, - bq_account , - jrn, - ok) - values ('$code', - '$date_exec', - '$date_exec', - $montant, - '$devise', - '".addslashes($compte_ordre)."', - '".addslashes($detail).$num_compte." ', - '$p_bq_account', - $p_jrn, - false)"; -echo $sql; - $Res=ExecSql($p_cn,$Sql); - } -} + + } // for ($c=0;$c<$num;$c++) + $row++; +} // file is read +fclose($handle); ?> \ No newline at end of file