diff --git a/modules/entities/class/class_manage_entities_Abstract.php b/modules/entities/class/class_manage_entities_Abstract.php index 497c45ac98829116d839dea1634cb6528883f218..10820d4e4d9d07c7e4329ad1ddcad251843bf880 100644 --- a/modules/entities/class/class_manage_entities_Abstract.php +++ b/modules/entities/class/class_manage_entities_Abstract.php @@ -63,6 +63,8 @@ abstract class entity_Abstract extends functions $_SESSION['m_admin']['entity']['business'] = functions::show_string($line->business_id); $_SESSION['m_admin']['entity']['parent'] = functions::show_string($line->parent_entity_id); $_SESSION['m_admin']['entity']['type'] = functions::show_string($line->entity_type); + $_SESSION['m_admin']['entity']['archival_agreement'] = functions::show_string($line->archival_agreement); + $_SESSION['m_admin']['entity']['archival_agency'] = functions::show_string($line->archival_agency); } } //$core_tools->execute_modules_services($_SESSION['modules_services'], 'entity_up', "include"); @@ -107,7 +109,7 @@ abstract class entity_Abstract extends functions else { ?> - <div class="block" style="float:left;width:65%;height:600px;"> + <div class="block" style="float:left;width:65%;height:700px;"> <form name="formentity" id="formentity" method="post" style="width:500px;margin:auto;" action="<?php if($mode == 'up') { echo $_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=entity_up_db'; } elseif($mode == 'add') { echo $_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=entity_add_db'; } ?>" class="forms"> <input type="hidden" name="display" value="true" /> <input type="hidden" name="module" value="entities" /> @@ -214,6 +216,14 @@ abstract class entity_Abstract extends functions ?> </select><span class="red_asterisk"><i class="fa fa-star"></i></span> </p> + <p style="text-align:right;"> + <label><?php echo _ARCHIVAL_AGREEMENT ?> : </label> + <input name="archival_agreement" style="margin-right: 7px" type="text" id="archival_agreement" value="<?php if(isset($_SESSION['m_admin']['entity']['archival_agreement'])){ functions::xecho($_SESSION['m_admin']['entity']['archival_agreement']); }?>"> + </p> + <p style="text-align:right;"> + <label><?php echo _ARCHIVAL_AGENCY ?> : </label> + <input name="archival_agency" style="margin-right: 7px" type="text" id="archival_agency" value="<?php if(isset($_SESSION['m_admin']['entity']['archival_agency'])){ functions::xecho($_SESSION['m_admin']['entity']['archival_agency']); }?>"> + </p> <?php $foundParent = false; for ($cptEnt=0; $cptEnt<count($entities);$cptEnt++) { diff --git a/modules/entities/lang/en.php b/modules/entities/lang/en.php index 232731c8d107a0070801558e2c7e8aee7da7118f..9ef2d1f0a177d1fb78a67ec5e0087c6237e755aa 100644 --- a/modules/entities/lang/en.php +++ b/modules/entities/lang/en.php @@ -437,3 +437,9 @@ if (!defined("_ADD_USER_LISTDIFF")) if (!defined("_ADD_ENTITY_LISTDIFF")) define("_ADD_ENTITY_LISTDIFF", "Add the department to the diffusion list"); + +// SEDA +if (!defined("_ARCHIVAL_AGREEMENT")) + define("_ARCHIVAL_AGREEMENT", "Archival agreement"); +if (!defined("_ARCHIVAL_AGENCY")) + define("_ARCHIVAL_AGENCY", "Archival agency"); \ No newline at end of file diff --git a/modules/entities/lang/fr.php b/modules/entities/lang/fr.php index ecfc0f40449ade6f39a97c85c95e5564d6a51d9d..255ca350c10724e54f95b19fb09c7114acc8ee0c 100644 --- a/modules/entities/lang/fr.php +++ b/modules/entities/lang/fr.php @@ -450,3 +450,9 @@ if (!defined("_RESPONSE_RATE_BY_ENTITIES")) if (!defined("_RESPONSE_RATE_BY_ENTITIES_DESC")) define("_RESPONSE_RATE_BY_ENTITIES_DESC", "Permet d'afficher le pourcentage de courrier dont une réponse a été effectuée. Cette statistique se base sur le nombre de courriers dont une date de départ a été inscrite (il faut utiliser le champ custom_d1)"); + +// SEDA +if (!defined("_ARCHIVAL_AGREEMENT")) + define("_ARCHIVAL_AGREEMENT", "Convention d'archivage"); +if (!defined("_ARCHIVAL_AGENCY")) + define("_ARCHIVAL_AGENCY", "Service d'archive"); diff --git a/modules/entities/xml/IVS/validation_rules.xml b/modules/entities/xml/IVS/validation_rules.xml index 68df6ae9875d7d2aa20b031295b12db66e809ca5..955e77b7f54ff23cef24643ed41328281ef4a555 100755 --- a/modules/entities/xml/IVS/validation_rules.xml +++ b/modules/entities/xml/IVS/validation_rules.xml @@ -71,6 +71,8 @@ <parameter name="parententity" type="identifier" /> <parameter name="short_label" type="string" /> <parameter name="type" type="string" /> + <parameter name="archival_agreement" type="string" /> + <parameter name="archival_agency" type="string" /> </validationRule> <validationRule name="entity_del" extends="standardForm" mode="error"> <parameter name="module" type="identifier" />