From c69a42b2b5963ba766863e3c753fd1043ea5ff90 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sat, 15 Mar 2008 19:21:34 +0000 Subject: [PATCH] Forget to add the sql 45 --- html/admin/sql/patch/upgrade45.sql | 124 +++++++++++++++++++++++++++++ html/index.php | 2 +- 2 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 html/admin/sql/patch/upgrade45.sql diff --git a/html/admin/sql/patch/upgrade45.sql b/html/admin/sql/patch/upgrade45.sql new file mode 100644 index 000000000..696dc2b48 --- /dev/null +++ b/html/admin/sql/patch/upgrade45.sql @@ -0,0 +1,124 @@ +begin; + +CREATE or replace FUNCTION account_insert(p_f_id integer, p_account poste_comptable) RETURNS integer + AS $$ +declare +nParent tmp_pcmn.pcm_val_parent%type; +sName varchar; +nNew tmp_pcmn.pcm_val%type; +bAuto bool; +nFd_id integer; +nCount integer; +begin + + if length(trim(p_account::text)) != 0 then + raise debug 'p_account is not empty'; + select count(*) into nCount from tmp_pcmn where pcm_val=p_account; + raise notice 'found in tmp_pcm %',nCount; + if nCount !=0 then + raise notice 'this account exists in tmp_pcmn '; + perform attribut_insert(p_f_id,5,to_char(p_account,'999999999999999999999999')); + else + -- account doesn't exist, create it + select av_text into sName from + attr_value join jnt_fic_att_value using (jft_id) + where + ad_id=1 and f_id=p_f_id; + + nParent:=account_parent(p_account); + insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_account,sName,nParent); + perform attribut_insert(p_f_id,5,to_char(p_account,'999999999999999999999999')); + + end if; + else + raise notice 'p_account is empty'; + select fd_id into nFd_id from fiche where f_id=p_f_id; + bAuto:= account_auto(nFd_id); + if bAuto = true then + raise notice 'account generated automatically'; + nNew:=account_compute(p_f_id); + raise notice 'nNew %', nNew; + select av_text into sName from + attr_value join jnt_fic_att_value using (jft_id) + where + ad_id=1 and f_id=p_f_id; + nParent:=account_parent(nNew); + perform account_add (nNew,sName); + perform attribut_insert(p_f_id,5,to_char(nNew,'999999999999999999999999')); + + else + -- if there is an account_base then it is the default + select fd_class_base::text into nNew from fiche_def join fiche using (fd_id) where f_id=p_f_id; + if nNew is null or length(trim(nNew)) = 0 then + raise notice 'count is null'; + perform attribut_insert(p_f_id,5,null); + else + perform attribut_insert(p_f_id,5,to_char(nNew,'999999999999999999999999')); + end if; + end if; + end if; + +return 0; +end; +$$ + LANGUAGE plpgsql; + +CREATE or replace FUNCTION account_parent(p_account poste_comptable) RETURNS poste_comptable + AS $$ +declare + nParent tmp_pcmn.pcm_val_parent%type; + sParent varchar; + nCount integer; +begin + sParent:=to_char(p_account,'9999999999999999'); + sParent:=trim(sParent::text); + nParent:=0; + while nParent = 0 loop + select count(*) into nCount + from tmp_pcmn + where + pcm_val = to_number(sParent,'9999999999999999'); + if nCount != 0 then + nParent:=to_number(sParent,'9999999999999999'); + end if; + sParent:= substr(sParent,1,length(sParent)-1); + if length(sParent) <= 0 then + raise exception 'Impossible de trouver le compte parent pour %',p_account; + end if; + end loop; + raise notice 'account_parent : Parent is %',nParent; + return nParent; +end; +$$ + LANGUAGE plpgsql; + +CREATE or replace FUNCTION account_update(p_f_id integer, p_account poste_comptable) RETURNS integer + AS $$ +declare +nMax fiche.f_id%type; +nCount integer; +nParent tmp_pcmn.pcm_val_parent%type; +sName varchar; +nJft_id attr_value.jft_id%type; +begin + + if length(trim(p_account::text)) != 0 then + select count(*) into nCount from tmp_pcmn where pcm_val=p_account; + if nCount = 0 then + select av_text into sName from + attr_value join jnt_fic_att_value using (jft_id) + where + ad_id=1 and f_id=p_f_id; + nParent:=account_parent(p_account); + insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_account,sName,nParent); + end if; + end if; + select jft_id into njft_id from jnt_fic_att_value where f_id=p_f_id and ad_id=5; + update attr_value set av_text=p_account where jft_id=njft_id; + +return njft_id; +end; +$$ + LANGUAGE plpgsql; +update version set val=47; +commit; diff --git a/html/index.php b/html/index.php index 4fad9adf7..34af13ac7 100644 --- a/html/index.php +++ b/html/index.php @@ -77,7 +77,7 @@ BODY { -version 4.0 +version 4.0.1