diff --git a/core/trunk/structure.sql b/core/trunk/structure.sql
index 804bc64f93e0152c6d35bc172257af430a1a0c76..017bb1f9863cf90204c313eef37e0d8a6dc3cc54 100644
--- a/core/trunk/structure.sql
+++ b/core/trunk/structure.sql
@@ -1,6 +1,6 @@
 
 
--- core/sql/structure/core.postgresql.sql
+-- from core/sql/structure/core.postgresql.sql
 
 
 SET client_encoding = 'UTF8';
@@ -302,7 +302,7 @@ CREATE TABLE users
 WITH (OIDS=FALSE);
 
 
--- modules/advanced_physical_archive/sql/structure/advanced_physical_archive.postgresql.sql
+-- from modules/advanced_physical_archive/sql/structure/advanced_physical_archive.postgresql.sql
 
 CREATE SEQUENCE arbox_id_seq
   INCREMENT 1
@@ -549,7 +549,7 @@ WITH (OIDS=FALSE);
 WITH (OIDS=FALSE);
 
 
--- modules/alert_diffusion/sql/structure/alert_diffusion.postgresql.sql
+-- from modules/alert_diffusion/sql/structure/alert_diffusion.postgresql.sql
 
 
 CREATE SEQUENCE alerts_alert_id_seq
@@ -619,7 +619,7 @@ CREATE TABLE alert_insts
 WITH (OIDS=FALSE);
 
 
--- modules/attachments/sql/structure/attachments.postgresql.sql
+-- from modules/attachments/sql/structure/attachments.postgresql.sql
 
 
 CREATE SEQUENCE res_attachment_res_id_seq
@@ -687,7 +687,7 @@ CREATE TABLE res_attachments
 WITH (OIDS=FALSE);
 
 
--- modules/autofoldering/sql/structure/autofoldering.postgresql.sql
+-- from modules/autofoldering/sql/structure/autofoldering.postgresql.sql
 
 
 CREATE TABLE af_security
@@ -731,7 +731,7 @@ CREATE TABLE af_view_customer_target
 WITH (OIDS=FALSE);
 
 
--- modules/basket/sql/structure/basket.postgresql.sql
+-- from modules/basket/sql/structure/basket.postgresql.sql
 
 CREATE TABLE actions_groupbaskets
 (
@@ -794,7 +794,7 @@ CREATE TABLE user_abs
 WITH (OIDS=FALSE);
 
 
--- modules/cases/sql/structure/cases.postgresql.sql
+-- from modules/cases/sql/structure/cases.postgresql.sql
 
 CREATE SEQUENCE case_id_seq
   INCREMENT 1
@@ -830,7 +830,7 @@ CREATE TABLE cases_res
 
 
 
--- modules/entities/sql/structure/entities.postgresql.sql
+-- from modules/entities/sql/structure/entities.postgresql.sql
 
 
 CREATE TABLE entities
@@ -912,7 +912,7 @@ CREATE TABLE groupbasket_redirect
 WITH (OIDS=FALSE);
 
 
--- modules/folder/sql/structure/folder.postgresql.sql
+-- from modules/folder/sql/structure/folder.postgresql.sql
 
 CREATE SEQUENCE folders_system_id_seq
   INCREMENT 1
@@ -1077,7 +1077,7 @@ CREATE TABLE foldertypes_indexes
 WITH (OIDS=FALSE);
 
 
--- modules/full_text/sql/structure/full_text.postgresql.sql
+-- from modules/full_text/sql/structure/full_text.postgresql.sql
 
 CREATE TABLE fulltext
 (
@@ -1092,64 +1092,7 @@ WITH (
 );
 
 
--- modules/life_cycle/sql/structure/life_cycle.postgresql.sql
-
-CREATE TABLE lc_policies
-(
-   policy_id character varying(32) NOT NULL, 
-   policy_name character varying(255) NOT NULL,
-   policy_desc character varying(255) NOT NULL,
-   CONSTRAINT lc_policies_pkey PRIMARY KEY (policy_id)
-) 
-WITH (OIDS = FALSE);
-
-
-CREATE TABLE lc_cycles
-(
-   policy_id character varying(32) NOT NULL,
-   cycle_id character varying(32) NOT NULL, 
-   cycle_desc character varying(255) NOT NULL,
-   sequence_number integer NOT NULL,
-   where_clause text, 
-   break_key character varying(255) DEFAULT NULL,
-   validation_mode character varying(32) NOT NULL, 
-   CONSTRAINT lc_cycle_pkey PRIMARY KEY (policy_id, cycle_id)
-) 
-WITH (OIDS = FALSE);
-
-CREATE TABLE lc_cycle_steps
-(
-   policy_id character varying(32) NOT NULL,
-   cycle_id character varying(32) NOT NULL, 
-   cycle_step_id character varying(32) NOT NULL, 
-   cycle_step_desc character varying(255) NOT NULL,
-   docserver_type_id character varying(32) NOT NULL,
-   is_allow_failure boolean NOT NULL DEFAULT false,
-   step_operation character varying(32) NOT NULL,
-   sequence_number integer NOT NULL,
-   is_must_complete boolean NOT NULL DEFAULT false,
-   preprocess_script character varying(255) DEFAULT NULL, 
-   postprocess_script character varying(255) DEFAULT NULL,
-   CONSTRAINT lc_cycle_steps_pkey PRIMARY KEY (policy_id, cycle_id, cycle_step_id, docserver_type_id)
-) 
-WITH (OIDS = FALSE);
-
-CREATE TABLE lc_stack
-(
-   policy_id character varying(32) NOT NULL,
-   cycle_id character varying(32) NOT NULL, 
-   cycle_step_id character varying(32) NOT NULL, 
-   coll_id character varying(32) NOT NULL,
-   res_id bigint NOT NULL, 
-   cnt_retry integer DEFAULT NULL, 
-   status character(1) NOT NULL,
-   CONSTRAINT lc_stack_pkey PRIMARY KEY (policy_id, cycle_id, cycle_step_id, res_id)
-) 
-WITH (OIDS = FALSE);
-
-
-
--- modules/notes/sql/structure/notes.postgresql.sql
+-- from modules/notes/sql/structure/notes.postgresql.sql
 
 CREATE SEQUENCE notes_seq
   INCREMENT 1
@@ -1173,7 +1116,7 @@ CREATE TABLE notes
 WITH (OIDS=FALSE);
 
 
--- modules/physical_archive/sql/structure/physical_archive.postgresql.sql
+-- from modules/physical_archive/sql/structure/physical_archive.postgresql.sql
 
 create or replace function update_the_db() returns void as
 $$
@@ -1306,18 +1249,7 @@ CREATE TABLE ar_batch
 ) ;
 
 
--- modules/reports/sql/structure/reports.postgresql.sql
-
-CREATE TABLE usergroups_reports
-(
-  group_id character varying(32) NOT NULL,
-  report_id character varying(50) NOT NULL,
-  CONSTRAINT usergroups_reports_pkey PRIMARY KEY (group_id, report_id)
-)
-WITH (OIDS=FALSE);
-
-
--- modules/templates/sql/structure/templates.postgresql.sql
+-- from modules/templates/sql/structure/templates.postgresql.sql
 
 
 CREATE SEQUENCE templates_seq
@@ -1365,7 +1297,76 @@ CREATE TABLE templates_doctype_ext
 WITH (OIDS=FALSE);
 
 
--- apps/maarch_entreprise/sql/structure/apps.postgresql.sql
+-- from modules/reports/sql/structure/reports.postgresql.sql
+
+CREATE TABLE usergroups_reports
+(
+  group_id character varying(32) NOT NULL,
+  report_id character varying(50) NOT NULL,
+  CONSTRAINT usergroups_reports_pkey PRIMARY KEY (group_id, report_id)
+)
+WITH (OIDS=FALSE);
+
+
+
+-- from modules/life_cycle/sql/structure/life_cycle.postgresql.sql
+
+CREATE TABLE lc_policies
+(
+   policy_id character varying(32) NOT NULL, 
+   policy_name character varying(255) NOT NULL,
+   policy_desc character varying(255) NOT NULL,
+   CONSTRAINT lc_policies_pkey PRIMARY KEY (policy_id)
+) 
+WITH (OIDS = FALSE);
+
+
+CREATE TABLE lc_cycles
+(
+   policy_id character varying(32) NOT NULL,
+   cycle_id character varying(32) NOT NULL, 
+   cycle_desc character varying(255) NOT NULL,
+   sequence_number integer NOT NULL,
+   where_clause text, 
+   break_key character varying(255) DEFAULT NULL,
+   validation_mode character varying(32) NOT NULL, 
+   CONSTRAINT lc_cycle_pkey PRIMARY KEY (policy_id, cycle_id)
+) 
+WITH (OIDS = FALSE);
+
+CREATE TABLE lc_cycle_steps
+(
+   policy_id character varying(32) NOT NULL,
+   cycle_id character varying(32) NOT NULL, 
+   cycle_step_id character varying(32) NOT NULL, 
+   cycle_step_desc character varying(255) NOT NULL,
+   docserver_type_id character varying(32) NOT NULL,
+   is_allow_failure boolean NOT NULL DEFAULT false,
+   step_operation character varying(32) NOT NULL,
+   sequence_number integer NOT NULL,
+   is_must_complete boolean NOT NULL DEFAULT false,
+   preprocess_script character varying(255) DEFAULT NULL, 
+   postprocess_script character varying(255) DEFAULT NULL,
+   CONSTRAINT lc_cycle_steps_pkey PRIMARY KEY (policy_id, cycle_id, cycle_step_id, docserver_type_id)
+) 
+WITH (OIDS = FALSE);
+
+CREATE TABLE lc_stack
+(
+   policy_id character varying(32) NOT NULL,
+   cycle_id character varying(32) NOT NULL, 
+   cycle_step_id character varying(32) NOT NULL, 
+   coll_id character varying(32) NOT NULL,
+   res_id bigint NOT NULL, 
+   cnt_retry integer DEFAULT NULL, 
+   status character(1) NOT NULL,
+   CONSTRAINT lc_stack_pkey PRIMARY KEY (policy_id, cycle_id, cycle_step_id, res_id)
+) 
+WITH (OIDS = FALSE);
+
+
+
+-- from apps/maarch_entreprise/sql/structure/apps.postgresql.sql
 
 CREATE SEQUENCE contact_id_seq
   INCREMENT 1
@@ -1830,20 +1831,6 @@ CREATE VIEW res_view_letterbox AS
 CREATE OR REPLACE VIEW res_view_apa AS
  select * from res_apa;
 
-ALTER TABLE folders ADD video_status character varying(10) DEFAULT NULL;
-ALTER TABLE folders ADD video_user character varying(32) DEFAULT NULL;
-CREATE OR REPLACE VIEW view_postindexing AS 
- SELECT res_view_letterbox.video_user, (users.firstname::text || ' '::text) || users.lastname::text AS user_name, 
- res_view_letterbox.video_batch, res_view_letterbox.video_time, count(res_view_letterbox.res_id) AS count_documents, 
- res_view_letterbox.folders_system_id, (folders.folder_id::text || ' / '::text) || folders.folder_name::text AS folder_full_label, 
- folders.video_status
-   FROM res_view_letterbox
-   LEFT JOIN users ON res_view_letterbox.video_user::text = users.user_id::text
-   LEFT JOIN folders ON folders.folders_system_id = res_view_letterbox.folders_system_id
-  WHERE res_view_letterbox.video_batch IS NOT NULL
-  GROUP BY res_view_letterbox.video_user, (users.firstname::text || ' '::text) || users.lastname::text, 
-  res_view_letterbox.video_batch, res_view_letterbox.video_time, res_view_letterbox.folders_system_id, 
-  (folders.folder_id::text || ' / '::text) || folders.folder_name::text, folders.video_status;
 
 
 CREATE TABLE doctypes_indexes
@@ -1885,3 +1872,28 @@ CREATE OR REPLACE VIEW af_view_year_target_view AS
 CREATE OR REPLACE VIEW af_view_customer_target_view AS
  SELECT af.level1, af.level1_id, af.level1 as level1_label, af.level2, af.level2_id, af.level2 as level2_label, af.level3, af.level3_id, af.level3 as level3_label
    FROM af_view_customer_target af ;
+
+   -- from modules/postindexing/sql/structure/postindexing.postgresql.sql
+
+ALTER TABLE folders ADD video_status character varying(10) DEFAULT NULL;
+ALTER TABLE folders ADD video_user character varying(32) DEFAULT NULL;
+
+ CREATE OR REPLACE VIEW view_folders AS 
+ SELECT folders.folders_system_id, folders.folder_id, folders.foldertype_id, foldertypes.foldertype_label, (folders.folder_id::text || ' - '::text) || folders.folder_name::text AS folder_full_label, folders.parent_id, folders.folder_name, folders.subject, folders.description, folders.author, folders.typist, folders.status, folders.folder_level, folders.creation_date, folders.folder_out_id, folders.custom_t1, folders.custom_n1, folders.custom_f1, folders.custom_d1, folders.custom_t2, folders.custom_n2, folders.custom_f2, folders.custom_d2, folders.custom_t3, folders.custom_n3, folders.custom_f3, folders.custom_d3, folders.custom_t4, folders.custom_n4, folders.custom_f4, folders.custom_d4, folders.custom_t5, folders.custom_n5, folders.custom_f5, folders.custom_d5, folders.custom_t6, folders.custom_d6, folders.custom_t7, folders.custom_d7, folders.custom_t8, folders.custom_d8, folders.custom_t9, folders.custom_d9, folders.custom_t10, folders.custom_d10, folders.custom_t11, folders.custom_d11, folders.custom_t12, folders.custom_d12, folders.custom_t13, folders.custom_d13, folders.custom_t14, folders.custom_d14, folders.custom_t15, folders.is_complete, folders.is_folder_out, folders.last_modified_date, count(res_view_letterbox.folders_system_id) AS count_document, folders.video_status
+   FROM foldertypes, folders
+   LEFT JOIN res_view_letterbox ON res_view_letterbox.folders_system_id = folders.folders_system_id
+  WHERE folders.foldertype_id = foldertypes.foldertype_id
+  GROUP BY folders.folders_system_id, folders.folder_id, folders.foldertype_id, foldertypes.foldertype_label, folder_full_label, folders.parent_id, folders.folder_name, folders.subject, folders.description, folders.author, folders.typist, folders.status, folders.folder_level, folders.creation_date, folders.folder_out_id, folders.custom_t1, folders.custom_n1, folders.custom_f1, folders.custom_d1, folders.custom_t2, folders.custom_n2, folders.custom_f2, folders.custom_d2, folders.custom_t3, folders.custom_n3, folders.custom_f3, folders.custom_d3, folders.custom_t4, folders.custom_n4, folders.custom_f4, folders.custom_d4, folders.custom_t5, folders.custom_n5, folders.custom_f5, folders.custom_d5, folders.custom_t6, folders.custom_d6, folders.custom_t7, folders.custom_d7, folders.custom_t8, folders.custom_d8, folders.custom_t9, folders.custom_d9, folders.custom_t10, folders.custom_d10, folders.custom_t11, folders.custom_d11, folders.custom_t12, folders.custom_d12, folders.custom_t13, folders.custom_d13, folders.custom_t14, folders.custom_d14, folders.custom_t15, folders.is_complete, folders.is_folder_out, folders.last_modified_date, folders.video_status;
+
+  ALTER TABLE view_folders OWNER TO postgres;
+  
+  CREATE OR REPLACE VIEW view_postindexing AS 
+ SELECT res_view_letterbox.video_user, (users.firstname::text || ' '::text) || users.lastname::text AS user_name, res_view_letterbox.video_batch, res_view_letterbox.video_time, count(res_view_letterbox.res_id) AS count_documents, res_view_letterbox.folders_system_id, (folders.folder_id::text || ' / '::text) || folders.folder_name::text AS folder_full_label, folders.video_status
+   FROM res_view_letterbox
+   LEFT JOIN users ON res_view_letterbox.video_user::text = users.user_id::text
+   LEFT JOIN folders ON folders.folders_system_id = res_view_letterbox.folders_system_id
+  WHERE res_view_letterbox.video_batch IS NOT NULL
+  GROUP BY res_view_letterbox.video_user, (users.firstname::text || ' '::text) || users.lastname::text, res_view_letterbox.video_batch, res_view_letterbox.video_time, res_view_letterbox.folders_system_id, (folders.folder_id::text || ' / '::text) || folders.folder_name::text, folders.video_status;
+
+ALTER TABLE view_postindexing OWNER TO postgres;
+