diff --git a/html/admin/sql/account_repository/data.sql b/html/admin/sql/account_repository/data.sql
index 561fb76c5..4b265253b 100644
--- a/html/admin/sql/account_repository/data.sql
+++ b/html/admin/sql/account_repository/data.sql
@@ -5,59 +5,60 @@
SET search_path = public, pg_catalog;
--
--- Data for TOC entry 6 (OID 44866)
+-- Data for TOC entry 6 (OID 940848)
-- 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, '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 (5, 'dany', 'dany', 'dany', 1, '1b9fc02e98389d29c1506fe944b07d16', 0, 'classic', 'compta');
-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');
+INSERT INTO ac_users (use_id, use_first_name, use_name, use_login, use_active, use_pass, use_admin, use_theme, use_usertype) VALUES (5, 'Dany', 'De Bontridder', 'dany', 1, '3adc2ecf3ffced14bcde9be1c078df5f', 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 (6, 'France ', 'Bertrand', 'france', 1, 'c7d71eed70ad733630046409d8adfb2f', 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, '3adc2ecf3ffced14bcde9be1c078df5f', 1, 'Light', 'user');
--
--- Data for TOC entry 7 (OID 44876)
+-- Data for TOC entry 7 (OID 940858)
-- 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);
-INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (4, 'Test Sécurité', 'Test pour la sécurité', 0);
-INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (5, 'Alchimerys 2003', '', 0);
-INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (8, 'Alchimerys 2004', '', 0);
-INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (9, 'DB Supp', 'Db supp', 0);
+INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (3, 'Alchimerys', 'Comptabilité production', 0);
+INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (4, 'Alchimerys 2004', 'Alchimerys 2004', 0);
+INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (7, 'Test', '', 0);
+INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (9, 'Creation', 'Test', 0);
+INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (10, 'Nouveau test', '', 0);
+INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (12, 'test 3', '', 0);
--
--- Data for TOC entry 8 (OID 44885)
+-- Data for TOC entry 8 (OID 940867)
-- 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 (27, 5, 5);
-INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (28, 5, 8);
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 (29, 5, 9);
-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);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (20, 5, 3);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (21, 5, 1);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (22, 6, 3);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (23, 6, 1);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (24, 1, 4);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (26, 1, 6);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (27, 1, 8);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (28, 1, 9);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (29, 1, 10);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (30, 1, 12);
--
--- Data for TOC entry 9 (OID 44888)
+-- Data for TOC entry 9 (OID 940870)
-- Name: version; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
-INSERT INTO "version" (val) VALUES (3);
+INSERT INTO "version" (val) VALUES (4);
--
--- Data for TOC entry 10 (OID 44892)
+-- Data for TOC entry 10 (OID 940874)
-- Name: priv_user; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -70,16 +71,14 @@ 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 (10, 21, 'NO');
-INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (13, 27, 'W');
-INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (14, 28, 'W');
-INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (15, 29, 'W');
-INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (12, 23, 'W');
-INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (11, 22, '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');
--
--- Data for TOC entry 11 (OID 44898)
+-- Data for TOC entry 11 (OID 940880)
-- Name: theme; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -90,63 +89,53 @@ INSERT INTO theme (the_name, the_filestyle, the_filebutton) VALUES ('Light', 'st
--
--- Data for TOC entry 12 (OID 44905)
+-- Data for TOC entry 12 (OID 940887)
-- Name: modeledef; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (1, '(BE) Basique', 'Comptabilité Belge, tout doit être adaptée');
-INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (14, 'test1', 'Si vous voulez récupérer toutes les adaptations d''un dossier dans un autre dossier, vous pouvez en faire un modèle. Seules les fiches, la structure des journaux, les périodes,... seront reprises et aucune données du dossier sur lequel le dossier est basé.');
-INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (2, 'test2', 'test');
-INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (15, 'test1', 'Si vous voulez récupérer toutes les adaptations d''un dossier dans un autre dossier, vous pouvez en faire un modèle. Seules les fiches, la structure des journaux, les périodes,... seront reprises et aucune données du dossier sur lequel le dossier est basé.');
-INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (16, 'test1', 'Si vous voulez récupérer toutes les adaptations d''un dossier dans un autre dossier, vous pouvez en faire un modèle. Seules les fiches, la structure des journaux, les périodes,... seront reprises et aucune données du dossier sur lequel le dossier est basé.');
-INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (17, 'test1', 'Si vous voulez récupérer toutes les adaptations d''un dossier dans un autre dossier, vous pouvez en faire un modèle. Seules les fiches, la structure des journaux, les périodes,... seront reprises et aucune données du dossier sur lequel le dossier est basé.');
-INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (13, 'Autre', 'Test');
+INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (3, 'Alchimerys', 'Comptabilité Production');
+INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (7, 'Nouveay', '');
+INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (10, 'Test', '');
--
--- Data for TOC entry 13 (OID 679377)
--- Name: log; Type: TABLE DATA; Schema: public; Owner: phpcompta
---
-
-
-
---
--- TOC entry 1 (OID 44864)
+-- TOC entry 1 (OID 940846)
-- Name: users_id; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
-SELECT pg_catalog.setval ('users_id', 5, true);
+SELECT pg_catalog.setval ('users_id', 6, true);
--
--- TOC entry 2 (OID 44883)
+-- TOC entry 2 (OID 940865)
-- Name: seq_jnt_use_dos; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
-SELECT pg_catalog.setval ('seq_jnt_use_dos', 29, true);
+SELECT pg_catalog.setval ('seq_jnt_use_dos', 30, true);
--
--- TOC entry 3 (OID 44890)
+-- TOC entry 3 (OID 940872)
-- Name: seq_priv_user; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
-SELECT pg_catalog.setval ('seq_priv_user', 15, true);
+SELECT pg_catalog.setval ('seq_priv_user', 13, true);
--
--- TOC entry 4 (OID 44903)
+-- TOC entry 4 (OID 940885)
-- Name: s_modid; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
-SELECT pg_catalog.setval ('s_modid', 17, true);
+SELECT pg_catalog.setval ('s_modid', 10, true);
--
--- TOC entry 5 (OID 44911)
+-- TOC entry 5 (OID 940893)
-- Name: dossier_id; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
-SELECT pg_catalog.setval ('dossier_id', 9, true);
+SELECT pg_catalog.setval ('dossier_id', 12, true);
diff --git a/html/admin/sql/account_repository/schema.sql b/html/admin/sql/account_repository/schema.sql
index cbfe29a15..0fb0c7c80 100644
--- a/html/admin/sql/account_repository/schema.sql
+++ b/html/admin/sql/account_repository/schema.sql
@@ -71,13 +71,6 @@ CREATE SEQUENCE dossier_id
MAXVALUE 9223372036854775807
MINVALUE 3
CACHE 1;
-CREATE TABLE log (
- lg_timestamp timestamp without time zone DEFAULT now(),
- lg_file text,
- lg_type text DEFAULT 'debug',
- lg_line text,
- lg_msg text
-);
CREATE INDEX fk_jnt_use_dos ON jnt_use_dos USING btree (use_id);
CREATE INDEX fk_jnt_dos_id ON jnt_use_dos USING btree (dos_id);
ALTER TABLE ONLY ac_users
diff --git a/html/admin/sql/account_repository/table.sql b/html/admin/sql/account_repository/table.sql
index a30b31432..c983d3f2b 100644
--- a/html/admin/sql/account_repository/table.sql
+++ b/html/admin/sql/account_repository/table.sql
@@ -39,10 +39,3 @@ CREATE TABLE modeledef (
mod_name text NOT NULL,
mod_desc text
);
-CREATE TABLE log (
- lg_timestamp timestamp without time zone DEFAULT now(),
- lg_file text,
- lg_type text DEFAULT 'debug',
- lg_line text,
- lg_msg text
-);
diff --git a/html/admin/sql/dossier1/data.sql b/html/admin/sql/dossier1/data.sql
index 561fb76c5..4b265253b 100644
--- a/html/admin/sql/dossier1/data.sql
+++ b/html/admin/sql/dossier1/data.sql
@@ -5,59 +5,60 @@
SET search_path = public, pg_catalog;
--
--- Data for TOC entry 6 (OID 44866)
+-- Data for TOC entry 6 (OID 940848)
-- 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, '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 (5, 'dany', 'dany', 'dany', 1, '1b9fc02e98389d29c1506fe944b07d16', 0, 'classic', 'compta');
-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');
+INSERT INTO ac_users (use_id, use_first_name, use_name, use_login, use_active, use_pass, use_admin, use_theme, use_usertype) VALUES (5, 'Dany', 'De Bontridder', 'dany', 1, '3adc2ecf3ffced14bcde9be1c078df5f', 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 (6, 'France ', 'Bertrand', 'france', 1, 'c7d71eed70ad733630046409d8adfb2f', 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, '3adc2ecf3ffced14bcde9be1c078df5f', 1, 'Light', 'user');
--
--- Data for TOC entry 7 (OID 44876)
+-- Data for TOC entry 7 (OID 940858)
-- 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);
-INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (4, 'Test Sécurité', 'Test pour la sécurité', 0);
-INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (5, 'Alchimerys 2003', '', 0);
-INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (8, 'Alchimerys 2004', '', 0);
-INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (9, 'DB Supp', 'Db supp', 0);
+INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (3, 'Alchimerys', 'Comptabilité production', 0);
+INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (4, 'Alchimerys 2004', 'Alchimerys 2004', 0);
+INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (7, 'Test', '', 0);
+INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (9, 'Creation', 'Test', 0);
+INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (10, 'Nouveau test', '', 0);
+INSERT INTO ac_dossier (dos_id, dos_name, dos_description, dos_jnt_user) VALUES (12, 'test 3', '', 0);
--
--- Data for TOC entry 8 (OID 44885)
+-- Data for TOC entry 8 (OID 940867)
-- 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 (27, 5, 5);
-INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (28, 5, 8);
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 (29, 5, 9);
-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);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (20, 5, 3);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (21, 5, 1);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (22, 6, 3);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (23, 6, 1);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (24, 1, 4);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (26, 1, 6);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (27, 1, 8);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (28, 1, 9);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (29, 1, 10);
+INSERT INTO jnt_use_dos (jnt_id, use_id, dos_id) VALUES (30, 1, 12);
--
--- Data for TOC entry 9 (OID 44888)
+-- Data for TOC entry 9 (OID 940870)
-- Name: version; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
-INSERT INTO "version" (val) VALUES (3);
+INSERT INTO "version" (val) VALUES (4);
--
--- Data for TOC entry 10 (OID 44892)
+-- Data for TOC entry 10 (OID 940874)
-- Name: priv_user; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -70,16 +71,14 @@ 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 (10, 21, 'NO');
-INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (13, 27, 'W');
-INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (14, 28, 'W');
-INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (15, 29, 'W');
-INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (12, 23, 'W');
-INSERT INTO priv_user (priv_id, priv_jnt, priv_priv) VALUES (11, 22, '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');
--
--- Data for TOC entry 11 (OID 44898)
+-- Data for TOC entry 11 (OID 940880)
-- Name: theme; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -90,63 +89,53 @@ INSERT INTO theme (the_name, the_filestyle, the_filebutton) VALUES ('Light', 'st
--
--- Data for TOC entry 12 (OID 44905)
+-- Data for TOC entry 12 (OID 940887)
-- Name: modeledef; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (1, '(BE) Basique', 'Comptabilité Belge, tout doit être adaptée');
-INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (14, 'test1', 'Si vous voulez récupérer toutes les adaptations d''un dossier dans un autre dossier, vous pouvez en faire un modèle. Seules les fiches, la structure des journaux, les périodes,... seront reprises et aucune données du dossier sur lequel le dossier est basé.');
-INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (2, 'test2', 'test');
-INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (15, 'test1', 'Si vous voulez récupérer toutes les adaptations d''un dossier dans un autre dossier, vous pouvez en faire un modèle. Seules les fiches, la structure des journaux, les périodes,... seront reprises et aucune données du dossier sur lequel le dossier est basé.');
-INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (16, 'test1', 'Si vous voulez récupérer toutes les adaptations d''un dossier dans un autre dossier, vous pouvez en faire un modèle. Seules les fiches, la structure des journaux, les périodes,... seront reprises et aucune données du dossier sur lequel le dossier est basé.');
-INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (17, 'test1', 'Si vous voulez récupérer toutes les adaptations d''un dossier dans un autre dossier, vous pouvez en faire un modèle. Seules les fiches, la structure des journaux, les périodes,... seront reprises et aucune données du dossier sur lequel le dossier est basé.');
-INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (13, 'Autre', 'Test');
+INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (3, 'Alchimerys', 'Comptabilité Production');
+INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (7, 'Nouveay', '');
+INSERT INTO modeledef (mod_id, mod_name, mod_desc) VALUES (10, 'Test', '');
--
--- Data for TOC entry 13 (OID 679377)
--- Name: log; Type: TABLE DATA; Schema: public; Owner: phpcompta
---
-
-
-
---
--- TOC entry 1 (OID 44864)
+-- TOC entry 1 (OID 940846)
-- Name: users_id; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
-SELECT pg_catalog.setval ('users_id', 5, true);
+SELECT pg_catalog.setval ('users_id', 6, true);
--
--- TOC entry 2 (OID 44883)
+-- TOC entry 2 (OID 940865)
-- Name: seq_jnt_use_dos; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
-SELECT pg_catalog.setval ('seq_jnt_use_dos', 29, true);
+SELECT pg_catalog.setval ('seq_jnt_use_dos', 30, true);
--
--- TOC entry 3 (OID 44890)
+-- TOC entry 3 (OID 940872)
-- Name: seq_priv_user; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
-SELECT pg_catalog.setval ('seq_priv_user', 15, true);
+SELECT pg_catalog.setval ('seq_priv_user', 13, true);
--
--- TOC entry 4 (OID 44903)
+-- TOC entry 4 (OID 940885)
-- Name: s_modid; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
-SELECT pg_catalog.setval ('s_modid', 17, true);
+SELECT pg_catalog.setval ('s_modid', 10, true);
--
--- TOC entry 5 (OID 44911)
+-- TOC entry 5 (OID 940893)
-- Name: dossier_id; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
-SELECT pg_catalog.setval ('dossier_id', 9, true);
+SELECT pg_catalog.setval ('dossier_id', 12, true);
diff --git a/html/admin/sql/dossier1/index.sql b/html/admin/sql/dossier1/index.sql
index 3072042a7..792d015d5 100644
--- a/html/admin/sql/dossier1/index.sql
+++ b/html/admin/sql/dossier1/index.sql
@@ -14,3 +14,4 @@ CREATE INDEX fk_user_sec_act ON user_sec_act USING btree (ua_act_id);
CREATE UNIQUE INDEX x_jrn_jr_id ON jrn USING btree (jr_id);
CREATE INDEX fk_stock_goods_j_id ON stock_goods USING btree (j_id);
CREATE INDEX fk_stock_goods_f_id ON stock_goods USING btree (f_id);
+CREATE INDEX x_poste ON jrnx USING btree (j_poste);
diff --git a/html/admin/sql/dossier1/schema.sql b/html/admin/sql/dossier1/schema.sql
index 254d9426b..44373b828 100644
--- a/html/admin/sql/dossier1/schema.sql
+++ b/html/admin/sql/dossier1/schema.sql
@@ -95,8 +95,7 @@ CREATE TABLE jrnx (
j_internal text,
j_tech_user text NOT NULL,
j_tech_date timestamp without time zone DEFAULT now() NOT NULL,
- j_tech_per integer,
- j_montant_n numeric(200,100)
+ j_tech_per integer
);
CREATE TABLE user_pref (
pref_user text NOT NULL,
@@ -296,7 +295,9 @@ CREATE TABLE jrn (
jrn_ech date,
jr_ech date,
jr_rapt text,
- jr_valid boolean DEFAULT true
+ jr_valid boolean DEFAULT true,
+ j_pj integer,
+ jr_opid integer
);
CREATE TABLE stock_goods (
sg_id integer DEFAULT nextval('s_stock_goods'::text) NOT NULL,
@@ -314,33 +315,36 @@ CREATE TABLE attr_min (
frd_id integer,
ad_id integer
);
-\connect - dany
-SET search_path = public, pg_catalog;
-CREATE TABLE jrnx_back (
- j_id integer,
- j_date date,
- j_montant double precision,
- j_poste integer,
- j_grpt integer,
- j_rapt text,
- j_jrn_def integer,
- j_debit boolean,
- j_text text,
- j_centralized boolean,
- j_internal text,
- j_tech_user text,
- j_tech_date timestamp without time zone,
- j_tech_per integer
-);
-\connect - phpcompta
-SET search_path = public, pg_catalog;
-CREATE TABLE log (
- lg_timestamp timestamp without time zone DEFAULT now(),
- lg_file text,
- lg_type text DEFAULT 'debug',
- lg_line text,
- lg_msg text
-);
+CREATE SEQUENCE s_internal
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
+CREATE SEQUENCE s_jrn_4
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
+CREATE SEQUENCE s_jrn_3
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
+CREATE SEQUENCE s_jrn_2
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
+CREATE SEQUENCE s_jrn_1
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ 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);
@@ -357,6 +361,7 @@ CREATE INDEX fk_user_sec_act ON user_sec_act USING btree (ua_act_id);
CREATE UNIQUE INDEX x_jrn_jr_id ON jrn USING btree (jr_id);
CREATE INDEX fk_stock_goods_j_id ON stock_goods USING btree (j_id);
CREATE INDEX fk_stock_goods_f_id ON stock_goods USING btree (f_id);
+CREATE INDEX x_poste ON jrnx USING btree (j_poste);
ALTER TABLE ONLY tmp_pcmn
ADD CONSTRAINT tmp_pcmn_pkey PRIMARY KEY (pcm_val);
ALTER TABLE ONLY parm_money
diff --git a/html/admin/sql/dossier1/sequence.sql b/html/admin/sql/dossier1/sequence.sql
index 94dee9331..3d4b3fab7 100644
--- a/html/admin/sql/dossier1/sequence.sql
+++ b/html/admin/sql/dossier1/sequence.sql
@@ -124,3 +124,33 @@ CREATE SEQUENCE s_stock_goods
MAXVALUE 9223372036854775807
MINVALUE 1
CACHE 1;
+CREATE SEQUENCE s_internal
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
+CREATE SEQUENCE s_jrn_4
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
+CREATE SEQUENCE s_jrn_3
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
+CREATE SEQUENCE s_jrn_2
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
+CREATE SEQUENCE s_jrn_1
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
diff --git a/html/admin/sql/dossier1/table.sql b/html/admin/sql/dossier1/table.sql
index f5daa12f6..69a3dc5cd 100644
--- a/html/admin/sql/dossier1/table.sql
+++ b/html/admin/sql/dossier1/table.sql
@@ -51,8 +51,7 @@ CREATE TABLE jrnx (
j_internal text,
j_tech_user text NOT NULL,
j_tech_date timestamp without time zone DEFAULT now() NOT NULL,
- j_tech_per integer,
- j_montant_n numeric(200,100)
+ j_tech_per integer
);
CREATE TABLE user_pref (
pref_user text NOT NULL,
@@ -166,7 +165,9 @@ CREATE TABLE jrn (
jrn_ech date,
jr_ech date,
jr_rapt text,
- jr_valid boolean DEFAULT true
+ jr_valid boolean DEFAULT true,
+ j_pj integer,
+ jr_opid integer
);
CREATE TABLE stock_goods (
sg_id integer DEFAULT nextval('s_stock_goods'::text) NOT NULL,
@@ -184,26 +185,3 @@ CREATE TABLE attr_min (
frd_id integer,
ad_id integer
);
-CREATE TABLE jrnx_back (
- j_id integer,
- j_date date,
- j_montant double precision,
- j_poste integer,
- j_grpt integer,
- j_rapt text,
- j_jrn_def integer,
- j_debit boolean,
- j_text text,
- j_centralized boolean,
- j_internal text,
- j_tech_user text,
- j_tech_date timestamp without time zone,
- j_tech_per integer
-);
-CREATE TABLE log (
- lg_timestamp timestamp without time zone DEFAULT now(),
- lg_file text,
- lg_type text DEFAULT 'debug',
- lg_line text,
- lg_msg text
-);
diff --git a/html/admin/sql/mod1/data.sql b/html/admin/sql/mod1/data.sql
index 1ecaa56e4..4224462d6 100644
--- a/html/admin/sql/mod1/data.sql
+++ b/html/admin/sql/mod1/data.sql
@@ -5,7 +5,7 @@
SET search_path = public, pg_catalog;
--
--- Data for TOC entry 23 (OID 44961)
+-- Data for TOC entry 28 (OID 954808)
-- Name: tmp_pcmn; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -515,15 +515,15 @@ INSERT INTO tmp_pcmn (pcm_val, pcm_lib, pcm_val_parent, pcm_country) VALUES (101
--
--- Data for TOC entry 24 (OID 44968)
+-- Data for TOC entry 29 (OID 954815)
-- Name: version; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
-INSERT INTO "version" (val) VALUES (5);
+INSERT INTO "version" (val) VALUES (4);
--
--- Data for TOC entry 25 (OID 44974)
+-- Data for TOC entry 30 (OID 954821)
-- Name: parm_money; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -531,7 +531,7 @@ INSERT INTO parm_money (pm_id, pm_code, pm_rate) VALUES (1, 'EUR', 1);
--
--- Data for TOC entry 26 (OID 44977)
+-- Data for TOC entry 31 (OID 954824)
-- Name: parm_periode; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -564,7 +564,7 @@ INSERT INTO parm_periode (p_id, p_start, p_end, p_exercice, p_closed) VALUES (52
--
--- Data for TOC entry 27 (OID 44993)
+-- Data for TOC entry 32 (OID 954840)
-- Name: jrn_type; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -575,7 +575,7 @@ INSERT INTO jrn_type (jrn_type_id, jrn_desc) VALUES ('OD ', 'Op
--
--- Data for TOC entry 28 (OID 44998)
+-- Data for TOC entry 33 (OID 954845)
-- Name: jrn_def; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -586,14 +586,14 @@ INSERT INTO jrn_def (jrn_def_id, jrn_def_name, jrn_def_class_deb, jrn_def_class_
--
--- Data for TOC entry 29 (OID 45009)
+-- Data for TOC entry 34 (OID 954856)
-- Name: jrnx; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 30 (OID 45020)
+-- Data for TOC entry 35 (OID 954867)
-- Name: user_pref; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -601,35 +601,35 @@ INSERT INTO user_pref (pref_user, pref_periode) VALUES ('dany', 30);
--
--- Data for TOC entry 31 (OID 45029)
+-- Data for TOC entry 36 (OID 954876)
-- Name: formdef; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 32 (OID 45035)
+-- Data for TOC entry 37 (OID 954882)
-- Name: form; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 33 (OID 45047)
+-- Data for TOC entry 38 (OID 954894)
-- Name: centralized; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 34 (OID 45058)
+-- Data for TOC entry 39 (OID 954905)
-- Name: user_sec_jrn; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 35 (OID 45064)
+-- Data for TOC entry 40 (OID 954911)
-- Name: action; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -650,39 +650,31 @@ INSERT INTO "action" (ac_id, ac_description) VALUES (15, 'Fiche
--
--- Data for TOC entry 36 (OID 45069)
+-- Data for TOC entry 41 (OID 954916)
-- Name: user_sec_act; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 37 (OID 45077)
+-- Data for TOC entry 42 (OID 954924)
-- Name: jrn_action; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (2, 'Voir', 'Voir toutes les factures', 'user_jrn.php', 'action=voir_jrn', 'FR', 'VEN');
INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (4, 'Voir Impayés', 'Voir toutes les factures non payées', 'user_jrn.php', 'action=voir_jrn_non_paye', 'FR', 'VEN');
-INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (6, 'Recherche', 'Recherche dans le journal', 'user_jrn.php', 'action=search', 'FR', 'VEN');
INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (1, 'Nouvelle', 'Création d''une facture', 'user_jrn.php', 'action=insert_vente&blank', 'FR', 'VEN');
INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (10, 'Nouveau', 'Encode un nouvel achat (matériel, marchandises, services et biens divers)', 'user_jrn.php', 'action=new&blank', 'FR', 'ACH');
INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (12, 'Voir', 'Voir toutes les factures', 'user_jrn.php', 'action=voir_jrn', 'FR', 'ACH');
INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (14, 'Voir Impayés', 'Voir toutes les factures non payées', 'user_jrn.php', 'action=voir_jrn_non_paye', 'FR', 'ACH');
-INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (18, 'Recherche', 'Recherche dans le journal', 'user_jrn.php', 'action=search', 'FR', 'ACH');
INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (20, 'Nouveau', 'Encode un nouvel achat (matériel, marchandises, services et biens divers)', 'user_jrn.php', 'action=new&blank', 'FR', 'FIN');
INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (22, 'Voir', 'Voir toutes les factures', 'user_jrn.php', 'action=voir_jrn', 'FR', 'FIN');
-INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (26, 'Recherche', 'Recherche dans le journal', 'user_jrn.php', 'action=search', 'FR', 'FIN');
INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (30, 'Nouveau', NULL, 'user_jrn.php', 'action=new&blank', 'FR', 'OD ');
INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (32, 'Voir', 'Voir toutes les factures', 'user_jrn.php', 'action=voir_jrn', 'FR', 'OD ');
-INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (36, 'Recherche', 'Recherche dans le journal', 'user_jrn.php', 'action=search', 'FR', 'OD ');
-INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (5, 'Impression', 'Impression du journal', 'impress.php', 'filter=1&action=viewpdf&type=jrn&direct=1', 'FR', 'VEN');
-INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (16, 'Impression', 'Impression du journal', 'impress.php', 'filter=1&action=viewpdf&type=jrn&direct=1', 'FR', 'ACH');
-INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (24, 'Impression', 'Impression du journal', 'impress.php', 'filter=1&action=viewpdf&type=jrn&direct=1', 'FR', 'FIN');
-INSERT INTO jrn_action (ja_id, ja_name, ja_desc, ja_url, ja_action, ja_lang, ja_jrn_type) VALUES (34, 'Impression', 'Impression du journal', 'impress.php', 'filter=1&action=viewpdf&type=jrn&direct=1', 'FR', 'OD ');
--
--- Data for TOC entry 38 (OID 45084)
+-- Data for TOC entry 43 (OID 954931)
-- Name: tva_rate; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -693,7 +685,7 @@ INSERT INTO tva_rate (tva_id, tva_label, tva_rate, tva_comment, tva_poste) VALUE
--
--- Data for TOC entry 39 (OID 45100)
+-- Data for TOC entry 44 (OID 954947)
-- Name: fiche_def_ref; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -715,7 +707,7 @@ INSERT INTO fiche_def_ref (frd_id, frd_text, frd_class_base) VALUES (15, 'Autres
--
--- Data for TOC entry 40 (OID 45106)
+-- Data for TOC entry 45 (OID 954953)
-- Name: fiche_def; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -728,7 +720,7 @@ INSERT INTO fiche_def (fd_id, fd_class_base, fd_label, fd_create_account, frd_id
--
--- Data for TOC entry 41 (OID 45113)
+-- Data for TOC entry 46 (OID 954960)
-- Name: attr_def; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -754,7 +746,7 @@ INSERT INTO attr_def (ad_id, ad_text) VALUES (19, 'Gestion stock');
--
--- Data for TOC entry 42 (OID 45119)
+-- Data for TOC entry 47 (OID 954966)
-- Name: attr_min; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -833,7 +825,7 @@ INSERT INTO attr_min (frd_id, ad_id) VALUES (15, 9);
--
--- Data for TOC entry 43 (OID 45121)
+-- Data for TOC entry 48 (OID 954968)
-- Name: fiche; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -860,7 +852,7 @@ INSERT INTO fiche (f_id, fd_id) VALUES (20, 6);
--
--- Data for TOC entry 44 (OID 45124)
+-- Data for TOC entry 49 (OID 954971)
-- Name: jnt_fic_att_value; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -1012,7 +1004,7 @@ INSERT INTO jnt_fic_att_value (jft_id, f_id, ad_id) VALUES (145, 20, 19);
--
--- Data for TOC entry 45 (OID 45127)
+-- Data for TOC entry 50 (OID 954974)
-- Name: attr_value; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -1164,7 +1156,7 @@ INSERT INTO attr_value (jft_id, av_text) VALUES (145, '');
--
--- Data for TOC entry 46 (OID 45132)
+-- Data for TOC entry 51 (OID 954979)
-- Name: jnt_fic_attr; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
@@ -1216,28 +1208,28 @@ INSERT INTO jnt_fic_attr (fd_id, ad_id) VALUES (6, 19);
--
--- Data for TOC entry 47 (OID 45142)
+-- Data for TOC entry 52 (OID 954989)
-- Name: jrn_rapt; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 48 (OID 45145)
+-- Data for TOC entry 53 (OID 954992)
-- Name: jrn; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- Data for TOC entry 49 (OID 45153)
+-- Data for TOC entry 54 (OID 955000)
-- Name: stock_goods; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
--
--- TOC entry 1 (OID 44970)
+-- TOC entry 1 (OID 954817)
-- Name: s_periode; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1245,7 +1237,7 @@ SELECT pg_catalog.setval ('s_periode', 52, true);
--
--- TOC entry 2 (OID 44972)
+-- TOC entry 2 (OID 954819)
-- Name: s_currency; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1253,7 +1245,7 @@ SELECT pg_catalog.setval ('s_currency', 1, true);
--
--- TOC entry 3 (OID 44985)
+-- TOC entry 3 (OID 954832)
-- Name: s_jrn_def; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1261,7 +1253,7 @@ SELECT pg_catalog.setval ('s_jrn_def', 5, false);
--
--- TOC entry 4 (OID 44987)
+-- TOC entry 4 (OID 954834)
-- Name: s_grpt; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1269,7 +1261,7 @@ SELECT pg_catalog.setval ('s_grpt', 1, false);
--
--- TOC entry 5 (OID 44989)
+-- TOC entry 5 (OID 954836)
-- Name: s_jrn_op; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1277,7 +1269,7 @@ SELECT pg_catalog.setval ('s_jrn_op', 1, false);
--
--- TOC entry 6 (OID 44991)
+-- TOC entry 6 (OID 954838)
-- Name: s_jrn; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1285,7 +1277,7 @@ SELECT pg_catalog.setval ('s_jrn', 1, false);
--
--- TOC entry 7 (OID 45007)
+-- TOC entry 7 (OID 954854)
-- Name: s_jrnx; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1293,7 +1285,7 @@ SELECT pg_catalog.setval ('s_jrnx', 1, false);
--
--- TOC entry 8 (OID 45025)
+-- TOC entry 8 (OID 954872)
-- Name: s_formdef; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1301,7 +1293,7 @@ SELECT pg_catalog.setval ('s_formdef', 1, false);
--
--- TOC entry 9 (OID 45027)
+-- TOC entry 9 (OID 954874)
-- Name: s_form; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1309,7 +1301,7 @@ SELECT pg_catalog.setval ('s_form', 1, false);
--
--- TOC entry 10 (OID 45041)
+-- TOC entry 10 (OID 954888)
-- Name: s_isup; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1317,7 +1309,7 @@ SELECT pg_catalog.setval ('s_isup', 1, false);
--
--- TOC entry 11 (OID 45043)
+-- TOC entry 11 (OID 954890)
-- Name: s_idef; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1325,7 +1317,7 @@ SELECT pg_catalog.setval ('s_idef', 1, false);
--
--- TOC entry 12 (OID 45045)
+-- TOC entry 12 (OID 954892)
-- Name: s_centralized; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1333,7 +1325,7 @@ SELECT pg_catalog.setval ('s_centralized', 1, false);
--
--- TOC entry 13 (OID 45054)
+-- TOC entry 13 (OID 954901)
-- Name: s_user_jrn; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1341,7 +1333,7 @@ SELECT pg_catalog.setval ('s_user_jrn', 1, false);
--
--- TOC entry 14 (OID 45056)
+-- TOC entry 14 (OID 954903)
-- Name: s_user_act; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1349,7 +1341,7 @@ SELECT pg_catalog.setval ('s_user_act', 1, false);
--
--- TOC entry 15 (OID 45075)
+-- TOC entry 15 (OID 954922)
-- Name: s_jrnaction; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1357,7 +1349,7 @@ SELECT pg_catalog.setval ('s_jrnaction', 5, true);
--
--- TOC entry 16 (OID 45090)
+-- TOC entry 16 (OID 954937)
-- Name: s_fiche; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1365,7 +1357,7 @@ SELECT pg_catalog.setval ('s_fiche', 20, true);
--
--- TOC entry 17 (OID 45092)
+-- TOC entry 17 (OID 954939)
-- Name: s_fiche_def_ref; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1373,7 +1365,7 @@ SELECT pg_catalog.setval ('s_fiche_def_ref', 1, false);
--
--- TOC entry 18 (OID 45094)
+-- TOC entry 18 (OID 954941)
-- Name: s_fdef; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1381,7 +1373,7 @@ SELECT pg_catalog.setval ('s_fdef', 6, true);
--
--- TOC entry 19 (OID 45096)
+-- TOC entry 19 (OID 954943)
-- Name: s_attr_def; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1389,7 +1381,7 @@ SELECT pg_catalog.setval ('s_attr_def', 1, false);
--
--- TOC entry 20 (OID 45098)
+-- TOC entry 20 (OID 954945)
-- Name: s_jnt_fic_att_value; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1397,7 +1389,7 @@ SELECT pg_catalog.setval ('s_jnt_fic_att_value', 145, true);
--
--- TOC entry 21 (OID 45138)
+-- TOC entry 21 (OID 954985)
-- Name: s_stock_goods; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
@@ -1405,10 +1397,50 @@ SELECT pg_catalog.setval ('s_stock_goods', 1, false);
--
--- TOC entry 22 (OID 45140)
+-- TOC entry 22 (OID 954987)
-- Name: s_jrn_rapt; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
--
SELECT pg_catalog.setval ('s_jrn_rapt', 1, false);
+--
+-- TOC entry 23 (OID 966677)
+-- Name: s_internal; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
+--
+
+SELECT pg_catalog.setval ('s_internal', 1, false);
+
+
+--
+-- TOC entry 24 (OID 966682)
+-- Name: s_jrn_4; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
+--
+
+SELECT pg_catalog.setval ('s_jrn_4', 1, false);
+
+
+--
+-- TOC entry 25 (OID 966685)
+-- Name: s_jrn_1; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
+--
+
+SELECT pg_catalog.setval ('s_jrn_1', 1, false);
+
+
+--
+-- TOC entry 26 (OID 966688)
+-- Name: s_jrn_3; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
+--
+
+SELECT pg_catalog.setval ('s_jrn_3', 1, false);
+
+
+--
+-- TOC entry 27 (OID 966691)
+-- 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/function.sql b/html/admin/sql/mod1/function.sql
index 9cb69e994..e69de29bb 100644
--- a/html/admin/sql/mod1/function.sql
+++ b/html/admin/sql/mod1/function.sql
@@ -1,19 +0,0 @@
--- 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;
--- Name: today_hour (); Type: FUNCTION; Schema: public; Owner: dany
---
-
-CREATE FUNCTION today_hour () RETURNS text
- AS '
-declare
-hour text ;
-begin
-select to_char(now(),''HHMI'') into hour;
-return hour;
-end;
-'
- LANGUAGE plpgsql;
diff --git a/html/admin/sql/mod1/index.sql b/html/admin/sql/mod1/index.sql
index 46f43f2ab..d4dcb6f09 100644
--- a/html/admin/sql/mod1/index.sql
+++ b/html/admin/sql/mod1/index.sql
@@ -8,3 +8,5 @@ CREATE UNIQUE INDEX x_jrn_jr_id ON jrn USING btree (jr_id);
CREATE INDEX fk_stock_goods_j_id ON stock_goods USING btree (j_id);
-- Name: fk_stock_goods_f_id; Type: INDEX; Schema: public; Owner: phpcompta
CREATE INDEX fk_stock_goods_f_id ON stock_goods USING btree (f_id);
+-- Name: x_poste; Type: INDEX; Schema: public; Owner: phpcompta
+CREATE INDEX x_poste ON jrnx USING btree (j_poste);
diff --git a/html/admin/sql/mod1/schema.sql b/html/admin/sql/mod1/schema.sql
index 1bd14c778..35848862e 100644
--- a/html/admin/sql/mod1/schema.sql
+++ b/html/admin/sql/mod1/schema.sql
@@ -7,7 +7,7 @@
SET search_path = public, pg_catalog;
--
--- TOC entry 24 (OID 44961)
+-- TOC entry 29 (OID 954808)
-- Name: tmp_pcmn; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -20,7 +20,7 @@ CREATE TABLE tmp_pcmn (
--
--- TOC entry 26 (OID 44968)
+-- TOC entry 31 (OID 954815)
-- Name: version; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -30,7 +30,7 @@ CREATE TABLE "version" (
--
--- TOC entry 2 (OID 44970)
+-- TOC entry 2 (OID 954817)
-- Name: s_periode; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -43,7 +43,7 @@ CREATE SEQUENCE s_periode
--
--- TOC entry 3 (OID 44972)
+-- TOC entry 3 (OID 954819)
-- Name: s_currency; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -56,7 +56,7 @@ CREATE SEQUENCE s_currency
--
--- TOC entry 27 (OID 44974)
+-- TOC entry 32 (OID 954821)
-- Name: parm_money; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -68,7 +68,7 @@ CREATE TABLE parm_money (
--
--- TOC entry 29 (OID 44977)
+-- TOC entry 34 (OID 954824)
-- Name: parm_periode; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -82,7 +82,7 @@ CREATE TABLE parm_periode (
--
--- TOC entry 4 (OID 44985)
+-- TOC entry 4 (OID 954832)
-- Name: s_jrn_def; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -95,7 +95,7 @@ CREATE SEQUENCE s_jrn_def
--
--- TOC entry 5 (OID 44987)
+-- TOC entry 5 (OID 954834)
-- Name: s_grpt; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -108,7 +108,7 @@ CREATE SEQUENCE s_grpt
--
--- TOC entry 6 (OID 44989)
+-- TOC entry 6 (OID 954836)
-- Name: s_jrn_op; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -121,7 +121,7 @@ CREATE SEQUENCE s_jrn_op
--
--- TOC entry 7 (OID 44991)
+-- TOC entry 7 (OID 954838)
-- Name: s_jrn; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -134,7 +134,7 @@ CREATE SEQUENCE s_jrn
--
--- TOC entry 31 (OID 44993)
+-- TOC entry 36 (OID 954840)
-- Name: jrn_type; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -145,7 +145,7 @@ CREATE TABLE jrn_type (
--
--- TOC entry 33 (OID 44998)
+-- TOC entry 38 (OID 954845)
-- Name: jrn_def; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -166,7 +166,7 @@ CREATE TABLE jrn_def (
--
--- TOC entry 8 (OID 45007)
+-- TOC entry 8 (OID 954854)
-- Name: s_jrnx; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -179,7 +179,7 @@ CREATE SEQUENCE s_jrnx
--
--- TOC entry 35 (OID 45009)
+-- TOC entry 40 (OID 954856)
-- Name: jrnx; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -202,7 +202,7 @@ CREATE TABLE jrnx (
--
--- TOC entry 37 (OID 45020)
+-- TOC entry 42 (OID 954867)
-- Name: user_pref; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -213,7 +213,7 @@ CREATE TABLE user_pref (
--
--- TOC entry 9 (OID 45025)
+-- TOC entry 9 (OID 954872)
-- Name: s_formdef; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -226,7 +226,7 @@ CREATE SEQUENCE s_formdef
--
--- TOC entry 10 (OID 45027)
+-- TOC entry 10 (OID 954874)
-- Name: s_form; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -239,7 +239,7 @@ CREATE SEQUENCE s_form
--
--- TOC entry 38 (OID 45029)
+-- TOC entry 43 (OID 954876)
-- Name: formdef; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -250,7 +250,7 @@ CREATE TABLE formdef (
--
--- TOC entry 39 (OID 45035)
+-- TOC entry 44 (OID 954882)
-- Name: form; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -264,7 +264,7 @@ CREATE TABLE form (
--
--- TOC entry 11 (OID 45041)
+-- TOC entry 11 (OID 954888)
-- Name: s_isup; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -277,7 +277,7 @@ CREATE SEQUENCE s_isup
--
--- TOC entry 12 (OID 45043)
+-- TOC entry 12 (OID 954890)
-- Name: s_idef; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -290,7 +290,7 @@ CREATE SEQUENCE s_idef
--
--- TOC entry 13 (OID 45045)
+-- TOC entry 13 (OID 954892)
-- Name: s_centralized; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -303,7 +303,7 @@ CREATE SEQUENCE s_centralized
--
--- TOC entry 41 (OID 45047)
+-- TOC entry 46 (OID 954894)
-- Name: centralized; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -325,7 +325,7 @@ CREATE TABLE centralized (
--
--- TOC entry 14 (OID 45054)
+-- TOC entry 14 (OID 954901)
-- Name: s_user_jrn; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -338,7 +338,7 @@ CREATE SEQUENCE s_user_jrn
--
--- TOC entry 15 (OID 45056)
+-- TOC entry 15 (OID 954903)
-- Name: s_user_act; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -351,7 +351,7 @@ CREATE SEQUENCE s_user_act
--
--- TOC entry 43 (OID 45058)
+-- TOC entry 48 (OID 954905)
-- Name: user_sec_jrn; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -364,7 +364,7 @@ CREATE TABLE user_sec_jrn (
--
--- TOC entry 44 (OID 45064)
+-- TOC entry 49 (OID 954911)
-- Name: action; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -375,7 +375,7 @@ CREATE TABLE "action" (
--
--- TOC entry 46 (OID 45069)
+-- TOC entry 51 (OID 954916)
-- Name: user_sec_act; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -387,7 +387,7 @@ CREATE TABLE user_sec_act (
--
--- TOC entry 16 (OID 45075)
+-- TOC entry 16 (OID 954922)
-- Name: s_jrnaction; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -400,7 +400,7 @@ CREATE SEQUENCE s_jrnaction
--
--- TOC entry 47 (OID 45077)
+-- TOC entry 52 (OID 954924)
-- Name: jrn_action; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -416,7 +416,7 @@ CREATE TABLE jrn_action (
--
--- TOC entry 49 (OID 45084)
+-- TOC entry 54 (OID 954931)
-- Name: tva_rate; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -430,7 +430,7 @@ CREATE TABLE tva_rate (
--
--- TOC entry 17 (OID 45090)
+-- TOC entry 17 (OID 954937)
-- Name: s_fiche; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -443,7 +443,7 @@ CREATE SEQUENCE s_fiche
--
--- TOC entry 18 (OID 45092)
+-- TOC entry 18 (OID 954939)
-- Name: s_fiche_def_ref; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -456,7 +456,7 @@ CREATE SEQUENCE s_fiche_def_ref
--
--- TOC entry 19 (OID 45094)
+-- TOC entry 19 (OID 954941)
-- Name: s_fdef; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -469,7 +469,7 @@ CREATE SEQUENCE s_fdef
--
--- TOC entry 20 (OID 45096)
+-- TOC entry 20 (OID 954943)
-- Name: s_attr_def; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -482,7 +482,7 @@ CREATE SEQUENCE s_attr_def
--
--- TOC entry 21 (OID 45098)
+-- TOC entry 21 (OID 954945)
-- Name: s_jnt_fic_att_value; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -495,7 +495,7 @@ CREATE SEQUENCE s_jnt_fic_att_value
--
--- TOC entry 51 (OID 45100)
+-- TOC entry 56 (OID 954947)
-- Name: fiche_def_ref; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -507,7 +507,7 @@ CREATE TABLE fiche_def_ref (
--
--- TOC entry 53 (OID 45106)
+-- TOC entry 58 (OID 954953)
-- Name: fiche_def; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -521,7 +521,7 @@ CREATE TABLE fiche_def (
--
--- TOC entry 55 (OID 45113)
+-- TOC entry 60 (OID 954960)
-- Name: attr_def; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -532,7 +532,7 @@ CREATE TABLE attr_def (
--
--- TOC entry 57 (OID 45119)
+-- TOC entry 62 (OID 954966)
-- Name: attr_min; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -543,7 +543,7 @@ CREATE TABLE attr_min (
--
--- TOC entry 59 (OID 45121)
+-- TOC entry 64 (OID 954968)
-- Name: fiche; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -554,7 +554,7 @@ CREATE TABLE fiche (
--
--- TOC entry 61 (OID 45124)
+-- TOC entry 66 (OID 954971)
-- Name: jnt_fic_att_value; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -566,7 +566,7 @@ CREATE TABLE jnt_fic_att_value (
--
--- TOC entry 63 (OID 45127)
+-- TOC entry 68 (OID 954974)
-- Name: attr_value; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -577,7 +577,7 @@ CREATE TABLE attr_value (
--
--- TOC entry 64 (OID 45132)
+-- TOC entry 69 (OID 954979)
-- Name: jnt_fic_attr; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -588,7 +588,7 @@ CREATE TABLE jnt_fic_attr (
--
--- TOC entry 66 (OID 45136)
+-- TOC entry 71 (OID 954983)
-- Name: vw_fiche_attr; Type: VIEW; Schema: public; Owner: phpcompta
--
@@ -597,7 +597,7 @@ CREATE VIEW vw_fiche_attr AS
--
--- TOC entry 22 (OID 45138)
+-- TOC entry 22 (OID 954985)
-- Name: s_stock_goods; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -610,7 +610,7 @@ CREATE SEQUENCE s_stock_goods
--
--- TOC entry 23 (OID 45140)
+-- TOC entry 23 (OID 954987)
-- Name: s_jrn_rapt; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
@@ -623,7 +623,7 @@ CREATE SEQUENCE s_jrn_rapt
--
--- TOC entry 67 (OID 45142)
+-- TOC entry 72 (OID 954989)
-- Name: jrn_rapt; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -635,7 +635,7 @@ CREATE TABLE jrn_rapt (
--
--- TOC entry 69 (OID 45145)
+-- TOC entry 74 (OID 954992)
-- Name: jrn; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -652,12 +652,14 @@ CREATE TABLE jrn (
jrn_ech date,
jr_ech date,
jr_rapt text,
- jr_valid boolean DEFAULT true
+ jr_valid boolean DEFAULT true,
+ j_pj integer,
+ jr_opid integer
);
--
--- TOC entry 71 (OID 45153)
+-- TOC entry 76 (OID 955000)
-- Name: stock_goods; Type: TABLE; Schema: public; Owner: phpcompta
--
@@ -675,51 +677,73 @@ CREATE TABLE stock_goods (
);
-\connect - dany
-
-SET search_path = public, pg_catalog;
-
--
--- TOC entry 103 (OID 678773)
--- Name: plpgsql_call_handler (); Type: FUNCTION; Schema: public; Owner: dany
+-- TOC entry 24 (OID 966677)
+-- Name: s_internal; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE FUNCTION plpgsql_call_handler () RETURNS language_handler
- AS '$libdir/plpgsql', 'plpgsql_call_handler'
- LANGUAGE c;
+CREATE SEQUENCE s_internal
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
--
--- TOC entry 102 (OID 678774)
--- Name: plpgsql; Type: PROCEDURAL LANGUAGE; Schema: public; Owner:
+-- TOC entry 25 (OID 966682)
+-- Name: s_jrn_4; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE TRUSTED PROCEDURAL LANGUAGE plpgsql HANDLER plpgsql_call_handler;
+CREATE SEQUENCE s_jrn_4
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
--
--- TOC entry 104 (OID 678775)
--- Name: today_hour (); Type: FUNCTION; Schema: public; Owner: dany
+-- TOC entry 26 (OID 966685)
+-- Name: s_jrn_1; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE FUNCTION today_hour () RETURNS text
- AS '
-declare
-hour text ;
-begin
-select to_char(now(),''HHMI'') into hour;
-return hour;
-end;
-'
- LANGUAGE plpgsql;
+CREATE SEQUENCE s_jrn_1
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
-\connect - phpcompta
-
-SET search_path = public, pg_catalog;
-
--
--- TOC entry 88 (OID 46203)
+-- TOC entry 27 (OID 966688)
+-- Name: s_jrn_3; Type: SEQUENCE; Schema: public; Owner: phpcompta
+--
+
+CREATE SEQUENCE s_jrn_3
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
+
+
+--
+-- TOC entry 28 (OID 966691)
+-- Name: s_jrn_2; Type: SEQUENCE; Schema: public; Owner: phpcompta
+--
+
+CREATE SEQUENCE s_jrn_2
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
+
+
+--
+-- TOC entry 94 (OID 956053)
-- Name: x_act; Type: INDEX; Schema: public; Owner: phpcompta
--
@@ -727,7 +751,7 @@ CREATE UNIQUE INDEX x_act ON "action" USING btree (ac_description);
--
--- TOC entry 86 (OID 46204)
+-- TOC entry 92 (OID 956054)
-- Name: x_usr_jrn; Type: INDEX; Schema: public; Owner: phpcompta
--
@@ -735,7 +759,7 @@ CREATE UNIQUE INDEX x_usr_jrn ON user_sec_jrn USING btree (uj_login, uj_jrn_id);
--
--- TOC entry 98 (OID 46205)
+-- TOC entry 104 (OID 956055)
-- Name: x_jrn_jr_id; Type: INDEX; Schema: public; Owner: phpcompta
--
@@ -743,7 +767,7 @@ CREATE UNIQUE INDEX x_jrn_jr_id ON jrn USING btree (jr_id);
--
--- TOC entry 100 (OID 46206)
+-- TOC entry 106 (OID 956056)
-- Name: fk_stock_goods_j_id; Type: INDEX; Schema: public; Owner: phpcompta
--
@@ -751,7 +775,7 @@ CREATE INDEX fk_stock_goods_j_id ON stock_goods USING btree (j_id);
--
--- TOC entry 99 (OID 46207)
+-- TOC entry 105 (OID 956057)
-- Name: fk_stock_goods_f_id; Type: INDEX; Schema: public; Owner: phpcompta
--
@@ -759,7 +783,15 @@ CREATE INDEX fk_stock_goods_f_id ON stock_goods USING btree (f_id);
--
--- TOC entry 73 (OID 46208)
+-- TOC entry 86 (OID 966669)
+-- Name: x_poste; Type: INDEX; Schema: public; Owner: phpcompta
+--
+
+CREATE INDEX x_poste ON jrnx USING btree (j_poste);
+
+
+--
+-- TOC entry 78 (OID 956058)
-- Name: tmp_pcmn_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -768,7 +800,7 @@ ALTER TABLE ONLY tmp_pcmn
--
--- TOC entry 74 (OID 46210)
+-- TOC entry 79 (OID 956060)
-- Name: parm_money_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -777,7 +809,7 @@ ALTER TABLE ONLY parm_money
--
--- TOC entry 76 (OID 46212)
+-- TOC entry 81 (OID 956062)
-- Name: parm_periode_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -786,7 +818,7 @@ ALTER TABLE ONLY parm_periode
--
--- TOC entry 75 (OID 46214)
+-- TOC entry 80 (OID 956064)
-- Name: parm_periode_p_start_key; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -795,7 +827,7 @@ ALTER TABLE ONLY parm_periode
--
--- TOC entry 77 (OID 46216)
+-- TOC entry 82 (OID 956066)
-- Name: jrn_type_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -804,7 +836,7 @@ ALTER TABLE ONLY jrn_type
--
--- TOC entry 79 (OID 46218)
+-- TOC entry 84 (OID 956068)
-- Name: jrn_def_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -813,7 +845,7 @@ ALTER TABLE ONLY jrn_def
--
--- TOC entry 78 (OID 46220)
+-- TOC entry 83 (OID 956070)
-- Name: jrn_def_jrn_def_name_key; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -822,7 +854,7 @@ ALTER TABLE ONLY jrn_def
--
--- TOC entry 105 (OID 46222)
+-- TOC entry 108 (OID 956072)
-- Name: $1; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -831,7 +863,7 @@ ALTER TABLE ONLY jrn_def
--
--- TOC entry 80 (OID 46226)
+-- TOC entry 85 (OID 956076)
-- Name: jrnx_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -840,7 +872,7 @@ ALTER TABLE ONLY jrnx
--
--- TOC entry 106 (OID 46228)
+-- TOC entry 109 (OID 956078)
-- Name: $1; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -849,7 +881,7 @@ ALTER TABLE ONLY jrnx
--
--- TOC entry 107 (OID 46232)
+-- TOC entry 110 (OID 956082)
-- Name: $2; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -858,7 +890,7 @@ ALTER TABLE ONLY jrnx
--
--- TOC entry 81 (OID 46236)
+-- TOC entry 87 (OID 956086)
-- Name: user_pref_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -867,7 +899,7 @@ ALTER TABLE ONLY user_pref
--
--- TOC entry 82 (OID 46238)
+-- TOC entry 88 (OID 956088)
-- Name: formdef_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -876,7 +908,7 @@ ALTER TABLE ONLY formdef
--
--- TOC entry 83 (OID 46240)
+-- TOC entry 89 (OID 956090)
-- Name: form_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -885,7 +917,7 @@ ALTER TABLE ONLY form
--
--- TOC entry 108 (OID 46242)
+-- TOC entry 111 (OID 956092)
-- Name: $1; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -894,7 +926,7 @@ ALTER TABLE ONLY form
--
--- TOC entry 84 (OID 46246)
+-- TOC entry 90 (OID 956096)
-- Name: centralized_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -903,7 +935,7 @@ ALTER TABLE ONLY centralized
--
--- TOC entry 109 (OID 46248)
+-- TOC entry 112 (OID 956098)
-- Name: $1; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -912,7 +944,7 @@ ALTER TABLE ONLY centralized
--
--- TOC entry 110 (OID 46252)
+-- TOC entry 113 (OID 956102)
-- Name: $2; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -921,7 +953,7 @@ ALTER TABLE ONLY centralized
--
--- TOC entry 85 (OID 46256)
+-- TOC entry 91 (OID 956106)
-- Name: user_sec_jrn_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -930,7 +962,7 @@ ALTER TABLE ONLY user_sec_jrn
--
--- TOC entry 111 (OID 46258)
+-- TOC entry 114 (OID 956108)
-- Name: $1; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -939,7 +971,7 @@ ALTER TABLE ONLY user_sec_jrn
--
--- TOC entry 87 (OID 46262)
+-- TOC entry 93 (OID 956112)
-- Name: action_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -948,7 +980,7 @@ ALTER TABLE ONLY "action"
--
--- TOC entry 89 (OID 46264)
+-- TOC entry 95 (OID 956114)
-- Name: user_sec_act_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -957,7 +989,7 @@ ALTER TABLE ONLY user_sec_act
--
--- TOC entry 112 (OID 46266)
+-- TOC entry 115 (OID 956116)
-- Name: $1; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -966,7 +998,7 @@ ALTER TABLE ONLY user_sec_act
--
--- TOC entry 90 (OID 46270)
+-- TOC entry 96 (OID 956120)
-- Name: jrn_action_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -975,7 +1007,7 @@ ALTER TABLE ONLY jrn_action
--
--- TOC entry 113 (OID 46272)
+-- TOC entry 116 (OID 956122)
-- Name: $1; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -984,7 +1016,7 @@ ALTER TABLE ONLY jrn_action
--
--- TOC entry 91 (OID 46276)
+-- TOC entry 97 (OID 956126)
-- Name: fiche_def_ref_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -993,7 +1025,7 @@ ALTER TABLE ONLY fiche_def_ref
--
--- TOC entry 92 (OID 46278)
+-- TOC entry 98 (OID 956128)
-- Name: fiche_def_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1002,7 +1034,7 @@ ALTER TABLE ONLY fiche_def
--
--- TOC entry 114 (OID 46280)
+-- TOC entry 117 (OID 956130)
-- Name: $1; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1011,7 +1043,7 @@ ALTER TABLE ONLY fiche_def
--
--- TOC entry 93 (OID 46284)
+-- TOC entry 99 (OID 956134)
-- Name: attr_def_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1020,7 +1052,7 @@ ALTER TABLE ONLY attr_def
--
--- TOC entry 115 (OID 46286)
+-- TOC entry 118 (OID 956136)
-- Name: $1; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1029,7 +1061,7 @@ ALTER TABLE ONLY attr_min
--
--- TOC entry 116 (OID 46290)
+-- TOC entry 119 (OID 956140)
-- Name: $2; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1038,7 +1070,7 @@ ALTER TABLE ONLY attr_min
--
--- TOC entry 94 (OID 46294)
+-- TOC entry 100 (OID 956144)
-- Name: fiche_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1047,7 +1079,7 @@ ALTER TABLE ONLY fiche
--
--- TOC entry 117 (OID 46296)
+-- TOC entry 120 (OID 956146)
-- Name: $1; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1056,7 +1088,7 @@ ALTER TABLE ONLY fiche
--
--- TOC entry 95 (OID 46300)
+-- TOC entry 101 (OID 956150)
-- Name: jnt_fic_att_value_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1065,7 +1097,7 @@ ALTER TABLE ONLY jnt_fic_att_value
--
--- TOC entry 118 (OID 46302)
+-- TOC entry 121 (OID 956152)
-- Name: $1; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1074,7 +1106,7 @@ ALTER TABLE ONLY jnt_fic_att_value
--
--- TOC entry 119 (OID 46306)
+-- TOC entry 122 (OID 956156)
-- Name: $2; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1083,7 +1115,7 @@ ALTER TABLE ONLY jnt_fic_att_value
--
--- TOC entry 120 (OID 46310)
+-- TOC entry 123 (OID 956160)
-- Name: $1; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1092,7 +1124,7 @@ ALTER TABLE ONLY attr_value
--
--- TOC entry 121 (OID 46314)
+-- TOC entry 124 (OID 956164)
-- Name: $1; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1101,7 +1133,7 @@ ALTER TABLE ONLY jnt_fic_attr
--
--- TOC entry 122 (OID 46318)
+-- TOC entry 125 (OID 956168)
-- Name: $2; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1110,7 +1142,7 @@ ALTER TABLE ONLY jnt_fic_attr
--
--- TOC entry 96 (OID 46322)
+-- TOC entry 102 (OID 956172)
-- Name: jrn_rapt_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1119,7 +1151,7 @@ ALTER TABLE ONLY jrn_rapt
--
--- TOC entry 123 (OID 46324)
+-- TOC entry 126 (OID 956174)
-- Name: $1; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1128,7 +1160,7 @@ ALTER TABLE ONLY jrn
--
--- TOC entry 97 (OID 46328)
+-- TOC entry 103 (OID 956178)
-- Name: jrn_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1137,7 +1169,7 @@ ALTER TABLE ONLY jrn
--
--- TOC entry 101 (OID 46330)
+-- TOC entry 107 (OID 956180)
-- Name: stock_goods_pkey; Type: CONSTRAINT; Schema: public; Owner: phpcompta
--
@@ -1146,7 +1178,7 @@ ALTER TABLE ONLY stock_goods
--
--- TOC entry 25 (OID 44961)
+-- TOC entry 30 (OID 954808)
-- Name: TABLE tmp_pcmn; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1154,7 +1186,7 @@ COMMENT ON TABLE tmp_pcmn IS 'Plan comptable minimum normalis
--
--- TOC entry 28 (OID 44974)
+-- TOC entry 33 (OID 954821)
-- Name: TABLE parm_money; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1162,7 +1194,7 @@ COMMENT ON TABLE parm_money IS 'Currency conversion';
--
--- TOC entry 30 (OID 44977)
+-- TOC entry 35 (OID 954824)
-- Name: TABLE parm_periode; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1170,7 +1202,7 @@ COMMENT ON TABLE parm_periode IS 'Periode definition';
--
--- TOC entry 32 (OID 44993)
+-- TOC entry 37 (OID 954840)
-- Name: TABLE jrn_type; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1178,7 +1210,7 @@ COMMENT ON TABLE jrn_type IS 'Type of journal (Sell, Buy, Financial...)';
--
--- TOC entry 34 (OID 44998)
+-- TOC entry 39 (OID 954845)
-- Name: TABLE jrn_def; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1186,7 +1218,7 @@ COMMENT ON TABLE jrn_def IS 'Definition of a journal, his properties';
--
--- TOC entry 36 (OID 45009)
+-- TOC entry 41 (OID 954856)
-- Name: TABLE jrnx; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1194,7 +1226,7 @@ COMMENT ON TABLE jrnx IS 'Journal: content one line for each accountancy writing
--
--- TOC entry 40 (OID 45035)
+-- TOC entry 45 (OID 954882)
-- Name: TABLE form; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1202,7 +1234,7 @@ COMMENT ON TABLE form IS 'Forms content';
--
--- TOC entry 42 (OID 45047)
+-- TOC entry 47 (OID 954894)
-- Name: TABLE centralized; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1210,7 +1242,7 @@ COMMENT ON TABLE centralized IS 'The centralized journal';
--
--- TOC entry 45 (OID 45064)
+-- TOC entry 50 (OID 954911)
-- Name: TABLE "action"; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1218,7 +1250,7 @@ COMMENT ON TABLE "action" IS 'The different privileges';
--
--- TOC entry 48 (OID 45077)
+-- TOC entry 53 (OID 954924)
-- Name: TABLE jrn_action; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1226,7 +1258,7 @@ COMMENT ON TABLE jrn_action IS 'Possible action when we are in journal (menu)';
--
--- TOC entry 50 (OID 45084)
+-- TOC entry 55 (OID 954931)
-- Name: TABLE tva_rate; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1234,7 +1266,7 @@ COMMENT ON TABLE tva_rate IS 'Rate of vat';
--
--- TOC entry 52 (OID 45100)
+-- TOC entry 57 (OID 954947)
-- Name: TABLE fiche_def_ref; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1242,7 +1274,7 @@ COMMENT ON TABLE fiche_def_ref IS 'Family Cards definition';
--
--- TOC entry 54 (OID 45106)
+-- TOC entry 59 (OID 954953)
-- Name: TABLE fiche_def; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1250,7 +1282,7 @@ COMMENT ON TABLE fiche_def IS 'Cards definition';
--
--- TOC entry 56 (OID 45113)
+-- TOC entry 61 (OID 954960)
-- Name: TABLE attr_def; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1258,7 +1290,7 @@ COMMENT ON TABLE attr_def IS 'The available attributs for the cards';
--
--- TOC entry 58 (OID 45119)
+-- TOC entry 63 (OID 954966)
-- Name: TABLE attr_min; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1266,7 +1298,7 @@ COMMENT ON TABLE attr_min IS 'The value of attributs for the cards';
--
--- TOC entry 60 (OID 45121)
+-- TOC entry 65 (OID 954968)
-- Name: TABLE fiche; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1274,7 +1306,7 @@ COMMENT ON TABLE fiche IS 'Cards';
--
--- TOC entry 62 (OID 45124)
+-- TOC entry 67 (OID 954971)
-- Name: TABLE jnt_fic_att_value; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1282,7 +1314,7 @@ COMMENT ON TABLE jnt_fic_att_value IS 'join between the card and the attribut de
--
--- TOC entry 65 (OID 45132)
+-- TOC entry 70 (OID 954979)
-- Name: TABLE jnt_fic_attr; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1290,7 +1322,7 @@ COMMENT ON TABLE jnt_fic_attr IS 'join between the family card and the attribut
--
--- TOC entry 68 (OID 45142)
+-- TOC entry 73 (OID 954989)
-- Name: TABLE jrn_rapt; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1298,7 +1330,7 @@ COMMENT ON TABLE jrn_rapt IS 'Rapprochement between operation';
--
--- TOC entry 70 (OID 45145)
+-- TOC entry 75 (OID 954992)
-- Name: TABLE jrn; Type: COMMENT; Schema: public; Owner: phpcompta
--
@@ -1306,7 +1338,7 @@ COMMENT ON TABLE jrn IS 'Journal: content one line for a group of accountancy wr
--
--- TOC entry 72 (OID 45153)
+-- TOC entry 77 (OID 955000)
-- 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 723e6e4bc..d891cdc82 100644
--- a/html/admin/sql/mod1/sequence.sql
+++ b/html/admin/sql/mod1/sequence.sql
@@ -152,3 +152,38 @@ CREATE SEQUENCE s_jrn_rapt
MAXVALUE 9223372036854775807
MINVALUE 1
CACHE 1;
+-- Name: s_internal; Type: SEQUENCE; Schema: public; Owner: phpcompta
+CREATE SEQUENCE s_internal
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
+-- Name: s_jrn_4; Type: SEQUENCE; Schema: public; Owner: phpcompta
+CREATE SEQUENCE s_jrn_4
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
+-- Name: s_jrn_1; Type: SEQUENCE; Schema: public; Owner: phpcompta
+CREATE SEQUENCE s_jrn_1
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
+-- Name: s_jrn_3; Type: SEQUENCE; Schema: public; Owner: phpcompta
+CREATE SEQUENCE s_jrn_3
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
+-- Name: s_jrn_2; Type: SEQUENCE; Schema: public; Owner: phpcompta
+CREATE SEQUENCE s_jrn_2
+ START 1
+ INCREMENT 1
+ MAXVALUE 9223372036854775807
+ MINVALUE 1
+ CACHE 1;
diff --git a/html/admin/sql/mod1/table.sql b/html/admin/sql/mod1/table.sql
index a8a5a9547..4b866d9a7 100644
--- a/html/admin/sql/mod1/table.sql
+++ b/html/admin/sql/mod1/table.sql
@@ -169,7 +169,9 @@ CREATE TABLE jrn (
jrn_ech date,
jr_ech date,
jr_rapt text,
- jr_valid boolean DEFAULT true
+ jr_valid boolean DEFAULT true,
+ j_pj integer,
+ jr_opid integer
);
CREATE TABLE stock_goods (
sg_id integer DEFAULT nextval('s_stock_goods'::text) NOT NULL,