diff --git a/migration/19.12/1912.sql b/migration/19.12/1912.sql
index 01ed2c2489452b574aa481e611cbe309b9fc8588..601fa12df7d8b26202558707a2290701327bdecd 100644
--- a/migration/19.12/1912.sql
+++ b/migration/19.12/1912.sql
@@ -479,8 +479,13 @@ ALTER TABLE listinstance_history_details DROP COLUMN IF EXISTS added_by_entity;
 ALTER TABLE usergroup_content DROP COLUMN IF EXISTS primary_group;
 
 /* M2M */
-UPDATE res_letterbox SET external_id = json_build_object('m2m', reference_number), reference_number = null FROM mlb_coll_ext WHERE res_letterbox.res_id = mlb_coll_ext.res_id AND mlb_coll_ext.nature_id = 'message_exchange';
-UPDATE mlb_coll_ext SET nature_id = null WHERE nature_id = 'message_exchange';
+DO $$ BEGIN
+  IF (SELECT count(attname) FROM pg_attribute WHERE attrelid = (SELECT oid FROM pg_class WHERE relname = 'mlb_coll_ext')) THEN
+    UPDATE res_letterbox SET external_id = json_build_object('m2m', reference_number), reference_number = null FROM mlb_coll_ext WHERE res_letterbox.res_id = mlb_coll_ext.res_id AND mlb_coll_ext.nature_id = 'message_exchange';
+    UPDATE mlb_coll_ext SET nature_id = null WHERE nature_id = 'message_exchange';
+  END IF;
+END$$;
+
 
 /* RE CREATE VIEWS */
 CREATE VIEW res_view_attachments AS
@@ -502,17 +507,21 @@ TRUNCATE TABLE custom_fields;
 INSERT INTO custom_fields (id, label, type, values) VALUES (1, 'Nature', 'select', '["Courrier simple", "Courriel", "Courrier suivi", "Courrier avec AR", "Autre"]');
 SELECT setval('custom_fields_id_seq', (select max(id)+1 from custom_fields), false);
 
-TRUNCATE TABLE resources_custom_fields;
-INSERT INTO resources_custom_fields (res_id, custom_field_id, value)  
-SELECT res_id, 1, '"Courrier simple"' FROM mlb_coll_ext WHERE nature_id = 'simple_mail';
-INSERT INTO resources_custom_fields (res_id, custom_field_id, value)  
-SELECT res_id, 1, '"Courriel"' FROM mlb_coll_ext WHERE nature_id = 'email';
-INSERT INTO resources_custom_fields (res_id, custom_field_id, value)  
-SELECT res_id, 1, '"Autre"' FROM mlb_coll_ext WHERE nature_id IN ('fax', 'other', 'courier');
-INSERT INTO resources_custom_fields (res_id, custom_field_id, value)  
-SELECT res_id, 1, '"Courrier suivi"' FROM mlb_coll_ext WHERE nature_id IN ('chronopost', 'fedex');
-INSERT INTO resources_custom_fields (res_id, custom_field_id, value)  
-SELECT res_id, 1, '"Courrier avec AR"' FROM mlb_coll_ext WHERE nature_id = 'registered_mail';
+DO $$ BEGIN
+  IF (SELECT count(attname) FROM pg_attribute WHERE attrelid = (SELECT oid FROM pg_class WHERE relname = 'mlb_coll_ext')) THEN
+    TRUNCATE TABLE resources_custom_fields;
+    INSERT INTO resources_custom_fields (res_id, custom_field_id, value)  
+    SELECT res_id, 1, '"Courrier simple"' FROM mlb_coll_ext WHERE nature_id = 'simple_mail';
+    INSERT INTO resources_custom_fields (res_id, custom_field_id, value)  
+    SELECT res_id, 1, '"Courriel"' FROM mlb_coll_ext WHERE nature_id = 'email';
+    INSERT INTO resources_custom_fields (res_id, custom_field_id, value)  
+    SELECT res_id, 1, '"Autre"' FROM mlb_coll_ext WHERE nature_id IN ('fax', 'other', 'courier');
+    INSERT INTO resources_custom_fields (res_id, custom_field_id, value)  
+    SELECT res_id, 1, '"Courrier suivi"' FROM mlb_coll_ext WHERE nature_id IN ('chronopost', 'fedex');
+    INSERT INTO resources_custom_fields (res_id, custom_field_id, value)  
+    SELECT res_id, 1, '"Courrier avec AR"' FROM mlb_coll_ext WHERE nature_id = 'registered_mail';
+  END IF;
+END$$;
 
 TRUNCATE TABLE indexing_models;
 INSERT INTO indexing_models (id, category, label, "default", owner, private) VALUES (1, 'incoming', 'Courrier arrivée', TRUE, 23, FALSE);
