diff --git a/apps/maarch_entreprise/class/class_types_Abstract.php b/apps/maarch_entreprise/class/class_types_Abstract.php
index f06c9fd92abf3c52620e1e643ce8dd718ddb1374..ce6930308e30bd129b74fabce94fe19485e4fb91 100644
--- a/apps/maarch_entreprise/class/class_types_Abstract.php
+++ b/apps/maarch_entreprise/class/class_types_Abstract.php
@@ -83,7 +83,7 @@ abstract class types_Abstract extends database
);
$_SESSION['m_admin']['doctypes']['RETENTION_RULE'] = $line->retention_rule;
$_SESSION['m_admin']['doctypes']['RETENTION_FINAL_DISPOSITION'] = $line->retention_final_disposition;
- $_SESSION['m_admin']['doctypes']['_DURATION_CURRENT_USE'] = $line->duration_current_use;
+ $_SESSION['m_admin']['doctypes']['DURATION_CURRENT_USE'] = $line->duration_current_use;
$_SESSION['m_admin']['doctypes']['SUB_FOLDER'] = $line->doctypes_second_level_id;
$_SESSION['m_admin']['doctypes']['VALIDATE'] = $line->enabled;
$_SESSION['m_admin']['doctypes']['TABLE'] = $line->coll_id;
@@ -200,15 +200,15 @@ abstract class types_Abstract extends database
<select name="retention_final_disposition" id="retention_final_disposition">
<option value =""><?php echo _CHOOSE_FINAL_DISPOSITION ?></option>
<?php if (!$_SESSION['m_admin']['doctypes']['RETENTION_FINAL_DISPOSITION']) { ?>
- <option value="<?php echo _DESTROY ?>"><?php echo _DESTROY ?></option>
- <option value="<?php echo _KEEP ?>"><?php echo _KEEP ?></option>
+ <option value="<?php echo strtolower(_DESTROY) ?>"><?php echo _DESTROY ?></option>
+ <option value="<?php echo strtolower(_KEEP) ?>"><?php echo _KEEP ?></option>
<?php } else {
if ($_SESSION['m_admin']['doctypes']['RETENTION_FINAL_DISPOSITION'] == strtolower(_DESTROY)) { ?>
- <option value="<?php echo _DESTROY ?>" selected="selected" ><?php echo _DESTROY ?></option>
- <option value="<?php echo _KEEP ?>"><?php echo _KEEP ?></option>
+ <option value="<?php echo strtolower(_DESTROY) ?>" selected="selected" ><?php echo _DESTROY ?></option>
+ <option value="<?php echo strtolower(_KEEP) ?>"><?php echo _KEEP ?></option>
<?php } else { ?>
- <option value="<?php echo _DESTROY ?>"><?php echo _DESTROY ?></option>
- <option value="<?php echo _KEEP ?>" selected="selected"><?php echo _KEEP ?></option>
+ <option value="<?php echo strtolower(_DESTROY) ?>"><?php echo _DESTROY ?></option>
+ <option value="<?php echo strtolower(_KEEP) ?>" selected="selected"><?php echo _KEEP ?></option>
<?php }
} ?>
</select>
@@ -225,11 +225,11 @@ abstract class types_Abstract extends database
</p>
<p>
<label for="duration_current_use"><?php echo _DURATION_CURRENT_USE;?> : </label>
- <?php if ($_SESSION['m_admin']['doctypes']['date_current_use']) {
+ <?php if ($_SESSION['m_admin']['doctypes']['DURATION_CURRENT_USE']) {
?>
- <input type="number" name="duration_current_use" value="<?php echo $_SESSION['m_admin']['doctypes']['duration_current_use'] ?>" min="0" step="1">
+ <input type="text" name="duration_current_use" value="<?php echo $_SESSION['m_admin']['doctypes']['DURATION_CURRENT_USE'] ?>"><?php echo _MONTH;?>
<?php } else { ?>
- <input type="number" name="duration_current_use" min="0" step="1"> <?php echo _MONTH;?>
+ <input type="text" name="duration_current_use"> <?php echo _MONTH;?>
<?php } ?>
</p>
@@ -344,6 +344,9 @@ abstract class types_Abstract extends database
$_SESSION['m_admin']['doctypes']['COLL_ID'] = $_REQUEST['collection'];
$_SESSION['m_admin']['doctypes']['indexes'] = array();
$_SESSION['m_admin']['doctypes']['mandatory_indexes'] = array();
+ $_SESSION['m_admin']['doctypes']['RETENTION_RULE'] = $_REQUEST['retention_rule'];
+ $_SESSION['m_admin']['doctypes']['RETENTION_FINAL_DISPOSITION'] = $_REQUEST['retention_final_disposition'];
+ $_SESSION['m_admin']['doctypes']['DURATION_CURRENT_USE'] = $_REQUEST['duration_current_use'];
if (isset($_REQUEST['fields'])) {
for ($i = 0; $i < count($_REQUEST['fields']); $i ++) {
array_push(
@@ -438,10 +441,12 @@ abstract class types_Abstract extends database
} else {
if ($_REQUEST['mode'] <> "prop" && $_REQUEST['mode'] <> "add") {
$db->query(
- "UPDATE " . DOCTYPES_TABLE . " SET description = ? , doctypes_first_level_id = ?, doctypes_second_level_id = ?, enabled = 'Y', coll_id = ?
+ "UPDATE " . DOCTYPES_TABLE . " SET description = ? , doctypes_first_level_id = ?, doctypes_second_level_id = ?, retention_final_disposition = ?, retention_rule = ?, duration_current_use = ?, enabled = 'Y', coll_id = ?
WHERE type_id = ?",
- array($_SESSION['m_admin']['doctypes']['LABEL'], $_SESSION['m_admin']['doctypes']['STRUCTURE'], $_SESSION['m_admin']['doctypes']['SUB_FOLDER'],
- $_SESSION['m_admin']['doctypes']['COLL_ID'], $_SESSION['m_admin']['doctypes']['TYPE_ID'])
+ array($_SESSION['m_admin']['doctypes']['LABEL'], $_SESSION['m_admin']['doctypes']['STRUCTURE'], $_SESSION['m_admin']['doctypes']['SUB_FOLDER'],
+ $_SESSION['m_admin']['doctypes']['RETENTION_FINAL_DISPOSITION'], $_SESSION['m_admin']['doctypes']['RETENTION_RULE'],
+ $_SESSION['m_admin']['doctypes']['DURATION_CURRENT_USE'], $_SESSION['m_admin']['doctypes']['COLL_ID'],
+ $_SESSION['m_admin']['doctypes']['TYPE_ID'] )
);
$db->query(
@@ -507,8 +512,9 @@ abstract class types_Abstract extends database
$db->query(
"INSERT INTO " . DOCTYPES_TABLE . " (coll_id, "
." description, doctypes_first_level_id, "
- . "doctypes_second_level_id, enabled ) VALUES (?, ?, ?, ?, 'Y' )",
- array($_SESSION['m_admin']['doctypes']['COLL_ID'], $tmp, $_SESSION['m_admin']['doctypes']['STRUCTURE'], $_SESSION['m_admin']['doctypes']['SUB_FOLDER'])
+ . "doctypes_second_level_id, retention_final_disposition, retention_rule, duration_current_use, enabled ) VALUES (?, ?, ?, ?,?,?,? 'Y' )",
+ array($_SESSION['m_admin']['doctypes']['COLL_ID'], $tmp, $_SESSION['m_admin']['doctypes']['STRUCTURE'], $_SESSION['m_admin']['doctypes']['SUB_FOLDER'],
+ $_SESSION['m_admin']['doctypes']['RETENTION_FINAL_DISPOSITION'], $_SESSION['m_admin']['doctypes']['RETENTION_RULE'], $_SESSION['m_admin']['doctypes']['DURATION_CURRENT_USE'])
);
//$this->show();
$stmt = $db->query(
@@ -534,10 +540,11 @@ abstract class types_Abstract extends database
}
$db->query(
"INSERT INTO " . DOCTYPES_INDEXES_TABLE
- . " (coll_id, type_id, field_name, mandatory) "
- . "values(?, ?, ?, ?)",
+ . " (coll_id, type_id, field_name, mandatory, retention_final_disposition, retention_rule, duration_current_use) "
+ . "values(?, ?, ?, ?, ?, ?, ?)",
array($_SESSION['m_admin']['doctypes']['COLL_ID'], $_SESSION['m_admin']['doctypes']['TYPE_ID']
- , $_SESSION['m_admin']['doctypes']['indexes'][$i], $mandatory)
+ , $_SESSION['m_admin']['doctypes']['indexes'][$i], $mandatory, $_SESSION['m_admin']['doctypes']['RETENTION_FINAL_DISPOSITION'], $_SESSION['m_admin']['doctypes']['RETENTION_RULE'],
+ $_SESSION['m_admin']['doctypes']['DURATION_CURRENT_USE'])
);
}
diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php
index e9ebc41566a980bf71bf5e80b9125be32d900d6b..b995e0b751c40f1484e4f1642bdc05450da3f452 100755
--- a/apps/maarch_entreprise/lang/fr.php
+++ b/apps/maarch_entreprise/lang/fr.php
@@ -1829,7 +1829,7 @@ if (!defined("_CHOOSE_FINAL_DISPOSITION")) define("_CHOOSE_FINAL_DISPOSITION","C
if (!defined("_DESTROY")) define("_DESTROY","Destruction");
if (!defined("_KEEP")) define("_KEEP","Conservation");
if (!defined("_RETENTION_RULE")) define("_RETENTION_RULE","Règle de conservation");
-if (!defined("_DURATION_CURRENT_USE")) define("_DURATION_CURRENT_USE","Durée de conservation");
+if (!defined("_DURATION_CURRENT_USE")) define("_DURATION_CURRENT_USE","Durée d'utilité courante");
if (!defined("_UNSELECT_ALL")) define("_UNSELECT_ALL","Tout désélectionner");
diff --git a/apps/maarch_entreprise/xml/IVS/validation_rules.xml b/apps/maarch_entreprise/xml/IVS/validation_rules.xml
index 21f3239dc6e333d328cdd366e7efab5a661e5700..08ef49ce0a21a0f0e67653f8dedd968a2cc85a83 100755
--- a/apps/maarch_entreprise/xml/IVS/validation_rules.xml
+++ b/apps/maarch_entreprise/xml/IVS/validation_rules.xml
@@ -98,7 +98,7 @@
<parameter name="fields_attachments" type="identifier" />
<parameter name="mandatory_fields" type="identifier" />
<parameter name="retention_final_disposition" type="string" />
- <parameter name="retention_rule" type="identifier" />
+ <parameter name="retention_rule" type="string" />
<parameter name="duration_current_use" type="integer" />
</validationRule>
diff --git a/install/lang/en.php b/install/lang/en.php
index 532d297be7a4c0e42cc5baff137d8cf32aff2fa2..d7bb29f519529a893e053de851196dcf08548b46 100755
--- a/install/lang/en.php
+++ b/install/lang/en.php
@@ -442,3 +442,7 @@ if (!defined('_ZIP_LIB')) {
if (!defined('_INSTALL_ZIP_LIB_FIRST')) {
define('_INSTALL_ZIP_LIB_FIRST', "Install zip lib first to deploy dependencies automatically");
}
+
+if (!defined('_NO_AVAILABLE_TAG_TO_UPDATE')) {
+ define('_NO_AVAILABLE_TAG_TO_UPDATE', "No available tag to update");
+}
diff --git a/install/lang/fr.php b/install/lang/fr.php
index 328a12cf97e0c3e51d7450ea3bbac7e3a9348cbd..bfabf44b2e5ccb9cd2de3ac7aa246206ff3d82e0 100755
--- a/install/lang/fr.php
+++ b/install/lang/fr.php
@@ -445,3 +445,7 @@ if (!defined('_ZIP_LIB')) {
if (!defined('_INSTALL_ZIP_LIB_FIRST')) {
define('_INSTALL_ZIP_LIB_FIRST', "Installez la librairie zip pour déployer automatiquement les dépendances");
}
+
+if (!defined('_NO_AVAILABLE_TAG_TO_UPDATE')) {
+ define('_NO_AVAILABLE_TAG_TO_UPDATE', "Pas de tag disponible pour une mise à jour");
+}
diff --git a/sql/data_fr.sql b/sql/data_fr.sql
index 802743911729f1b7590a14a11b3c14b044dba57a..40ee1f496cd382da1645b9e6c646cdc668ba40fb 100644
--- a/sql/data_fr.sql
+++ b/sql/data_fr.sql
@@ -833,11 +833,11 @@ INSERT INTO baskets (basket_id, basket_name, basket_desc, basket_clause, coll_id
DELETE FROM baskets WHERE basket_id = 'SupAvisBasket';
DELETE FROM actions_groupbaskets WHERE basket_id = 'SupAvisBasket';
DELETE FROM groupbasket_redirect WHERE basket_id = 'SupAvisBasket';
-INSERT INTO baskets (basket_id, basket_name, basket_desc, basket_clause, coll_id, is_visible, is_folder_basket, enabled, basket_order) VALUES ('SupAvisBasket', 'Avis : En attente de réponse', 'Courriers en attente d''avis', 'status=''EAVIS'' and ((DEST_USER = @user) OR (DEST_USER IN (select user_id from users_entities WHERE entity_id = @my_primary_entity) or DESTINATION in (@subentities[@my_primary_entity]))) and res_id NOT IN (SELECT res_id FROM listinstance WHERE item_mode = ''avis'' and difflist_type = ''entity_id'' and process_date is not NULL and res_view_letterbox.res_id = res_id group by res_id) AND res_id IN (SELECT res_id FROM listinstance WHERE item_mode = ''avis'' and difflist_type = ''entity_id'' and process_date is NULL and res_view_letterbox.res_id = res_id group by res_id)', 'letterbox_coll', 'Y', 'N', 'Y',60);
+INSERT INTO baskets (basket_id, basket_name, basket_desc, basket_clause, coll_id, is_visible, is_folder_basket, enabled, basket_order) VALUES ('SupAvisBasket', 'Avis : En attente de réponse', 'Courriers en attente d''avis', 'status=''EAVIS'' and ((DEST_USER = @user) OR (DEST_USER IN (select user_id from users_entities WHERE entity_id IN( @my_entities)) or DESTINATION in (@subentities[@my_entities]))) and res_id NOT IN (SELECT res_id FROM listinstance WHERE item_mode = ''avis'' and difflist_type = ''entity_id'' and process_date is not NULL and res_view_letterbox.res_id = res_id group by res_id) AND res_id IN (SELECT res_id FROM listinstance WHERE item_mode = ''avis'' and difflist_type = ''entity_id'' and process_date is NULL and res_view_letterbox.res_id = res_id group by res_id)', 'letterbox_coll', 'Y', 'N', 'Y',60);
DELETE FROM baskets WHERE basket_id = 'RetAvisBasket';
DELETE FROM actions_groupbaskets WHERE basket_id = 'RetAvisBasket';
DELETE FROM groupbasket_redirect WHERE basket_id = 'RetAvisBasket';
-INSERT INTO baskets (basket_id, basket_name, basket_desc, basket_clause, coll_id, is_visible, is_folder_basket, enabled, basket_order) VALUES ('RetAvisBasket', 'Avis : Retours partiels', 'Courriers avec avis reçus', 'status=''EAVIS'' and ((DEST_USER = @user) OR (DEST_USER IN (select user_id from users_entities WHERE entity_id = @my_primary_entity) or DESTINATION in (@subentities[@my_primary_entity]))) and res_id IN (SELECT res_id FROM listinstance WHERE item_mode = ''avis'' and difflist_type = ''entity_id'' and process_date is not NULL and res_view_letterbox.res_id = res_id group by res_id)', 'letterbox_coll', 'Y', 'N', 'Y',70);
+INSERT INTO baskets (basket_id, basket_name, basket_desc, basket_clause, coll_id, is_visible, is_folder_basket, enabled, basket_order) VALUES ('RetAvisBasket', 'Avis : Retours partiels', 'Courriers avec avis reçus', 'status=''EAVIS'' and ((DEST_USER = @user) OR (DEST_USER IN (select user_id from users_entities WHERE entity_id IN( @my_entities)) or DESTINATION in (@subentities[@my_entities]))) and res_id IN (SELECT res_id FROM listinstance WHERE item_mode = ''avis'' and difflist_type = ''entity_id'' and process_date is not NULL and res_view_letterbox.res_id = res_id group by res_id)', 'letterbox_coll', 'Y', 'N', 'Y',70);
DELETE FROM baskets WHERE basket_id = 'ValidationBasket';
DELETE FROM actions_groupbaskets WHERE basket_id = 'ValidationBasket';
DELETE FROM groupbasket_redirect WHERE basket_id = 'ValidationBasket';
@@ -845,7 +845,7 @@ INSERT INTO baskets (basket_id, basket_name, basket_desc, basket_clause, coll_id
DELETE FROM baskets WHERE basket_id = 'InValidationBasket';
DELETE FROM actions_groupbaskets WHERE basket_id = 'InValidationBasket';
DELETE FROM groupbasket_redirect WHERE basket_id = 'InValidationBasket';
-INSERT INTO baskets (basket_id, basket_name, basket_desc, basket_clause, coll_id, is_visible, is_folder_basket, enabled, basket_order) VALUES ('InValidationBasket', 'Courriers signalés en attente d''instruction', 'Courriers signalés en attente d''instruction par le responsable', 'destination in (@my_entities, @subentities[@my_primary_entity]) and status=''VAL''', 'letterbox_coll', 'Y', 'N', 'Y',90);
+INSERT INTO baskets (basket_id, basket_name, basket_desc, basket_clause, coll_id, is_visible, is_folder_basket, enabled, basket_order) VALUES ('InValidationBasket', 'Courriers signalés en attente d''instruction', 'Courriers signalés en attente d''instruction par le responsable', 'destination in (@my_entities, @subentities[@my_entities]) and status=''VAL''', 'letterbox_coll', 'Y', 'N', 'Y',90);
DELETE FROM baskets WHERE basket_id = 'MyBasket';
DELETE FROM actions_groupbaskets WHERE basket_id = 'MyBasket';
DELETE FROM groupbasket_redirect WHERE basket_id = 'MyBasket';
@@ -960,17 +960,17 @@ TRUNCATE TABLE security;
DELETE FROM security WHERE group_id = 'COURRIER';
INSERT INTO security (group_id, coll_id, where_clause, maarch_comment, can_insert, can_update, can_delete, rights_bitmask, mr_start_date, mr_stop_date, where_target) VALUES ('COURRIER', 'letterbox_coll', 'typist=@user', 'Les courriers que j''ai numérisé','N','N','N', 25, NULL, NULL, 'DOC');
DELETE FROM security WHERE group_id = 'AGENT';
-INSERT INTO security (group_id, coll_id, where_clause, maarch_comment, can_insert, can_update, can_delete, rights_bitmask, mr_start_date, mr_stop_date, where_target) VALUES ('AGENT', 'letterbox_coll', 'destination in (@my_entities, @subentities[@my_primary_entity])', 'Les courriers de mes services et sous-services','N','N','N', 25, NULL, NULL, 'DOC');
+INSERT INTO security (group_id, coll_id, where_clause, maarch_comment, can_insert, can_update, can_delete, rights_bitmask, mr_start_date, mr_stop_date, where_target) VALUES ('AGENT', 'letterbox_coll', 'destination in (@my_entities, @subentities[@my_entities])', 'Les courriers de mes services et sous-services','N','N','N', 25, NULL, NULL, 'DOC');
DELETE FROM security WHERE group_id = 'RESP_COURRIER';
INSERT INTO security (group_id, coll_id, where_clause, maarch_comment, can_insert, can_update, can_delete, rights_bitmask, mr_start_date, mr_stop_date, where_target) VALUES ('RESP_COURRIER', 'letterbox_coll', '1=1', 'Tous les courriers','N','N','N', 9, NULL, NULL, 'DOC');
DELETE FROM security WHERE group_id = 'RESPONSABLE';
-INSERT INTO security (group_id, coll_id, where_clause, maarch_comment, can_insert, can_update, can_delete, rights_bitmask, mr_start_date, mr_stop_date, where_target) VALUES ('RESPONSABLE', 'letterbox_coll', 'destination in (@my_entities, @subentities[@my_primary_entity])', 'Les courriers de mes services et sous-services','N','N','N', 25, NULL, NULL, 'DOC');
+INSERT INTO security (group_id, coll_id, where_clause, maarch_comment, can_insert, can_update, can_delete, rights_bitmask, mr_start_date, mr_stop_date, where_target) VALUES ('RESPONSABLE', 'letterbox_coll', 'destination in (@my_entities, @subentities[@my_entities])', 'Les courriers de mes services et sous-services','N','N','N', 25, NULL, NULL, 'DOC');
DELETE FROM security WHERE group_id = 'ADMINISTRATEUR';
INSERT INTO security (group_id, coll_id, where_clause, maarch_comment, can_insert, can_update, can_delete, rights_bitmask, mr_start_date, mr_stop_date, where_target) VALUES ('ADMINISTRATEUR', 'letterbox_coll', '1=1', 'Tous les courriers','N','N','N', 24, NULL, NULL, 'DOC');
DELETE FROM security WHERE group_id = 'DIRECTEUR';
INSERT INTO security (group_id, coll_id, where_clause, maarch_comment, can_insert, can_update, can_delete, rights_bitmask, mr_start_date, mr_stop_date, where_target) VALUES ('DIRECTEUR', 'letterbox_coll', '1=1', 'Tous les courriers','N','N','N', 25, NULL, NULL, 'DOC');
DELETE FROM security WHERE group_id = 'ELU';
-INSERT INTO security (group_id, coll_id, where_clause, maarch_comment, can_insert, can_update, can_delete, rights_bitmask, mr_start_date, mr_stop_date, where_target) VALUES ('ELU', 'letterbox_coll', 'destination in (@my_entities, @subentities[@my_primary_entity])', 'Les courriers de mes services et sous-services','N','N','N', 0, NULL, NULL, 'DOC');
+INSERT INTO security (group_id, coll_id, where_clause, maarch_comment, can_insert, can_update, can_delete, rights_bitmask, mr_start_date, mr_stop_date, where_target) VALUES ('ELU', 'letterbox_coll', 'destination in (@my_entities, @subentities[@my_entities])', 'Les courriers de mes services et sous-services','N','N','N', 0, NULL, NULL, 'DOC');
DELETE FROM security WHERE group_id = 'ARCHIVISTE';
INSERT INTO security (group_id, coll_id, where_clause, maarch_comment, can_insert, can_update, can_delete, rights_bitmask, mr_start_date, mr_stop_date, where_target) VALUES ('ARCHIVISTE', 'letterbox_coll', '1=1', 'Tous les courriers','N','N','N', 0, NULL, NULL, 'DOC');
@@ -1075,12 +1075,13 @@ INSERT INTO difflist_types (difflist_type_id, difflist_type_label, difflist_type
--ACTIONS
------------
TRUNCATE TABLE actions;
-INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (1, 'redirect', 'Affecter à un service', 'NEW', 'Y', 'N', 'Y', 'redirect', 'Y', 'entities', 'N', NULL);
+INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (1, 'redirect', 'Rediriger', 'NEW', 'Y', 'N', 'Y', 'redirect', 'Y', 'entities', 'N', NULL);
INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (2, 'to_validate', 'Valider', 'VAL', 'Y', 'N', 'N', 'confirm_status', 'N', 'apps', 'N', NULL);
INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (3, '', 'Retourner au service Courrier', 'RET', 'N', 'N', 'Y', 'confirm_status', 'Y', 'apps', 'N', NULL);
INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (4, '', 'Enregistrer les modifications', '_NOSTATUS_', 'N', 'N', 'Y', 'process', 'N', 'apps', 'N', NULL);
INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (5, '', 'Remettre en traitement', 'COU', 'N', 'N', 'Y', '', 'Y', 'apps', 'N', NULL);
INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (6, '', 'Classer sans suite', 'SSUITE', 'N', 'N', 'Y', '', 'Y', 'apps', 'N', NULL);
+INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (7, '', 'Affecter au service', 'NEW', 'N', 'N', 'Y', 'confirm_status', 'Y', 'apps', 'N', NULL);
INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (18, 'indexing', 'Valider courrier', 'NEW', 'N', 'N', 'Y', 'validate_mail', 'Y', 'apps', 'N', NULL);
INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (19, '', 'Traiter courrier', 'COU', 'N', 'N', 'Y', 'process', 'N', 'apps', 'N', NULL);
INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (20, '', 'Cloturer', 'END', 'N', 'N', 'Y', 'close_mail', 'Y', 'apps', 'N', NULL);
@@ -1147,7 +1148,7 @@ INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id,
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (417, '', 'AGENT', 'EenvARBasket', 'N', 'Y', 'N');
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (18, '', 'RESP_COURRIER', 'ValidationBasket', 'N', 'N', 'Y');
-INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (1, '', 'RESP_COURRIER', 'ValidationBasket', 'N', 'Y', 'N');
+INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (7, '', 'RESP_COURRIER', 'ValidationBasket', 'N', 'Y', 'N');
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (3, '', 'RESP_COURRIER', 'ValidationBasket', 'N', 'Y', 'N');
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (6, '', 'RESP_COURRIER', 'ValidationBasket', 'N', 'Y', 'N');
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (100, '', 'RESP_COURRIER', 'CopyMailBasket', 'N', 'N', 'Y');
@@ -1183,7 +1184,7 @@ INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id,
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (3, '', 'RESPONSABLE', 'DepartmentBasket', 'Y', 'N', 'N');
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (100, '', 'RESPONSABLE', 'DepartmentBasket', 'N', 'N', 'Y');
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (112, '', 'RESPONSABLE', 'IndexingBasket', 'N', 'N', 'Y');
-INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (36, '', 'RESPONSABLE', 'MyBasket', 'N', 'Y', 'Y');
+INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (36, '', 'RESPONSABLE', 'MyBasket', 'N', 'Y', 'N');
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (37, '', 'RESPONSABLE', 'DdeAvisBasket', 'N', 'Y', 'N');
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (4, '', 'RESPONSABLE', 'DdeAvisBasket', 'N', 'N', 'Y');
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (100, '', 'RESPONSABLE', 'SupAvisBasket', 'N', 'N', 'Y');
@@ -1201,7 +1202,7 @@ INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id,
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (210, '', 'RESPONSABLE', 'EsigARBasket', 'Y', 'N', 'N');
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (18, '', 'DIRECTEUR', 'ValidationBasket', 'N', 'N', 'Y');
-INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (1, '', 'DIRECTEUR', 'ValidationBasket', 'N', 'Y', 'N');
+INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (7, '', 'DIRECTEUR', 'ValidationBasket', 'N', 'Y', 'N');
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (3, '', 'DIRECTEUR', 'ValidationBasket', 'N', 'Y', 'N');
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (6, '', 'DIRECTEUR', 'ValidationBasket', 'N', 'Y', 'N');