[Phpcompta-dev] r4235 - phpcompta/trunk/sql

[phpcompta-dev]

Author: danydb
Date: 2011-10-26 01:10:17 +0200 (Wed, 26 Oct 2011)
New Revision: 4235

Added:
   phpcompta/trunk/sql/account_add.sql
Modified:
   phpcompta/trunk/sql/account_insert.sql
Log:
Fix  bug : duplicate and return correct accounting

Added: phpcompta/trunk/sql/account_add.sql
===================================================================
--- phpcompta/trunk/sql/account_add.sql                         (rev 0)
+++ phpcompta/trunk/sql/account_add.sql 2011-10-25 23:10:17 UTC (rev 4235)
@@ -0,0 +1,25 @@
+-- Function: comptaproc.account_add(account_type, character varying)
+
+DROP FUNCTION comptaproc.account_add(account_type, character varying);
+
+CREATE OR REPLACE FUNCTION comptaproc.account_add(p_id account_type, p_name 
character varying)
+  RETURNS text AS
+$BODY$
+declare
+       nParent tmp_pcmn.pcm_val_parent%type;
+       nCount integer;
+       sReturn text;
+begin
+       sReturn:= format_account(p_id);
+       select count(*) into nCount from tmp_pcmn where pcm_val=sReturn;
+       if nCount = 0 then
+               nParent=account_parent(p_id);
+               insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent)
+                       values (p_id, p_name,nParent) returning pcm_val into 
sReturn;
+       end if;
+return sReturn;
+end ;
+$BODY$
+  LANGUAGE plpgsql VOLATILE
+  COST 100;
+ALTER FUNCTION comptaproc.account_add(account_type, character varying) OWNER 
TO dany;

Modified: phpcompta/trunk/sql/account_insert.sql
===================================================================
--- phpcompta/trunk/sql/account_insert.sql      2011-10-25 23:09:02 UTC (rev 
4234)
+++ phpcompta/trunk/sql/account_insert.sql      2011-10-25 23:10:17 UTC (rev 
4235)
@@ -1,9 +1,9 @@
 -- Function: comptaproc.account_insert(integer, text)
 
--- DROP FUNCTION comptaproc.account_insert(integer, text);
+ DROP FUNCTION comptaproc.account_insert(integer, text);
 
 CREATE OR REPLACE FUNCTION comptaproc.account_insert(p_f_id integer, p_account 
text)
-  RETURNS integer AS
+  RETURNS text  AS
 $BODY$
 declare
        nParent tmp_pcmn.pcm_val_parent%type;
@@ -67,7 +67,7 @@
                        where
                                ad_id=1 and f_id=p_f_id;
                        nParent:=account_parent(sNew);
-                       perform account_add  (sNew,sName);
+                       sNew := account_add  (sNew,sName);
                        perform attribut_insert(p_f_id,5,sNew);
 
                else