svn+ssh://danydb@svn/svn/phpcompta/branches/rel500
........
r2906 | danydb | 2010-01-27 15:16:08 +0100 (Wed, 27 Jan 2010) | 2 lines
Cosmetic for html popup
........
r2907 | danydb | 2010-01-27 15:28:03 +0100 (Wed, 27 Jan 2010) | 5 lines
Fix typo translation
Fix Bug : cannot save extension in IE, probably because the same scripts are included several times
........
r2908 | danydb | 2010-01-28 13:56:37 +0100 (Thu, 28 Jan 2010) | 5 lines
Fix Bug In getNodeText when retrieving data for Internet Explorer,
it fails if the xmlNode.firstChild.nodeValue does not contains data.
It is directly set to undefined
........
r2909 | danydb | 2010-01-29 12:20:24 +0100 (Fri, 29 Jan 2010) | 2 lines
Generate invoice : update the comment of the entry only if there were no comment
........
r2910 | danydb | 2010-01-29 19:39:11 +0100 (Fri, 29 Jan 2010) | 6 lines
Improve User
============
Status only plugin means that the user can use only the plugin and can't access to
anything else.
........
r2911 | danydb | 2010-01-29 19:42:38 +0100 (Fri, 29 Jan 2010) | 1 line
Bug import Dexia
........
r2912 | danydb | 2010-01-31 16:24:22 +0100 (Sun, 31 Jan 2010) | 3 lines
For insert_jrnx, the desc is now in the function, we don't need anymore to update after inserting
........
r2913 | danydb | 2010-01-31 16:33:55 +0100 (Sun, 31 Jan 2010) | 4 lines
Fix bug : cannot see operation in quick_writing
cause : the p_action must be set to ALL, it wasn't for quick_writing
........
r2914 | danydb | 2010-02-02 14:52:37 +0100 (Tue, 02 Feb 2010) | 4 lines
Code cleaning
Bug : in ledger of sale, we have twice the possibility to add~ or generate document, and only for invoice (type 4)
Solution : fix the function Acc_Ledger_Purchase::extra_info (type of document = 10), remove extra code
........
r2915 | danydb | 2010-02-05 01:01:11 +0100 (Fri, 05 Feb 2010) | 4 lines
Improve : search_card you can also find a card thanks is tva_num
Documentation doxygen improved
........
r2916 | danydb | 2010-02-05 11:18:36 +0100 (Fri, 05 Feb 2010) | 2 lines
when inserting into ledger_sold the test to check the attach was wrong
........
r2917 | danydb | 2010-02-05 14:45:33 +0100 (Fri, 05 Feb 2010) | 2 lines
Extension : add the possibility to use ajax
........
r2918 | danydb | 2010-02-06 14:25:22 +0100 (Sat, 06 Feb 2010) | 1 line
rewrite the function encodeJSON, hide and show for doxygen
........
r2919 | danydb | 2010-02-06 14:26:07 +0100 (Sat, 06 Feb 2010) | 1 line
remove error where _SESSION is expired
........
r2920 | danydb | 2010-02-06 14:26:49 +0100 (Sat, 06 Feb 2010) | 1 line
In ITva_Select add the display
........
r2921 | danydb | 2010-02-06 14:27:47 +0100 (Sat, 06 Feb 2010) | 1 line
Cosmetic
........
r2922 | danydb | 2010-02-06 14:27:49 +0100 (Sat, 06 Feb 2010) | 1 line
IPopup add a new property drag to make the ipopup dragguable or not
........
r2923 | danydb | 2010-02-06 14:35:28 +0100 (Sat, 06 Feb 2010) | 5 lines
Middle of payment
=================
Feature : add or remove middle of payment
........
r2924 | danydb | 2010-02-06 18:17:15 +0100 (Sat, 06 Feb 2010) | 7 lines
Card
----
A same card can now have 2 different sides (debit or credit)
usefull to have only one card for a customer and a supplier
........
r2925 | danydb | 2010-02-06 18:23:03 +0100 (Sat, 06 Feb 2010) | 1 line
Add the sql script for the double accounting
........
r2926 | danydb | 2010-02-06 19:29:29 +0100 (Sat, 06 Feb 2010) | 2 lines
Update documentation
........
r2927 | danydb | 2010-02-06 20:37:12 +0100 (Sat, 06 Feb 2010) | 4 lines
Fiche_def
========
Permit to have 2 accouting as class_base
........
r2928 | danydb | 2010-02-06 20:56:00 +0100 (Sat, 06 Feb 2010) | 1 line
Bug : FK from stock prevent the removal of a card
........
r2929 | danydb | 2010-02-06 21:14:10 +0100 (Sat, 06 Feb 2010) | 1 line
removeless useless test
........
r2930 | danydb | 2010-02-07 00:55:03 +0100 (Sun, 07 Feb 2010) | 1 line
Improve appearance extension
........
r2931 | danydb | 2010-02-07 00:56:28 +0100 (Sun, 07 Feb 2010) | 2 lines
remove debug
........
r2932 | danydb | 2010-02-07 01:16:51 +0100 (Sun, 07 Feb 2010) | 1 line
Improve appearance extension
........
r2933 | danydb | 2010-02-07 01:19:08 +0100 (Sun, 07 Feb 2010) | 1 line
Improve appearance extension
........
r2934 | danydb | 2010-02-07 01:30:31 +0100 (Sun, 07 Feb 2010) | 1 line
Improve appearance extension
........
r2935 | danydb | 2010-02-07 02:36:25 +0100 (Sun, 07 Feb 2010) | 1 line
Version PHP5.3 : split is obsolete and replace by explode
........
r2936 | danydb | 2010-02-07 04:56:17 +0100 (Sun, 07 Feb 2010) | 1 line
remove owner
........
r2937 | danydb | 2010-02-08 22:34:07 +0100 (Mon, 08 Feb 2010) | 1 line
typo
........
r2938 | danydb | 2010-02-08 22:34:28 +0100 (Mon, 08 Feb 2010) | 1 line
Start translation for Dutch
........
134 lines
No EOL
4.1 KiB
PL/PgSQL
134 lines
No EOL
4.1 KiB
PL/PgSQL
begin;
|
|
|
|
drop function account_insert(p_f_id integer, p_account poste_comptable);
|
|
|
|
CREATE OR REPLACE FUNCTION account_insert(p_f_id integer, p_account text)
|
|
RETURNS integer AS
|
|
$BODY$
|
|
declare
|
|
nParent tmp_pcmn.pcm_val_parent%type;
|
|
sName varchar;
|
|
nNew tmp_pcmn.pcm_val%type;
|
|
bAuto bool;
|
|
nFd_id integer;
|
|
nCount integer;
|
|
first text;
|
|
second text;
|
|
begin
|
|
|
|
if length(trim(p_account)) != 0 then
|
|
-- if there is coma in p_account, treat normally
|
|
if position (',' in p_account) = 0 then
|
|
raise info '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 info 'this account exists in tmp_pcmn ';
|
|
perform attribut_insert(p_f_id,5,p_account);
|
|
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::poste_comptable);
|
|
insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_account::poste_comptable,sName,nParent);
|
|
perform attribut_insert(p_f_id,5,p_account);
|
|
|
|
end if;
|
|
else
|
|
raise info 'presence of a comma';
|
|
-- there is 2 accounts separated by a comma
|
|
first := split_part(p_account,',',1);
|
|
second := split_part(p_account,',',2);
|
|
-- check there is no other coma
|
|
raise info 'first value % second value %', first, second;
|
|
|
|
if position (',' in first) != 0 or position (',' in second) != 0 then
|
|
raise exception 'Too many comas, invalid account';
|
|
end if;
|
|
perform attribut_insert(p_f_id,5,p_account);
|
|
end if;
|
|
else
|
|
raise info '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;
|
|
$BODY$
|
|
LANGUAGE 'plpgsql';
|
|
|
|
drop function account_update(p_f_id integer, p_account poste_comptable);
|
|
|
|
CREATE OR REPLACE FUNCTION account_update(p_f_id integer, p_account text)
|
|
RETURNS integer AS
|
|
$BODY$
|
|
declare
|
|
nMax fiche.f_id%type;
|
|
nCount integer;
|
|
nParent tmp_pcmn.pcm_val_parent%type;
|
|
sName varchar;
|
|
nJft_id attr_value.jft_id%type;
|
|
first text;
|
|
second text;
|
|
begin
|
|
|
|
if length(trim(p_account)) != 0 then
|
|
if position (',' in p_account) = 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::poste_comptable);
|
|
insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_account::poste_comptable,sName,nParent);
|
|
end if;
|
|
else
|
|
raise info 'presence of a comma';
|
|
-- there is 2 accounts separated by a comma
|
|
first := split_part(p_account,',',1);
|
|
second := split_part(p_account,',',2);
|
|
-- check there is no other coma
|
|
raise info 'first value % second value %', first, second;
|
|
|
|
if position (',' in first) != 0 or position (',' in second) != 0 then
|
|
raise exception 'Too many comas, invalid account';
|
|
end if;
|
|
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;
|
|
$BODY$
|
|
LANGUAGE 'plpgsql';
|
|
|
|
update version set val=67;
|
|
commit; |