diff --git a/html/admin/setup.php b/html/admin/setup.php
index f617e2dfd..681ae1dca 100644
--- a/html/admin/setup.php
+++ b/html/admin/setup.php
@@ -112,7 +112,7 @@ function ExecuteScript($p_cn,$script) {
//echo "Blank $buffer";
Continue;
}
- if ( strpos($buffer,"create function")===0 ) {
+ if ( strpos(strtolower($buffer),"create function")===0 ) {
echo "found a function";
$flag_function=true;
$sql=$buffer;
@@ -124,7 +124,7 @@ function ExecuteScript($p_cn,$script) {
continue;
}
if ( $flag_function ) {
- if ( strpos($buffer, "language plpgsql") == false ) {
+ if ( strpos(strtolower($buffer), "language plpgsql") == false ) {
$sql.=$buffer;
continue;
}
@@ -135,8 +135,9 @@ function ExecuteScript($p_cn,$script) {
$sql.=$buffer;
if ( ExecSql($p_cn,$sql) == false ) {
Rollback($p_cn);
+ if ( DEBUG=='false' ) ob_end_flush();
print "ERROR : $sql";
- break;
+ exit();
}
$sql="";
$flag_function=false;
@@ -164,6 +165,9 @@ foreach (array('magic_quotes_gpc','magic_quotes_runtime') as $a) {
}
}
+if ( ini_get("max_execution_time") < 60 ) {
+ print ' max_execution_time should be set to 60 minimum
';
+}
if ( ini_get("session.auto_start") == false ) {
print ' session.auto_start must be set to true
';
$flag_php++;
@@ -339,7 +343,7 @@ for ($e=0;$e < $MaxDossier;$e++) {
$db_row=pg_fetch_array($Resdossier,$e);
$db=DbConnect($db_row['dos_id'],'dossier');
echo "Patching ".$db_row['dos_name']." from the version ".GetVersion($db)."
";
-
+if ( DEBUG=='false' ) ob_start();
if ( GetVersion($db) <= 4 ) {
ExecuteScript($db,'sql/patch/upgrade4.sql');
@@ -383,8 +387,8 @@ for ($e=0;$e < $MaxDossier;$e++) {
ExecSql($db,"select setval('s_grpt',$M,true)");
}
} // version == 7
-
- }
+if ( DEBUG == 'false') ob_end_clean();
+ }//for
$Resdossier=ExecSql($cn,"select mod_id, mod_name from modeledef");
$MaxDossier=pg_NumRows($Resdossier);
@@ -393,6 +397,7 @@ for ($e=0;$e < $MaxDossier;$e++) {
$db_row=pg_fetch_array($Resdossier,$e);
echo "Patching ".$db_row['mod_name']."
";
$db=DbConnect($db_row['mod_id'],'mod');
+if (DEBUG == 'false' ) ob_start();
if ( GetVersion($db) <= 4 ) {
ExecuteScript($db,'sql/patch/upgrade4.sql');
@@ -432,11 +437,12 @@ for ($e=0;$e < $MaxDossier;$e++) {
ExecSql($db,"select setval('s_grpt',$M,true)");
}
} // version == 7
-
+if ( DEBUG == 'false') ob_end_clean();
}
echo "Upgrading Repository";
$cn=DbConnect();
+if ( DEBUG == 'false') ob_start();
if ( GetVersion($cn) <= 4 ) {
ExecuteScript($cn,'sql/patch/ac-upgrade4.sql');
}
@@ -446,3 +452,5 @@ if ( GetVersion($cn) == 5 ) {
if ( GetVersion($cn) == 6 ) {
ExecuteScript($cn,'sql/patch/ac-upgrade6.sql');
}
+if (DEBUG=='false') ob_end_clean();
+echo "Voilà tout est installé ;-)
";
\ No newline at end of file
diff --git a/html/admin/sql/mod2/comment.sql b/html/admin/sql/mod2/comment.sql
index a0884e754..733817e2d 100644
--- a/html/admin/sql/mod2/comment.sql
+++ b/html/admin/sql/mod2/comment.sql
@@ -1,5 +1,3 @@
--- Name: SCHEMA public; Type: COMMENT; Schema: -; Owner: postgres
-COMMENT ON SCHEMA public IS 'Standard public schema';
-- Name: TABLE "action"; Type: COMMENT; Schema: public; Owner: phpcompta
COMMENT ON TABLE "action" IS 'The different privileges';
-- Name: TABLE attr_def; Type: COMMENT; Schema: public; Owner: phpcompta
diff --git a/html/admin/sql/mod2/data.sql b/html/admin/sql/mod2/data.sql
index 64b8635c1..051cd6db6 100644
--- a/html/admin/sql/mod2/data.sql
+++ b/html/admin/sql/mod2/data.sql
@@ -1830,9 +1830,6 @@ INSERT INTO tva_rate (tva_id, tva_label, tva_rate, tva_comment, tva_poste) VALUE
INSERT INTO tva_rate (tva_id, tva_label, tva_rate, tva_comment, tva_poste) VALUES (2, '5.5%', 0.055, 'TVA réduite', '44566,44571');
INSERT INTO tva_rate (tva_id, tva_label, tva_rate, tva_comment, tva_poste) VALUES (3, '2.1%', 0.021000000000000001, 'TVA réduite', '44566,44571');
INSERT INTO tva_rate (tva_id, tva_label, tva_rate, tva_comment, tva_poste) VALUES (4, '0%', 0, 'Tva applicable lors de vente/achat intracommunautaire ', '44566,44571');
-INSERT INTO tva_rate (tva_id, tva_label, tva_rate, tva_comment, tva_poste) VALUES (5, '0%', 0, 'Pas soumis à la TVA', NULL);
-INSERT INTO tva_rate (tva_id, tva_label, tva_rate, tva_comment, tva_poste) VALUES (5, '0%', 0, 'Pas soumis à la TVA', NULL);
-INSERT INTO tva_rate (tva_id, tva_label, tva_rate, tva_comment, tva_poste) VALUES (5, '0%', 0, 'Pas soumis à la TVA', NULL);
--
@@ -1878,3 +1875,461 @@ INSERT INTO version (val) VALUES (8);
-- PostgreSQL database dump complete
--
+
+--
+-- Name: action_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY "action"
+ ADD CONSTRAINT action_pkey PRIMARY KEY (ac_id);
+
+
+ALTER INDEX public.action_pkey OWNER TO phpcompta;
+
+--
+-- Name: attr_def_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY attr_def
+ ADD CONSTRAINT attr_def_pkey PRIMARY KEY (ad_id);
+
+
+ALTER INDEX public.attr_def_pkey OWNER TO phpcompta;
+
+--
+-- Name: centralized_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY centralized
+ ADD CONSTRAINT centralized_pkey PRIMARY KEY (c_id);
+
+
+ALTER INDEX public.centralized_pkey OWNER TO phpcompta;
+
+--
+-- Name: fiche_def_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY fiche_def
+ ADD CONSTRAINT fiche_def_pkey PRIMARY KEY (fd_id);
+
+
+ALTER INDEX public.fiche_def_pkey OWNER TO phpcompta;
+
+--
+-- Name: fiche_def_ref_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY fiche_def_ref
+ ADD CONSTRAINT fiche_def_ref_pkey PRIMARY KEY (frd_id);
+
+
+ALTER INDEX public.fiche_def_ref_pkey OWNER TO phpcompta;
+
+--
+-- Name: fiche_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY fiche
+ ADD CONSTRAINT fiche_pkey PRIMARY KEY (f_id);
+
+
+ALTER INDEX public.fiche_pkey OWNER TO phpcompta;
+
+--
+-- Name: form_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY form
+ ADD CONSTRAINT form_pkey PRIMARY KEY (fo_id);
+
+
+ALTER INDEX public.form_pkey OWNER TO phpcompta;
+
+--
+-- Name: formdef_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY formdef
+ ADD CONSTRAINT formdef_pkey PRIMARY KEY (fr_id);
+
+
+ALTER INDEX public.formdef_pkey OWNER TO phpcompta;
+
+--
+-- Name: jnt_fic_att_value_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY jnt_fic_att_value
+ ADD CONSTRAINT jnt_fic_att_value_pkey PRIMARY KEY (jft_id);
+
+
+ALTER INDEX public.jnt_fic_att_value_pkey OWNER TO phpcompta;
+
+--
+-- Name: jrn_action_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY jrn_action
+ ADD CONSTRAINT jrn_action_pkey PRIMARY KEY (ja_id);
+
+
+ALTER INDEX public.jrn_action_pkey OWNER TO phpcompta;
+
+--
+-- Name: jrn_def_jrn_def_name_key; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY jrn_def
+ ADD CONSTRAINT jrn_def_jrn_def_name_key UNIQUE (jrn_def_name);
+
+
+ALTER INDEX public.jrn_def_jrn_def_name_key OWNER TO phpcompta;
+
+--
+-- Name: jrn_def_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY jrn_def
+ ADD CONSTRAINT jrn_def_pkey PRIMARY KEY (jrn_def_id);
+
+
+ALTER INDEX public.jrn_def_pkey OWNER TO phpcompta;
+
+--
+-- Name: jrn_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY jrn
+ ADD CONSTRAINT jrn_pkey PRIMARY KEY (jr_id, jr_def_id);
+
+
+ALTER INDEX public.jrn_pkey OWNER TO phpcompta;
+
+--
+-- Name: jrn_rapt_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY jrn_rapt
+ ADD CONSTRAINT jrn_rapt_pkey PRIMARY KEY (jra_id);
+
+
+ALTER INDEX public.jrn_rapt_pkey OWNER TO phpcompta;
+
+--
+-- Name: jrn_type_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY jrn_type
+ ADD CONSTRAINT jrn_type_pkey PRIMARY KEY (jrn_type_id);
+
+
+ALTER INDEX public.jrn_type_pkey OWNER TO phpcompta;
+
+--
+-- Name: jrnx_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY jrnx
+ ADD CONSTRAINT jrnx_pkey PRIMARY KEY (j_id);
+
+
+ALTER INDEX public.jrnx_pkey OWNER TO phpcompta;
+
+--
+-- Name: parameter_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY parameter
+ ADD CONSTRAINT parameter_pkey PRIMARY KEY (pr_id);
+
+
+ALTER INDEX public.parameter_pkey OWNER TO phpcompta;
+
+--
+-- Name: parm_money_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY parm_money
+ ADD CONSTRAINT parm_money_pkey PRIMARY KEY (pm_code);
+
+
+ALTER INDEX public.parm_money_pkey OWNER TO phpcompta;
+
+--
+-- Name: parm_periode_p_start_key; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY parm_periode
+ ADD CONSTRAINT parm_periode_p_start_key UNIQUE (p_start);
+
+
+ALTER INDEX public.parm_periode_p_start_key OWNER TO phpcompta;
+
+--
+-- Name: parm_periode_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY parm_periode
+ ADD CONSTRAINT parm_periode_pkey PRIMARY KEY (p_id);
+
+
+ALTER INDEX public.parm_periode_pkey OWNER TO phpcompta;
+
+--
+-- Name: pk_user_local_pref; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY user_local_pref
+ ADD CONSTRAINT pk_user_local_pref PRIMARY KEY (user_id, parameter_type);
+
+
+ALTER INDEX public.pk_user_local_pref OWNER TO phpcompta;
+
+--
+-- Name: stock_goods_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY stock_goods
+ ADD CONSTRAINT stock_goods_pkey PRIMARY KEY (sg_id);
+
+
+ALTER INDEX public.stock_goods_pkey OWNER TO phpcompta;
+
+--
+-- Name: tmp_pcmn_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY tmp_pcmn
+ ADD CONSTRAINT tmp_pcmn_pkey PRIMARY KEY (pcm_val);
+
+
+ALTER INDEX public.tmp_pcmn_pkey OWNER TO phpcompta;
+
+--
+-- Name: user_pref_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY user_pref
+ ADD CONSTRAINT user_pref_pkey PRIMARY KEY (pref_user);
+
+
+ALTER INDEX public.user_pref_pkey OWNER TO phpcompta;
+
+--
+-- Name: user_sec_act_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY user_sec_act
+ ADD CONSTRAINT user_sec_act_pkey PRIMARY KEY (ua_id);
+
+
+ALTER INDEX public.user_sec_act_pkey OWNER TO phpcompta;
+
+--
+-- Name: user_sec_jrn_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+ALTER TABLE ONLY user_sec_jrn
+ ADD CONSTRAINT user_sec_jrn_pkey PRIMARY KEY (uj_id);
+
+
+ALTER INDEX public.user_sec_jrn_pkey OWNER TO phpcompta;
+
+--
+-- Name: fk_stock_goods_f_id; Type: INDEX; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+CREATE INDEX fk_stock_goods_f_id ON stock_goods USING btree (f_id);
+
+
+ALTER INDEX public.fk_stock_goods_f_id OWNER TO phpcompta;
+
+--
+-- Name: fk_stock_goods_j_id; Type: INDEX; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+CREATE INDEX fk_stock_goods_j_id ON stock_goods USING btree (j_id);
+
+
+ALTER INDEX public.fk_stock_goods_j_id OWNER TO phpcompta;
+
+--
+-- Name: x_jrn_jr_id; Type: INDEX; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+CREATE UNIQUE INDEX x_jrn_jr_id ON jrn USING btree (jr_id);
+
+
+ALTER INDEX public.x_jrn_jr_id OWNER TO phpcompta;
+
+--
+-- Name: x_poste; Type: INDEX; Schema: public; Owner: phpcompta; Tablespace:
+--
+
+CREATE INDEX x_poste ON jrnx USING btree (j_poste);
+
+
+ALTER INDEX public.x_poste OWNER TO phpcompta;
+
+--
+-- Name: tr_jrn_check_balance; Type: TRIGGER; Schema: public; Owner: phpcompta
+--
+
+CREATE TRIGGER tr_jrn_check_balance
+ AFTER INSERT ON jrn
+ FOR EACH ROW
+ EXECUTE PROCEDURE proc_check_balance();
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY jrn_def
+ ADD CONSTRAINT "$1" FOREIGN KEY (jrn_def_type) REFERENCES jrn_type(jrn_type_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY jrnx
+ ADD CONSTRAINT "$1" FOREIGN KEY (j_poste) REFERENCES tmp_pcmn(pcm_val);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY form
+ ADD CONSTRAINT "$1" FOREIGN KEY (fo_fr_id) REFERENCES formdef(fr_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY centralized
+ ADD CONSTRAINT "$1" FOREIGN KEY (c_jrn_def) REFERENCES jrn_def(jrn_def_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY user_sec_jrn
+ ADD CONSTRAINT "$1" FOREIGN KEY (uj_jrn_id) REFERENCES jrn_def(jrn_def_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY user_sec_act
+ ADD CONSTRAINT "$1" FOREIGN KEY (ua_act_id) REFERENCES "action"(ac_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY jrn_action
+ ADD CONSTRAINT "$1" FOREIGN KEY (ja_jrn_type) REFERENCES jrn_type(jrn_type_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY attr_min
+ ADD CONSTRAINT "$1" FOREIGN KEY (frd_id) REFERENCES fiche_def_ref(frd_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY jnt_fic_att_value
+ ADD CONSTRAINT "$1" FOREIGN KEY (f_id) REFERENCES fiche(f_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY attr_value
+ ADD CONSTRAINT "$1" FOREIGN KEY (jft_id) REFERENCES jnt_fic_att_value(jft_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY jnt_fic_attr
+ ADD CONSTRAINT "$1" FOREIGN KEY (fd_id) REFERENCES fiche_def(fd_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY jrn
+ ADD CONSTRAINT "$1" FOREIGN KEY (jr_def_id) REFERENCES jrn_def(jrn_def_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY fiche
+ ADD CONSTRAINT "$1" FOREIGN KEY (fd_id) REFERENCES fiche_def(fd_id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY fiche_def
+ ADD CONSTRAINT "$1" FOREIGN KEY (frd_id) REFERENCES fiche_def_ref(frd_id);
+
+
+--
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY jrnx
+ ADD CONSTRAINT "$2" FOREIGN KEY (j_jrn_def) REFERENCES jrn_def(jrn_def_id);
+
+
+--
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY centralized
+ ADD CONSTRAINT "$2" FOREIGN KEY (c_poste) REFERENCES tmp_pcmn(pcm_val);
+
+
+--
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY attr_min
+ ADD CONSTRAINT "$2" FOREIGN KEY (ad_id) REFERENCES attr_def(ad_id);
+
+
+--
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY jnt_fic_att_value
+ ADD CONSTRAINT "$2" FOREIGN KEY (ad_id) REFERENCES attr_def(ad_id);
+
+
+--
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
+--
+
+ALTER TABLE ONLY jnt_fic_attr
+ ADD CONSTRAINT "$2" FOREIGN KEY (ad_id) REFERENCES attr_def(ad_id);
+
diff --git a/html/admin/sql/mod2/function.sql b/html/admin/sql/mod2/function.sql
index 007c83f16..87007a2fd 100644
--- a/html/admin/sql/mod2/function.sql
+++ b/html/admin/sql/mod2/function.sql
@@ -1,35 +1,6 @@
-- Name: plpgsql_call_handler(); Type: FUNCTION; Schema: public; Owner: postgres
--
-CREATE FUNCTION plpgsql_call_handler() RETURNS language_handler
- AS '$libdir/plpgsql', 'plpgsql_call_handler'
- LANGUAGE c;
-ALTER FUNCTION public.plpgsql_call_handler() OWNER TO postgres;
-
---
--- Name: plpgsql_validator(oid); Type: FUNCTION; Schema: public; Owner: postgres
---
-
-CREATE FUNCTION plpgsql_validator(oid) RETURNS void
- AS '$libdir/plpgsql', 'plpgsql_validator'
- LANGUAGE c;
-ALTER FUNCTION public.plpgsql_validator(oid) OWNER TO postgres;
-
---
--- Name: plpgsql; Type: PROCEDURAL LANGUAGE; Schema: public; Owner:
--- Name: plpython_call_handler(); Type: FUNCTION; Schema: public; Owner: postgres
---
-
-CREATE FUNCTION plpython_call_handler() RETURNS language_handler
- AS '$libdir/plpython', 'plpython_call_handler'
- LANGUAGE c;
-ALTER FUNCTION public.plpython_call_handler() OWNER TO postgres;
-
---
--- Name: plpythonu; Type: PROCEDURAL LANGUAGE; Schema: public; Owner:
--- Name: check_balance(text); Type: FUNCTION; Schema: public; Owner: phpcompta
---
-
CREATE FUNCTION check_balance(p_internal text) RETURNS numeric
AS $$
declare
diff --git a/html/admin/sql/mod2/schema.sql b/html/admin/sql/mod2/schema.sql
index 627c99429..abdcf14e3 100644
--- a/html/admin/sql/mod2/schema.sql
+++ b/html/admin/sql/mod2/schema.sql
@@ -10,7 +10,6 @@ SET client_min_messages = warning;
-- Name: SCHEMA public; Type: COMMENT; Schema: -; Owner: postgres
--
-COMMENT ON SCHEMA public IS 'Standard public schema';
SET search_path = public, pg_catalog;
@@ -19,55 +18,11 @@ SET search_path = public, pg_catalog;
-- Name: plpgsql_call_handler(); Type: FUNCTION; Schema: public; Owner: dany
--
-CREATE FUNCTION plpgsql_call_handler() RETURNS language_handler
- AS '$libdir/plpgsql', 'plpgsql_call_handler'
- LANGUAGE c;
-
-
-ALTER FUNCTION public.plpgsql_call_handler() OWNER TO dany;
-
---
--- Name: plpgsql_validator(oid); Type: FUNCTION; Schema: public; Owner: dany
---
-
-CREATE FUNCTION plpgsql_validator(oid) RETURNS void
- AS '$libdir/plpgsql', 'plpgsql_validator'
- LANGUAGE c;
-
-
-ALTER FUNCTION public.plpgsql_validator(oid) OWNER TO dany;
-
---
--- Name: plpgsql; Type: PROCEDURAL LANGUAGE; Schema: public; Owner:
---
-
-CREATE TRUSTED PROCEDURAL LANGUAGE plpgsql HANDLER plpgsql_call_handler VALIDATOR plpgsql_validator;
-
-
---
--- Name: plpython_call_handler(); Type: FUNCTION; Schema: public; Owner: dany
---
-
-CREATE FUNCTION plpython_call_handler() RETURNS language_handler
- AS '$libdir/plpython', 'plpython_call_handler'
- LANGUAGE c;
-
-
-ALTER FUNCTION public.plpython_call_handler() OWNER TO dany;
-
---
--- Name: plpythonu; Type: PROCEDURAL LANGUAGE; Schema: public; Owner:
---
-
-CREATE PROCEDURAL LANGUAGE plpythonu HANDLER plpython_call_handler;
-
-
--
-- Name: check_balance(text); Type: FUNCTION; Schema: public; Owner: phpcompta
--
-CREATE FUNCTION check_balance(p_internal text) RETURNS numeric
- AS $$
+CREATE FUNCTION check_balance(p_internal text) RETURNS numeric AS $$
declare
amount_jrnx_debit numeric;
amount_jrnx_credit numeric;
@@ -100,8 +55,7 @@ begin
end if;
return 0;
end;
-$$
- LANGUAGE plpgsql;
+$$ LANGUAGE plpgsql;
ALTER FUNCTION public.check_balance(p_internal text) OWNER TO phpcompta;
@@ -1204,464 +1158,6 @@ ALTER TABLE public.vw_fiche_min OWNER TO phpcompta;
COMMENT ON VIEW vw_fiche_min IS 'minimum attribut for reference card';
---
--- Name: action_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY "action"
- ADD CONSTRAINT action_pkey PRIMARY KEY (ac_id);
-
-
-ALTER INDEX public.action_pkey OWNER TO phpcompta;
-
---
--- Name: attr_def_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY attr_def
- ADD CONSTRAINT attr_def_pkey PRIMARY KEY (ad_id);
-
-
-ALTER INDEX public.attr_def_pkey OWNER TO phpcompta;
-
---
--- Name: centralized_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY centralized
- ADD CONSTRAINT centralized_pkey PRIMARY KEY (c_id);
-
-
-ALTER INDEX public.centralized_pkey OWNER TO phpcompta;
-
---
--- Name: fiche_def_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY fiche_def
- ADD CONSTRAINT fiche_def_pkey PRIMARY KEY (fd_id);
-
-
-ALTER INDEX public.fiche_def_pkey OWNER TO phpcompta;
-
---
--- Name: fiche_def_ref_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY fiche_def_ref
- ADD CONSTRAINT fiche_def_ref_pkey PRIMARY KEY (frd_id);
-
-
-ALTER INDEX public.fiche_def_ref_pkey OWNER TO phpcompta;
-
---
--- Name: fiche_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY fiche
- ADD CONSTRAINT fiche_pkey PRIMARY KEY (f_id);
-
-
-ALTER INDEX public.fiche_pkey OWNER TO phpcompta;
-
---
--- Name: form_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY form
- ADD CONSTRAINT form_pkey PRIMARY KEY (fo_id);
-
-
-ALTER INDEX public.form_pkey OWNER TO phpcompta;
-
---
--- Name: formdef_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY formdef
- ADD CONSTRAINT formdef_pkey PRIMARY KEY (fr_id);
-
-
-ALTER INDEX public.formdef_pkey OWNER TO phpcompta;
-
---
--- Name: jnt_fic_att_value_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY jnt_fic_att_value
- ADD CONSTRAINT jnt_fic_att_value_pkey PRIMARY KEY (jft_id);
-
-
-ALTER INDEX public.jnt_fic_att_value_pkey OWNER TO phpcompta;
-
---
--- Name: jrn_action_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY jrn_action
- ADD CONSTRAINT jrn_action_pkey PRIMARY KEY (ja_id);
-
-
-ALTER INDEX public.jrn_action_pkey OWNER TO phpcompta;
-
---
--- Name: jrn_def_jrn_def_name_key; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY jrn_def
- ADD CONSTRAINT jrn_def_jrn_def_name_key UNIQUE (jrn_def_name);
-
-
-ALTER INDEX public.jrn_def_jrn_def_name_key OWNER TO phpcompta;
-
---
--- Name: jrn_def_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY jrn_def
- ADD CONSTRAINT jrn_def_pkey PRIMARY KEY (jrn_def_id);
-
-
-ALTER INDEX public.jrn_def_pkey OWNER TO phpcompta;
-
---
--- Name: jrn_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY jrn
- ADD CONSTRAINT jrn_pkey PRIMARY KEY (jr_id, jr_def_id);
-
-
-ALTER INDEX public.jrn_pkey OWNER TO phpcompta;
-
---
--- Name: jrn_rapt_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY jrn_rapt
- ADD CONSTRAINT jrn_rapt_pkey PRIMARY KEY (jra_id);
-
-
-ALTER INDEX public.jrn_rapt_pkey OWNER TO phpcompta;
-
---
--- Name: jrn_type_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY jrn_type
- ADD CONSTRAINT jrn_type_pkey PRIMARY KEY (jrn_type_id);
-
-
-ALTER INDEX public.jrn_type_pkey OWNER TO phpcompta;
-
---
--- Name: jrnx_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY jrnx
- ADD CONSTRAINT jrnx_pkey PRIMARY KEY (j_id);
-
-
-ALTER INDEX public.jrnx_pkey OWNER TO phpcompta;
-
---
--- Name: parameter_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY parameter
- ADD CONSTRAINT parameter_pkey PRIMARY KEY (pr_id);
-
-
-ALTER INDEX public.parameter_pkey OWNER TO phpcompta;
-
---
--- Name: parm_money_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY parm_money
- ADD CONSTRAINT parm_money_pkey PRIMARY KEY (pm_code);
-
-
-ALTER INDEX public.parm_money_pkey OWNER TO phpcompta;
-
---
--- Name: parm_periode_p_start_key; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY parm_periode
- ADD CONSTRAINT parm_periode_p_start_key UNIQUE (p_start);
-
-
-ALTER INDEX public.parm_periode_p_start_key OWNER TO phpcompta;
-
---
--- Name: parm_periode_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY parm_periode
- ADD CONSTRAINT parm_periode_pkey PRIMARY KEY (p_id);
-
-
-ALTER INDEX public.parm_periode_pkey OWNER TO phpcompta;
-
---
--- Name: pk_user_local_pref; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY user_local_pref
- ADD CONSTRAINT pk_user_local_pref PRIMARY KEY (user_id, parameter_type);
-
-
-ALTER INDEX public.pk_user_local_pref OWNER TO phpcompta;
-
---
--- Name: stock_goods_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY stock_goods
- ADD CONSTRAINT stock_goods_pkey PRIMARY KEY (sg_id);
-
-
-ALTER INDEX public.stock_goods_pkey OWNER TO phpcompta;
-
---
--- Name: tmp_pcmn_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY tmp_pcmn
- ADD CONSTRAINT tmp_pcmn_pkey PRIMARY KEY (pcm_val);
-
-
-ALTER INDEX public.tmp_pcmn_pkey OWNER TO phpcompta;
-
---
--- Name: user_pref_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY user_pref
- ADD CONSTRAINT user_pref_pkey PRIMARY KEY (pref_user);
-
-
-ALTER INDEX public.user_pref_pkey OWNER TO phpcompta;
-
---
--- Name: user_sec_act_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY user_sec_act
- ADD CONSTRAINT user_sec_act_pkey PRIMARY KEY (ua_id);
-
-
-ALTER INDEX public.user_sec_act_pkey OWNER TO phpcompta;
-
---
--- Name: user_sec_jrn_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace:
---
-
-ALTER TABLE ONLY user_sec_jrn
- ADD CONSTRAINT user_sec_jrn_pkey PRIMARY KEY (uj_id);
-
-
-ALTER INDEX public.user_sec_jrn_pkey OWNER TO phpcompta;
-
---
--- Name: fk_stock_goods_f_id; Type: INDEX; Schema: public; Owner: phpcompta; Tablespace:
---
-
-CREATE INDEX fk_stock_goods_f_id ON stock_goods USING btree (f_id);
-
-
-ALTER INDEX public.fk_stock_goods_f_id OWNER TO phpcompta;
-
---
--- Name: fk_stock_goods_j_id; Type: INDEX; Schema: public; Owner: phpcompta; Tablespace:
---
-
-CREATE INDEX fk_stock_goods_j_id ON stock_goods USING btree (j_id);
-
-
-ALTER INDEX public.fk_stock_goods_j_id OWNER TO phpcompta;
-
---
--- Name: x_jrn_jr_id; Type: INDEX; Schema: public; Owner: phpcompta; Tablespace:
---
-
-CREATE UNIQUE INDEX x_jrn_jr_id ON jrn USING btree (jr_id);
-
-
-ALTER INDEX public.x_jrn_jr_id OWNER TO phpcompta;
-
---
--- Name: x_poste; Type: INDEX; Schema: public; Owner: phpcompta; Tablespace:
---
-
-CREATE INDEX x_poste ON jrnx USING btree (j_poste);
-
-
-ALTER INDEX public.x_poste OWNER TO phpcompta;
-
---
--- Name: tr_jrn_check_balance; Type: TRIGGER; Schema: public; Owner: phpcompta
---
-
-CREATE TRIGGER tr_jrn_check_balance
- AFTER INSERT ON jrn
- FOR EACH ROW
- EXECUTE PROCEDURE proc_check_balance();
-
-
---
--- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY jrn_def
- ADD CONSTRAINT "$1" FOREIGN KEY (jrn_def_type) REFERENCES jrn_type(jrn_type_id);
-
-
---
--- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY jrnx
- ADD CONSTRAINT "$1" FOREIGN KEY (j_poste) REFERENCES tmp_pcmn(pcm_val);
-
-
---
--- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY form
- ADD CONSTRAINT "$1" FOREIGN KEY (fo_fr_id) REFERENCES formdef(fr_id);
-
-
---
--- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY centralized
- ADD CONSTRAINT "$1" FOREIGN KEY (c_jrn_def) REFERENCES jrn_def(jrn_def_id);
-
-
---
--- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY user_sec_jrn
- ADD CONSTRAINT "$1" FOREIGN KEY (uj_jrn_id) REFERENCES jrn_def(jrn_def_id);
-
-
---
--- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY user_sec_act
- ADD CONSTRAINT "$1" FOREIGN KEY (ua_act_id) REFERENCES "action"(ac_id);
-
-
---
--- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY jrn_action
- ADD CONSTRAINT "$1" FOREIGN KEY (ja_jrn_type) REFERENCES jrn_type(jrn_type_id);
-
-
---
--- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY attr_min
- ADD CONSTRAINT "$1" FOREIGN KEY (frd_id) REFERENCES fiche_def_ref(frd_id);
-
-
---
--- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY jnt_fic_att_value
- ADD CONSTRAINT "$1" FOREIGN KEY (f_id) REFERENCES fiche(f_id);
-
-
---
--- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY attr_value
- ADD CONSTRAINT "$1" FOREIGN KEY (jft_id) REFERENCES jnt_fic_att_value(jft_id);
-
-
---
--- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY jnt_fic_attr
- ADD CONSTRAINT "$1" FOREIGN KEY (fd_id) REFERENCES fiche_def(fd_id);
-
-
---
--- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY jrn
- ADD CONSTRAINT "$1" FOREIGN KEY (jr_def_id) REFERENCES jrn_def(jrn_def_id);
-
-
---
--- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY fiche
- ADD CONSTRAINT "$1" FOREIGN KEY (fd_id) REFERENCES fiche_def(fd_id);
-
-
---
--- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY fiche_def
- ADD CONSTRAINT "$1" FOREIGN KEY (frd_id) REFERENCES fiche_def_ref(frd_id);
-
-
---
--- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY jrnx
- ADD CONSTRAINT "$2" FOREIGN KEY (j_jrn_def) REFERENCES jrn_def(jrn_def_id);
-
-
---
--- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY centralized
- ADD CONSTRAINT "$2" FOREIGN KEY (c_poste) REFERENCES tmp_pcmn(pcm_val);
-
-
---
--- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY attr_min
- ADD CONSTRAINT "$2" FOREIGN KEY (ad_id) REFERENCES attr_def(ad_id);
-
-
---
--- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY jnt_fic_att_value
- ADD CONSTRAINT "$2" FOREIGN KEY (ad_id) REFERENCES attr_def(ad_id);
-
-
---
--- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
---
-
-ALTER TABLE ONLY jnt_fic_attr
- ADD CONSTRAINT "$2" FOREIGN KEY (ad_id) REFERENCES attr_def(ad_id);
-
-
--
-- Name: public; Type: ACL; Schema: -; Owner: postgres
--