diff --git a/html/admin/setup.php b/html/admin/setup.php
index f4f8dcbc2..2dcf16548 100644
--- a/html/admin/setup.php
+++ b/html/admin/setup.php
@@ -54,7 +54,7 @@ h2.error {
// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
$inc_path=get_include_path();
-$inc_path.=';..\..\include';
+$inc_path.=':../../include';
set_include_path($inc_path);
include_once('constant.php');
@@ -268,7 +268,7 @@ for ($e=0;$e < $MaxDossier;$e++) {
$db_row=pg_fetch_array($Resdossier,$e);
echo "Patching ".$db_row['dos_name']."
";
$db=DbConnect($db_row['dos_id'],'dossier');
- if ( GetVersion($db) == 3 ) {
+ if ( GetVersion($db) == 4 ) {
ExecuteScript($db,'sql/patch/upgrade4.sql');
$sql="select jrn_def_id from jrn_def ";
@@ -279,7 +279,7 @@ for ($e=0;$e < $MaxDossier;$e++) {
$sql=sprintf ("create sequence s_jrn_%d",$row['jrn_def_id']);
ExecSql($db,$sql);
}
- } // version == 3
+ } // version == 4
}
$Resdossier=ExecSql($cn,"select mod_id, mod_name from modeledef");
@@ -289,7 +289,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 ( GetVersion($db) == 3 ) {
+ if ( GetVersion($db) == 4 ) {
ExecuteScript($db,'sql/patch/upgrade4.sql');
$sql="select jrn_def_id from jrn_def ";
diff --git a/html/admin/sql/account_repository/comment.sql b/html/admin/sql/account_repository/comment.sql
index e69de29bb..92f001a48 100644
--- a/html/admin/sql/account_repository/comment.sql
+++ b/html/admin/sql/account_repository/comment.sql
@@ -0,0 +1 @@
+COMMENT ON SCHEMA public IS 'Standard public schema';
diff --git a/html/admin/sql/account_repository/constraint.sql b/html/admin/sql/account_repository/constraint.sql
index 1cc7c33c2..868ce2cb6 100644
--- a/html/admin/sql/account_repository/constraint.sql
+++ b/html/admin/sql/account_repository/constraint.sql
@@ -8,7 +8,5 @@ ALTER TABLE ONLY ac_dossier
ADD CONSTRAINT ac_dossier_dos_name_key UNIQUE (dos_name);
ALTER TABLE ONLY jnt_use_dos
ADD CONSTRAINT jnt_use_dos_pkey PRIMARY KEY (use_id, dos_id);
-ALTER TABLE ONLY jnt_use_dos
- ADD CONSTRAINT "$1" FOREIGN KEY (use_id) REFERENCES ac_users(use_id) ON UPDATE NO ACTION ON DELETE NO ACTION;
ALTER TABLE ONLY modeledef
ADD CONSTRAINT modeledef_pkey PRIMARY KEY (mod_id);
diff --git a/html/admin/sql/account_repository/data.sql b/html/admin/sql/account_repository/data.sql
index 8221963bd..3bab6648f 100644
--- a/html/admin/sql/account_repository/data.sql
+++ b/html/admin/sql/account_repository/data.sql
@@ -2,33 +2,51 @@
-- PostgreSQL database dump
--
+SET client_encoding = 'LATIN1';
+SET check_function_bodies = false;
+
SET search_path = public, pg_catalog;
--
--- Data for TOC entry 6 (OID 940848)
+-- Data for TOC entry 7 (OID 108176)
-- Name: ac_users; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
-INSERT INTO ac_users (use_id, use_first_name, use_name, use_login, use_active, use_pass, use_admin, use_theme, use_usertype) VALUES (4, 'demo', 'demo', 'demo', 1, 'b1cc88e1907cde80cb2595fa793b3da9', 0, 'Light', 'user');
+INSERT INTO ac_users (use_id, use_first_name, use_name, use_login, use_active, use_pass, use_admin, use_theme, use_usertype) VALUES (4, 'demo', 'demo', 'demo', 1, 'fe01ce2a7fbac8fafaed7c982a04e229', 0, 'Light', 'user');
INSERT INTO ac_users (use_id, use_first_name, use_name, use_login, use_active, use_pass, use_admin, use_theme, use_usertype) VALUES (1, NULL, NULL, 'phpcompta', 1, 'b1cc88e1907cde80cb2595fa793b3da9', 1, 'Light', 'user');
--
--- Data for TOC entry 7 (OID 940858)
+-- Data for TOC entry 8 (OID 108186)
-- Name: ac_dossier; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (1, 'Demo', 'Base de données pour développement & démo', 0);
+
--
--- Data for TOC entry 8 (OID 940867)
+-- Data for TOC entry 9 (OID 108195)
-- Name: jnt_use_dos; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (1, 1, 1);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (2, 1, 2);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (3, 1, 5);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (4, 1, 6);
INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (13, 4, 1);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (14, 1, 7);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (15, 1, 8);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (16, 1, 9);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (17, 1, 10);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (18, 1, 11);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (19, 1, 3);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (20, 1, 4);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (22, 5, 4);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (23, 5, 1);
--- Data for TOC entry 9 (OID 940870)
+
+--
+-- Data for TOC entry 10 (OID 108198)
-- Name: version; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -36,7 +54,7 @@ INSERT INTO "version" (val) VALUES (4);
--
--- Data for TOC entry 10 (OID 940874)
+-- Data for TOC entry 11 (OID 108202)
-- Name: priv_user; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -49,14 +67,13 @@ INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (6, 10, 'NO');
INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (7, 11, 'W');
INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (8, 12, 'NO');
INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (9, 13, 'W');
-INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (12, 22, 'NO');
-INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (13, 23, 'R');
-INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (10, 20, 'W');
-INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (11, 21, 'W');
+INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (10, 21, 'NO');
+INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (12, 23, 'NO');
+INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (11, 22, 'R');
--
--- Data for TOC entry 11 (OID 940880)
+-- Data for TOC entry 12 (OID 108208)
-- Name: theme; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -67,7 +84,7 @@ INSERT INTO theme (the_name, the_filestyle, the_filebutton) VALUES ('Light', 'st
--
--- Data for TOC entry 12 (OID 940887)
+-- Data for TOC entry 13 (OID 108215)
-- Name: modeledef; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -75,42 +92,42 @@ INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (1, '(BE) Basique', 'C
--
--- TOC entry 1 (OID 940846)
+-- TOC entry 2 (OID 108174)
-- Name: users_id; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
-SELECT pg_catalog.setval ('users_id', 6, true);
+SELECT pg_catalog.setval('users_id', 5, true);
--
--- TOC entry 2 (OID 940865)
+-- TOC entry 3 (OID 108193)
-- Name: seq_jnt_use_dos; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
-SELECT pg_catalog.setval ('seq_jnt_use_dos', 30, true);
+SELECT pg_catalog.setval('seq_jnt_use_dos', 23, true);
--
--- TOC entry 3 (OID 940872)
+-- TOC entry 4 (OID 108200)
-- Name: seq_priv_user; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
-SELECT pg_catalog.setval ('seq_priv_user', 13, true);
+SELECT pg_catalog.setval('seq_priv_user', 12, true);
--
--- TOC entry 4 (OID 940885)
+-- TOC entry 5 (OID 108213)
-- Name: s_modid; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
-SELECT pg_catalog.setval ('s_modid', 10, true);
+SELECT pg_catalog.setval('s_modid', 1, false);
--
--- TOC entry 5 (OID 940893)
+-- TOC entry 6 (OID 108221)
-- Name: dossier_id; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
-SELECT pg_catalog.setval ('dossier_id', 12, true);
+SELECT pg_catalog.setval('dossier_id', 4, true);
diff --git a/html/admin/sql/account_repository/schema.sql b/html/admin/sql/account_repository/schema.sql
index 2042490de..22285f4f6 100644
--- a/html/admin/sql/account_repository/schema.sql
+++ b/html/admin/sql/account_repository/schema.sql
@@ -1,8 +1,10 @@
+SET client_encoding = 'LATIN1';
+SET check_function_bodies = false;
+SET search_path = public, pg_catalog;
CREATE SEQUENCE users_id
- START 1
- INCREMENT 1
- MAXVALUE 9223372036854775807
- MINVALUE 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
CACHE 1;
CREATE TABLE ac_users (
use_id integer DEFAULT nextval('users_id'::text) NOT NULL,
@@ -12,25 +14,20 @@ CREATE TABLE ac_users (
use_active integer DEFAULT 0,
use_pass text,
use_admin integer DEFAULT 0,
- use_theme text DEFAULT 'Light',
+ use_theme text DEFAULT 'Light'::text,
use_usertype text NOT NULL,
- CHECK (((use_active = 0) OR (use_active = 1)))
+ CONSTRAINT "$1" CHECK (((use_active = 0) OR (use_active = 1)))
);
-
CREATE TABLE ac_dossier (
dos_id integer DEFAULT nextval('dossier_id'::text) NOT NULL,
dos_name text NOT NULL,
dos_description text,
dos_jnt_user integer DEFAULT 0
);
-
-COMMENT ON COLUMN ac_dossier.dos_jnt_user IS 'The user owning the file.';
-
CREATE SEQUENCE seq_jnt_use_dos
- START 1
- INCREMENT 1
- MAXVALUE 9223372036854775807
- MINVALUE 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
CACHE 1;
CREATE TABLE jnt_use_dos (
jnt_id integer DEFAULT nextval('seq_jnt_use_dos'::text) NOT NULL,
@@ -41,10 +38,9 @@ CREATE TABLE "version" (
val integer
);
CREATE SEQUENCE seq_priv_user
- START 1
- INCREMENT 1
- MAXVALUE 9223372036854775807
- MINVALUE 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
CACHE 1;
CREATE TABLE priv_user (
priv_id integer DEFAULT nextval('seq_priv_user'::text) NOT NULL,
@@ -57,10 +53,10 @@ CREATE TABLE theme (
the_filebutton text
);
CREATE SEQUENCE s_modid
- START 1
- INCREMENT 1
- MAXVALUE 9223372036854775807
- MINVALUE 1
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
CACHE 1;
CREATE TABLE modeledef (
mod_id integer DEFAULT nextval('s_modid'::text) NOT NULL,
@@ -68,9 +64,8 @@ CREATE TABLE modeledef (
mod_desc text
);
CREATE SEQUENCE dossier_id
- START 3
- INCREMENT 1
- MAXVALUE 9223372036854775807
+ INCREMENT BY 1
+ NO MAXVALUE
MINVALUE 3
CACHE 1;
CREATE INDEX fk_jnt_use_dos ON jnt_use_dos USING btree (use_id);
@@ -85,7 +80,5 @@ ALTER TABLE ONLY ac_dossier
ADD CONSTRAINT ac_dossier_dos_name_key UNIQUE (dos_name);
ALTER TABLE ONLY jnt_use_dos
ADD CONSTRAINT jnt_use_dos_pkey PRIMARY KEY (use_id, dos_id);
-ALTER TABLE ONLY jnt_use_dos
- ADD CONSTRAINT "$1" FOREIGN KEY (use_id) REFERENCES ac_users(use_id) ON UPDATE NO ACTION ON DELETE NO ACTION;
ALTER TABLE ONLY modeledef
ADD CONSTRAINT modeledef_pkey PRIMARY KEY (mod_id);
diff --git a/html/admin/sql/account_repository/sequence.sql b/html/admin/sql/account_repository/sequence.sql
index c1a3cdf5f..1ab0a8ba3 100644
--- a/html/admin/sql/account_repository/sequence.sql
+++ b/html/admin/sql/account_repository/sequence.sql
@@ -1,30 +1,26 @@
CREATE SEQUENCE users_id
- START 1
- INCREMENT 1
- MAXVALUE 9223372036854775807
- MINVALUE 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
CACHE 1;
CREATE SEQUENCE seq_jnt_use_dos
- START 1
- INCREMENT 1
- MAXVALUE 9223372036854775807
- MINVALUE 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
CACHE 1;
CREATE SEQUENCE seq_priv_user
- START 1
- INCREMENT 1
- MAXVALUE 9223372036854775807
- MINVALUE 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
CACHE 1;
CREATE SEQUENCE s_modid
- START 1
- INCREMENT 1
- MAXVALUE 9223372036854775807
- MINVALUE 1
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
CACHE 1;
CREATE SEQUENCE dossier_id
- START 3
- INCREMENT 1
- MAXVALUE 9223372036854775807
+ INCREMENT BY 1
+ NO MAXVALUE
MINVALUE 3
CACHE 1;
diff --git a/html/admin/sql/account_repository/table.sql b/html/admin/sql/account_repository/table.sql
index c983d3f2b..1cd07b004 100644
--- a/html/admin/sql/account_repository/table.sql
+++ b/html/admin/sql/account_repository/table.sql
@@ -6,9 +6,9 @@ CREATE TABLE ac_users (
use_active integer DEFAULT 0,
use_pass text,
use_admin integer DEFAULT 0,
- use_theme text DEFAULT 'Light',
+ use_theme text DEFAULT 'Light'::text,
use_usertype text NOT NULL,
- CHECK (((use_active = 0) OR (use_active = 1)))
+ CONSTRAINT "$1" CHECK (((use_active = 0) OR (use_active = 1)))
);
CREATE TABLE ac_dossier (
dos_id integer DEFAULT nextval('dossier_id'::text) NOT NULL,
diff --git a/html/admin/sql/dossier1/data.sql b/html/admin/sql/dossier1/data.sql
index 940a50974..527d34945 100644
--- a/html/admin/sql/dossier1/data.sql
+++ b/html/admin/sql/dossier1/data.sql
@@ -2,6 +2,15 @@
-- PostgreSQL database dump
--
+SET client_encoding = 'LATIN1';
+SET check_function_bodies = false;
+
+SET search_path = public, pg_catalog;
+
+--
+-- Data for TOC entry 30 (OID 109648)
+-- Name: tmp_pcmn; Type: TABLE DATA; Schema: public; Owner: phpcompta
+--
INSERT INTO tmp_pcmn (pcm_val, pcm_lib, pcm_val_parent, pcm_country) VALUES (10, 'Capital ', 1, 'BE');
INSERT INTO tmp_pcmn (pcm_val, pcm_lib, pcm_val_parent, pcm_country) VALUES (100, ' Capital souscrit', 10, 'BE');
@@ -509,15 +518,15 @@ INSERT INTO tmp_pcmn (pcm_val, pcm_lib, pcm_val_parent, pcm_country) VALUES (604
--
--- Data for TOC entry 27 (OID 67436)
+-- Data for TOC entry 31 (OID 109655)
-- Name: version; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
-INSERT INTO "version" (val) VALUES (4);
+INSERT INTO "version" (val) VALUES (5);
--
--- Data for TOC entry 28 (OID 67445)
+-- Data for TOC entry 32 (OID 109661)
-- Name: parm_money; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -525,7 +534,7 @@ INSERT INTO parm_money (pm_id, pm_code, pm_rate) VALUES (1, 'EUR', 1);
--
--- Data for TOC entry 29 (OID 67449)
+-- Data for TOC entry 33 (OID 109664)
-- Name: parm_periode; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -558,7 +567,7 @@ INSERT INTO parm_periode (p_id, p_start, p_end, p_exercice, p_closed) VALUES (39
--
--- Data for TOC entry 30 (OID 67470)
+-- Data for TOC entry 34 (OID 109680)
-- Name: jrn_type; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -569,7 +578,7 @@ INSERT INTO jrn_type (jrn_type_id, jrn_desc) VALUES ('OD ', 'Op
--
--- Data for TOC entry 31 (OID 67476)
+-- Data for TOC entry 35 (OID 109685)
-- Name: jrn_def; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -580,14 +589,14 @@ INSERT INTO jrn_def (jrn_def_id, jrn_def_name, jrn_def_class_deb, jrn_def_class_
--
--- Data for TOC entry 32 (OID 67489)
+-- Data for TOC entry 36 (OID 109696)
-- Name: jrnx; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 33 (OID 67501)
+-- Data for TOC entry 37 (OID 109707)
-- Name: user_pref; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -597,28 +606,28 @@ INSERT INTO user_pref (pref_user, pref_periode) VALUES ('phpcompta', 1);
--
--- Data for TOC entry 34 (OID 67513)
+-- Data for TOC entry 38 (OID 109716)
-- Name: formdef; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 35 (OID 67520)
+-- Data for TOC entry 39 (OID 109722)
-- Name: form; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 36 (OID 67533)
+-- Data for TOC entry 40 (OID 109732)
-- Name: centralized; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 37 (OID 67547)
+-- Data for TOC entry 41 (OID 109743)
-- Name: user_sec_jrn; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -637,7 +646,7 @@ INSERT INTO user_sec_jrn (uj_id, uj_login, uj_jrn_id, uj_priv) VALUES (8, 'dany'
--
--- Data for TOC entry 38 (OID 67554)
+-- Data for TOC entry 42 (OID 109749)
-- Name: action; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -658,7 +667,7 @@ INSERT INTO "action" (ac_id, ac_description) VALUES (14, 'Achat');
--
--- Data for TOC entry 39 (OID 67560)
+-- Data for TOC entry 43 (OID 109754)
-- Name: user_sec_act; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -678,7 +687,7 @@ INSERT INTO user_sec_act (ua_id, ua_login, ua_act_id) VALUES (13, 'demo', 8);
--
--- Data for TOC entry 40 (OID 67570)
+-- Data for TOC entry 44 (OID 109762)
-- Name: jrn_action; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -695,7 +704,7 @@ INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_
--
--- Data for TOC entry 41 (OID 67578)
+-- Data for TOC entry 45 (OID 109769)
-- Name: tva_rate; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -706,7 +715,7 @@ INSERT INTO tva_rate (tva_id, tva_label, tva_rate, tva_comment, tva_poste) VALUE
--
--- Data for TOC entry 42 (OID 67600)
+-- Data for TOC entry 46 (OID 109785)
-- Name: fiche_def_ref; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -728,7 +737,7 @@ INSERT INTO fiche_def_ref (frd_id, frd_text, frd_class_base) VALUES (15, 'Autres
--
--- Data for TOC entry 43 (OID 67607)
+-- Data for TOC entry 47 (OID 109791)
-- Name: fiche_def; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -744,7 +753,7 @@ INSERT INTO fiche_def (fd_id, fd_class_base, fd_label, fd_create_account, frd_id
--
--- Data for TOC entry 44 (OID 67615)
+-- Data for TOC entry 48 (OID 109798)
-- Name: attr_def; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -770,7 +779,7 @@ INSERT INTO attr_def (ad_id, ad_text) VALUES (19, 'Gestion stock');
--
--- Data for TOC entry 45 (OID 67622)
+-- Data for TOC entry 49 (OID 109804)
-- Name: fiche; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -798,7 +807,7 @@ INSERT INTO fiche (f_id, fd_id) VALUES (21, 6);
--
--- Data for TOC entry 46 (OID 67626)
+-- Data for TOC entry 50 (OID 109807)
-- Name: jnt_fic_att_value; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -953,7 +962,7 @@ INSERT INTO jnt_fic_att_value (jft_id, f_id, ad_id) VALUES (148, 21, 19);
--
--- Data for TOC entry 47 (OID 67630)
+-- Data for TOC entry 51 (OID 109810)
-- Name: attr_value; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -1108,7 +1117,7 @@ INSERT INTO attr_value (jft_id, av_text) VALUES (148, '1');
--
--- Data for TOC entry 48 (OID 67636)
+-- Data for TOC entry 52 (OID 109815)
-- Name: jnt_fic_attr; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -1181,28 +1190,28 @@ INSERT INTO jnt_fic_attr (fd_id, ad_id) VALUES (9, 16);
--
--- Data for TOC entry 49 (OID 67642)
+-- Data for TOC entry 53 (OID 109819)
-- Name: jrn_rapt; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 50 (OID 67654)
+-- Data for TOC entry 54 (OID 109828)
-- Name: jrn; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 51 (OID 67663)
+-- Data for TOC entry 55 (OID 109836)
-- Name: stock_goods; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 52 (OID 67674)
+-- Data for TOC entry 56 (OID 109846)
-- Name: attr_min; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -1281,7 +1290,7 @@ INSERT INTO attr_min (frd_id, ad_id) VALUES (15, 9);
--
--- TOC entry 2 (OID 67439)
+-- TOC entry 2 (OID 109657)
-- Name: s_periode; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1289,7 +1298,7 @@ SELECT pg_catalog.setval('s_periode', 39, true);
--
--- TOC entry 3 (OID 67442)
+-- TOC entry 3 (OID 109659)
-- Name: s_currency; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1297,7 +1306,7 @@ SELECT pg_catalog.setval('s_currency', 1, true);
--
--- TOC entry 4 (OID 67458)
+-- TOC entry 4 (OID 109672)
-- Name: s_jrn_def; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1305,7 +1314,7 @@ SELECT pg_catalog.setval('s_jrn_def', 5, false);
--
--- TOC entry 5 (OID 67461)
+-- TOC entry 5 (OID 109674)
-- Name: s_grpt; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1313,7 +1322,7 @@ SELECT pg_catalog.setval('s_grpt', 1, false);
--
--- TOC entry 6 (OID 67464)
+-- TOC entry 6 (OID 109676)
-- Name: s_jrn_op; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1321,7 +1330,7 @@ SELECT pg_catalog.setval('s_jrn_op', 461, true);
--
--- TOC entry 7 (OID 67467)
+-- TOC entry 7 (OID 109678)
-- Name: s_jrn; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1329,7 +1338,7 @@ SELECT pg_catalog.setval('s_jrn', 139, true);
--
--- TOC entry 8 (OID 67486)
+-- TOC entry 8 (OID 109694)
-- Name: s_jrnx; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1337,7 +1346,7 @@ SELECT pg_catalog.setval('s_jrnx', 1, false);
--
--- TOC entry 9 (OID 67507)
+-- TOC entry 9 (OID 109712)
-- Name: s_formdef; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1345,7 +1354,7 @@ SELECT pg_catalog.setval('s_formdef', 1, false);
--
--- TOC entry 10 (OID 67510)
+-- TOC entry 10 (OID 109714)
-- Name: s_form; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1353,7 +1362,7 @@ SELECT pg_catalog.setval('s_form', 1, false);
--
--- TOC entry 11 (OID 67527)
+-- TOC entry 11 (OID 109728)
-- Name: s_idef; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1361,7 +1370,7 @@ SELECT pg_catalog.setval('s_idef', 2, true);
--
--- TOC entry 12 (OID 67530)
+-- TOC entry 12 (OID 109730)
-- Name: s_centralized; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1369,7 +1378,7 @@ SELECT pg_catalog.setval('s_centralized', 1, false);
--
--- TOC entry 13 (OID 67541)
+-- TOC entry 13 (OID 109739)
-- Name: s_user_jrn; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1377,7 +1386,7 @@ SELECT pg_catalog.setval('s_user_jrn', 12, true);
--
--- TOC entry 14 (OID 67544)
+-- TOC entry 14 (OID 109741)
-- Name: s_user_act; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1385,7 +1394,7 @@ SELECT pg_catalog.setval('s_user_act', 15, true);
--
--- TOC entry 15 (OID 67567)
+-- TOC entry 15 (OID 109760)
-- Name: s_jrnaction; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1393,7 +1402,7 @@ SELECT pg_catalog.setval('s_jrnaction', 7, true);
--
--- TOC entry 16 (OID 67585)
+-- TOC entry 16 (OID 109775)
-- Name: s_fiche; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1401,7 +1410,7 @@ SELECT pg_catalog.setval('s_fiche', 21, true);
--
--- TOC entry 17 (OID 67588)
+-- TOC entry 17 (OID 109777)
-- Name: s_fiche_def_ref; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1409,7 +1418,7 @@ SELECT pg_catalog.setval('s_fiche_def_ref', 14, true);
--
--- TOC entry 18 (OID 67591)
+-- TOC entry 18 (OID 109779)
-- Name: s_fdef; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1417,7 +1426,7 @@ SELECT pg_catalog.setval('s_fdef', 10, true);
--
--- TOC entry 19 (OID 67594)
+-- TOC entry 19 (OID 109781)
-- Name: s_attr_def; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1425,7 +1434,7 @@ SELECT pg_catalog.setval('s_attr_def', 19, true);
--
--- TOC entry 20 (OID 67597)
+-- TOC entry 20 (OID 109783)
-- Name: s_jnt_fic_att_value; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1433,7 +1442,7 @@ SELECT pg_catalog.setval('s_jnt_fic_att_value', 148, true);
--
--- TOC entry 21 (OID 67639)
+-- TOC entry 21 (OID 109817)
-- Name: s_jrn_rapt; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1441,7 +1450,7 @@ SELECT pg_catalog.setval('s_jrn_rapt', 13, true);
--
--- TOC entry 22 (OID 67651)
+-- TOC entry 22 (OID 109826)
-- Name: s_stock_goods; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1449,7 +1458,7 @@ SELECT pg_catalog.setval('s_stock_goods', 24, true);
--
--- TOC entry 23 (OID 73387)
+-- TOC entry 23 (OID 111122)
-- Name: s_central; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1457,7 +1466,7 @@ SELECT pg_catalog.setval('s_central', 1, false);
--
--- TOC entry 24 (OID 73390)
+-- TOC entry 24 (OID 111133)
-- Name: s_central_order; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1465,10 +1474,42 @@ SELECT pg_catalog.setval('s_central_order', 1, false);
--
--- TOC entry 25 (OID 73392)
+-- TOC entry 25 (OID 111138)
-- Name: s_internal; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
SELECT pg_catalog.setval('s_internal', 1, false);
+--
+-- TOC entry 26 (OID 111144)
+-- Name: s_jrn_4; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
+--
+
+SELECT pg_catalog.setval('s_jrn_4', 1, false);
+
+
+--
+-- TOC entry 27 (OID 111147)
+-- Name: s_jrn_3; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
+--
+
+SELECT pg_catalog.setval('s_jrn_3', 1, false);
+
+
+--
+-- TOC entry 28 (OID 111150)
+-- Name: s_jrn_2; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
+--
+
+SELECT pg_catalog.setval('s_jrn_2', 1, false);
+
+
+--
+-- TOC entry 29 (OID 111153)
+-- Name: s_jrn_1; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
+--
+
+SELECT pg_catalog.setval('s_jrn_1', 1, false);
+
+
diff --git a/html/admin/sql/dossier1/schema.sql b/html/admin/sql/dossier1/schema.sql
index 2d780825a..294637a83 100644
--- a/html/admin/sql/dossier1/schema.sql
+++ b/html/admin/sql/dossier1/schema.sql
@@ -1,6 +1,6 @@
SET client_encoding = 'LATIN1';
SET check_function_bodies = false;
-
+SET search_path = public, pg_catalog;
CREATE TABLE tmp_pcmn (
pcm_val integer NOT NULL,
pcm_lib text,
@@ -321,6 +321,30 @@ CREATE SEQUENCE s_internal
NO MAXVALUE
NO MINVALUE
CACHE 1;
+CREATE SEQUENCE s_jrn_4
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+CREATE SEQUENCE s_jrn_3
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+CREATE SEQUENCE s_jrn_2
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+CREATE SEQUENCE s_jrn_1
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
CREATE UNIQUE INDEX x_act ON "action" USING btree (ac_description);
CREATE UNIQUE INDEX x_usr_jrn ON user_sec_jrn USING btree (uj_login, uj_jrn_id);
CREATE INDEX fk_centralized_c_jrn_def ON centralized USING btree (c_jrn_def);
diff --git a/html/admin/sql/dossier1/sequence.sql b/html/admin/sql/dossier1/sequence.sql
index 7c70ef840..c4f1b5445 100644
--- a/html/admin/sql/dossier1/sequence.sql
+++ b/html/admin/sql/dossier1/sequence.sql
@@ -127,3 +127,27 @@ CREATE SEQUENCE s_internal
NO MAXVALUE
NO MINVALUE
CACHE 1;
+CREATE SEQUENCE s_jrn_4
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+CREATE SEQUENCE s_jrn_3
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+CREATE SEQUENCE s_jrn_2
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+CREATE SEQUENCE s_jrn_1
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
diff --git a/html/admin/sql/mod1/data.sql b/html/admin/sql/mod1/data.sql
index 8d396b837..359dd4ee3 100644
--- a/html/admin/sql/mod1/data.sql
+++ b/html/admin/sql/mod1/data.sql
@@ -8,7 +8,7 @@ SET check_function_bodies = false;
SET search_path = public, pg_catalog;
--
--- Data for TOC entry 31 (OID 70105)
+-- Data for TOC entry 31 (OID 108273)
-- Name: tmp_pcmn; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -518,15 +518,15 @@ INSERT INTO tmp_pcmn (pcm_val, pcm_lib, pcm_val_parent, pcm_country) VALUES (101
--
--- Data for TOC entry 32 (OID 70113)
+-- Data for TOC entry 32 (OID 108280)
-- Name: version; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
-INSERT INTO "version" (val) VALUES (4);
+INSERT INTO "version" (val) VALUES (5);
--
--- Data for TOC entry 33 (OID 70122)
+-- Data for TOC entry 33 (OID 108286)
-- Name: parm_money; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -534,7 +534,7 @@ INSERT INTO parm_money (pm_id, pm_code, pm_rate) VALUES (1, 'EUR', 1);
--
--- Data for TOC entry 34 (OID 70126)
+-- Data for TOC entry 34 (OID 108289)
-- Name: parm_periode; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -567,7 +567,7 @@ INSERT INTO parm_periode (p_id, p_start, p_end, p_exercice, p_closed) VALUES (52
--
--- Data for TOC entry 35 (OID 70147)
+-- Data for TOC entry 35 (OID 108305)
-- Name: jrn_type; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -578,7 +578,7 @@ INSERT INTO jrn_type (jrn_type_id, jrn_desc) VALUES ('OD ', 'Op
--
--- Data for TOC entry 36 (OID 70153)
+-- Data for TOC entry 36 (OID 108310)
-- Name: jrn_def; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -589,14 +589,14 @@ INSERT INTO jrn_def (jrn_def_id, jrn_def_name, jrn_def_class_deb, jrn_def_class_
--
--- Data for TOC entry 37 (OID 70166)
+-- Data for TOC entry 37 (OID 108321)
-- Name: jrnx; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 38 (OID 70178)
+-- Data for TOC entry 38 (OID 108332)
-- Name: user_pref; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -604,35 +604,35 @@ INSERT INTO user_pref (pref_user, pref_periode) VALUES ('dany', 30);
--
--- Data for TOC entry 39 (OID 70190)
+-- Data for TOC entry 39 (OID 108341)
-- Name: formdef; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 40 (OID 70197)
+-- Data for TOC entry 40 (OID 108347)
-- Name: form; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 41 (OID 70213)
+-- Data for TOC entry 41 (OID 108359)
-- Name: centralized; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 42 (OID 70227)
+-- Data for TOC entry 42 (OID 108370)
-- Name: user_sec_jrn; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 43 (OID 70234)
+-- Data for TOC entry 43 (OID 108376)
-- Name: action; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -653,14 +653,14 @@ INSERT INTO "action" (ac_id, ac_description) VALUES (15, 'Fiche
--
--- Data for TOC entry 44 (OID 70240)
+-- Data for TOC entry 44 (OID 108381)
-- Name: user_sec_act; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 45 (OID 70250)
+-- Data for TOC entry 45 (OID 108389)
-- Name: jrn_action; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -677,7 +677,7 @@ INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_
--
--- Data for TOC entry 46 (OID 70258)
+-- Data for TOC entry 46 (OID 108396)
-- Name: tva_rate; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -688,7 +688,7 @@ INSERT INTO tva_rate (tva_id, tva_label, tva_rate, tva_comment, tva_poste) VALUE
--
--- Data for TOC entry 47 (OID 70280)
+-- Data for TOC entry 47 (OID 108412)
-- Name: fiche_def_ref; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -710,7 +710,7 @@ INSERT INTO fiche_def_ref (frd_id, frd_text, frd_class_base) VALUES (15, 'Autres
--
--- Data for TOC entry 48 (OID 70287)
+-- Data for TOC entry 48 (OID 108418)
-- Name: fiche_def; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -723,7 +723,7 @@ INSERT INTO fiche_def (fd_id, fd_class_base, fd_label, fd_create_account, frd_id
--
--- Data for TOC entry 49 (OID 70295)
+-- Data for TOC entry 49 (OID 108425)
-- Name: attr_def; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -749,7 +749,7 @@ INSERT INTO attr_def (ad_id, ad_text) VALUES (19, 'Gestion stock');
--
--- Data for TOC entry 50 (OID 70302)
+-- Data for TOC entry 50 (OID 108431)
-- Name: attr_min; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -828,7 +828,7 @@ INSERT INTO attr_min (frd_id, ad_id) VALUES (15, 9);
--
--- Data for TOC entry 51 (OID 70305)
+-- Data for TOC entry 51 (OID 108433)
-- Name: fiche; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -855,7 +855,7 @@ INSERT INTO fiche (f_id, fd_id) VALUES (20, 6);
--
--- Data for TOC entry 52 (OID 70309)
+-- Data for TOC entry 52 (OID 108436)
-- Name: jnt_fic_att_value; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -1007,7 +1007,7 @@ INSERT INTO jnt_fic_att_value (jft_id, f_id, ad_id) VALUES (145, 20, 19);
--
--- Data for TOC entry 53 (OID 70313)
+-- Data for TOC entry 53 (OID 108439)
-- Name: attr_value; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -1159,7 +1159,7 @@ INSERT INTO attr_value (jft_id, av_text) VALUES (145, '');
--
--- Data for TOC entry 54 (OID 70319)
+-- Data for TOC entry 54 (OID 108444)
-- Name: jnt_fic_attr; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -1211,28 +1211,28 @@ INSERT INTO jnt_fic_attr (fd_id, ad_id) VALUES (6, 19);
--
--- Data for TOC entry 55 (OID 70333)
+-- Data for TOC entry 55 (OID 108454)
-- Name: jrn_rapt; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 56 (OID 70337)
+-- Data for TOC entry 56 (OID 108457)
-- Name: jrn; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 57 (OID 70346)
+-- Data for TOC entry 57 (OID 108465)
-- Name: stock_goods; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- TOC entry 2 (OID 70116)
+-- TOC entry 2 (OID 108282)
-- Name: s_periode; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1240,7 +1240,7 @@ SELECT pg_catalog.setval('s_periode', 52, true);
--
--- TOC entry 3 (OID 70119)
+-- TOC entry 3 (OID 108284)
-- Name: s_currency; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1248,7 +1248,7 @@ SELECT pg_catalog.setval('s_currency', 1, true);
--
--- TOC entry 4 (OID 70135)
+-- TOC entry 4 (OID 108297)
-- Name: s_jrn_def; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1256,7 +1256,7 @@ SELECT pg_catalog.setval('s_jrn_def', 5, false);
--
--- TOC entry 5 (OID 70138)
+-- TOC entry 5 (OID 108299)
-- Name: s_grpt; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1264,7 +1264,7 @@ SELECT pg_catalog.setval('s_grpt', 1, false);
--
--- TOC entry 6 (OID 70141)
+-- TOC entry 6 (OID 108301)
-- Name: s_jrn_op; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1272,7 +1272,7 @@ SELECT pg_catalog.setval('s_jrn_op', 1, false);
--
--- TOC entry 7 (OID 70144)
+-- TOC entry 7 (OID 108303)
-- Name: s_jrn; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1280,7 +1280,7 @@ SELECT pg_catalog.setval('s_jrn', 1, false);
--
--- TOC entry 8 (OID 70163)
+-- TOC entry 8 (OID 108319)
-- Name: s_jrnx; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1288,7 +1288,7 @@ SELECT pg_catalog.setval('s_jrnx', 1, false);
--
--- TOC entry 9 (OID 70184)
+-- TOC entry 9 (OID 108337)
-- Name: s_formdef; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1296,7 +1296,7 @@ SELECT pg_catalog.setval('s_formdef', 1, false);
--
--- TOC entry 10 (OID 70187)
+-- TOC entry 10 (OID 108339)
-- Name: s_form; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1304,7 +1304,7 @@ SELECT pg_catalog.setval('s_form', 1, false);
--
--- TOC entry 11 (OID 70204)
+-- TOC entry 11 (OID 108353)
-- Name: s_isup; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1312,7 +1312,7 @@ SELECT pg_catalog.setval('s_isup', 1, false);
--
--- TOC entry 12 (OID 70207)
+-- TOC entry 12 (OID 108355)
-- Name: s_idef; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1320,7 +1320,7 @@ SELECT pg_catalog.setval('s_idef', 1, false);
--
--- TOC entry 13 (OID 70210)
+-- TOC entry 13 (OID 108357)
-- Name: s_centralized; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1328,7 +1328,7 @@ SELECT pg_catalog.setval('s_centralized', 1, false);
--
--- TOC entry 14 (OID 70221)
+-- TOC entry 14 (OID 108366)
-- Name: s_user_jrn; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1336,7 +1336,7 @@ SELECT pg_catalog.setval('s_user_jrn', 1, false);
--
--- TOC entry 15 (OID 70224)
+-- TOC entry 15 (OID 108368)
-- Name: s_user_act; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1344,7 +1344,7 @@ SELECT pg_catalog.setval('s_user_act', 1, false);
--
--- TOC entry 16 (OID 70247)
+-- TOC entry 16 (OID 108387)
-- Name: s_jrnaction; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1352,7 +1352,7 @@ SELECT pg_catalog.setval('s_jrnaction', 5, true);
--
--- TOC entry 17 (OID 70265)
+-- TOC entry 17 (OID 108402)
-- Name: s_fiche; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1360,7 +1360,7 @@ SELECT pg_catalog.setval('s_fiche', 20, true);
--
--- TOC entry 18 (OID 70268)
+-- TOC entry 18 (OID 108404)
-- Name: s_fiche_def_ref; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1368,7 +1368,7 @@ SELECT pg_catalog.setval('s_fiche_def_ref', 1, false);
--
--- TOC entry 19 (OID 70271)
+-- TOC entry 19 (OID 108406)
-- Name: s_fdef; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1376,7 +1376,7 @@ SELECT pg_catalog.setval('s_fdef', 6, true);
--
--- TOC entry 20 (OID 70274)
+-- TOC entry 20 (OID 108408)
-- Name: s_attr_def; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1384,7 +1384,7 @@ SELECT pg_catalog.setval('s_attr_def', 1, false);
--
--- TOC entry 21 (OID 70277)
+-- TOC entry 21 (OID 108410)
-- Name: s_jnt_fic_att_value; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1392,7 +1392,7 @@ SELECT pg_catalog.setval('s_jnt_fic_att_value', 145, true);
--
--- TOC entry 22 (OID 70327)
+-- TOC entry 22 (OID 108450)
-- Name: s_stock_goods; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1400,7 +1400,7 @@ SELECT pg_catalog.setval('s_stock_goods', 1, false);
--
--- TOC entry 23 (OID 70330)
+-- TOC entry 23 (OID 108452)
-- Name: s_jrn_rapt; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1408,47 +1408,7 @@ SELECT pg_catalog.setval('s_jrn_rapt', 1, false);
--
--- TOC entry 24 (OID 70357)
--- Name: s_internal; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
---
-
-SELECT pg_catalog.setval('s_internal', 1, false);
-
-
---
--- TOC entry 25 (OID 70360)
--- Name: s_jrn_4; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
---
-
-SELECT pg_catalog.setval('s_jrn_4', 1, false);
-
-
---
--- TOC entry 26 (OID 70363)
--- Name: s_jrn_1; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
---
-
-SELECT pg_catalog.setval('s_jrn_1', 1, false);
-
-
---
--- TOC entry 27 (OID 70366)
--- Name: s_jrn_3; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
---
-
-SELECT pg_catalog.setval('s_jrn_3', 1, false);
-
-
---
--- TOC entry 28 (OID 70369)
--- Name: s_jrn_2; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
---
-
-SELECT pg_catalog.setval('s_jrn_2', 1, false);
-
-
---
--- TOC entry 29 (OID 73394)
+-- TOC entry 24 (OID 111182)
-- Name: s_central; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1456,10 +1416,50 @@ SELECT pg_catalog.setval('s_central', 1, false);
--
--- TOC entry 30 (OID 73396)
+-- TOC entry 25 (OID 111193)
-- Name: s_central_order; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
SELECT pg_catalog.setval('s_central_order', 1, false);
+--
+-- TOC entry 26 (OID 111198)
+-- Name: s_internal; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
+--
+
+SELECT pg_catalog.setval('s_internal', 1, false);
+
+
+--
+-- TOC entry 27 (OID 111204)
+-- Name: s_jrn_4; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
+--
+
+SELECT pg_catalog.setval('s_jrn_4', 1, false);
+
+
+--
+-- TOC entry 28 (OID 111207)
+-- Name: s_jrn_1; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
+--
+
+SELECT pg_catalog.setval('s_jrn_1', 1, false);
+
+
+--
+-- TOC entry 29 (OID 111210)
+-- Name: s_jrn_3; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
+--
+
+SELECT pg_catalog.setval('s_jrn_3', 1, false);
+
+
+--
+-- TOC entry 30 (OID 111213)
+-- Name: s_jrn_2; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
+--
+
+SELECT pg_catalog.setval('s_jrn_2', 1, false);
+
+
diff --git a/html/admin/sql/mod1/schema.sql b/html/admin/sql/mod1/schema.sql
index 2c07ef3ac..140a98eb9 100644
--- a/html/admin/sql/mod1/schema.sql
+++ b/html/admin/sql/mod1/schema.sql
@@ -12,6 +12,15 @@ SET check_function_bodies = false;
--
+
+
+SET search_path = public, pg_catalog;
+
+--
+-- TOC entry 34 (OID 108273)
+-- Name: tmp_pcmn; Type: TABLE; Schema: public; Owner: phpcompta
+--
+
CREATE TABLE tmp_pcmn (
pcm_val integer NOT NULL,
pcm_lib text,
@@ -21,7 +30,7 @@ CREATE TABLE tmp_pcmn (
--
--- TOC entry 36 (OID 70113)
+-- TOC entry 36 (OID 108280)
-- Name: version; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -31,7 +40,7 @@ CREATE TABLE "version" (
--
--- TOC entry 5 (OID 70116)
+-- TOC entry 5 (OID 108282)
-- Name: s_periode; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -43,7 +52,7 @@ CREATE SEQUENCE s_periode
--
--- TOC entry 6 (OID 70119)
+-- TOC entry 6 (OID 108284)
-- Name: s_currency; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -55,7 +64,7 @@ CREATE SEQUENCE s_currency
--
--- TOC entry 37 (OID 70122)
+-- TOC entry 37 (OID 108286)
-- Name: parm_money; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -67,7 +76,7 @@ CREATE TABLE parm_money (
--
--- TOC entry 39 (OID 70126)
+-- TOC entry 39 (OID 108289)
-- Name: parm_periode; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -81,7 +90,7 @@ CREATE TABLE parm_periode (
--
--- TOC entry 7 (OID 70135)
+-- TOC entry 7 (OID 108297)
-- Name: s_jrn_def; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -94,7 +103,7 @@ CREATE SEQUENCE s_jrn_def
--
--- TOC entry 8 (OID 70138)
+-- TOC entry 8 (OID 108299)
-- Name: s_grpt; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -107,7 +116,7 @@ CREATE SEQUENCE s_grpt
--
--- TOC entry 9 (OID 70141)
+-- TOC entry 9 (OID 108301)
-- Name: s_jrn_op; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -120,7 +129,7 @@ CREATE SEQUENCE s_jrn_op
--
--- TOC entry 10 (OID 70144)
+-- TOC entry 10 (OID 108303)
-- Name: s_jrn; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -133,7 +142,7 @@ CREATE SEQUENCE s_jrn
--
--- TOC entry 41 (OID 70147)
+-- TOC entry 41 (OID 108305)
-- Name: jrn_type; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -144,7 +153,7 @@ CREATE TABLE jrn_type (
--
--- TOC entry 43 (OID 70153)
+-- TOC entry 43 (OID 108310)
-- Name: jrn_def; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -165,7 +174,7 @@ CREATE TABLE jrn_def (
--
--- TOC entry 11 (OID 70163)
+-- TOC entry 11 (OID 108319)
-- Name: s_jrnx; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -178,7 +187,7 @@ CREATE SEQUENCE s_jrnx
--
--- TOC entry 45 (OID 70166)
+-- TOC entry 45 (OID 108321)
-- Name: jrnx; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -201,7 +210,7 @@ CREATE TABLE jrnx (
--
--- TOC entry 47 (OID 70178)
+-- TOC entry 47 (OID 108332)
-- Name: user_pref; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -212,7 +221,7 @@ CREATE TABLE user_pref (
--
--- TOC entry 12 (OID 70184)
+-- TOC entry 12 (OID 108337)
-- Name: s_formdef; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -225,7 +234,7 @@ CREATE SEQUENCE s_formdef
--
--- TOC entry 13 (OID 70187)
+-- TOC entry 13 (OID 108339)
-- Name: s_form; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -238,7 +247,7 @@ CREATE SEQUENCE s_form
--
--- TOC entry 48 (OID 70190)
+-- TOC entry 48 (OID 108341)
-- Name: formdef; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -249,7 +258,7 @@ CREATE TABLE formdef (
--
--- TOC entry 49 (OID 70197)
+-- TOC entry 49 (OID 108347)
-- Name: form; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -263,7 +272,7 @@ CREATE TABLE form (
--
--- TOC entry 14 (OID 70204)
+-- TOC entry 14 (OID 108353)
-- Name: s_isup; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -276,7 +285,7 @@ CREATE SEQUENCE s_isup
--
--- TOC entry 15 (OID 70207)
+-- TOC entry 15 (OID 108355)
-- Name: s_idef; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -289,7 +298,7 @@ CREATE SEQUENCE s_idef
--
--- TOC entry 16 (OID 70210)
+-- TOC entry 16 (OID 108357)
-- Name: s_centralized; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -302,7 +311,7 @@ CREATE SEQUENCE s_centralized
--
--- TOC entry 51 (OID 70213)
+-- TOC entry 51 (OID 108359)
-- Name: centralized; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -325,7 +334,7 @@ CREATE TABLE centralized (
--
--- TOC entry 17 (OID 70221)
+-- TOC entry 17 (OID 108366)
-- Name: s_user_jrn; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -338,7 +347,7 @@ CREATE SEQUENCE s_user_jrn
--
--- TOC entry 18 (OID 70224)
+-- TOC entry 18 (OID 108368)
-- Name: s_user_act; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -351,7 +360,7 @@ CREATE SEQUENCE s_user_act
--
--- TOC entry 53 (OID 70227)
+-- TOC entry 53 (OID 108370)
-- Name: user_sec_jrn; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -364,7 +373,7 @@ CREATE TABLE user_sec_jrn (
--
--- TOC entry 54 (OID 70234)
+-- TOC entry 54 (OID 108376)
-- Name: action; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -375,7 +384,7 @@ CREATE TABLE "action" (
--
--- TOC entry 56 (OID 70240)
+-- TOC entry 56 (OID 108381)
-- Name: user_sec_act; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -387,7 +396,7 @@ CREATE TABLE user_sec_act (
--
--- TOC entry 19 (OID 70247)
+-- TOC entry 19 (OID 108387)
-- Name: s_jrnaction; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -399,7 +408,7 @@ CREATE SEQUENCE s_jrnaction
--
--- TOC entry 57 (OID 70250)
+-- TOC entry 57 (OID 108389)
-- Name: jrn_action; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -415,7 +424,7 @@ CREATE TABLE jrn_action (
--
--- TOC entry 59 (OID 70258)
+-- TOC entry 59 (OID 108396)
-- Name: tva_rate; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -429,7 +438,7 @@ CREATE TABLE tva_rate (
--
--- TOC entry 20 (OID 70265)
+-- TOC entry 20 (OID 108402)
-- Name: s_fiche; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -441,7 +450,7 @@ CREATE SEQUENCE s_fiche
--
--- TOC entry 21 (OID 70268)
+-- TOC entry 21 (OID 108404)
-- Name: s_fiche_def_ref; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -454,7 +463,7 @@ CREATE SEQUENCE s_fiche_def_ref
--
--- TOC entry 22 (OID 70271)
+-- TOC entry 22 (OID 108406)
-- Name: s_fdef; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -466,7 +475,7 @@ CREATE SEQUENCE s_fdef
--
--- TOC entry 23 (OID 70274)
+-- TOC entry 23 (OID 108408)
-- Name: s_attr_def; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -479,7 +488,7 @@ CREATE SEQUENCE s_attr_def
--
--- TOC entry 24 (OID 70277)
+-- TOC entry 24 (OID 108410)
-- Name: s_jnt_fic_att_value; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -491,7 +500,7 @@ CREATE SEQUENCE s_jnt_fic_att_value
--
--- TOC entry 61 (OID 70280)
+-- TOC entry 61 (OID 108412)
-- Name: fiche_def_ref; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -503,7 +512,7 @@ CREATE TABLE fiche_def_ref (
--
--- TOC entry 63 (OID 70287)
+-- TOC entry 63 (OID 108418)
-- Name: fiche_def; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -517,7 +526,7 @@ CREATE TABLE fiche_def (
--
--- TOC entry 65 (OID 70295)
+-- TOC entry 65 (OID 108425)
-- Name: attr_def; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -528,7 +537,7 @@ CREATE TABLE attr_def (
--
--- TOC entry 67 (OID 70302)
+-- TOC entry 67 (OID 108431)
-- Name: attr_min; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -539,7 +548,7 @@ CREATE TABLE attr_min (
--
--- TOC entry 69 (OID 70305)
+-- TOC entry 69 (OID 108433)
-- Name: fiche; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -550,7 +559,7 @@ CREATE TABLE fiche (
--
--- TOC entry 71 (OID 70309)
+-- TOC entry 71 (OID 108436)
-- Name: jnt_fic_att_value; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -562,7 +571,7 @@ CREATE TABLE jnt_fic_att_value (
--
--- TOC entry 73 (OID 70313)
+-- TOC entry 73 (OID 108439)
-- Name: attr_value; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -573,7 +582,7 @@ CREATE TABLE attr_value (
--
--- TOC entry 74 (OID 70319)
+-- TOC entry 74 (OID 108444)
-- Name: jnt_fic_attr; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -584,7 +593,7 @@ CREATE TABLE jnt_fic_attr (
--
--- TOC entry 76 (OID 70324)
+-- TOC entry 76 (OID 108448)
-- Name: vw_fiche_attr; Type: VIEW; Schema: public; Owner: phpcompta
--
@@ -593,7 +602,7 @@ CREATE VIEW vw_fiche_attr AS
--
--- TOC entry 25 (OID 70327)
+-- TOC entry 25 (OID 108450)
-- Name: s_stock_goods; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -606,7 +615,7 @@ CREATE SEQUENCE s_stock_goods
--
--- TOC entry 26 (OID 70330)
+-- TOC entry 26 (OID 108452)
-- Name: s_jrn_rapt; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -619,7 +628,7 @@ CREATE SEQUENCE s_jrn_rapt
--
--- TOC entry 77 (OID 70333)
+-- TOC entry 77 (OID 108454)
-- Name: jrn_rapt; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -631,7 +640,7 @@ CREATE TABLE jrn_rapt (
--
--- TOC entry 79 (OID 70337)
+-- TOC entry 79 (OID 108457)
-- Name: jrn; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -656,7 +665,7 @@ CREATE TABLE jrn (
--
--- TOC entry 81 (OID 70346)
+-- TOC entry 81 (OID 108465)
-- Name: stock_goods; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -675,72 +684,7 @@ CREATE TABLE stock_goods (
--
--- TOC entry 27 (OID 70357)
--- Name: s_internal; Type: SEQUENCE; Schema: public; Owner: phpcompta
---
-
-CREATE SEQUENCE s_internal
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
-
---
--- TOC entry 28 (OID 70360)
--- Name: s_jrn_4; Type: SEQUENCE; Schema: public; Owner: phpcompta
---
-
-CREATE SEQUENCE s_jrn_4
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
-
---
--- TOC entry 29 (OID 70363)
--- Name: s_jrn_1; Type: SEQUENCE; Schema: public; Owner: phpcompta
---
-
-CREATE SEQUENCE s_jrn_1
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
-
---
--- TOC entry 30 (OID 70366)
--- Name: s_jrn_3; Type: SEQUENCE; Schema: public; Owner: phpcompta
---
-
-CREATE SEQUENCE s_jrn_3
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
-
---
--- TOC entry 31 (OID 70369)
--- Name: s_jrn_2; Type: SEQUENCE; Schema: public; Owner: phpcompta
---
-
-CREATE SEQUENCE s_jrn_2
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
-
---
--- TOC entry 32 (OID 73394)
+-- TOC entry 27 (OID 111182)
-- Name: s_central; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -753,7 +697,7 @@ CREATE SEQUENCE s_central
--
--- TOC entry 33 (OID 73396)
+-- TOC entry 28 (OID 111193)
-- Name: s_central_order; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -766,7 +710,72 @@ CREATE SEQUENCE s_central_order
--
--- TOC entry 99 (OID 70372)
+-- TOC entry 29 (OID 111198)
+-- Name: s_internal; Type: SEQUENCE; Schema: public; Owner: phpcompta
+--
+
+CREATE SEQUENCE s_internal
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+
+
+--
+-- TOC entry 30 (OID 111204)
+-- Name: s_jrn_4; Type: SEQUENCE; Schema: public; Owner: phpcompta
+--
+
+CREATE SEQUENCE s_jrn_4
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+
+
+--
+-- TOC entry 31 (OID 111207)
+-- Name: s_jrn_1; Type: SEQUENCE; Schema: public; Owner: phpcompta
+--
+
+CREATE SEQUENCE s_jrn_1
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+
+
+--
+-- TOC entry 32 (OID 111210)
+-- Name: s_jrn_3; Type: SEQUENCE; Schema: public; Owner: phpcompta
+--
+
+CREATE SEQUENCE s_jrn_3
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+
+
+--
+-- TOC entry 33 (OID 111213)
+-- Name: s_jrn_2; Type: SEQUENCE; Schema: public; Owner: phpcompta
+--
+
+CREATE SEQUENCE s_jrn_2
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+
+
+--
+-- TOC entry 99 (OID 109518)
-- Name: x_act; Type: INDEX; Schema: public; Owner: phpcompta
--
@@ -774,7 +783,7 @@ CREATE UNIQUE INDEX x_act ON "action" USING btree (ac_description);
--
--- TOC entry 97 (OID 70374)
+-- TOC entry 97 (OID 109519)
-- Name: x_usr_jrn; Type: INDEX; Schema: public; Owner: phpcompta
--
@@ -782,7 +791,7 @@ CREATE UNIQUE INDEX x_usr_jrn ON user_sec_jrn USING btree (uj_login, uj_jrn_id);
--
--- TOC entry 109 (OID 70376)
+-- TOC entry 109 (OID 109520)
-- Name: x_jrn_jr_id; Type: INDEX; Schema: public; Owner: phpcompta
--
@@ -790,7 +799,7 @@ CREATE UNIQUE INDEX x_jrn_jr_id ON jrn USING btree (jr_id);
--
--- TOC entry 111 (OID 70378)
+-- TOC entry 111 (OID 109521)
-- Name: fk_stock_goods_j_id; Type: INDEX; Schema: public; Owner: phpcompta
--
@@ -798,7 +807,7 @@ CREATE INDEX fk_stock_goods_j_id ON stock_goods USING btree (j_id);
--
--- TOC entry 110 (OID 70380)
+-- TOC entry 110 (OID 109522)
-- Name: fk_stock_goods_f_id; Type: INDEX; Schema: public; Owner: phpcompta
--
@@ -806,7 +815,7 @@ CREATE INDEX fk_stock_goods_f_id ON stock_goods USING btree (f_id);
--
--- TOC entry 91 (OID 70382)
+-- TOC entry 91 (OID 111185)
-- Name: x_poste; Type: INDEX; Schema: public; Owner: phpcompta
--
@@ -814,7 +823,7 @@ CREATE INDEX x_poste ON jrnx USING btree (j_poste);
--
--- TOC entry 83 (OID 70384)
+-- TOC entry 83 (OID 109523)
-- Name: tmp_pcmn_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -823,7 +832,7 @@ ALTER TABLE ONLY tmp_pcmn
--
--- TOC entry 84 (OID 70387)
+-- TOC entry 84 (OID 109525)
-- Name: parm_money_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -832,7 +841,7 @@ ALTER TABLE ONLY parm_money
--
--- TOC entry 86 (OID 70390)
+-- TOC entry 86 (OID 109527)
-- Name: parm_periode_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -841,7 +850,7 @@ ALTER TABLE ONLY parm_periode
--
--- TOC entry 85 (OID 70393)
+-- TOC entry 85 (OID 109529)
-- Name: parm_periode_p_start_key; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -850,7 +859,7 @@ ALTER TABLE ONLY parm_periode
--
--- TOC entry 87 (OID 70396)
+-- TOC entry 87 (OID 109531)
-- Name: jrn_type_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -859,7 +868,7 @@ ALTER TABLE ONLY jrn_type
--
--- TOC entry 89 (OID 70399)
+-- TOC entry 89 (OID 109533)
-- Name: jrn_def_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -868,7 +877,7 @@ ALTER TABLE ONLY jrn_def
--
--- TOC entry 88 (OID 70402)
+-- TOC entry 88 (OID 109535)
-- Name: jrn_def_jrn_def_name_key; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -877,7 +886,7 @@ ALTER TABLE ONLY jrn_def
--
--- TOC entry 90 (OID 70410)
+-- TOC entry 90 (OID 109541)
-- Name: jrnx_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -886,7 +895,7 @@ ALTER TABLE ONLY jrnx
--
--- TOC entry 92 (OID 70423)
+-- TOC entry 92 (OID 109551)
-- Name: user_pref_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -895,7 +904,7 @@ ALTER TABLE ONLY user_pref
--
--- TOC entry 93 (OID 70426)
+-- TOC entry 93 (OID 109553)
-- Name: formdef_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -904,7 +913,7 @@ ALTER TABLE ONLY formdef
--
--- TOC entry 94 (OID 70429)
+-- TOC entry 94 (OID 109555)
-- Name: form_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -913,7 +922,7 @@ ALTER TABLE ONLY form
--
--- TOC entry 95 (OID 70437)
+-- TOC entry 95 (OID 109561)
-- Name: centralized_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -922,7 +931,7 @@ ALTER TABLE ONLY centralized
--
--- TOC entry 96 (OID 70450)
+-- TOC entry 96 (OID 109571)
-- Name: user_sec_jrn_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -931,7 +940,7 @@ ALTER TABLE ONLY user_sec_jrn
--
--- TOC entry 98 (OID 70458)
+-- TOC entry 98 (OID 109577)
-- Name: action_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -940,7 +949,7 @@ ALTER TABLE ONLY "action"
--
--- TOC entry 100 (OID 70461)
+-- TOC entry 100 (OID 109579)
-- Name: user_sec_act_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -949,7 +958,7 @@ ALTER TABLE ONLY user_sec_act
--
--- TOC entry 101 (OID 70469)
+-- TOC entry 101 (OID 109585)
-- Name: jrn_action_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -958,7 +967,7 @@ ALTER TABLE ONLY jrn_action
--
--- TOC entry 102 (OID 70477)
+-- TOC entry 102 (OID 109591)
-- Name: fiche_def_ref_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -967,7 +976,7 @@ ALTER TABLE ONLY fiche_def_ref
--
--- TOC entry 103 (OID 70480)
+-- TOC entry 103 (OID 109593)
-- Name: fiche_def_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -976,7 +985,7 @@ ALTER TABLE ONLY fiche_def
--
--- TOC entry 104 (OID 70488)
+-- TOC entry 104 (OID 109599)
-- Name: attr_def_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -985,7 +994,7 @@ ALTER TABLE ONLY attr_def
--
--- TOC entry 105 (OID 70501)
+-- TOC entry 105 (OID 109609)
-- Name: fiche_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -994,7 +1003,7 @@ ALTER TABLE ONLY fiche
--
--- TOC entry 106 (OID 70509)
+-- TOC entry 106 (OID 109615)
-- Name: jnt_fic_att_value_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1003,7 +1012,7 @@ ALTER TABLE ONLY jnt_fic_att_value
--
--- TOC entry 107 (OID 70537)
+-- TOC entry 107 (OID 109637)
-- Name: jrn_rapt_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1012,7 +1021,7 @@ ALTER TABLE ONLY jrn_rapt
--
--- TOC entry 108 (OID 70545)
+-- TOC entry 108 (OID 109643)
-- Name: jrn_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1021,7 +1030,7 @@ ALTER TABLE ONLY jrn
--
--- TOC entry 112 (OID 70548)
+-- TOC entry 112 (OID 109645)
-- Name: stock_goods_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1030,7 +1039,7 @@ ALTER TABLE ONLY stock_goods
--
--- TOC entry 113 (OID 70405)
+-- TOC entry 113 (OID 109537)
-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1039,7 +1048,7 @@ ALTER TABLE ONLY jrn_def
--
--- TOC entry 114 (OID 70413)
+-- TOC entry 114 (OID 109543)
-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1048,7 +1057,7 @@ ALTER TABLE ONLY jrnx
--
--- TOC entry 115 (OID 70418)
+-- TOC entry 115 (OID 109547)
-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1057,7 +1066,7 @@ ALTER TABLE ONLY jrnx
--
--- TOC entry 116 (OID 70432)
+-- TOC entry 116 (OID 109557)
-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1066,7 +1075,7 @@ ALTER TABLE ONLY form
--
--- TOC entry 117 (OID 70440)
+-- TOC entry 117 (OID 109563)
-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1075,7 +1084,7 @@ ALTER TABLE ONLY centralized
--
--- TOC entry 118 (OID 70445)
+-- TOC entry 118 (OID 109567)
-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1084,7 +1093,7 @@ ALTER TABLE ONLY centralized
--
--- TOC entry 119 (OID 70453)
+-- TOC entry 119 (OID 109573)
-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1093,7 +1102,7 @@ ALTER TABLE ONLY user_sec_jrn
--
--- TOC entry 120 (OID 70464)
+-- TOC entry 120 (OID 109581)
-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1102,7 +1111,7 @@ ALTER TABLE ONLY user_sec_act
--
--- TOC entry 121 (OID 70472)
+-- TOC entry 121 (OID 109587)
-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1111,7 +1120,7 @@ ALTER TABLE ONLY jrn_action
--
--- TOC entry 122 (OID 70483)
+-- TOC entry 122 (OID 109595)
-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1120,7 +1129,7 @@ ALTER TABLE ONLY fiche_def
--
--- TOC entry 123 (OID 70491)
+-- TOC entry 123 (OID 109601)
-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1129,7 +1138,7 @@ ALTER TABLE ONLY attr_min
--
--- TOC entry 124 (OID 70496)
+-- TOC entry 124 (OID 109605)
-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1138,7 +1147,7 @@ ALTER TABLE ONLY attr_min
--
--- TOC entry 125 (OID 70504)
+-- TOC entry 125 (OID 109611)
-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1147,7 +1156,7 @@ ALTER TABLE ONLY fiche
--
--- TOC entry 126 (OID 70512)
+-- TOC entry 126 (OID 109617)
-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1156,7 +1165,7 @@ ALTER TABLE ONLY jnt_fic_att_value
--
--- TOC entry 127 (OID 70517)
+-- TOC entry 127 (OID 109621)
-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1165,7 +1174,7 @@ ALTER TABLE ONLY jnt_fic_att_value
--
--- TOC entry 128 (OID 70522)
+-- TOC entry 128 (OID 109625)
-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1174,7 +1183,7 @@ ALTER TABLE ONLY attr_value
--
--- TOC entry 129 (OID 70527)
+-- TOC entry 129 (OID 109629)
-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1183,7 +1192,7 @@ ALTER TABLE ONLY jnt_fic_attr
--
--- TOC entry 130 (OID 70532)
+-- TOC entry 130 (OID 109633)
-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1192,7 +1201,7 @@ ALTER TABLE ONLY jnt_fic_attr
--
--- TOC entry 131 (OID 70540)
+-- TOC entry 131 (OID 109639)
-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1200,8 +1209,17 @@ ALTER TABLE ONLY jrn
ADD CONSTRAINT "$1" FOREIGN KEY (jr_def_id) REFERENCES jrn_def(jrn_def_id);
+
--
--- TOC entry 35 (OID 70105)
+-- TOC entry 3 (OID 2200)
+-- Name: SCHEMA public; Type: COMMENT; Schema: -; Owner: postgres
+--
+
+
+
+
+--
+-- TOC entry 35 (OID 108273)
-- Name: TABLE tmp_pcmn; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1209,7 +1227,7 @@ COMMENT ON TABLE tmp_pcmn IS 'Plan comptable minimum normalis
--
--- TOC entry 38 (OID 70122)
+-- TOC entry 38 (OID 108286)
-- Name: TABLE parm_money; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1217,7 +1235,7 @@ COMMENT ON TABLE parm_money IS 'Currency conversion';
--
--- TOC entry 40 (OID 70126)
+-- TOC entry 40 (OID 108289)
-- Name: TABLE parm_periode; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1225,7 +1243,7 @@ COMMENT ON TABLE parm_periode IS 'Periode definition';
--
--- TOC entry 42 (OID 70147)
+-- TOC entry 42 (OID 108305)
-- Name: TABLE jrn_type; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1233,7 +1251,7 @@ COMMENT ON TABLE jrn_type IS 'Type of journal (Sell, Buy, Financial...)';
--
--- TOC entry 44 (OID 70153)
+-- TOC entry 44 (OID 108310)
-- Name: TABLE jrn_def; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1241,7 +1259,7 @@ COMMENT ON TABLE jrn_def IS 'Definition of a journal, his properties';
--
--- TOC entry 46 (OID 70166)
+-- TOC entry 46 (OID 108321)
-- Name: TABLE jrnx; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1249,7 +1267,7 @@ COMMENT ON TABLE jrnx IS 'Journal: content one line for each accountancy writing
--
--- TOC entry 50 (OID 70197)
+-- TOC entry 50 (OID 108347)
-- Name: TABLE form; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1257,7 +1275,7 @@ COMMENT ON TABLE form IS 'Forms content';
--
--- TOC entry 52 (OID 70213)
+-- TOC entry 52 (OID 108359)
-- Name: TABLE centralized; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1265,7 +1283,7 @@ COMMENT ON TABLE centralized IS 'The centralized journal';
--
--- TOC entry 55 (OID 70234)
+-- TOC entry 55 (OID 108376)
-- Name: TABLE "action"; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1273,7 +1291,7 @@ COMMENT ON TABLE "action" IS 'The different privileges';
--
--- TOC entry 58 (OID 70250)
+-- TOC entry 58 (OID 108389)
-- Name: TABLE jrn_action; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1281,7 +1299,7 @@ COMMENT ON TABLE jrn_action IS 'Possible action when we are in journal (menu)';
--
--- TOC entry 60 (OID 70258)
+-- TOC entry 60 (OID 108396)
-- Name: TABLE tva_rate; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1289,7 +1307,7 @@ COMMENT ON TABLE tva_rate IS 'Rate of vat';
--
--- TOC entry 62 (OID 70280)
+-- TOC entry 62 (OID 108412)
-- Name: TABLE fiche_def_ref; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1297,7 +1315,7 @@ COMMENT ON TABLE fiche_def_ref IS 'Family Cards definition';
--
--- TOC entry 64 (OID 70287)
+-- TOC entry 64 (OID 108418)
-- Name: TABLE fiche_def; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1305,7 +1323,7 @@ COMMENT ON TABLE fiche_def IS 'Cards definition';
--
--- TOC entry 66 (OID 70295)
+-- TOC entry 66 (OID 108425)
-- Name: TABLE attr_def; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1313,7 +1331,7 @@ COMMENT ON TABLE attr_def IS 'The available attributs for the cards';
--
--- TOC entry 68 (OID 70302)
+-- TOC entry 68 (OID 108431)
-- Name: TABLE attr_min; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1321,7 +1339,7 @@ COMMENT ON TABLE attr_min IS 'The value of attributs for the cards';
--
--- TOC entry 70 (OID 70305)
+-- TOC entry 70 (OID 108433)
-- Name: TABLE fiche; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1329,7 +1347,7 @@ COMMENT ON TABLE fiche IS 'Cards';
--
--- TOC entry 72 (OID 70309)
+-- TOC entry 72 (OID 108436)
-- Name: TABLE jnt_fic_att_value; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1337,7 +1355,7 @@ COMMENT ON TABLE jnt_fic_att_value IS 'join between the card and the attribut de
--
--- TOC entry 75 (OID 70319)
+-- TOC entry 75 (OID 108444)
-- Name: TABLE jnt_fic_attr; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1345,7 +1363,7 @@ COMMENT ON TABLE jnt_fic_attr IS 'join between the family card and the attribut
--
--- TOC entry 78 (OID 70333)
+-- TOC entry 78 (OID 108454)
-- Name: TABLE jrn_rapt; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1353,7 +1371,7 @@ COMMENT ON TABLE jrn_rapt IS 'Rapprochement between operation';
--
--- TOC entry 80 (OID 70337)
+-- TOC entry 80 (OID 108457)
-- Name: TABLE jrn; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1361,7 +1379,7 @@ COMMENT ON TABLE jrn IS 'Journal: content one line for a group of accountancy wr
--
--- TOC entry 82 (OID 70346)
+-- TOC entry 82 (OID 108465)
-- Name: TABLE stock_goods; Type: COMMENT; Schema: public; Owner: phpcompta
--
diff --git a/html/admin/sql/mod1/sequence.sql b/html/admin/sql/mod1/sequence.sql
index e2c9e85c3..fdde25fdb 100644
--- a/html/admin/sql/mod1/sequence.sql
+++ b/html/admin/sql/mod1/sequence.sql
@@ -146,6 +146,20 @@ CREATE SEQUENCE s_jrn_rapt
NO MAXVALUE
NO MINVALUE
CACHE 1;
+-- Name: s_central; Type: SEQUENCE; Schema: public; Owner: phpcompta
+CREATE SEQUENCE s_central
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+-- Name: s_central_order; Type: SEQUENCE; Schema: public; Owner: phpcompta
+CREATE SEQUENCE s_central_order
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
-- Name: s_internal; Type: SEQUENCE; Schema: public; Owner: phpcompta
CREATE SEQUENCE s_internal
START WITH 1
@@ -181,17 +195,3 @@ CREATE SEQUENCE s_jrn_2
NO MAXVALUE
NO MINVALUE
CACHE 1;
--- Name: s_central; Type: SEQUENCE; Schema: public; Owner: phpcompta
-CREATE SEQUENCE s_central
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
--- Name: s_central_order; Type: SEQUENCE; Schema: public; Owner: phpcompta
-CREATE SEQUENCE s_central_order
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
diff --git a/html/admin/sql/patch/upgrade4.sql b/html/admin/sql/patch/upgrade4.sql
index 688091add..54ac357d1 100644
--- a/html/admin/sql/patch/upgrade4.sql
+++ b/html/admin/sql/patch/upgrade4.sql
@@ -31,7 +31,7 @@ delete from jrn_action where ja_name='Impression' or ja_name = 'Recherche';
delete from fiche where f_id not in (select f_id from jnt_fic_att_value);
alter table jrn add j_pj int4;
alter table jrn add jr_opid int4;
-update version set val=4;
+update version set val=5;
alter table jrn add jr_c_opid int4;
create SEQUENCE s_central_order;
alter table centralized add c_order int4;