diff --git a/html/admin/sql/account_repository/data.sql b/html/admin/sql/account_repository/data.sql
index 3bab6648f..f00181ada 100644
--- a/html/admin/sql/account_repository/data.sql
+++ b/html/admin/sql/account_repository/data.sql
@@ -3,7 +3,6 @@
--
SET client_encoding = 'LATIN1';
-SET check_function_bodies = false;
SET search_path = public, pg_catalog;
diff --git a/html/admin/sql/account_repository/schema.sql b/html/admin/sql/account_repository/schema.sql
index 22285f4f6..788c2b196 100644
--- a/html/admin/sql/account_repository/schema.sql
+++ b/html/admin/sql/account_repository/schema.sql
@@ -1,11 +1,7 @@
SET client_encoding = 'LATIN1';
-SET check_function_bodies = false;
-SET search_path = public, pg_catalog;
-CREATE SEQUENCE users_id
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+
+CREATE SEQUENCE users_id;
+
CREATE TABLE ac_users (
use_id integer DEFAULT nextval('users_id'::text) NOT NULL,
use_first_name text,
@@ -24,11 +20,7 @@ CREATE TABLE ac_dossier (
dos_description text,
dos_jnt_user integer DEFAULT 0
);
-CREATE SEQUENCE seq_jnt_use_dos
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE seq_jnt_use_dos;
CREATE TABLE jnt_use_dos (
jnt_id integer DEFAULT nextval('seq_jnt_use_dos'::text) NOT NULL,
use_id integer NOT NULL,
@@ -37,11 +29,7 @@ CREATE TABLE jnt_use_dos (
CREATE TABLE "version" (
val integer
);
-CREATE SEQUENCE seq_priv_user
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE seq_priv_user;
CREATE TABLE priv_user (
priv_id integer DEFAULT nextval('seq_priv_user'::text) NOT NULL,
priv_jnt integer NOT NULL,
@@ -52,22 +40,14 @@ CREATE TABLE theme (
the_filestyle text,
the_filebutton text
);
-CREATE SEQUENCE s_modid
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_modid ;
CREATE TABLE modeledef (
mod_id integer DEFAULT nextval('s_modid'::text) NOT NULL,
mod_name text NOT NULL,
mod_desc text
);
-CREATE SEQUENCE dossier_id
- INCREMENT BY 1
- NO MAXVALUE
- MINVALUE 3
- CACHE 1;
+CREATE SEQUENCE dossier_id;
+
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/dossier1/data.sql b/html/admin/sql/dossier1/data.sql
index 527d34945..4c16e68a8 100644
--- a/html/admin/sql/dossier1/data.sql
+++ b/html/admin/sql/dossier1/data.sql
@@ -3,7 +3,6 @@
--
SET client_encoding = 'LATIN1';
-SET check_function_bodies = false;
SET search_path = public, pg_catalog;
@@ -522,7 +521,7 @@ INSERT INTO tmp_pcmn (pcm_val, pcm_lib, pcm_val_parent, pcm_country) VALUES (604
-- Name: version; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
-INSERT INTO "version" (val) VALUES (5);
+INSERT INTO "version" (val) VALUES (4);
--
@@ -1369,13 +1368,6 @@ SELECT pg_catalog.setval('s_form', 1, false);
SELECT pg_catalog.setval('s_idef', 2, true);
---
--- TOC entry 12 (OID 109730)
--- Name: s_centralized; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
---
-
-SELECT pg_catalog.setval('s_centralized', 1, false);
-
--
-- TOC entry 13 (OID 109739)
@@ -1457,59 +1449,3 @@ SELECT pg_catalog.setval('s_jrn_rapt', 13, true);
SELECT pg_catalog.setval('s_stock_goods', 24, true);
---
--- TOC entry 23 (OID 111122)
--- Name: s_central; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
---
-
-SELECT pg_catalog.setval('s_central', 1, false);
-
-
---
--- TOC entry 24 (OID 111133)
--- Name: s_central_order; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
---
-
-SELECT pg_catalog.setval('s_central_order', 1, false);
-
-
---
--- 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 294637a83..e0d9f321c 100644
--- a/html/admin/sql/dossier1/schema.sql
+++ b/html/admin/sql/dossier1/schema.sql
@@ -1,5 +1,4 @@
SET client_encoding = 'LATIN1';
-SET check_function_bodies = false;
SET search_path = public, pg_catalog;
CREATE TABLE tmp_pcmn (
pcm_val integer NOT NULL,
@@ -10,16 +9,10 @@ CREATE TABLE tmp_pcmn (
CREATE TABLE "version" (
val integer
);
-CREATE SEQUENCE s_periode
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-CREATE SEQUENCE s_currency
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_periode;
+
+CREATE SEQUENCE s_currency;
+
CREATE TABLE parm_money (
pm_id integer DEFAULT nextval('s_currency'::text),
pm_code character(3) NOT NULL,
@@ -32,28 +25,14 @@ CREATE TABLE parm_periode (
p_exercice text DEFAULT to_char(now(), 'YYYY'::text) NOT NULL,
p_closed boolean DEFAULT false
);
-CREATE SEQUENCE s_jrn_def
- START WITH 5
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-CREATE SEQUENCE s_grpt
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-CREATE SEQUENCE s_jrn_op
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-CREATE SEQUENCE s_jrn
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_jrn_def;
+select setval('s_jrn_def',5);
+CREATE SEQUENCE s_grpt;
+
+CREATE SEQUENCE s_jrn_op;
+
+CREATE SEQUENCE s_jrn;
+
CREATE TABLE jrn_type (
jrn_type_id character(3) NOT NULL,
jrn_desc text
@@ -72,12 +51,8 @@ CREATE TABLE jrn_def (
jrn_def_type character(3) NOT NULL,
jrn_def_code text NOT NULL
);
-CREATE SEQUENCE s_jrnx
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_jrnx;
+
CREATE TABLE jrnx (
j_id integer DEFAULT nextval('s_jrn_op'::text) NOT NULL,
j_date date DEFAULT now(),
@@ -98,18 +73,8 @@ CREATE TABLE user_pref (
pref_user text NOT NULL,
pref_periode integer NOT NULL
);
-CREATE SEQUENCE s_formdef
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-CREATE SEQUENCE s_form
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_formdef;
+CREATE SEQUENCE s_form;
CREATE TABLE formdef (
fr_id integer DEFAULT nextval('s_formdef'::text) NOT NULL,
fr_label text
@@ -121,17 +86,9 @@ CREATE TABLE form (
fo_label text,
fo_formula text
);
-CREATE SEQUENCE s_idef
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-CREATE SEQUENCE s_centralized
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_idef;
+
+CREATE SEQUENCE s_centralized;
CREATE TABLE centralized (
c_id integer DEFAULT nextval('s_centralized'::text) NOT NULL,
c_j_id integer,
@@ -145,19 +102,11 @@ CREATE TABLE centralized (
c_grp integer NOT NULL,
c_comment text,
c_rapt text,
- c_periode integer,
- c_order integer
+ c_periode integer
+
);
-CREATE SEQUENCE s_user_jrn
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-CREATE SEQUENCE s_user_act
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_user_jrn;
+CREATE SEQUENCE s_user_act;
CREATE TABLE user_sec_jrn (
uj_id integer DEFAULT nextval('s_user_jrn'::text) NOT NULL,
uj_login text,
@@ -173,11 +122,7 @@ CREATE TABLE user_sec_act (
ua_login text,
ua_act_id integer
);
-CREATE SEQUENCE s_jrnaction
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_jrnaction;
CREATE TABLE jrn_action (
ja_id integer DEFAULT nextval('s_jrnaction'::text) NOT NULL,
ja_name text NOT NULL,
@@ -194,31 +139,11 @@ CREATE TABLE tva_rate (
tva_comment text,
tva_poste text
);
-CREATE SEQUENCE s_fiche
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-CREATE SEQUENCE s_fiche_def_ref
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-CREATE SEQUENCE s_fdef
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-CREATE SEQUENCE s_attr_def
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-CREATE SEQUENCE s_jnt_fic_att_value
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_fiche;
+CREATE SEQUENCE s_fiche_def_ref;
+CREATE SEQUENCE s_fdef;
+CREATE SEQUENCE s_attr_def;
+CREATE SEQUENCE s_jnt_fic_att_value;
CREATE TABLE fiche_def_ref (
frd_id integer DEFAULT nextval('s_fiche_def_ref'::text) NOT NULL,
frd_text text,
@@ -252,11 +177,7 @@ CREATE TABLE jnt_fic_attr (
fd_id integer,
ad_id integer
);
-CREATE SEQUENCE s_jrn_rapt
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_jrn_rapt;
CREATE TABLE jrn_rapt (
jra_id integer DEFAULT nextval('s_jrn_rapt'::text) NOT NULL,
jr_id integer NOT NULL,
@@ -264,11 +185,7 @@ CREATE TABLE jrn_rapt (
);
CREATE VIEW vw_fiche_attr AS
SELECT a.f_id, fd_id, a.av_text AS vw_name, b.av_text AS vw_sell, c.av_text AS vw_buy, d.av_text AS tva_code, tva_id, tva_rate, tva_label, e.av_text AS vw_addr, f.av_text AS vw_cp, frd_id FROM ((((((((SELECT f_id, fd_id, av_text FROM (((fiche JOIN jnt_fic_att_value USING (f_id)) JOIN attr_value USING (jft_id)) JOIN attr_def USING (ad_id)) WHERE (ad_id = 1)) a LEFT JOIN (SELECT f_id, av_text FROM (((fiche JOIN jnt_fic_att_value USING (f_id)) JOIN attr_value USING (jft_id)) JOIN attr_def USING (ad_id)) WHERE (ad_id = 6)) b ON ((a.f_id = b.f_id))) LEFT JOIN (SELECT f_id, av_text FROM (((fiche JOIN jnt_fic_att_value USING (f_id)) JOIN attr_value USING (jft_id)) JOIN attr_def USING (ad_id)) WHERE (ad_id = 7)) c ON ((a.f_id = c.f_id))) LEFT JOIN (SELECT f_id, av_text FROM (((fiche JOIN jnt_fic_att_value USING (f_id)) JOIN attr_value USING (jft_id)) JOIN attr_def USING (ad_id)) WHERE (ad_id = 2)) d ON ((a.f_id = d.f_id))) LEFT JOIN (SELECT f_id, av_text FROM (((fiche JOIN jnt_fic_att_value USING (f_id)) JOIN attr_value USING (jft_id)) JOIN attr_def USING (ad_id)) WHERE (ad_id = 14)) e ON ((a.f_id = e.f_id))) LEFT JOIN (SELECT f_id, av_text FROM (((fiche JOIN jnt_fic_att_value USING (f_id)) JOIN attr_value USING (jft_id)) JOIN attr_def USING (ad_id)) WHERE (ad_id = 15)) f ON ((a.f_id = f.f_id))) LEFT JOIN tva_rate ON ((d.av_text = (tva_rate.tva_id)::text))) JOIN fiche_def USING (fd_id));
-CREATE SEQUENCE s_stock_goods
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_stock_goods;
CREATE TABLE jrn (
jr_id integer DEFAULT nextval('s_jrn'::text) NOT NULL,
jr_def_id integer NOT NULL,
@@ -282,11 +199,8 @@ CREATE TABLE jrn (
jrn_ech date,
jr_ech date,
jr_rapt text,
- jr_valid boolean DEFAULT true,
- j_pj integer,
- jr_opid integer,
- jr_c_opid integer
-);
+ jr_valid boolean DEFAULT true
+ );
CREATE TABLE stock_goods (
sg_id integer DEFAULT nextval('s_stock_goods'::text) NOT NULL,
j_id integer,
@@ -303,48 +217,6 @@ CREATE TABLE attr_min (
frd_id integer,
ad_id integer
);
-CREATE SEQUENCE s_central
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-CREATE SEQUENCE s_central_order
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-CREATE SEQUENCE s_internal
- START WITH 1
- INCREMENT BY 1
- 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);
@@ -361,7 +233,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/mod1/data.sql b/html/admin/sql/mod1/data.sql
index 359dd4ee3..f237a37c2 100644
--- a/html/admin/sql/mod1/data.sql
+++ b/html/admin/sql/mod1/data.sql
@@ -3,7 +3,6 @@
--
SET client_encoding = 'LATIN1';
-SET check_function_bodies = false;
SET search_path = public, pg_catalog;
@@ -522,7 +521,7 @@ INSERT INTO tmp_pcmn (pcm_val, pcm_lib, pcm_val_parent, pcm_country) VALUES (101
-- Name: version; Type: TABLE DATA; Schema: public; Owner: phpcompta
--
-INSERT INTO "version" (val) VALUES (5);
+INSERT INTO "version" (val) VALUES (4);
--
@@ -1271,12 +1270,6 @@ SELECT pg_catalog.setval('s_grpt', 1, false);
SELECT pg_catalog.setval('s_jrn_op', 1, false);
---
--- TOC entry 7 (OID 108303)
--- Name: s_jrn; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
---
-
-SELECT pg_catalog.setval('s_jrn', 1, false);
--
@@ -1406,60 +1399,3 @@ SELECT pg_catalog.setval('s_stock_goods', 1, false);
SELECT pg_catalog.setval('s_jrn_rapt', 1, false);
-
---
--- TOC entry 24 (OID 111182)
--- Name: s_central; Type: SEQUENCE SET; Schema: public; Owner: phpcompta
---
-
-SELECT pg_catalog.setval('s_central', 1, false);
-
-
---
--- 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 140a98eb9..5b7ce93b8 100644
--- a/html/admin/sql/mod1/schema.sql
+++ b/html/admin/sql/mod1/schema.sql
@@ -3,7 +3,6 @@
--
SET client_encoding = 'LATIN1';
-SET check_function_bodies = false;
--
@@ -41,14 +40,10 @@ CREATE TABLE "version" (
--
-- TOC entry 5 (OID 108282)
--- Name: s_periode; Type: SEQUENCE; Schema: public; Owner: phpcompta
+-- Name: s_periode; Type: SEQUENCE; Schema: public; Owner: phpcompta;
--
-CREATE SEQUENCE s_periode
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_periode;
--
@@ -56,11 +51,7 @@ CREATE SEQUENCE s_periode
-- Name: s_currency; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_currency
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_currency;
--
@@ -94,12 +85,7 @@ CREATE TABLE parm_periode (
-- Name: s_jrn_def; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_jrn_def
- START WITH 5
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_jrn_def;
--
@@ -107,25 +93,14 @@ CREATE SEQUENCE s_jrn_def
-- Name: s_grpt; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_grpt
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
+CREATE SEQUENCE s_grpt;
--
-- TOC entry 9 (OID 108301)
-- Name: s_jrn_op; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_jrn_op
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_jrn_op;
--
@@ -133,12 +108,7 @@ CREATE SEQUENCE s_jrn_op
-- Name: s_jrn; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_jrn
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_jrn;
--
@@ -178,12 +148,7 @@ CREATE TABLE jrn_def (
-- Name: s_jrnx; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_jrnx
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_jrnx;
--
@@ -225,25 +190,14 @@ CREATE TABLE user_pref (
-- Name: s_formdef; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_formdef
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
+CREATE SEQUENCE s_formdef;
--
-- TOC entry 13 (OID 108339)
-- Name: s_form; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_form
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_form;
--
@@ -276,12 +230,7 @@ CREATE TABLE form (
-- Name: s_isup; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_isup
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_isup;
--
@@ -289,26 +238,14 @@ CREATE SEQUENCE s_isup
-- Name: s_idef; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_idef
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
+CREATE SEQUENCE s_idef;
--
-- TOC entry 16 (OID 108357)
-- Name: s_centralized; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_centralized
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
+CREATE SEQUENCE s_centralized;
--
-- TOC entry 51 (OID 108359)
@@ -328,8 +265,7 @@ CREATE TABLE centralized (
c_grp integer NOT NULL,
c_comment text,
c_rapt text,
- c_periode integer,
- c_order integer
+ c_periode integer
);
@@ -338,25 +274,14 @@ CREATE TABLE centralized (
-- Name: s_user_jrn; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_user_jrn
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
+CREATE SEQUENCE s_user_jrn;
--
-- TOC entry 18 (OID 108368)
-- Name: s_user_act; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_user_act
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_user_act;
--
@@ -400,12 +325,7 @@ CREATE TABLE user_sec_act (
-- Name: s_jrnaction; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_jrnaction
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
+CREATE SEQUENCE s_jrnaction;
--
-- TOC entry 57 (OID 108389)
@@ -442,11 +362,7 @@ CREATE TABLE tva_rate (
-- Name: s_fiche; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_fiche
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_fiche;
--
@@ -454,12 +370,7 @@ CREATE SEQUENCE s_fiche
-- Name: s_fiche_def_ref; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_fiche_def_ref
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_fiche_def_ref;
--
@@ -467,24 +378,14 @@ CREATE SEQUENCE s_fiche_def_ref
-- Name: s_fdef; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_fdef
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
+CREATE SEQUENCE s_fdef;
--
-- TOC entry 23 (OID 108408)
-- Name: s_attr_def; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_attr_def
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_attr_def;
--
@@ -492,12 +393,7 @@ CREATE SEQUENCE s_attr_def
-- Name: s_jnt_fic_att_value; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_jnt_fic_att_value
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
+CREATE SEQUENCE s_jnt_fic_att_value;
--
-- TOC entry 61 (OID 108412)
@@ -606,25 +502,14 @@ CREATE VIEW vw_fiche_attr AS
-- Name: s_stock_goods; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_stock_goods
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
+CREATE SEQUENCE s_stock_goods;
--
-- TOC entry 26 (OID 108452)
-- Name: s_jrn_rapt; Type: SEQUENCE; Schema: public; Owner: phpcompta
--
-CREATE SEQUENCE s_jrn_rapt
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE SEQUENCE s_jrn_rapt;
--
@@ -657,10 +542,8 @@ CREATE TABLE jrn (
jrn_ech date,
jr_ech date,
jr_rapt text,
- jr_valid boolean DEFAULT true,
- j_pj integer,
- jr_opid integer,
- jr_c_opid integer
+ jr_valid boolean DEFAULT true
+
);
@@ -683,114 +566,7 @@ CREATE TABLE stock_goods (
);
---
--- TOC entry 27 (OID 111182)
--- 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;
-
-
---
--- TOC entry 28 (OID 111193)
--- 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;
-
-
---
--- 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
---
-
-CREATE UNIQUE INDEX x_act ON "action" USING btree (ac_description);
-
-
---
--- TOC entry 97 (OID 109519)
--- Name: x_usr_jrn; Type: INDEX; Schema: public; Owner: phpcompta
---
-
-CREATE UNIQUE INDEX x_usr_jrn ON user_sec_jrn USING btree (uj_login, uj_jrn_id);
-
-
---
-- TOC entry 109 (OID 109520)
-- Name: x_jrn_jr_id; Type: INDEX; Schema: public; Owner: phpcompta
--
@@ -814,13 +590,6 @@ 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);
---
--- TOC entry 91 (OID 111185)
--- Name: x_poste; Type: INDEX; Schema: public; Owner: phpcompta
---
-
-CREATE INDEX x_poste ON jrnx USING btree (j_poste);
-
--
-- TOC entry 83 (OID 109523)
diff --git a/html/admin/sql/patch/upgrade4.sql b/html/admin/sql/patch/upgrade4.sql
index c7a484bd1..1a96b093f 100644
--- a/html/admin/sql/patch/upgrade4.sql
+++ b/html/admin/sql/patch/upgrade4.sql
@@ -29,7 +29,6 @@ create sequence s_central;
create index x_poste on jrnx(j_poste );
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;
alter table jrn add jr_c_opid int4;
create SEQUENCE s_central_order;