diff --git a/apps/maarch_entreprise/actions/process.php b/apps/maarch_entreprise/actions/process.php
index 6359fd8165e27ea7a233e7b02e27acc803c3bbda..e2208a8158f9f405cb8d2c4b5f196005de9a92a2 100755
--- a/apps/maarch_entreprise/actions/process.php
+++ b/apps/maarch_entreprise/actions/process.php
@@ -152,7 +152,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
require_once 'modules/entities/class/class_manage_listdiff.php';
$listdiff = new diffusion_list();
$roles = $listdiff->list_difflist_roles();
- $_SESSION['process']['diff_list'] = $listdiff->get_listinstance($res_id, false, $coll_id);
+ $_SESSION['process']['diff_list'] = $listdiff->get_listinstance($res_id, false);
$_SESSION['process']['difflist_type'] = $listdiff->get_difflist_type($_SESSION['process']['diff_list']['object_type']);
}
diff --git a/apps/maarch_entreprise/indexing_searching/details.php b/apps/maarch_entreprise/indexing_searching/details.php
index a6d7221c207e120317604a52f1e6afa98f555285..ba1e1999a419c09d9de31085a6d9950c5bfcd813 100755
--- a/apps/maarch_entreprise/indexing_searching/details.php
+++ b/apps/maarch_entreprise/indexing_searching/details.php
@@ -510,7 +510,7 @@ if ($stmt->rowCount() == 0) {
if ($core->is_module_loaded('entities')) {
require_once 'modules/entities/class/class_manage_listdiff.php';
$diff_list = new diffusion_list();
- $_SESSION['details']['diff_list'] = $diff_list->get_listinstance($s_id, false, $coll_id);
+ $_SESSION['details']['diff_list'] = $diff_list->get_listinstance($s_id, false);
$_SESSION['details']['difflist_type'] = $diff_list->get_difflist_type($_SESSION['details']['diff_list']['difflist_type']);
$roles = $diff_list->list_difflist_roles();
diff --git a/migration/19.12/1912.sql b/migration/19.12/1912.sql
index 14948dc3f3815917df402564df7edbfa30e32cb3..d40a6cca6847d87fafcd38a3218673932f06b84d 100644
--- a/migration/19.12/1912.sql
+++ b/migration/19.12/1912.sql
@@ -514,6 +514,7 @@ INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_val
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'priority', TRUE, null, 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'confidential', TRUE, null, 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'documentDate', TRUE, null, 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'departureDate', TRUE, null, 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'subject', TRUE, null, 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'indexingCustomField_1', FALSE, null, 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'senders', FALSE, null, 'contact');
diff --git a/modules/avis/class/avis_controler_Abstract.php b/modules/avis/class/avis_controler_Abstract.php
index 429ea5d9d61b149a09fa3283399ab493e1a4284a..1f3cf5ba997cc5ba8c2b6cde0c233fa1c6778274 100755
--- a/modules/avis/class/avis_controler_Abstract.php
+++ b/modules/avis/class/avis_controler_Abstract.php
@@ -201,7 +201,7 @@ abstract class avis_controler_Abstract
require_once 'modules/entities/class/class_manage_listdiff.php';
$listdiff = new diffusion_list();
$roles = $listdiff->list_difflist_roles();
- $circuitAvis = $listdiff->get_listinstance($res_id, false, $coll_id, $typeList);
+ $circuitAvis = $listdiff->get_listinstance($res_id, false, $typeList);
if (isset($circuitAvis['copy'])) {
unset($circuitAvis['copy']);
}
diff --git a/modules/avis/send_docs_to_recommendation.php b/modules/avis/send_docs_to_recommendation.php
index 9235aa35927a40b1ee5e6f88f1efec72b8a0a163..07a17da34b9898f4d76c98f4833eb78a06135268 100755
--- a/modules/avis/send_docs_to_recommendation.php
+++ b/modules/avis/send_docs_to_recommendation.php
@@ -120,7 +120,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module
$_SESSION['redirect']['diff_list']['difflist_type'] = 'entity_id';
- $_SESSION['redirect']['diff_list'] = $difflist->get_listinstance($values_str, false, $coll_id);
+ $_SESSION['redirect']['diff_list'] = $difflist->get_listinstance($values_str, false);
if ($_SESSION['save_list']['fromProcess'] == 'true') {
if (!empty($_SESSION['process']['diff_list']['avis'])) {
diff --git a/modules/entities/class/class_manage_listdiff_Abstract.php b/modules/entities/class/class_manage_listdiff_Abstract.php
index 8fc5a35e4e1431bb1d4fc98aaea97723b1d54515..ebf299d435899d2b63ba7bcf52a2d00cc5e50dea 100755
--- a/modules/entities/class/class_manage_listdiff_Abstract.php
+++ b/modules/entities/class/class_manage_listdiff_Abstract.php
@@ -103,7 +103,7 @@ abstract class diffusion_list_Abstract extends functions
}
// Users
$stmt = $db->query(
- 'SELECT l.item_id, l.item_mode, u.firstname, u.lastname, e.entity_id, e.entity_label, l.visible, l.process_comment '
+ 'SELECT l.item_id, l.item_mode, u.firstname, u.lastname, e.entity_id, e.entity_label, l.process_comment '
.' FROM '.ENT_LISTMODELS.' l '
.' JOIN '.USERS_TABLE.' u ON l.item_id = u.user_id '
.' JOIN '.ENT_USERS_ENTITIES.' ue ON u.user_id = ue.user_id '
@@ -145,7 +145,6 @@ abstract class diffusion_list_Abstract extends functions
'firstname' => functions::show_string($user->firstname),
'entity_id' => functions::show_string($user->entity_id),
'entity_label' => functions::show_string($user->entity_label),
- 'visible' => $user->visible,
'process_comment' => $user->process_comment,
'requested_signature' => $user->requested_signature,
)
@@ -154,7 +153,7 @@ abstract class diffusion_list_Abstract extends functions
// Entities
$stmt = $db->query(
- 'SELECT l.item_id, e.entity_label, l.item_mode, l.visible '
+ 'SELECT l.item_id, e.entity_label, l.item_mode '
.'FROM '.ENT_LISTMODELS.' l '
.'JOIN '.ENT_ENTITIES.' e ON l.item_id = e.entity_id '
.'WHERE '
@@ -179,7 +178,6 @@ abstract class diffusion_list_Abstract extends functions
array(
'entity_id' => functions::show_string($entity->item_id),
'entity_label' => functions::show_string($entity->entity_label),
- 'visible' => $entity->visible,
)
);
}
@@ -238,7 +236,7 @@ abstract class diffusion_list_Abstract extends functions
//print_r($description); exit;
$stmt = $db->query(
'insert into '.ENT_LISTMODELS
- .' (object_id, object_type, sequence, item_id, item_type, item_mode, description, title, visible, process_comment ) '
+ .' (object_id, object_type, sequence, item_id, item_type, item_mode, description, title, process_comment ) '
.' values ('
.'? , '
.'?, ?, '
@@ -250,7 +248,7 @@ abstract class diffusion_list_Abstract extends functions
.'?,'
.'?'
.')',
- array($objectId, $objectType, $i, $user['user_id'], $item_mode, $description, $title, $user['visible'], $user['process_comment'])
+ array($objectId, $objectType, $i, $user['user_id'], $item_mode, $description, $title, $user['process_comment'])
);
}
// Entities
@@ -264,7 +262,7 @@ abstract class diffusion_list_Abstract extends functions
//print_r($description); exit;
$stmt = $db->query(
'insert into '.ENT_LISTMODELS
- .' (object_id, object_type, sequence, item_id, item_type, item_mode, description, title, visible ) '
+ .' (object_id, object_type, sequence, item_id, item_type, item_mode, description, title ) '
.' values ('
.'? , '
.'?, ?, '
@@ -275,7 +273,7 @@ abstract class diffusion_list_Abstract extends functions
.'?,'
.'?'
.')',
- array($objectId, $objectType, $i, $entity['entity_id'], $item_mode, $description, $title, $entity['visible'])
+ array($objectId, $objectType, $i, $entity['entity_id'], $item_mode, $description, $title)
);
}
}
@@ -359,7 +357,7 @@ abstract class diffusion_list_Abstract extends functions
$creatorEntity = '';
}
- $oldListInst = $this->get_listinstance($resId, false, $collId, $difflistType);
+ $oldListInst = $this->get_listinstance($resId, false, $difflistType);
/*echo 'old<br/>';
var_dump($oldListInst);
echo 'new<br/>';
@@ -370,7 +368,7 @@ abstract class diffusion_list_Abstract extends functions
$roles = $this->list_difflist_roles();
$db = new Database();
- $stmt = $db->query('SELECT listinstance_id FROM listinstance WHERE res_id = ? and coll_id = ? and difflist_type = ?', array($resId, $collId, $difflistType));
+ $stmt = $db->query('SELECT listinstance_id FROM listinstance WHERE res_id = ? and difflist_type = ?', array($resId, $difflistType));
$diffUser = false;
$diffCopyUsers = false;
@@ -423,9 +421,8 @@ abstract class diffusion_list_Abstract extends functions
//Delete previous listinstance
$stmt = $db->query(
'DELETE FROM '.ENT_LISTINSTANCE
- .' WHERE coll_id = ?'
- .' AND res_id = ? AND difflist_type = ?',
- array($collId, $resId, $difflistType)
+ .' WHERE res_id = ? AND difflist_type = ?',
+ array($resId, $difflistType)
);
$roles = $this->list_difflist_roles();
@@ -446,7 +443,6 @@ abstract class diffusion_list_Abstract extends functions
$userId = trim($diffList[$role_id]['users'][$i]['user_id']);
$processComment = trim($diffList[$role_id]['users'][$i]['process_comment']);
$processDate = trim($diffList[$role_id]['users'][$i]['process_date']);
- $visible = $diffList[$role_id]['users'][$i]['visible'];
$viewed = (int) $diffList[$role_id]['users'][$i]['viewed'];
$signatory = ($diffList[$role_id]['users'][$i]['signatory'] ? 'true' : 'false');
@@ -465,7 +461,7 @@ abstract class diffusion_list_Abstract extends functions
}
}
//Modification du dest_user dans la table res_letterbox
- if ($role_id == 'dest' && $collId == 'letterbox_coll') {
+ if ($role_id == 'dest') {
$resEntities = \User\models\UserEntityModel::get(['select' => ['entity_id', 'primary_entity'], 'where' => ['user_id = ?'], 'data' => [$userId]]);
$mailDestination = \Resource\models\ResModel::getById(['select' => ['destination'], 'resId' => $resId]);
@@ -489,7 +485,7 @@ abstract class diffusion_list_Abstract extends functions
if ($processDate != '') {
$stmt = $db->query(
'insert into '.ENT_LISTINSTANCE
- .' (coll_id, res_id, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_comment, process_date, signatory, requested_signature) '
+ .' (res_id, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_comment, process_date, signatory, requested_signature) '
.'values ('
.'?, ?, '
."?, "
@@ -504,12 +500,12 @@ abstract class diffusion_list_Abstract extends functions
.'?, '
.'?'
.' )',
- array($collId, $resId, $i, $userId, $item_mode, $creatorUser, $visible, $viewed, $difflistType, $processComment, $processDate, $signatory, $requested_signature)
+ array($resId, $i, $userId, $item_mode, $creatorUser, $viewed, $difflistType, $processComment, $processDate, $signatory, $requested_signature)
);
} else {
$stmt = $db->query(
'insert into '.ENT_LISTINSTANCE
- .' (coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_comment, signatory, requested_signature) '
+ .' (res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_comment, signatory, requested_signature) '
.'values ('
.'?, ?, '
."'DOC', ?, "
@@ -523,7 +519,7 @@ abstract class diffusion_list_Abstract extends functions
.'?, '
.'?'
.' )',
- array($collId, $resId, $i, $userId, $item_mode, $creatorUser, $visible, $viewed, $difflistType, $processComment, $signatory, $requested_signature)
+ array($resId, $i, $userId, $item_mode, $creatorUser, $viewed, $difflistType, $processComment, $signatory, $requested_signature)
);
}
@@ -550,7 +546,6 @@ abstract class diffusion_list_Abstract extends functions
for ($j = 0; $j < $cptEntities; ++$j) {
$entityFound = false;
$entityId = trim($diffList[$role_id]['entities'][$j]['entity_id']);
- $visible = $diffList[$role_id]['entities'][$j]['visible'];
$viewed = (int) $diffList[$role_id]['entities'][$j]['viewed'];
$cptOldEntities = 0;
if (is_array($oldListInst[$role_id]['entities'])) {
@@ -567,7 +562,7 @@ abstract class diffusion_list_Abstract extends functions
$stmt = $db->query(
'INSERT INTO '.ENT_LISTINSTANCE
- .' (coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type) '
+ .' (res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type) '
.'VALUES ('
.'?, ?, '
."'DOC', ?, "
@@ -578,7 +573,7 @@ abstract class diffusion_list_Abstract extends functions
.'?,?, '
.'?'
.' )',
- array($collId, $resId, $j, $entityId, $item_mode, $creatorUser, $visible, $viewed, $difflistType)
+ array($resId, $j, $entityId, $item_mode, $creatorUser, $viewed, $difflistType)
);
if (!$entityFound || $fromQualif) {
@@ -603,15 +598,15 @@ abstract class diffusion_list_Abstract extends functions
$user = \User\models\UserModel::getByLogin(['select' => ['id'], 'login' => $_SESSION['user']['UserId']]);
$db = new Database();
- $db->query('INSERT INTO listinstance_history (coll_id, res_id, user_id, updated_date) VALUES (?, ?, ?, current_timestamp)', array($coll_id, $res_id, $user['id']));
+ $db->query('INSERT INTO listinstance_history (coll_id, res_id, user_id, updated_date) VALUES (?, ?, ?, current_timestamp)', array('letterbox_coll', $res_id, $user['id']));
$listinstance_history_id = $db->lastInsertId('listinstance_history_id_seq');
- $stmt = $db->query('SELECT * FROM listinstance WHERE res_id = ? and coll_id = ? and difflist_type = ?', array($res_id, $coll_id, $difflistType));
+ $stmt = $db->query('SELECT * FROM listinstance WHERE res_id = ? and difflist_type = ?', array($res_id, $difflistType));
while ($resListinstance = $stmt->fetchObject()) {
$stmt2 = $db->query(
'INSERT INTO listinstance_history_details
- (listinstance_history_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, visible, viewed, difflist_type, process_comment) '
+ (listinstance_history_id, coll_id, res_id, listinstance_type, sequence, item_id, item_type, item_mode, added_by_user, viewed, difflist_type, process_comment) '
.'VALUES (?,?, ?, '
."'DOC', ?, "
.'?, '
@@ -622,7 +617,7 @@ abstract class diffusion_list_Abstract extends functions
.'?, '
.'?'
.' )',
- array($listinstance_history_id, $resListinstance->coll_id, $res_id, $resListinstance->sequence, $resListinstance->item_id, $resListinstance->item_type, $resListinstance->item_mode, $resListinstance->added_by_user, $resListinstance->visible, $resListinstance->viewed, $resListinstance->difflist_type, $resListinstance->process_comment)
+ array($listinstance_history_id, 'letterbox_coll', $res_id, $resListinstance->sequence, $resListinstance->item_id, $resListinstance->item_type, $resListinstance->item_mode, $resListinstance->added_by_user, $resListinstance->viewed, $resListinstance->difflist_type, $resListinstance->process_comment)
);
}
}
@@ -653,7 +648,6 @@ abstract class diffusion_list_Abstract extends functions
public function get_listinstance(
$resId,
$modeCc = false,
- $collId = 'letterbox_coll',
$typeList = 'entity_id'
) {
$db = new Database();
@@ -661,17 +655,16 @@ abstract class diffusion_list_Abstract extends functions
$listinstance = array();
- if (empty($resId) || empty($collId)) {
+ if (empty($resId)) {
return $listinstance;
}
// Load header
$query =
- 'SELECT distinct coll_id, res_id, difflist_type'
+ 'SELECT distinct res_id, difflist_type'
.' FROM '.ENT_LISTINSTANCE
- .' WHERE coll_id = ? '
- .'and res_id = ? GROUP BY coll_id, res_id, difflist_type';
- $stmt = $db->query($query, array($collId, $resId));
+ .' WHERE res_id = ? GROUP BY res_id, difflist_type';
+ $stmt = $db->query($query, array($resId));
$listinstance = $stmt->fetch(PDO::FETCH_ASSOC);
if ($listinstance['difflist_type'] == '') {
@@ -682,11 +675,10 @@ abstract class diffusion_list_Abstract extends functions
/*if (! $modeCc) {
$stmt = $db->query(
"select l.item_id, u.firstname, u.lastname, e.entity_id, "
- . "e.entity_label, l.visible, l.viewed from " . ENT_LISTINSTANCE . " l, "
+ . "e.entity_label, l.viewed from " . ENT_LISTINSTANCE . " l, "
. USERS_TABLE . " u, " . ENT_ENTITIES . " e, "
. ENT_USERS_ENTITIES . " ue "
- . " where l.coll_id = '" . $collId . "' "
- ." and l.item_mode = 'dest' "
+ . " where l.item_mode = 'dest' "
. "and l.item_type = 'user_id' and l.sequence = 0 "
. "and l.item_id = u.user_id and u.user_id = ue.user_id "
. "and e.entity_id = ue.entity_id and ue.primary_entity = 'Y' "
@@ -701,7 +693,6 @@ abstract class diffusion_list_Abstract extends functions
'firstname' => $this->show_string($res->firstname),
'entity_id' => $this->show_string($res->entity_id),
'entity_label' => $this->show_string($res->entity_label),
- 'visible' => $this->show_string($res->visible),
'viewed' => $this->show_string($res->viewed)
);
}*/
@@ -710,11 +701,10 @@ abstract class diffusion_list_Abstract extends functions
//**********************************************************************
$stmt = $db->query(
'select l.listinstance_id ,l.item_id, u.firstname, u.lastname, e.entity_id, e.entity_label,'
- .' l.visible, l.viewed, l.item_mode, l.difflist_type, l.process_date, l.process_comment, l.signatory, l.requested_signature from '
+ .' l.viewed, l.item_mode, l.difflist_type, l.process_date, l.process_comment, l.signatory, l.requested_signature from '
.ENT_LISTINSTANCE.' l, '.USERS_TABLE
.' u, '.ENT_ENTITIES.' e, '.ENT_USERS_ENTITIES
- ." ue where l.coll_id = '".$collId."' "
- ." and l.item_type = 'user_id' and l.item_id = u.user_id "
+ ." ue where l.item_type = 'user_id' and l.item_id = u.user_id "
.' and l.item_id = ue.user_id and ue.user_id=u.user_id '
." and e.entity_id = ue.entity_id and l.difflist_type = ? and l.res_id = ? and ue.primary_entity = 'Y' order by l.sequence ",
array($typeList, $resId)
@@ -737,7 +727,6 @@ abstract class diffusion_list_Abstract extends functions
'firstname' => functions::show_string($res->firstname),
'entity_id' => functions::show_string($res->entity_id),
'entity_label' => functions::show_string($res->entity_label),
- 'visible' => functions::show_string($res->visible),
'viewed' => functions::show_string($res->viewed),
'difflist_type' => functions::show_string($res->difflist_type),
'process_date' => functions::show_string($res->process_date),
@@ -750,11 +739,11 @@ abstract class diffusion_list_Abstract extends functions
// OTHER ROLES ENTITIES
//**********************************************************************
$stmt = $db->query(
- 'select l.item_id, e.entity_label, l.visible, l.viewed, l.item_mode, l.difflist_type, l.process_date, l.process_comment from '.ENT_LISTINSTANCE
- .' l, '.ENT_ENTITIES.' e where l.difflist_type = ? and l.coll_id = ? '
+ 'select l.item_id, e.entity_label, l.viewed, l.item_mode, l.difflist_type, l.process_date, l.process_comment from '.ENT_LISTINSTANCE
+ .' l, '.ENT_ENTITIES.' e where l.difflist_type = ? '
."and l.item_type = 'entity_id' and l.item_id = e.entity_id "
.'and l.res_id = ? order by l.sequence ',
- array($typeList, $collId, $resId)
+ array($typeList, $resId)
);
while ($res = $stmt->fetchObject()) {
@@ -772,7 +761,6 @@ abstract class diffusion_list_Abstract extends functions
array(
'entity_id' => functions::show_string($res->item_id),
'entity_label' => functions::show_string($res->entity_label),
- 'visible' => functions::show_string($res->visible),
'viewed' => functions::show_string($res->viewed),
'difflist_type' => functions::show_string($res->difflist_type),
'process_date' => functions::show_string($res->process_date),
@@ -794,20 +782,20 @@ abstract class diffusion_list_Abstract extends functions
) {
$db = new Database();
$stmt = $db->query(
- 'select item_id from '.ENT_LISTINSTANCE." where res_id = ? and coll_id = ? and sequence = 0 and item_type = ? and item_mode = 'dest'",
- array($resId, $collId, $itemType)
+ 'select item_id from '.ENT_LISTINSTANCE." where res_id = ? and sequence = 0 and item_type = ? and item_mode = 'dest'",
+ array($resId, $itemType)
);
if ($stmt->rowCount() == 1) {
$stmt = $db->query(
- 'update '.ENT_LISTINSTANCE." set item_id = ?, viewed = ? where res_id = ? and coll_id = ? and sequence = 0 and item_type = ? and item_mode = 'dest'",
- array($dest, $viewed, $resId, $collId, $itemType)
+ 'update '.ENT_LISTINSTANCE." set item_id = ?, viewed = ? where res_id = ? and sequence = 0 and item_type = ? and item_mode = 'dest'",
+ array($dest, $viewed, $resId, $itemType)
);
} else {
$stmt = $db->query(
- 'insert into '.ENT_LISTINSTANCE.' (coll_id, res_id, '
+ 'insert into '.ENT_LISTINSTANCE.' (res_id, '
.'item_id, item_type, item_mode, sequence, '
."added_by_user, viewed) values (?, ?, ?, ?, 'dest', 0, ?, ?)",
- array($collId, $resId, $dest, $itemType, $_SESSION['user']['UserId'], $viewed)
+ array($resId, $dest, $itemType, $_SESSION['user']['UserId'], $viewed)
);
}
}
@@ -888,7 +876,7 @@ abstract class diffusion_list_Abstract extends functions
}
}
- $aCurrentDiffList = diffusion_list::get_listinstance($resId, false, $collId, $objectType);
+ $aCurrentDiffList = diffusion_list::get_listinstance($resId, false, $objectType);
if (!empty($aCurrentDiffList)) {
// On regarde les roles a conserver
foreach ($aCurrentDiffList as $roleId => $listDiffItemId) {
diff --git a/modules/entities/loadDiffList.php b/modules/entities/loadDiffList.php
index 3933047d44929a09dba73cf3bf261ef45c323364..04ddc1846fb331043cbc5cf32f135f78bb14d4d2 100755
--- a/modules/entities/loadDiffList.php
+++ b/modules/entities/loadDiffList.php
@@ -57,7 +57,7 @@ if ($typeList=='VISA_CIRCUIT') {
} else {
require_once('modules/entities/class/class_manage_listdiff.php');
$diffListObj = new diffusion_list();
- $difflist = $diffListObj->get_listinstance($_REQUEST['res_id'], false, $_SESSION['collection_id_choice'], $typeList);
+ $difflist = $diffListObj->get_listinstance($_REQUEST['res_id'], false, $typeList);
# Include display of list
$roles = $diffListObj->list_difflist_roles();
diff --git a/modules/visa/class/class_modules_tools_Abstract.php b/modules/visa/class/class_modules_tools_Abstract.php
index cb97a3aeab4fb4f22a0a068eb3dd14ec25b0e0d7..edaadb2b5ed445c6362249df1fc764f89299f7e8 100755
--- a/modules/visa/class/class_modules_tools_Abstract.php
+++ b/modules/visa/class/class_modules_tools_Abstract.php
@@ -124,7 +124,7 @@ abstract class visa_Abstract extends Database
require_once 'modules/entities/class/class_manage_listdiff.php';
$listdiff = new diffusion_list();
$roles = $listdiff->list_difflist_roles();
- $circuit = $listdiff->get_listinstance($res_id, false, $coll_id, $typeList);
+ $circuit = $listdiff->get_listinstance($res_id, false, $typeList);
if (isset($circuit['copy'])) {
unset($circuit['copy']);
}
diff --git a/sql/data_fr.sql b/sql/data_fr.sql
index 031119690f014a63fee42258ba405aac9eca066d..b4ac5a089d524d9e7ad3ac4721c97e83729619ca 100755
--- a/sql/data_fr.sql
+++ b/sql/data_fr.sql
@@ -1685,7 +1685,7 @@ TRUNCATE TABLE indexing_models_fields;
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'doctype', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'priority', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'confidential', TRUE, '""', 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'docDate', TRUE, '""', 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'documentDate', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'arrivalDate', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'subject', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'senders', TRUE, '""', 'contact');
@@ -1700,7 +1700,8 @@ INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_val
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'doctype', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'priority', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'confidential', TRUE, '""', 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'docDate', TRUE, '""', 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'documentDate', TRUE, '""', 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'departureDate', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'subject', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'senders', FALSE, '""', 'contact');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'getRecipients', TRUE, '""', 'contact');
@@ -1714,7 +1715,7 @@ INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_val
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'doctype', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'priority', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'confidential', TRUE, '""', 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'docDate', TRUE, '""', 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'documentDate', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'subject', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'senders', FALSE, '""', 'contact');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'getRecipients', FALSE, '""', 'contact');
@@ -1727,7 +1728,7 @@ INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_val
/* GED */
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'doctype', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'confidential', TRUE, '""', 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'docDate', TRUE, '""', 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'documentDate', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'subject', TRUE, '""', 'mail');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'senders', FALSE, '""', 'contact');
INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'getRecipients', FALSE, '""', 'contact');