diff --git a/core/trunk/core/core_tables.php b/core/trunk/core/core_tables.php
index c7978122bb9156fe5d5bbf8700768c003e7eefae..7dd6088caec072426f6da4e1aa514639234ab544 100644
--- a/core/trunk/core/core_tables.php
+++ b/core/trunk/core/core_tables.php
@@ -110,6 +110,9 @@ if(! defined('LISTMODELS_CONTENT_TABLE')) {
 if (! defined('USERS_TABLE')) {
     define('USERS_TABLE', 'users');
 }
+if (! defined('EMAIL_SIGNATURES_TABLE')) {
+    define('EMAIL_SIGNATURES_TABLE', 'email_signatures');
+}
 if (! defined('USER_BASKETS_SECONDARY_TABLE')) {
     define('USER_BASKETS_SECONDARY_TABLE', 'user_baskets_secondary');
 }
diff --git a/core/trunk/sql/160.sql b/core/trunk/sql/160.sql
new file mode 100644
index 0000000000000000000000000000000000000000..3a7ed6629e717ab09f20d6e023a933e54b747c1a
--- /dev/null
+++ b/core/trunk/sql/160.sql
@@ -0,0 +1,829 @@
+
+-- ************************************************************************* --
+--                               ALL VIEWS DROP                              --
+-- ************************************************************************* --
+
+DROP VIEW IF EXISTS view_postindexing;
+DROP VIEW IF EXISTS res_view_letterbox;
+DROP VIEW IF EXISTS res_view_business;
+DROP VIEW IF EXISTS res_view;
+DROP VIEW IF EXISTS view_contacts;
+DROP VIEW IF EXISTS res_view_attachments;
+
+-- ************************************************************************* --
+--                               MULTICONTACTS                               --
+-- ************************************************************************* --
+
+-- multicontacts
+DROP TABLE IF EXISTS contacts_res;
+CREATE TABLE contacts_res
+(
+  coll_id character varying(32) NOT NULL,
+  res_id bigint NOT NULL,
+  contact_id character varying(128) NOT NULL,
+  address_id bigint NOT NULL
+);
+
+-- ************************************************************************* --
+--                          NEW CONTACTS MANAGEMENTS                         --
+-- ************************************************************************* --
+
+-- Contact types
+DROP TABLE IF EXISTS contact_types;
+DROP SEQUENCE IF EXISTS contact_types_id_seq;
+
+CREATE SEQUENCE contact_types_id_seq
+  INCREMENT 1
+  MINVALUE 1
+  MAXVALUE 9223372036854775807
+  START 100
+  CACHE 1;
+
+CREATE TABLE contact_types 
+(
+    id bigint NOT NULL DEFAULT nextval('contact_types_id_seq'::regclass),
+    label character varying(255) NOT NULL,
+    can_add_contact character varying(1) NOT NULL DEFAULT 'Y'::character varying,
+    contact_target character varying(50),
+    CONSTRAINT contact_types_pkey PRIMARY KEY  (id)
+) WITH (OIDS=FALSE);
+
+-- Contacts v2
+DROP TABLE IF EXISTS contacts_v2;
+DROP SEQUENCE IF EXISTS contact_v2_id_seq;
+
+CREATE SEQUENCE contact_v2_id_seq
+  INCREMENT 1
+  MINVALUE 14
+  MAXVALUE 9223372036854775807
+  START 200
+  CACHE 1;
+
+CREATE TABLE contacts_v2 
+(
+    contact_id bigint NOT NULL DEFAULT nextval('contact_v2_id_seq'::regclass),
+    contact_type bigint NOT NULL,
+    is_corporate_person character(1) DEFAULT 'Y'::bpchar,
+    society character varying(255),
+    society_short character varying(32),
+    firstname character varying(255),
+    lastname character varying(255),
+    title character varying(255),
+    function character varying(255),
+    other_data character varying(255),
+    user_id character varying(255) NOT NULL,
+    entity_id character varying(32) NOT NULL,
+    creation_date timestamp without time zone NOT NULL,
+    update_date timestamp without time zone,
+    enabled character varying(1) NOT NULL DEFAULT 'Y'::bpchar,
+    CONSTRAINT contacts_v2_pkey PRIMARY KEY  (contact_id)
+) WITH (OIDS=FALSE);
+
+-- Contact purposes
+DROP TABLE IF EXISTS contact_purposes;
+DROP SEQUENCE IF EXISTS contact_purposes_id_seq;
+
+CREATE SEQUENCE contact_purposes_id_seq
+  INCREMENT 1
+  MINVALUE 1
+  MAXVALUE 9223372036854775807
+  START 100
+  CACHE 1;
+
+CREATE TABLE contact_purposes 
+(
+    id bigint NOT NULL DEFAULT nextval('contact_purposes_id_seq'::regclass),
+    label character varying(255) NOT NULL,
+    CONSTRAINT contact_purposes_pkey PRIMARY KEY  (id)
+) WITH (OIDS=FALSE);
+
+-- Contact addresses
+DROP TABLE IF EXISTS contact_addresses;
+DROP SEQUENCE IF EXISTS contact_addresses_id_seq;
+
+CREATE SEQUENCE contact_addresses_id_seq
+  INCREMENT 1
+  MINVALUE 1
+  MAXVALUE 9223372036854775807
+  START 100
+  CACHE 1;
+
+CREATE TABLE contact_addresses 
+(
+    id bigint NOT NULL DEFAULT nextval('contact_addresses_id_seq'::regclass),
+    contact_id bigint NOT NULL,
+    contact_purpose_id bigint DEFAULT 1,
+    departement character varying(255),
+    firstname character varying(255),
+    lastname character varying(255),
+    title character varying(255),
+    function character varying(255),
+    occupancy character varying(1024),
+    address_num character varying(32)  ,
+    address_street character varying(255),
+    address_complement character varying(255),
+    address_town character varying(255),
+    address_postal_code character varying(255),
+    address_country character varying(255),
+    phone character varying(20),
+    email character varying(255),
+    website character varying(255),
+    salutation_header character varying(255),
+    salutation_footer character varying(255),
+    other_data character varying(255),
+    user_id character varying(255) NOT NULL,
+    entity_id character varying(32) NOT NULL,
+    is_private character(1) NOT NULL DEFAULT 'N'::bpchar,
+    enabled character varying(1) NOT NULL DEFAULT 'Y'::bpchar,
+    CONSTRAINT contact_addresses_pkey PRIMARY KEY  (id)
+) WITH (OIDS=FALSE);
+
+CREATE SEQUENCE email_signatures_id_seq
+  INCREMENT 1
+  MINVALUE 1
+  MAXVALUE 9223372036854775807
+  START 7
+  CACHE 1;
+
+CREATE TABLE email_signatures
+(
+  id bigint NOT NULL DEFAULT nextval('email_signatures_id_seq'::regclass),
+  user_id character varying(255) NOT NULL,
+  html_body text NOT NULL,
+  title character varying NOT NULL,
+  CONSTRAINT email_signatures_pkey PRIMARY KEY (id)
+)
+WITH (
+  OIDS=FALSE
+);
+
+-- ************************************************************************* --
+--                               ACTIONS IN RELATION WITH CATEGORIES         --
+-- ************************************************************************* --
+
+
+-- actions / category
+ALTER TABLE actions DROP COLUMN IF EXISTS category_id; 
+--ALTER TABLE actions ADD category_id character varying(255);
+
+DROP TABLE IF EXISTS actions_categories;
+CREATE TABLE actions_categories
+(
+  action_id bigint NOT NULL,
+  category_id character varying(255) NOT NULL,
+  CONSTRAINT actions_categories_pkey PRIMARY KEY (action_id,category_id)
+);
+
+-- ************************************************************************* --
+--                  RELATION BETWEEN USERS AND BASKETS OF SECONDARY PROFILES --
+-- ************************************************************************* --
+
+DROP TABLE IF EXISTS user_baskets_secondary;
+DROP SEQUENCE IF EXISTS user_baskets_secondary_seq;
+CREATE SEQUENCE user_baskets_secondary_seq
+INCREMENT 1
+MINVALUE 1
+MAXVALUE 9223372036854775807
+START 1
+CACHE 1;
+
+CREATE TABLE user_baskets_secondary
+(
+  system_id bigint NOT NULL DEFAULT nextval('user_baskets_secondary_seq'::regclass),
+  user_id character varying(128) NOT NULL,
+  group_id character varying(32) NOT NULL,
+  basket_id character varying(32) NOT NULL,
+  CONSTRAINT user_baskets_secondary_pkey PRIMARY KEY (system_id)
+);
+
+-- ************************************************************************* --
+--                                VIEWED MAIL                                --
+-- ************************************************************************* --
+
+DROP TABLE IF EXISTS res_mark_as_read;
+CREATE TABLE res_mark_as_read
+(
+  coll_id character varying(32),
+  res_id bigint,
+  user_id character varying(32),
+  basket_id character varying(32)
+);
+
+-- ************************************************************************* --
+--                               NEW COLUMNS IN EXTENSIONS TABLE             --
+-- ************************************************************************* --
+
+ALTER TABLE mlb_coll_ext DROP COLUMN IF EXISTS address_id;
+ALTER TABLE mlb_coll_ext ADD address_id bigint;
+
+ALTER TABLE business_coll_ext DROP COLUMN IF EXISTS address_id;
+ALTER TABLE business_coll_ext ADD address_id bigint;
+
+
+-- ************************************************************************* --
+--                               NEW COLUMNS INTO TABLES                     --
+-- ************************************************************************* --
+
+ALTER TABLE templates DROP COLUMN IF EXISTS template_target; 
+ALTER TABLE templates ADD template_target character varying(255);
+
+ALTER TABLE entities DROP COLUMN IF EXISTS entity_path;
+ALTER TABLE entities ADD entity_path character varying(2048);
+
+ALTER TABLE entities DROP COLUMN IF EXISTS ldap_id;
+ALTER TABLE entities ADD ldap_id character varying(255);
+
+ALTER TABLE baskets DROP COLUMN IF EXISTS basket_order;
+ALTER TABLE baskets ADD basket_order integer;
+
+ALTER TABLE mlb_coll_ext DROP COLUMN IF EXISTS is_multicontacts; 
+ALTER TABLE mlb_coll_ext ADD is_multicontacts character(1);
+
+ALTER TABLE res_x DROP COLUMN IF EXISTS reference_number; 
+ALTER TABLE res_x ADD reference_number character varying(255) DEFAULT NULL::character varying;
+
+ALTER TABLE res_x DROP COLUMN IF EXISTS locker_user_id; 
+ALTER TABLE res_x ADD locker_user_id character varying(255) DEFAULT NULL::character varying;
+
+ALTER TABLE res_x DROP COLUMN IF EXISTS locker_time; 
+ALTER TABLE res_x ADD locker_time timestamp without time zone;
+
+ALTER TABLE res_letterbox DROP COLUMN IF EXISTS reference_number; 
+ALTER TABLE res_letterbox ADD reference_number character varying(255) DEFAULT NULL::character varying;
+
+ALTER TABLE res_letterbox DROP COLUMN IF EXISTS locker_user_id; 
+ALTER TABLE res_letterbox ADD locker_user_id character varying(255) DEFAULT NULL::character varying;
+
+ALTER TABLE res_letterbox DROP COLUMN IF EXISTS locker_time; 
+ALTER TABLE res_letterbox ADD locker_time timestamp without time zone;
+
+ALTER TABLE res_business DROP COLUMN IF EXISTS reference_number; 
+ALTER TABLE res_business ADD reference_number character varying(255) DEFAULT NULL::character varying;
+
+ALTER TABLE res_business DROP COLUMN IF EXISTS locker_user_id; 
+ALTER TABLE res_business ADD locker_user_id character varying(255) DEFAULT NULL::character varying;
+
+ALTER TABLE res_business DROP COLUMN IF EXISTS locker_time; 
+ALTER TABLE res_business ADD locker_time timestamp without time zone;
+
+ALTER TABLE lc_stack DROP COLUMN IF EXISTS work_batch;
+ALTER TABLE lc_stack ADD COLUMN work_batch bigint;
+
+ALTER TABLE lc_stack DROP COLUMN IF EXISTS regex;
+ALTER TABLE lc_stack ADD COLUMN regex character varying(32);
+
+ALTER TABLE res_letterbox DROP COLUMN IF EXISTS confidentiality; 
+ALTER TABLE res_letterbox ADD confidentiality character(1);
+
+ALTER TABLE listinstance DROP COLUMN IF EXISTS process_comment;
+ALTER TABLE listinstance ADD process_comment character varying(255);
+
+ALTER TABLE listinstance DROP COLUMN IF EXISTS process_date;
+ALTER TABLE listinstance ADD process_date timestamp without time zone;
+
+ALTER TABLE listmodels DROP COLUMN IF EXISTS title;
+ALTER TABLE listmodels ADD COLUMN title varchar(255);
+
+ALTER TABLE sendmail DROP COLUMN IF EXISTS sender_email;
+ALTER TABLE sendmail ADD COLUMN sender_email varchar(255);
+
+-- ALTER TABLE listmodels DROP COLUMN IF EXISTS description;
+-- ALTER TABLE listmodels ADD COLUMN description varchar(255);
+
+ALTER TABLE listmodels DROP COLUMN IF EXISTS process_comment;
+ALTER TABLE listmodels ADD COLUMN process_comment varchar(255);
+
+DROP TABLE IF EXISTS listinstance_history;
+DROP SEQUENCE IF EXISTS listinstance_history_id_seq;
+CREATE SEQUENCE listinstance_history_id_seq
+INCREMENT 1
+MINVALUE 1
+MAXVALUE 9223372036854775807
+START 1
+CACHE 1;
+
+CREATE TABLE listinstance_history
+(
+listinstance_history_id bigint NOT NULL DEFAULT nextval('listinstance_history_id_seq'::regclass),
+coll_id character varying(50) NOT NULL,
+res_id bigint NOT NULL,
+updated_by_user character varying(128) NOT NULL,
+updated_date timestamp without time zone NOT NULL,
+CONSTRAINT listinstance_history_pkey PRIMARY KEY (listinstance_history_id)
+)
+WITH ( OIDS=FALSE );
+
+DROP TABLE IF EXISTS listinstance_history_details;
+DROP SEQUENCE IF EXISTS listinstance_history_details_id_seq;
+CREATE SEQUENCE listinstance_history_details_id_seq
+INCREMENT 1
+MINVALUE 1
+MAXVALUE 9223372036854775807
+START 1
+CACHE 1;
+
+CREATE TABLE listinstance_history_details
+(
+listinstance_history_details_id bigint NOT NULL DEFAULT nextval('listinstance_history_details_id_seq'::regclass),
+listinstance_history_id bigint NOT NULL,
+coll_id character varying(50) NOT NULL,
+res_id bigint NOT NULL,
+listinstance_type character varying(50) DEFAULT 'DOC'::character varying,
+sequence bigint NOT NULL,
+item_id character varying(128) NOT NULL,
+item_type character varying(255) NOT NULL,
+item_mode character varying(50) NOT NULL,
+added_by_user character varying(128) NOT NULL,
+added_by_entity character varying(50) NOT NULL,
+visible character varying(1) NOT NULL DEFAULT 'Y'::bpchar,
+viewed bigint,
+difflist_type character varying(50),
+process_date timestamp without time zone,
+process_comment character varying(255),
+CONSTRAINT listinstance_history_details_pkey PRIMARY KEY (listinstance_history_details_id)
+) WITH ( OIDS=FALSE );
+
+ -- nouvelle gestion des pj
+ALTER TABLE res_attachments DROP COLUMN IF EXISTS attachment_type; 
+ALTER TABLE res_attachments ADD attachment_type character varying(255) DEFAULT NULL::character varying;
+
+ALTER TABLE res_attachments DROP COLUMN IF EXISTS dest_contact_id; 
+ALTER TABLE res_attachments ADD dest_contact_id bigint;
+
+ALTER TABLE res_attachments DROP COLUMN IF EXISTS dest_address_id; 
+ALTER TABLE res_attachments ADD dest_address_id bigint;
+
+ALTER TABLE res_attachments DROP COLUMN IF EXISTS updated_by; 
+ALTER TABLE res_attachments ADD updated_by character varying(128) DEFAULT NULL::character varying;
+
+ALTER TABLE res_attachments DROP COLUMN IF EXISTS is_multicontacts; 
+ALTER TABLE res_attachments ADD is_multicontacts character(1);
+
+ALTER TABLE res_attachments DROP COLUMN IF EXISTS is_multi_docservers; 
+ALTER TABLE res_attachments ADD is_multi_docservers character(1) NOT NULL DEFAULT 'N'::bpchar;
+
+ALTER TABLE templates DROP COLUMN IF EXISTS template_attachment_type; 
+ALTER TABLE templates ADD template_attachment_type character varying(255) DEFAULT NULL::character varying;
+
+ALTER TABLE users DROP COLUMN IF EXISTS thumbprint;
+ALTER TABLE users ADD thumbprint text;
+
+ALTER TABLE users DROP COLUMN IF EXISTS signature_path;
+ALTER TABLE users ADD signature_path character varying(255) DEFAULT NULL::character varying;
+
+ALTER TABLE users DROP COLUMN IF EXISTS signature_file_name;
+ALTER TABLE users ADD signature_file_name character varying(255) DEFAULT NULL::character varying;
+
+ALTER TABLE users DROP COLUMN IF EXISTS initials;
+ALTER TABLE users ADD COLUMN initials character varying(32);
+
+DELETE FROM status WHERE id = 'A_TRA';
+INSERT INTO status (id, label_status, is_system) VALUES ('A_TRA', 'A traiter', 'N');
+
+DELETE FROM status WHERE id = 'TRA';
+INSERT INTO status (id, label_status, is_system) VALUES ('TRA', 'Traité', 'N');
+
+DELETE FROM status WHERE id = 'OBS';
+INSERT INTO status (id, label_status, is_system) VALUES ('OBS', 'Obsolète', 'N');
+
+UPDATE status SET img_filename = 'fm-letter-status-inprogress' WHERE id = 'COU'; 
+UPDATE status SET img_filename = 'fm-letter-del' WHERE id = 'DEL'; 
+UPDATE status SET img_filename = 'fm-letter-status-end' WHERE id = 'END'; 
+UPDATE status SET img_filename = 'fm-letter-status-new' WHERE id = 'NEW'; 
+UPDATE status SET img_filename = 'fm-letter-status-rejected' WHERE id = 'RET'; 
+UPDATE status SET img_filename = 'fm-file-fingerprint' WHERE id = 'SIG'; 
+UPDATE status SET img_filename = 'fm-letter-status-rejected' WHERE id = 'UNS'; 
+UPDATE status SET img_filename = 'fm-letter-status-aval' WHERE id = 'VAL'; 
+UPDATE status SET img_filename = 'fm-letter-status-attr' WHERE id = 'INIT'; 
+UPDATE status SET img_filename = 'fm-letter-status-aval' WHERE id = 'VIS';
+
+-- tumbnails
+ALTER TABLE res_letterbox DROP COLUMN IF EXISTS tnl_path;
+ALTER TABLE res_letterbox DROP COLUMN IF EXISTS tnl_filename;
+ALTER TABLE res_letterbox ADD tnl_path character varying(255) DEFAULT NULL::character varying;
+ALTER TABLE res_letterbox ADD tnl_filename character varying(255) DEFAULT NULL::character varying;
+ALTER TABLE res_business DROP COLUMN IF EXISTS tnl_path;
+ALTER TABLE res_business DROP COLUMN IF EXISTS tnl_filename;
+ALTER TABLE res_business ADD tnl_path character varying(255) DEFAULT NULL::character varying;
+ALTER TABLE res_business ADD tnl_filename character varying(255) DEFAULT NULL::character varying;
+ALTER TABLE res_x DROP COLUMN IF EXISTS tnl_path;
+ALTER TABLE res_x DROP COLUMN IF EXISTS tnl_filename;
+ALTER TABLE res_x ADD tnl_path character varying(255) DEFAULT NULL::character varying;
+ALTER TABLE res_x ADD tnl_filename character varying(255) DEFAULT NULL::character varying;
+
+DROP TABLE IF EXISTS res_version_attachments;
+DROP SEQUENCE IF EXISTS res_id_version_attachments_seq;
+
+CREATE SEQUENCE res_id_version_attachments_seq
+  INCREMENT 1
+  MINVALUE 1
+  MAXVALUE 9223372036854775807
+  START 100
+  CACHE 1;
+
+CREATE TABLE res_version_attachments
+(
+  res_id bigint NOT NULL DEFAULT nextval('res_id_version_attachments_seq'::regclass),
+  title character varying(255) DEFAULT NULL::character varying,
+  subject text,
+  description text,
+  publisher character varying(255) DEFAULT NULL::character varying,
+  contributor character varying(255) DEFAULT NULL::character varying,
+  type_id bigint NOT NULL,
+  format character varying(50) NOT NULL,
+  typist character varying(128) NOT NULL,
+  creation_date timestamp without time zone NOT NULL,
+  fulltext_result character varying(10) DEFAULT NULL::character varying,
+  ocr_result character varying(10) DEFAULT NULL::character varying,
+  converter_result character varying(10) DEFAULT NULL::character varying,
+  author character varying(255) DEFAULT NULL::character varying,
+  author_name text,
+  identifier character varying(255) DEFAULT NULL::character varying,
+  source character varying(255) DEFAULT NULL::character varying,
+  doc_language character varying(50) DEFAULT NULL::character varying,
+  relation bigint,
+  coverage character varying(255) DEFAULT NULL::character varying,
+  doc_date timestamp without time zone,
+  docserver_id character varying(32) NOT NULL,
+  folders_system_id bigint,
+  arbox_id character varying(32) DEFAULT NULL::character varying,
+  path character varying(255) DEFAULT NULL::character varying,
+  filename character varying(255) DEFAULT NULL::character varying,
+  offset_doc character varying(255) DEFAULT NULL::character varying,
+  logical_adr character varying(255) DEFAULT NULL::character varying,
+  fingerprint character varying(255) DEFAULT NULL::character varying,
+  filesize bigint,
+  is_paper character(1) DEFAULT NULL::bpchar,
+  page_count integer,
+  scan_date timestamp without time zone,
+  scan_user character varying(50) DEFAULT NULL::character varying,
+  scan_location character varying(255) DEFAULT NULL::character varying,
+  scan_wkstation character varying(255) DEFAULT NULL::character varying,
+  scan_batch character varying(50) DEFAULT NULL::character varying,
+  burn_batch character varying(50) DEFAULT NULL::character varying,
+  scan_postmark character varying(50) DEFAULT NULL::character varying,
+  envelop_id bigint,
+  status character varying(10) NOT NULL,
+  destination character varying(50) DEFAULT NULL::character varying,
+  approver character varying(50) DEFAULT NULL::character varying,
+  validation_date timestamp without time zone,
+  work_batch bigint,
+  origin character varying(50) DEFAULT NULL::character varying,
+  is_ingoing character(1) DEFAULT NULL::bpchar,
+  priority smallint,
+  arbatch_id bigint,
+  policy_id character varying(32),
+  cycle_id character varying(32),
+  is_multi_docservers character(1) NOT NULL DEFAULT 'N'::bpchar,
+  is_frozen character(1) NOT NULL DEFAULT 'N'::bpchar,
+  custom_t1 text,
+  custom_n1 bigint,
+  custom_f1 numeric,
+  custom_d1 timestamp without time zone,
+  custom_t2 character varying(255) DEFAULT NULL::character varying,
+  custom_n2 bigint,
+  custom_f2 numeric,
+  custom_d2 timestamp without time zone,
+  custom_t3 character varying(255) DEFAULT NULL::character varying,
+  custom_n3 bigint,
+  custom_f3 numeric,
+  custom_d3 timestamp without time zone,
+  custom_t4 character varying(255) DEFAULT NULL::character varying,
+  custom_n4 bigint,
+  custom_f4 numeric,
+  custom_d4 timestamp without time zone,
+  custom_t5 character varying(255) DEFAULT NULL::character varying,
+  custom_n5 bigint,
+  custom_f5 numeric,
+  custom_d5 timestamp without time zone,
+  custom_t6 character varying(255) DEFAULT NULL::character varying,
+  custom_d6 timestamp without time zone,
+  custom_t7 character varying(255) DEFAULT NULL::character varying,
+  custom_d7 timestamp without time zone,
+  custom_t8 character varying(255) DEFAULT NULL::character varying,
+  custom_d8 timestamp without time zone,
+  custom_t9 character varying(255) DEFAULT NULL::character varying,
+  custom_d9 timestamp without time zone,
+  custom_t10 character varying(255) DEFAULT NULL::character varying,
+  custom_d10 timestamp without time zone,
+  custom_t11 character varying(255) DEFAULT NULL::character varying,
+  custom_t12 character varying(255) DEFAULT NULL::character varying,
+  custom_t13 character varying(255) DEFAULT NULL::character varying,
+  custom_t14 character varying(255) DEFAULT NULL::character varying,
+  custom_t15 character varying(255) DEFAULT NULL::character varying,
+  tablename character varying(32) DEFAULT 'res_version_attachments'::character varying,
+  initiator character varying(50) DEFAULT NULL::character varying,
+  dest_user character varying(128) DEFAULT NULL::character varying,
+  video_batch integer,
+  video_time integer,
+  video_user character varying(128) DEFAULT NULL::character varying,
+  video_date timestamp without time zone,
+  cycle_date timestamp without time zone,
+  coll_id character varying(32) NOT NULL,
+  attachment_type character varying(255) DEFAULT NULL::character varying,
+  dest_contact_id bigint,
+  dest_address_id bigint,
+  updated_by character varying(128) DEFAULT NULL::character varying,
+  is_multicontacts character(1),
+  res_id_master bigint,
+  attachment_id_master bigint,
+  CONSTRAINT res_version_attachments_pkey PRIMARY KEY (res_id)
+)
+WITH (
+  OIDS=FALSE
+);
+
+
+-- ************************************************************************* --
+--                               RECREATE VIEWS                              --
+-- ************************************************************************* --
+
+
+-- view for letterbox
+CREATE VIEW res_view_letterbox AS
+    SELECT r.tablename, r.is_multi_docservers, r.res_id, r.type_id, r.policy_id, r.cycle_id, 
+    d.description AS type_label, d.doctypes_first_level_id,
+    dfl.doctypes_first_level_label, dfl.css_style as doctype_first_level_style,
+    d.doctypes_second_level_id, dsl.doctypes_second_level_label,
+    dsl.css_style as doctype_second_level_style, r.format, r.typist,
+    r.creation_date, r.relation, r.docserver_id, r.folders_system_id,
+    f.folder_id, f.destination as folder_destination, f.is_frozen as folder_is_frozen, r.path, r.filename, r.fingerprint, r.offset_doc, r.filesize,
+    r.status, r.work_batch, r.arbatch_id, r.arbox_id, r.page_count, r.is_paper,
+    r.doc_date, r.scan_date, r.scan_user, r.scan_location, r.scan_wkstation,
+    r.scan_batch, r.doc_language, r.description, r.source, r.author, r.reference_number,
+    r.custom_t1 AS doc_custom_t1, r.custom_t2 AS doc_custom_t2,
+    r.custom_t3 AS doc_custom_t3, r.custom_t4 AS doc_custom_t4,
+    r.custom_t5 AS doc_custom_t5, r.custom_t6 AS doc_custom_t6,
+    r.custom_t7 AS doc_custom_t7, r.custom_t8 AS doc_custom_t8,
+    r.custom_t9 AS doc_custom_t9, r.custom_t10 AS doc_custom_t10,
+    r.custom_t11 AS doc_custom_t11, r.custom_t12 AS doc_custom_t12,
+    r.custom_t13 AS doc_custom_t13, r.custom_t14 AS doc_custom_t14,
+    r.custom_t15 AS doc_custom_t15, r.custom_d1 AS doc_custom_d1,
+    r.custom_d2 AS doc_custom_d2, r.custom_d3 AS doc_custom_d3,
+    r.custom_d4 AS doc_custom_d4, r.custom_d5 AS doc_custom_d5,
+    r.custom_d6 AS doc_custom_d6, r.custom_d7 AS doc_custom_d7,
+    r.custom_d8 AS doc_custom_d8, r.custom_d9 AS doc_custom_d9,
+    r.custom_d10 AS doc_custom_d10, r.custom_n1 AS doc_custom_n1,
+    r.custom_n2 AS doc_custom_n2, r.custom_n3 AS doc_custom_n3,
+    r.custom_n4 AS doc_custom_n4, r.custom_n5 AS doc_custom_n5,
+    r.custom_f1 AS doc_custom_f1, r.custom_f2 AS doc_custom_f2,
+    r.custom_f3 AS doc_custom_f3, r.custom_f4 AS doc_custom_f4,
+    r.custom_f5 AS doc_custom_f5, f.foldertype_id, ft.foldertype_label,
+    f.custom_t1 AS fold_custom_t1, f.custom_t2 AS fold_custom_t2,
+    f.custom_t3 AS fold_custom_t3, f.custom_t4 AS fold_custom_t4,
+    f.custom_t5 AS fold_custom_t5, f.custom_t6 AS fold_custom_t6,
+    f.custom_t7 AS fold_custom_t7, f.custom_t8 AS fold_custom_t8,
+    f.custom_t9 AS fold_custom_t9, f.custom_t10 AS fold_custom_t10,
+    f.custom_t11 AS fold_custom_t11, f.custom_t12 AS fold_custom_t12,
+    f.custom_t13 AS fold_custom_t13, f.custom_t14 AS fold_custom_t14,
+    f.custom_t15 AS fold_custom_t15, f.custom_d1 AS fold_custom_d1,
+    f.custom_d2 AS fold_custom_d2, f.custom_d3 AS fold_custom_d3,
+    f.custom_d4 AS fold_custom_d4, f.custom_d5 AS fold_custom_d5,
+    f.custom_d6 AS fold_custom_d6, f.custom_d7 AS fold_custom_d7,
+    f.custom_d8 AS fold_custom_d8, f.custom_d9 AS fold_custom_d9,
+    f.custom_d10 AS fold_custom_d10, f.custom_n1 AS fold_custom_n1,
+    f.custom_n2 AS fold_custom_n2, f.custom_n3 AS fold_custom_n3,
+    f.custom_n4 AS fold_custom_n4, f.custom_n5 AS fold_custom_n5,
+    f.custom_f1 AS fold_custom_f1, f.custom_f2 AS fold_custom_f2,
+    f.custom_f3 AS fold_custom_f3, f.custom_f4 AS fold_custom_f4,
+    f.custom_f5 AS fold_custom_f5, f.is_complete AS fold_complete,
+    f.status AS fold_status, f.subject AS fold_subject,
+    f.parent_id AS fold_parent_id, f.folder_level, f.folder_name,
+    f.creation_date AS fold_creation_date, r.initiator, r.destination,
+    r.dest_user, r.confidentiality, mlb.category_id, mlb.exp_contact_id, mlb.exp_user_id,
+    mlb.dest_user_id, mlb.dest_contact_id, mlb.address_id, mlb.nature_id, mlb.alt_identifier,
+    mlb.admission_date, mlb.answer_type_bitmask, mlb.other_answer_desc,
+    mlb.process_limit_date, mlb.closing_date, mlb.alarm1_date, mlb.alarm2_date,
+    mlb.flag_notif, mlb.flag_alarm1, mlb.flag_alarm2, mlb.is_multicontacts, r.video_user, r.video_time,
+    r.video_batch, r.subject, r.identifier, r.title, r.priority, mlb.process_notes,
+	r.locker_user_id, r.locker_time,
+    ca.case_id, ca.case_label, ca.case_description, en.entity_label, en.entity_type AS entityType,
+    cont.contact_id AS contact_id,
+    cont.firstname AS contact_firstname, cont.lastname AS contact_lastname,
+    cont.society AS contact_society, u.lastname AS user_lastname,
+    u.firstname AS user_firstname, list.item_id AS dest_user_from_listinstance, list.viewed, 
+    r.is_frozen as res_is_frozen, COALESCE(att.count_attachment, 0::bigint) AS count_attachment 
+    FROM doctypes d, doctypes_first_level dfl, doctypes_second_level dsl,
+    (((((((((((ar_batch a RIGHT JOIN res_letterbox r ON ((r.arbatch_id = a.arbatch_id)))
+    LEFT JOIN (SELECT res_attachments.res_id_master, count(res_attachments.res_id_master) AS count_attachment
+        FROM res_attachments WHERE res_attachments.status <> 'DEL' GROUP BY res_attachments.res_id_master) att ON (r.res_id = att.res_id_master))
+    LEFT JOIN entities en ON (((r.destination)::text = (en.entity_id)::text)))
+    LEFT JOIN folders f ON ((r.folders_system_id = f.folders_system_id)))
+    LEFT JOIN cases_res cr ON ((r.res_id = cr.res_id)))
+    LEFT JOIN mlb_coll_ext mlb ON ((mlb.res_id = r.res_id)))
+    LEFT JOIN foldertypes ft ON (((f.foldertype_id = ft.foldertype_id)
+        AND ((f.status)::text <> 'DEL'::text))))
+    LEFT JOIN cases ca ON ((cr.case_id = ca.case_id)))
+    LEFT JOIN contacts_v2 cont ON (((mlb.exp_contact_id = cont.contact_id)
+        OR (mlb.dest_contact_id = cont.contact_id))))
+    LEFT JOIN users u ON ((((mlb.exp_user_id)::text = (u.user_id)::text)
+        OR ((mlb.dest_user_id)::text = (u.user_id)::text))))
+    LEFT JOIN listinstance list ON (((r.res_id = list.res_id)
+        AND ((list.item_mode)::text = 'dest'::text))))
+    WHERE (((r.type_id = d.type_id) AND
+    (d.doctypes_first_level_id = dfl.doctypes_first_level_id))
+    AND (d.doctypes_second_level_id = dsl.doctypes_second_level_id));
+
+-- view for business
+CREATE VIEW res_view_business AS
+    SELECT r.tablename, r.is_multi_docservers, r.res_id, r.type_id,
+    d.description AS type_label, d.doctypes_first_level_id,
+    d.doctypes_second_level_id, dfl.doctypes_first_level_label, 
+    dfl.css_style as doctype_first_level_style,
+    dsl.doctypes_second_level_label,
+    dsl.css_style as doctype_second_level_style, r.format, r.typist,
+    r.creation_date, r.relation, r.docserver_id, r.folders_system_id,
+    f.folder_id, f.is_frozen as folder_is_frozen, r.path, r.filename, 
+    r.fingerprint, r.offset_doc, r.filesize,
+    r.status, r.work_batch, r.arbatch_id, r.arbox_id, r.page_count, r.is_paper,
+    r.doc_date, r.scan_date, r.scan_user, r.scan_location, r.scan_wkstation,
+    r.scan_batch, r.doc_language, r.description, r.source, r.author, r.reference_number,
+    r.custom_t1 AS doc_custom_t1, r.custom_t2 AS doc_custom_t2,
+    r.custom_t3 AS doc_custom_t3, r.custom_t4 AS doc_custom_t4,
+    r.custom_t5 AS doc_custom_t5, r.custom_t6 AS doc_custom_t6,
+    r.custom_t7 AS doc_custom_t7, r.custom_t8 AS doc_custom_t8,
+    r.custom_t9 AS doc_custom_t9, r.custom_t10 AS doc_custom_t10,
+    r.custom_t11 AS doc_custom_t11, r.custom_t12 AS doc_custom_t12,
+    r.custom_t13 AS doc_custom_t13, r.custom_t14 AS doc_custom_t14,
+    r.custom_t15 AS doc_custom_t15, r.custom_d1 AS doc_custom_d1,
+    r.custom_d2 AS doc_custom_d2, r.custom_d3 AS doc_custom_d3,
+    r.custom_d4 AS doc_custom_d4, r.custom_d5 AS doc_custom_d5,
+    r.custom_d6 AS doc_custom_d6, r.custom_d7 AS doc_custom_d7,
+    r.custom_d8 AS doc_custom_d8, r.custom_d9 AS doc_custom_d9,
+    r.custom_d10 AS doc_custom_d10, r.custom_n1 AS doc_custom_n1,
+    r.custom_n2 AS doc_custom_n2, r.custom_n3 AS doc_custom_n3,
+    r.custom_n4 AS doc_custom_n4, r.custom_n5 AS doc_custom_n5,
+    r.custom_f1 AS doc_custom_f1, r.custom_f2 AS doc_custom_f2,
+    r.custom_f3 AS doc_custom_f3, r.custom_f4 AS doc_custom_f4,
+    r.custom_f5 AS doc_custom_f5, f.foldertype_id,
+    f.custom_t1 AS fold_custom_t1, f.custom_t2 AS fold_custom_t2,
+    f.custom_t3 AS fold_custom_t3, f.custom_t4 AS fold_custom_t4,
+    f.custom_t5 AS fold_custom_t5, f.custom_t6 AS fold_custom_t6,
+    f.custom_t7 AS fold_custom_t7, f.custom_t8 AS fold_custom_t8,
+    f.custom_t9 AS fold_custom_t9, f.custom_t10 AS fold_custom_t10,
+    f.custom_t11 AS fold_custom_t11, f.custom_t12 AS fold_custom_t12,
+    f.custom_t13 AS fold_custom_t13, f.custom_t14 AS fold_custom_t14,
+    f.custom_t15 AS fold_custom_t15, f.custom_d1 AS fold_custom_d1,
+    f.custom_d2 AS fold_custom_d2, f.custom_d3 AS fold_custom_d3,
+    f.custom_d4 AS fold_custom_d4, f.custom_d5 AS fold_custom_d5,
+    f.custom_d6 AS fold_custom_d6, f.custom_d7 AS fold_custom_d7,
+    f.custom_d8 AS fold_custom_d8, f.custom_d9 AS fold_custom_d9,
+    f.custom_d10 AS fold_custom_d10, f.custom_n1 AS fold_custom_n1,
+    f.custom_n2 AS fold_custom_n2, f.custom_n3 AS fold_custom_n3,
+    f.custom_n4 AS fold_custom_n4, f.custom_n5 AS fold_custom_n5,
+    f.custom_f1 AS fold_custom_f1, f.custom_f2 AS fold_custom_f2,
+    f.custom_f3 AS fold_custom_f3, f.custom_f4 AS fold_custom_f4,
+    f.custom_f5 AS fold_custom_f5, f.is_complete AS fold_complete,
+    f.status AS fold_status, f.subject AS fold_subject,
+    f.parent_id AS fold_parent_id, f.folder_level, f.folder_name,
+    f.creation_date AS fold_creation_date, r.initiator, r.destination,
+    r.dest_user, busi.category_id, busi.contact_id, busi.address_id, busi.currency,
+	r.locker_user_id, r.locker_time,	
+    busi.net_sum, busi.tax_sum, busi.total_sum, 
+    busi.process_limit_date, busi.closing_date, busi.alarm1_date, busi.alarm2_date,
+    busi.flag_notif, busi.flag_alarm1, busi.flag_alarm2, r.video_user, r.video_time,
+    r.video_batch, r.subject, r.identifier, r.title, r.priority,
+    en.entity_label,
+    cont.firstname AS contact_firstname, cont.lastname AS contact_lastname,
+    cont.society AS contact_society, list.item_id AS dest_user_from_listinstance,  list.viewed, 
+    r.is_frozen as res_is_frozen, COALESCE(att.count_attachment, 0::bigint) AS count_attachment 
+    FROM doctypes d, doctypes_first_level dfl, doctypes_second_level dsl, res_business r
+    LEFT JOIN (SELECT res_attachments.res_id_master, coll_id, count(res_attachments.res_id_master) AS count_attachment
+        FROM res_attachments WHERE res_attachments.status <> 'DEL' GROUP BY res_attachments.res_id_master, coll_id) att ON (r.res_id = att.res_id_master and att.coll_id = 'business_coll')
+    LEFT JOIN entities en ON ((r.destination)::text = (en.entity_id)::text)
+    LEFT JOIN folders f ON ((r.folders_system_id = f.folders_system_id))
+    LEFT JOIN business_coll_ext busi ON (busi.res_id = r.res_id)
+    LEFT JOIN contacts_v2 cont ON (busi.contact_id = cont.contact_id)
+    LEFT JOIN listinstance list ON ((r.res_id = list.res_id)
+        AND ((list.item_mode)::text = 'dest'::text))
+    WHERE r.type_id = d.type_id 
+    AND d.doctypes_first_level_id = dfl.doctypes_first_level_id
+    AND d.doctypes_second_level_id = dsl.doctypes_second_level_id;
+
+
+CREATE VIEW res_view AS
+ SELECT r.tablename, r.is_multi_docservers, r.res_id, r.title, r.subject, r.page_count, r.identifier, r.doc_date, r.type_id,
+ d.description AS type_label, d.doctypes_first_level_id, dfl.doctypes_first_level_label, dfl.css_style as doctype_first_level_style,
+ d.doctypes_second_level_id, dsl.doctypes_second_level_label, dsl.css_style as doctype_second_level_style,
+ r.format, r.typist, r.creation_date, r.relation, r.docserver_id,
+ r.folders_system_id, r.path, r.filename, r.fingerprint, r.offset_doc, r.filesize, r.status,
+ r.work_batch, r.arbatch_id, r.arbox_id,  r.is_paper, r.scan_date, r.scan_user,r.scan_location,r.scan_wkstation,
+ r.scan_batch,r.doc_language,r.description,r.source,r.initiator,r.destination,r.dest_user,r.policy_id,r.cycle_id,r.cycle_date,
+ r.custom_t1 AS doc_custom_t1, r.custom_t2 AS doc_custom_t2, r.custom_t3 AS doc_custom_t3,
+ r.custom_t4 AS doc_custom_t4, r.custom_t5 AS doc_custom_t5, r.custom_t6 AS doc_custom_t6,
+ r.custom_t7 AS doc_custom_t7, r.custom_t8 AS doc_custom_t8, r.custom_t9 AS doc_custom_t9,
+ r.custom_t10 AS doc_custom_t10, r.custom_t11 AS doc_custom_t11, r.custom_t12 AS doc_custom_t12,
+ r.custom_t13 AS doc_custom_t13, r.custom_t14 AS doc_custom_t14, r.custom_t15 AS doc_custom_t15,
+ r.custom_d1 AS doc_custom_d1, r.custom_d2 AS doc_custom_d2, r.custom_d3 AS doc_custom_d3,
+ r.custom_d4 AS doc_custom_d4, r.custom_d5 AS doc_custom_d5, r.custom_d6 AS doc_custom_d6,
+ r.custom_d7 AS doc_custom_d7, r.custom_d8 AS doc_custom_d8, r.custom_d9 AS doc_custom_d9,
+ r.custom_d10 AS doc_custom_d10, r.custom_n1 AS doc_custom_n1, r.custom_n2 AS doc_custom_n2,
+ r.custom_n3 AS doc_custom_n3, r.custom_n4 AS doc_custom_n4, r.custom_n5 AS doc_custom_n5,
+ r.custom_f1 AS doc_custom_f1, r.custom_f2 AS doc_custom_f2, r.custom_f3 AS doc_custom_f3,
+ r.custom_f4 AS doc_custom_f4, r.custom_f5 AS doc_custom_f5, r.is_frozen as res_is_frozen,  
+ r.reference_number, r.locker_user_id, r.locker_time
+   FROM  doctypes d, doctypes_first_level dfl, doctypes_second_level dsl, res_x r
+   WHERE r.type_id = d.type_id
+   AND d.doctypes_first_level_id = dfl.doctypes_first_level_id
+   AND d.doctypes_second_level_id = dsl.doctypes_second_level_id;
+
+
+--view for postindexing
+CREATE 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;
+
+
+--view for contacts_v2
+CREATE VIEW view_contacts AS 
+ SELECT c.contact_id, c.contact_type, c.is_corporate_person, c.society, c.society_short, c.firstname AS contact_firstname
+, c.lastname AS contact_lastname, c.title AS contact_title, c.function AS contact_function, c.other_data AS contact_other_data
+, c.user_id AS contact_user_id, c.entity_id AS contact_entity_id, c.creation_date, c.update_date, c.enabled AS contact_enabled, ca.id AS ca_id
+, ca.contact_purpose_id, ca.departement, ca.firstname, ca.lastname, ca.title, ca.function, ca.occupancy
+, ca.address_num, ca.address_street, ca.address_complement, ca.address_town, ca.address_postal_code, ca.address_country
+, ca.phone, ca.email, ca.website, ca.salutation_header, ca.salutation_footer, ca.other_data, ca.user_id, ca.entity_id, ca.is_private, ca.enabled
+, cp.label as contact_purpose_label, ct.label as contact_type_label
+   FROM contacts_v2 c
+   RIGHT JOIN contact_addresses ca ON c.contact_id = ca.contact_id
+   LEFT JOIN contact_purposes cp ON ca.contact_purpose_id = cp.id
+   LEFT JOIN contact_types ct ON c.contact_type = ct.id;
+
+-- view for attachments
+CREATE VIEW res_view_attachments AS
+  SELECT '0' as res_id, res_id as res_id_version, title, subject, description, publisher, contributor, type_id, format, typist,
+  creation_date, fulltext_result, ocr_result, author, author_name, identifier, source,
+  doc_language, relation, coverage, doc_date, docserver_id, folders_system_id, arbox_id, path,
+  filename, offset_doc, logical_adr, fingerprint, filesize, is_paper, page_count,
+  scan_date, scan_user, scan_location, scan_wkstation, scan_batch, burn_batch, scan_postmark,
+  envelop_id, status, destination, approver, validation_date, work_batch, origin, is_ingoing, priority, initiator, dest_user,
+  coll_id, dest_contact_id, dest_address_id, updated_by, is_multicontacts, is_multi_docservers, res_id_master, attachment_type, attachment_id_master
+  FROM res_version_attachments
+  UNION ALL
+  SELECT res_id, '0' as res_id_version, title, subject, description, publisher, contributor, type_id, format, typist,
+  creation_date, fulltext_result, ocr_result, author, author_name, identifier, source,
+  doc_language, relation, coverage, doc_date, docserver_id, folders_system_id, arbox_id, path,
+  filename, offset_doc, logical_adr, fingerprint, filesize, is_paper, page_count,
+  scan_date, scan_user, scan_location, scan_wkstation, scan_batch, burn_batch, scan_postmark,
+  envelop_id, status, destination, approver, validation_date, work_batch, origin, is_ingoing, priority, initiator, dest_user,
+  coll_id, dest_contact_id, dest_address_id, updated_by, is_multicontacts, is_multi_docservers, res_id_master, attachment_type, '0'
+  FROM res_attachments;
+
+   
+
+-- ************************************************************************* --
+--                               DATABASE VERSION                            --
+-- ************************************************************************* --
+
+
+
+UPDATE parameters SET param_value_int = 151 where id='database_version';
+
+
+
+-- ************************************************************************* --
+--                               DATA MIGRATION                              --
+-- ************************************************************************* --
+
+-- confidentiality
+UPDATE res_letterbox SET confidentiality = 'N';
+
+-- contacts_v2
+INSERT INTO contacts_v2 (contact_id, contact_type, is_corporate_person, society, society_short,firstname,lastname,title,function,other_data,user_id,entity_id,creation_date,update_date,enabled)
+SELECT contact_id, '1', is_corporate_person, society, '', firstname, lastname, title,function, other_data,'superadmin','',CURRENT_DATE,CURRENT_DATE,enabled FROM contacts;
+
+INSERT INTO contact_addresses (contact_id, contact_purpose_id, departement,firstname,lastname,title,function,occupancy,address_num,address_street, address_complement, address_town, address_postal_code,address_country,phone,email,website,salutation_header,salutation_footer,other_data,user_id,entity_id,is_private, enabled)
+SELECT contact_id,'1','','','','','','',address_num,address_street,address_complement,address_town,address_postal_code,address_country,phone,email,'','','','','superadmin','',is_private,enabled from contacts;
+
+INSERT INTO contact_purposes (id,label) VALUES ('1','Adresse Principale');
+
+INSERT INTO contact_types (id,label,can_add_contact,contact_target) VALUES ('1','Courriers', 'Y', 'both');
+
+UPDATE mlb_coll_ext m SET address_id = adr.id FROM contact_addresses adr WHERE m.exp_contact_id = adr.contact_id OR m.dest_contact_id = adr.contact_id;
+
+-- attachments
+UPDATE res_attachments SET relation = 1, attachment_type='response_project';
+
+
+-- templates
+UPDATE templates SET template_target = 'attachments', template_attachment_type = 'response_project';
+
+UPDATE templates SET template_target = 'notifications', template_attachment_type = NULL WHERE lower(template_label) LIKE '%notification%';
+
+-- listmodels
+UPDATE listmodels SET title=description, description='';
+
+-- passwords SHA512
+UPDATE users SET password = '65d1d802c2c5e7e9035c5cef3cfc0902b6d0b591bfa85977055290736bbfcdd7e19cb7cfc9f980d0c815bbf7fe329a4efd8da880515ba520b22c0aa3a96514cc', change_password = 'Y' WHERE user_id != 'superadmin';
+UPDATE users SET password = '964a5502faec7a27f63ab5f7bddbe1bd8a685616a90ffcba633b5ad404569bd8fed4693cc00474a4881f636f3831a3e5a36bda049c568a89cfe54b1285b0c13e' WHERE user_id = 'superadmin';
+
+-- Docservers for thumbnails
+INSERT INTO docserver_types (docserver_type_id, docserver_type_label, enabled, is_container, container_max_number, is_compressed, compression_mode, is_meta, meta_template, is_logged, log_template, is_signed, fingerprint_mode) VALUES ('TNL', 'Thumbnails', 'Y', 'N', 0, 'N', 'NONE', 'N', 'NONE', 'N', 'NONE', 'Y', 'NONE');
+INSERT INTO docservers (docserver_id, docserver_type_id, device_label, is_readonly, enabled, size_limit_number, actual_size_number, path_template, ext_docserver_info, chain_before, chain_after, creation_date, closing_date, coll_id, priority_number, docserver_location_id, adr_priority_number) VALUES ('TNL', 'TNL', 'Server for thumbnails of documents', 'N', 'Y', 50000000000, 0, '/opt/maarch/docservers/thumbnails_mlb/', NULL, NULL, NULL, '2015-03-16 14:47:49.197164', NULL, 'letterbox_coll', 11, 'NANTERRE', 3);
+
+--Add service associate_folder by default
+INSERT INTO usergroups_services(group_id,service_id)
+SELECT group_id,'associate_folder' from usergroups;
diff --git a/core/trunk/sql/structure.sql b/core/trunk/sql/structure.sql
index 5db118ca67504f2694b634516f807a93f0fdcfc4..ed8ee5f34f8a078534a6d7993e19ba038e9a03f6 100644
--- a/core/trunk/sql/structure.sql
+++ b/core/trunk/sql/structure.sql
@@ -914,6 +914,24 @@ CREATE TABLE groupbasket_redirect
 )
 WITH (OIDS=FALSE);
 
+CREATE SEQUENCE email_signatures_id_seq
+  INCREMENT 1
+  MINVALUE 1
+  MAXVALUE 9223372036854775807
+  START 7
+  CACHE 1;
+
+CREATE TABLE email_signatures
+(
+  id bigint NOT NULL DEFAULT nextval('email_signatures_id_seq'::regclass),
+  user_id character varying(255) NOT NULL,
+  html_body text NOT NULL,
+  title character varying NOT NULL,
+  CONSTRAINT email_signatures_pkey PRIMARY KEY (id)
+)
+WITH (
+  OIDS=FALSE
+);
 
 -- modules/folder/sql/structure/folder.postgresql.sql