diff --git a/sql/sample.sql b/sql/sample.sql
index 4b16aac11961c5dc451ea9b810730322a31a17e6..3e553dd6be27c8b96550f12a09caf73e6a159c8a 100644
--- a/sql/sample.sql
+++ b/sql/sample.sql
@@ -196,87 +196,87 @@ Select setval('adr_attachments_id_seq', (select max(res_id)+1 from adr_attachmen
 TRUNCATE TABLE listinstance;
 ALTER SEQUENCE listinstance_id_seq restart WITH 1;
 -- to sign documents
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (1, 'letterbox_coll', 1, 'DOC', 0, 'bbain', 'user_id', 'dest', 'bbain', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (2, 'letterbox_coll', 1, 'DOC', 0, 'DSG', 'entity_id', 'cc', 'bbain', 'Y', 0, 'entity_id', NULL, NULL, false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (3, 'letterbox_coll', 2, 'DOC', 0, 'ccharles', 'user_id', 'dest', 'ccharles', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (4, 'letterbox_coll', 2, 'DOC', 0, 'DSG', 'entity_id', 'cc', 'ccharles', 'Y', 0, 'entity_id', NULL, NULL, false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user,  visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (5, 'letterbox_coll', 3, 'DOC', 0, 'rrenaud', 'user_id', 'dest', 'rrenaud', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (6, 'letterbox_coll', 4, 'DOC', 0, 'bbain', 'user_id', 'dest', 'bbain', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (7, 'letterbox_coll', 5, 'DOC', 0, 'ssaporta', 'user_id', 'dest', 'ssaporta', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (8, 'letterbox_coll', 5, 'DOC', 0, 'DSG', 'entity_id', 'cc', 'bbain', 'Y', 0, 'entity_id', NULL, NULL, false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (9, 'letterbox_coll', 6, 'DOC', 0, 'ssaporta', 'user_id', 'dest', 'ssaporta', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (10, 'letterbox_coll', 6, 'DOC', 0, 'DSG', 'entity_id', 'cc', 'bbain', 'Y', 0, 'entity_id', NULL, NULL, false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (1, 1, 0, 'bbain', 'user_id', 'dest', 'bbain', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (2, 1, 0, 'DSG', 'entity_id', 'cc', 'bbain', 0, 'entity_id', NULL, NULL, false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (3, 2, 0, 'ccharles', 'user_id', 'dest', 'ccharles', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (4, 2, 0, 'DSG', 'entity_id', 'cc', 'ccharles', 0, 'entity_id', NULL, NULL, false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (5, 3, 0, 'rrenaud', 'user_id', 'dest', 'rrenaud', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (6, 4, 0, 'bbain', 'user_id', 'dest', 'bbain', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (7, 5, 0, 'ssaporta', 'user_id', 'dest', 'ssaporta', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (8, 5, 0, 'DSG', 'entity_id', 'cc', 'bbain', 0, 'entity_id', NULL, NULL, false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (9, 6, 0, 'ssaporta', 'user_id', 'dest', 'ssaporta', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (10, 6, 0, 'DSG', 'entity_id', 'cc', 'bbain', 0, 'entity_id', NULL, NULL, false, false);
 -- to annotate documents
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (11, 'letterbox_coll', 7, 'DOC', 0, 'rrenaud', 'user_id', 'dest', 'rrenaud', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (12, 'letterbox_coll', 8, 'DOC', 0, 'rrenaud', 'user_id', 'dest', 'rrenaud', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (13, 'letterbox_coll', 9, 'DOC', 0, 'ssaporta', 'user_id', 'dest', 'ssaporta', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (14, 'letterbox_coll', 9, 'DOC', 0, 'DSG', 'entity_id', 'cc', 'bbain', 'Y', 0, 'entity_id', NULL, NULL, false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (15, 'letterbox_coll', 10, 'DOC', 0, 'rrenaud', 'user_id', 'dest', 'rrenaud', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (16, 'letterbox_coll', 11, 'DOC', 0, 'sstar', 'user_id', 'dest', 'sstar', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (17, 'letterbox_coll', 11, 'DOC', 0, 'DSG', 'entity_id', 'cc', 'sstar', 'Y', 0, 'entity_id', NULL, NULL, false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (18, 'letterbox_coll', 11, 'DOC', 0, 'jjane', 'user_id', 'cc', 'sstar', 'Y', 0, 'entity_id', NULL, NULL, false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (19, 'letterbox_coll', 12, 'DOC', 0, 'rrenaud', 'user_id', 'dest', 'rrenaud', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (20, 'letterbox_coll', 13, 'DOC', 0, 'ppruvost', 'user_id', 'dest', 'bbain', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (21, 'letterbox_coll', 13, 'DOC', 0, 'DSG', 'entity_id', 'cc', 'bbain', 'Y', 0, 'entity_id', NULL, NULL, false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (22, 'letterbox_coll', 14, 'DOC', 0, 'ssaporta', 'user_id', 'dest', 'ssaporta', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (23, 'letterbox_coll', 14, 'DOC', 0, 'DSG', 'entity_id', 'cc', 'bbain', 'Y', 0, 'entity_id', NULL, NULL, false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (11, 7, 0, 'rrenaud', 'user_id', 'dest', 'rrenaud', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (12, 8, 0, 'rrenaud', 'user_id', 'dest', 'rrenaud', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (13, 9, 0, 'ssaporta', 'user_id', 'dest', 'ssaporta', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (14, 9, 0, 'DSG', 'entity_id', 'cc', 'bbain', 0, 'entity_id', NULL, NULL, false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (15, 10, 0, 'rrenaud', 'user_id', 'dest', 'rrenaud', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (16, 11, 0, 'sstar', 'user_id', 'dest', 'sstar', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (17, 11, 0, 'DSG', 'entity_id', 'cc', 'sstar', 0, 'entity_id', NULL, NULL, false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (18, 11, 0, 'jjane', 'user_id', 'cc', 'sstar', 0, 'entity_id', NULL, NULL, false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (19, 12, 0, 'rrenaud', 'user_id', 'dest', 'rrenaud', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (20, 13, 0, 'ppruvost', 'user_id', 'dest', 'bbain', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (21, 13, 0, 'DSG', 'entity_id', 'cc', 'bbain', 0, 'entity_id', NULL, NULL, false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (22, 14, 0, 'ssaporta', 'user_id', 'dest', 'ssaporta', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (23, 14, 0, 'DSG', 'entity_id', 'cc', 'bbain', 0, 'entity_id', NULL, NULL, false, false);
 -- to qualify document
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (24, 'letterbox_coll', 15, 'DOC', 0, 'ccharles', 'user_id', 'dest', 'ccharles', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (25, 'letterbox_coll', 15, 'DOC', 0, 'DSG', 'entity_id', 'cc', 'ccharles', 'Y', 0, 'entity_id', NULL, NULL, false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (24, 15, 0, 'ccharles', 'user_id', 'dest', 'ccharles', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (25, 15, 0, 'DSG', 'entity_id', 'cc', 'ccharles', 0, 'entity_id', NULL, NULL, false, false);
 -- to validate document
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (26, 'letterbox_coll', 16, 'DOC', 0, 'ccharles', 'user_id', 'dest', 'ccharles', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (27, 'letterbox_coll', 16, 'DOC', 0, 'DSG', 'entity_id', 'cc', 'ccharles', 'Y', 0, 'entity_id', NULL, NULL, false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (26, 16, 0, 'ccharles', 'user_id', 'dest', 'ccharles', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (27, 16, 0, 'DSG', 'entity_id', 'cc', 'ccharles', 0, 'entity_id', NULL, NULL, false, false);
 -- to process document ccharles
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (28, 'letterbox_coll', 17, 'DOC', 0, 'ccharles', 'user_id', 'dest', 'ccharles', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (29, 'letterbox_coll', 17, 'DOC', 0, 'DSG', 'entity_id', 'cc', 'ccharles', 'Y', 0, 'entity_id', NULL, NULL, false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (28, 17, 0, 'ccharles', 'user_id', 'dest', 'ccharles', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (29, 17, 0, 'DSG', 'entity_id', 'cc', 'ccharles', 0, 'entity_id', NULL, NULL, false, false);
 -- to process document nnataly
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (30, 'letterbox_coll', 18, 'DOC', 0, 'nnataly', 'user_id', 'dest', 'nnataly', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (31, 'letterbox_coll', 18, 'DOC', 0, 'DSG', 'entity_id', 'cc', 'nnataly', 'Y', 0, 'entity_id', NULL, NULL, false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (30, 18, 0, 'nnataly', 'user_id', 'dest', 'nnataly', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (31, 18, 0, 'DSG', 'entity_id', 'cc', 'nnataly', 0, 'entity_id', NULL, NULL, false, false);
 -- to paraph document ppetit
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (32, 'letterbox_coll', 19, 'DOC', 0, 'ccharles', 'user_id', 'dest', 'ccharles', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (33, 'letterbox_coll', 19, 'DOC', 0, 'DSG', 'entity_id', 'cc', 'ccharles', 'Y', 0, 'entity_id', NULL, NULL, false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (34, 'letterbox_coll', 19, 'DOC', 0, 'mmanfred', 'user_id', 'visa', 'ccharles', 'Y', 1, 'VISA_CIRCUIT', CURRENT_DATE, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (35, 'letterbox_coll', 19, 'DOC', 0, 'ppetit', 'user_id', 'sign', 'ccharles', 'Y', 0, 'VISA_CIRCUIT', NULL, '', false, true);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (32, 19, 0, 'ccharles', 'user_id', 'dest', 'ccharles', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (33, 19, 0, 'DSG', 'entity_id', 'cc', 'ccharles', 0, 'entity_id', NULL, NULL, false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (34, 19, 0, 'mmanfred', 'user_id', 'visa', 'ccharles', 1, 'VISA_CIRCUIT', CURRENT_DATE, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (35, 19, 0, 'ppetit', 'user_id', 'sign', 'ccharles', 0, 'VISA_CIRCUIT', NULL, '', false, true);
 -- to archive document ggrand
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (36, 'letterbox_coll', 20, 'DOC', 0, 'ccharles', 'user_id', 'dest', 'ccharles', 'Y', 0, 'entity_id', NULL, '', false, false);
-INSERT INTO listinstance (listinstance_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
-VALUES (37, 'letterbox_coll', 20, 'DOC', 0, 'DSG', 'entity_id', 'cc', 'ccharles', 'Y', 0, 'entity_id', NULL, NULL, false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (36, 20, 0, 'ccharles', 'user_id', 'dest', 'ccharles', 0, 'entity_id', NULL, '', false, false);
+INSERT INTO listinstance (listinstance_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_date, process_comment, signatory, requested_signature)
+VALUES (37, 20, 0, 'DSG', 'entity_id', 'cc', 'ccharles', 0, 'entity_id', NULL, NULL, false, false);
 
 Select setval('listinstance_id_seq', (select max(listinstance_id)+1 from listinstance), false);
 
diff --git a/sql/structure.sql b/sql/structure.sql
index 743f3a0699c5e7b40de723c1885962de5cf676af..ec445a5bd15ec08ef9839c06cc1d70fcd4f20637 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -627,7 +627,6 @@ CREATE TABLE notes
   user_id bigint NOT NULL,
   creation_date timestamp without time zone NOT NULL,
   note_text text NOT NULL,
-  type CHARACTER VARYING (32) DEFAULT 'resource' NOT NULL,
   CONSTRAINT notes_pkey PRIMARY KEY (id)
 )
 WITH (OIDS=FALSE);
diff --git a/src/app/resource/models/ResModelAbstract.php b/src/app/resource/models/ResModelAbstract.php
index e201b3d44f91981b8089cc8dbe1735a7d93b14cb..fc176610751acaa7a0479da55ef315fac7ae7acf 100755
--- a/src/app/resource/models/ResModelAbstract.php
+++ b/src/app/resource/models/ResModelAbstract.php
@@ -14,9 +14,6 @@
 
 namespace Resource\models;
 
-use Doctype\models\DoctypeModel;
-use Resource\controllers\IndexingController;
-use SrcCore\models\CoreConfigModel;
 use SrcCore\models\ValidatorModel;
 use SrcCore\models\DatabaseModel;