Bug : fiche account not created automatically when empty , improve test
This commit is contained in:
sparkyx
parent
9d3e6db5eb
commit
f1ea56101d
5 changed files with 300 additions and 16 deletions
|
|
@ -495,7 +495,6 @@ class Card_Property
|
|||
if (mb_strlen($part2)>40)
|
||||
throw new Exception("CP476."._("Poste comptable trop long"), 1);
|
||||
|
||||
$part1=$p_fiche->cn->get_value('select format_account($1)', array($part1));
|
||||
$acc_account1=new Acc_Account($p_fiche->cn, $part1);
|
||||
|
||||
if ($acc_account1->get_parameter("id")==-1)
|
||||
|
|
@ -513,7 +512,6 @@ class Card_Property
|
|||
throw new Exception("CP493."._("Utilisation directe interdite du poste comptable $part1"));
|
||||
}
|
||||
// Part 2
|
||||
$part2=$p_fiche->cn->get_value('select format_account($1)', array($part2));
|
||||
$acc_account2=new Acc_Account($p_fiche->cn, $part2);
|
||||
|
||||
if ($acc_account2->get_parameter("id")==-1)
|
||||
|
|
@ -556,7 +554,7 @@ class Card_Property
|
|||
throw new Exception("CP537."._("Utilisation directe interdite du poste comptable $v"));
|
||||
}
|
||||
}
|
||||
$sql=sprintf("select account_update(%d,'%s')", $p_fiche->id, $v);
|
||||
$sql=sprintf("select account_insert(%d,'%s')", $p_fiche->id, $v);
|
||||
try
|
||||
{
|
||||
$p_fiche->cn->exec_sql($sql);
|
||||
|
|
@ -570,7 +568,7 @@ class Card_Property
|
|||
if (strlen(trim($v))==0)
|
||||
{
|
||||
|
||||
$sql=sprintf("select account_update(%d,null)", $p_fiche->id);
|
||||
$sql=sprintf("select account_insert(%d,null)", $p_fiche->id);
|
||||
try
|
||||
{
|
||||
$Ret=$p_fiche->cn->exec_sql($sql);
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ class Fiche
|
|||
* \param $p_qcode quick_code (ad_id=23)
|
||||
* \param $p_all retrieve all the attribut of the card, possible value
|
||||
* are true or false. false retrieves only the f_id. By default true
|
||||
* \return 0 success 1 error not found
|
||||
* \returns 0 success , card found / 1 error card not found
|
||||
*/
|
||||
function get_by_qcode($p_qcode=null,$p_all=true)
|
||||
{
|
||||
|
|
@ -477,8 +477,11 @@ class Fiche
|
|||
$this->setAttribut($property->ad_id, $p_array[$key]);
|
||||
}
|
||||
}
|
||||
// For accounting
|
||||
|
||||
Card_Property::update($this);
|
||||
$this->quick_code=$this->strAttribut(ATTR_DEF_QUICKCODE);
|
||||
// reread from database
|
||||
$this->getAttribut();
|
||||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
|
|||
if ( ! defined ("SYSINFO_DISPLAY")) {
|
||||
define ("SYSINFO_DISPLAY",TRUE);
|
||||
}
|
||||
define ("DBVERSION",166);
|
||||
define ("DBVERSION",167);
|
||||
define ("MONO_DATABASE",25);
|
||||
define ("DBVERSIONREPO",20);
|
||||
define ('NOTFOUND','--not found--');
|
||||
|
|
|
|||
120
include/sql/patch/upgrade166.sql
Normal file
120
include/sql/patch/upgrade166.sql
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
begin;
|
||||
|
||||
|
||||
CREATE OR REPLACE FUNCTION comptaproc.attribut_insert(p_f_id integer, p_ad_id integer, p_value character varying)
|
||||
RETURNS void
|
||||
AS $function$
|
||||
declare
|
||||
nResult bigint;
|
||||
begin
|
||||
update fiche_detail set ad_value=p_value where ad_id=p_ad_id and f_id=p_f_id returning jft_id into nResult;
|
||||
if nResult is null then
|
||||
insert into fiche_detail (f_id,ad_id, ad_value) values (p_f_id,p_ad_id,p_value);
|
||||
end if;
|
||||
|
||||
return;
|
||||
end;
|
||||
$function$
|
||||
LANGUAGE plpgsql;
|
||||
|
||||
CREATE OR REPLACE FUNCTION comptaproc.account_insert(p_f_id integer, p_account text)
|
||||
RETURNS text
|
||||
AS $function$
|
||||
declare
|
||||
nParent tmp_pcmn.pcm_val_parent%type;
|
||||
sName varchar;
|
||||
sNew tmp_pcmn.pcm_val%type;
|
||||
bAuto bool;
|
||||
nFd_id integer;
|
||||
sClass_Base fiche_def.fd_class_base%TYPE;
|
||||
nCount integer;
|
||||
first text;
|
||||
second text;
|
||||
s_account text;
|
||||
begin
|
||||
raise info 'ai17 : param card % account %',p_f_id,p_account;
|
||||
-- accouting is given
|
||||
if p_account is not null and length(trim(p_account)) != 0 then
|
||||
-- if there is coma in p_account, treat normally
|
||||
if position (',' in p_account) = 0 then
|
||||
raise info 'ai20.p_account is not empty';
|
||||
s_account := format_account(substr( p_account,1 , 40)::account_type);
|
||||
select count(*) into nCount from tmp_pcmn where pcm_val=s_account::account_type;
|
||||
raise notice 'ai24.found in tmp_pcm %',nCount;
|
||||
if nCount !=0 then
|
||||
raise info 'ai25.this account exists in tmp_pcmn ';
|
||||
perform attribut_insert(p_f_id,5,s_account);
|
||||
else
|
||||
-- account doesn't exist, create it
|
||||
select ad_value into sName from
|
||||
fiche_detail
|
||||
where
|
||||
ad_id=1 and f_id=p_f_id;
|
||||
|
||||
nParent:=account_parent(s_account::account_type);
|
||||
insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (s_account::account_type,sName,nParent);
|
||||
perform attribut_insert(p_f_id,5,s_account);
|
||||
|
||||
end if;
|
||||
return s_account;
|
||||
else
|
||||
raise info 'ai42.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;
|
||||
raise info 'ai55 : end ';
|
||||
return s_account;
|
||||
end if;
|
||||
|
||||
-- accouting is empty and must be computed
|
||||
---------------------------------------------------
|
||||
raise info 'ai61 : p_account is empty';
|
||||
select fd_id into nFd_id from fiche where f_id=p_f_id;
|
||||
bAuto:= account_auto(nFd_id);
|
||||
|
||||
select fd_class_base into sClass_base from fiche_def where fd_id=nFd_id;
|
||||
raise info 'ai67.sClass_Base : %',sClass_base;
|
||||
if bAuto = true and sClass_base similar to '[[:digit:]]*' then
|
||||
raise info 'ai66.account generated automatically';
|
||||
sNew:=account_compute(p_f_id);
|
||||
raise info 'ai68.sNew %', sNew;
|
||||
select ad_value into sName from
|
||||
fiche_detail
|
||||
where
|
||||
ad_id=1 and f_id=p_f_id;
|
||||
nParent:=account_parent(sNew);
|
||||
sNew := account_add (sNew,sName);
|
||||
raise info 'ai78.sNew % name %s', sNew,sName;
|
||||
perform attribut_insert(p_f_id,5,sNew);
|
||||
return sNew;
|
||||
else
|
||||
-- if there is an account_base then it is the default
|
||||
raise info 'ai82.account NOT generated automatically and class_base is [%]',sClass_base;
|
||||
if trim(coalesce(sClass_base::text,'')) = '' then
|
||||
raise notice 'ai81.count is null';
|
||||
perform attribut_insert(p_f_id,5,null);
|
||||
else
|
||||
raise notice 'ai87.Class base in the Accounting';
|
||||
perform attribut_insert(p_f_id,5,sClass_base);
|
||||
end if;
|
||||
return sClass_base;
|
||||
end if;
|
||||
|
||||
raise notice 'ai89.account_insert nothing done : error';
|
||||
|
||||
end;
|
||||
$function$
|
||||
LANGUAGE plpgsql;
|
||||
|
||||
insert into version (val,v_description) values (167,'Card accounting created automatically');
|
||||
commit ;
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue