From bd3f33609bd7b0f475847111937e8becff96256a Mon Sep 17 00:00:00 2001 From: sparkyx Date: Thu, 6 Jul 2006 23:15:14 +0000 Subject: [PATCH] Add CBC Belgium --- contrib/document_test/facture.odt | Bin 32844 -> 32817 bytes html/admin/sql/dossier1/schema.sql | 6 ++ html/admin/sql/mod1/schema.sql | 5 + html/admin/sql/mod2/schema.sql | 5 + html/admin/sql/patch/upgrade13.sql | 6 ++ html/admin/sql/patch/upgrade8.sql | 8 +- html/style.css | 5 + include/cbc_be.inc.php | 37 ++++++- include/import_inc.php | 153 +++++++++++++++-------------- 9 files changed, 144 insertions(+), 81 deletions(-) diff --git a/contrib/document_test/facture.odt b/contrib/document_test/facture.odt index 9087402c53a1be48e856a9f9b81c47cf78d067b6..9b944843b0d7f4372cb8b6c953ceb96dcebdd723 100644 GIT binary patch delta 3701 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 diff --git a/html/admin/sql/dossier1/schema.sql b/html/admin/sql/dossier1/schema.sql index 62b26d569..80aa47d5a 100644 --- a/html/admin/sql/dossier1/schema.sql +++ b/html/admin/sql/dossier1/schema.sql @@ -939,6 +939,12 @@ CREATE SEQUENCE s_user_jrn NO MAXVALUE NO MINVALUE CACHE 1; +CREATE SEQUENCE s_cbc + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + CREATE TABLE stock_goods ( sg_id integer DEFAULT nextval('s_stock_goods'::text) NOT NULL, j_id integer, diff --git a/html/admin/sql/mod1/schema.sql b/html/admin/sql/mod1/schema.sql index 2668d07fe..9fe4e362f 100644 --- a/html/admin/sql/mod1/schema.sql +++ b/html/admin/sql/mod1/schema.sql @@ -1439,6 +1439,11 @@ CREATE SEQUENCE s_attr_def NO MINVALUE CACHE 1; +CREATE SEQUENCE s_cbc + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; diff --git a/html/admin/sql/mod2/schema.sql b/html/admin/sql/mod2/schema.sql index a9cf3c77e..a26f2029f 100644 --- a/html/admin/sql/mod2/schema.sql +++ b/html/admin/sql/mod2/schema.sql @@ -309,6 +309,11 @@ CREATE SEQUENCE s_central NO MAXVALUE NO MINVALUE CACHE 1; +CREATE SEQUENCE s_cbc + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; CREATE SEQUENCE s_central_order START WITH 1 diff --git a/html/admin/sql/patch/upgrade13.sql b/html/admin/sql/patch/upgrade13.sql index cf85aef52..0f35cbc11 100644 --- a/html/admin/sql/patch/upgrade13.sql +++ b/html/admin/sql/patch/upgrade13.sql @@ -556,4 +556,10 @@ insert into action values (30,'Module Gestion'); insert into format_csv_banque values ('Argenta Belgique','argenta_be.inc.php'); insert into format_csv_banque values ('CBC Belgique','cbc_be.inc.php'); +CREATE SEQUENCE s_cbc + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + commit; diff --git a/html/admin/sql/patch/upgrade8.sql b/html/admin/sql/patch/upgrade8.sql index 6f7d673a6..3ef3ace0b 100644 --- a/html/admin/sql/patch/upgrade8.sql +++ b/html/admin/sql/patch/upgrade8.sql @@ -65,10 +65,10 @@ INSERT INTO format_csv_banque VALUES ('ING', 'ing_be.inc.php'); INSERT INTO format_csv_banque VALUES ('CBC', 'cbc_be.inc.php'); CREATE TABLE import_tmp ( - code text, - date_exec date, - date_valeur date, - montant text, + code text not null, + date_exec date not null , + date_valeur date not null, + montant number(20,4) not null default 0, devise text, compte_ordre text, detail text, diff --git a/html/style.css b/html/style.css index 549388c31..4c4d97642 100644 --- a/html/style.css +++ b/html/style.css @@ -181,6 +181,11 @@ td.selectedcell{ color:white; } +td.mtitle a.mtitle { + text-decoration:none; + color:white; +} + a.mtitle { text-decoration:none; color:grey; diff --git a/include/cbc_be.inc.php b/include/cbc_be.inc.php index a6625dd58..a48a05da9 100644 --- a/include/cbc_be.inc.php +++ b/include/cbc_be.inc.php @@ -26,15 +26,37 @@ // Bank CBC //----------------------------------------------------- $row=1; +StartSql($p_cn); while (($data = fgetcsv($handle, 2000,'!@')) !== FALSE) { $num = count($data); + echo_debug('cbc_be',__LINE__,$num); + echo_debug('cbc_be',__LINE__,var_export($data,true)); for ($c=0; $c < $num; $c++) { //----------------------------------------------------- // Parsing CSV comes here //----------------------------------------------------- + $row=split(';',$data[$c]); + echo_debug('cbc_be',__LINE__,'$row = '.var_export($row,true)); + echo_debug('cbc_be',__LINE__,'sizeof($row)'.sizeof($row)); + if ( sizeof ($row) < 13 ) + continue; - - + $num_compte=$row[0]; + $date_exec=$row[3]; + $date_val=$row[4]; + // remove first the thousand sep. + $montant=str_replace('.','',$row[6]); + // replace the coma by a period + $montant=str_replace(',','.',$montant); + // remove the sign + $montant=str_replace('+','',$montant); + $devise=$row[1]; + $compte_ordre=$row[0]; + $detail=$row[7].$row[8].$row[9].$row[10]; + if ( ereg('[0-9]{3}-[0-9]{7}-[0-9]{2}',$row[7],$r) ) + { + $compte_ordre=$r[0]; + } //----------------------------------------------------- // insert into import_tmp //----------------------------------------------------- @@ -48,9 +70,9 @@ while (($data = fgetcsv($handle, 2000,'!@')) !== FALSE) { bq_account , jrn, ok) - values ('$code', - '$date_exec', - '$date_exec', + values (nextval('s_cbc'), + to_date('$date_exec','YYYYMMDD'), + to_date('$date_exec','YYYYMMDD'), $montant, '$devise', '".addslashes($compte_ordre)."', @@ -58,6 +80,11 @@ while (($data = fgetcsv($handle, 2000,'!@')) !== FALSE) { '$p_bq_account', $p_jrn, false)"; + if ( ExecSql($p_cn,$Sql) == false ) + { + Rollback($p_cn); + break; + } } // for ($c=0;$c<$num;$c++) $row++; } // file is read diff --git a/include/import_inc.php b/include/import_inc.php index 5000afb5b..8ca45ddf5 100644 --- a/include/import_inc.php +++ b/include/import_inc.php @@ -22,6 +22,7 @@ include_once("jrn.php"); include_once("preference.php"); include_once("user_common.php"); +require_once('class_user.php'); /*! ************************************************** * \brief Parse the file and insert the record @@ -85,90 +86,98 @@ function VerifImport($p_cn){ } } /*!\brief Transfert data into the ledger + * \param $p_cn connx + * \param $periode periode */ function TransferCSV($p_cn, $periode){ //on obtient la période courante - //$p_user = $_SESSION['g_user']; - //$periode = GetUserPeriode($p_cn,$p_user); - //$periode = $p_user->GetPeriode(); - // on trouve les dates frontières de cette période - $sql = "select p_start,p_end from parm_periode where p_id = '".$periode."'"; - $Res=ExecSql($p_cn,$sql); - $val = pg_fetch_array($Res); - $start = $val['p_start']; $end = $val['p_end']; - - $sql = "select * from import_tmp where poste_comptable is not null and poste_comptable <> '' - AND ok <> TRUE AND date_exec BETWEEN '".$start."' and '".$end."'"; - $Res=ExecSql($p_cn,$sql); - //echo "boucle: ".sizeof($Res)."
"; - //while($val = pg_fetch_array($Res)){ - $Max=pg_NumRows($Res); - echo $Max." opérations à transférer.
"; - for ($i = 0;$i < $Max;$i++) { - $val=pg_fetch_array($Res,$i); - - $code=$val['code']; $date_exec=$val['date_exec']; $montant=$val['montant']; $num_compte=$val['num_compte']; - $poste_comptable=$val['poste_comptable'];$bq_account=$val['bq_account']; - $jrn=$val['jrn']; + $User=new cl_user($p_cn); + $periode = $User->GetPeriode(); + // on trouve les dates frontières de cette période + $sql = "select to_char(p_start,'DD-MM-YYYY') as p_start,to_char(p_end,'DD-MM-YYYY') as p_end". + " from parm_periode where p_id = '".$periode."'"; + $Res=ExecSql($p_cn,$sql); + $val = pg_fetch_array($Res); + if ( $val == false ) + { + echo ""; + exit(); + } + $start ="to_date('".$val['p_start']."','DD-MM-YYYY')"; + $end = "to_date('".$val['p_end']."','DD-MM-YYYY')"; + var_dump($val); + $sql = "select * from import_tmp where poste_comptable is not null and poste_comptable <> '' + and ok <> TRUE AND date_exec BETWEEN ".$start." and ".$end; + $Res=ExecSql($p_cn,$sql); + //echo "boucle: ".sizeof($Res)."
"; + //while($val = pg_fetch_array($Res)){ + $Max=pg_NumRows($Res); + echo $Max." opérations à transférer.
"; + for ($i = 0;$i < $Max;$i++) { + $val=pg_fetch_array($Res,$i); + + $code=$val['code']; $date_exec=$val['date_exec']; $montant=$val['montant']; $num_compte=$val['num_compte']; + $poste_comptable=$val['poste_comptable'];$bq_account=$val['bq_account']; + $jrn=$val['jrn']; + + list($annee, $mois, $jour) = explode("-", $date_exec); + $date_exec = $jour.".".$mois.".".$annee; + + // Vérification que le poste comptable trouvé existe + $sqltest = "select * from tmp_pcmn WHERE pcm_val='".$poste_comptable."'"; + $Restest=ExecSql($p_cn,$sqltest); + $test=pg_NumRows($Restest); + if($test == 0) { + $sqlupdate = "update import_tmp set poste_comptable='' WHERE code='".$code."' AND num_compte='".$num_compte."'"; + $Resupdate=ExecSql($p_cn,$sqlupdate); + echo "Poste comptable erronné pour l'opération ".$num_compte."-".$code.", réinitialisation du poste comptable
"; + } else { + + // Finances + + //$seq = GetNextId($p_cn,'j_grpt')+1; + $seq=NextSequence($p_cn,'s_grpt'); + $p_user = $_SESSION['g_user']; + //$periode = GetUserPeriode($p_cn,$p_user); + //$periode = $User->GetPeriode(); + StartSql($p_cn); - list($annee, $mois, $jour) = explode("-", $date_exec); - $date_exec = $jour.".".$mois.".".$annee; - - // Vérification que le poste comptable trouvé existe - $sqltest = "select * from tmp_pcmn WHERE pcm_val='".$poste_comptable."'"; - $Restest=ExecSql($p_cn,$sqltest); - $test=pg_NumRows($Restest); - if($test == 0) { - $sqlupdate = "update import_tmp set poste_comptable='' WHERE code='".$code."' AND num_compte='".$num_compte."'"; - $Resupdate=ExecSql($p_cn,$sqlupdate); - echo "Poste comptable erronné pour l'opération ".$num_compte."-".$code.", réinitialisation du poste comptable
"; - } else { - - // Finances - - //$seq = GetNextId($p_cn,'j_grpt')+1; - $seq=NextSequence($p_cn,'s_grpt'); - $p_user = $_SESSION['g_user']; - //$periode = GetUserPeriode($p_cn,$p_user); - //$periode = $User->GetPeriode(); - StartSql($p_cn); - - $r=InsertJrnx($p_cn,"d",$p_user,$jrn,$bq_account,$date_exec,$montant,$seq,$periode); - if ( $r == false) { $Rollback($p_cn);exit("error 'import_inc.php' __LINE__");} - - $r=InsertJrnx($p_cn,"c",$p_user,$jrn,$poste_comptable,$date_exec,$montant,$seq,$periode); - if ( $r == false) { $Rollback($p_cn);exit("error 'import_inc.php' __LINE__");} - - //remove annoying double-quote - $num_compte=str_replace('"','',$num_compte); - $code=str_replace('\"','',$code); - - $r=InsertJrn($p_cn,$date_exec,NULL,$jrn,$num_compte." ".$code,$montant,$seq,$periode); - if ( $r == false ) { Rollback($p_cn); exit(" Error 'import_inc.php' __LINE__");} - - //$sql = "insert into jrn (jr_def_id,jr_montant,jr_comment,jr_date,jr_grpt_id,jr_tech_per) values ( ".$p_jrn.", abs(".round($montant,2)."), '".$num_compte." ".$code."','".$date_valeur."','".$seq."','".$periode."')"; - SetInternalCode($p_cn,$seq,$jrn); - - - echo "Tranfer de l'opération ".$code." effectué
"; - $sql2 = "update import_tmp set ok=TRUE where code='".$code."'"; - $Res2=ExecSql($p_cn,$sql2); - - Commit($p_cn); - } - } + $r=InsertJrnx($p_cn,"d",$p_user,$jrn,$bq_account,$date_exec,$montant,$seq,$periode); + if ( $r == false) { $Rollback($p_cn);exit("error 'import_inc.php' __LINE__");} + + $r=InsertJrnx($p_cn,"c",$p_user,$jrn,$poste_comptable,$date_exec,$montant,$seq,$periode); + if ( $r == false) { $Rollback($p_cn);exit("error 'import_inc.php' __LINE__");} + + //remove annoying double-quote + $num_compte=str_replace('"','',$num_compte); + $code=str_replace('\"','',$code); + + $r=InsertJrn($p_cn,$date_exec,NULL,$jrn,$num_compte." ".$code,$montant,$seq,$periode); + if ( $r == false ) { Rollback($p_cn); exit(" Error 'import_inc.php' __LINE__");} + + //$sql = "insert into jrn (jr_def_id,jr_montant,jr_comment,jr_date,jr_grpt_id,jr_tech_per) values ( ".$p_jrn.", abs(".round($montant,2)."), '".$num_compte." ".$code."','".$date_valeur."','".$seq."','".$periode."')"; + SetInternalCode($p_cn,$seq,$jrn); + + + echo "Tranfer de l'opération ".$code." effectué
"; + $sql2 = "update import_tmp set ok=TRUE where code='".$code."'"; + $Res2=ExecSql($p_cn,$sql2); + + Commit($p_cn); + } + } } /*! ************************************************** * \brief ShowForm for getting data about * the bank transfert in cvs * - * parm : database connection + * \param : database connection * - - * gen : - * - - * return: none + * \return none */ function ShowFormTransfert($p_cn){