diff --git a/modules/entities/class/class_manage_entities_Abstract.php b/modules/entities/class/class_manage_entities_Abstract.php
index 286fbcbe3e04f9f7b8c95155d1e573f201c60a7c..6ca7714207fa58f951d77caf020dc4168f3039d3 100755
--- a/modules/entities/class/class_manage_entities_Abstract.php
+++ b/modules/entities/class/class_manage_entities_Abstract.php
@@ -52,6 +52,7 @@ abstract class entity_Abstract extends functions
$line = $stmt->fetchObject();
$_SESSION['m_admin']['entity']['label'] = functions::show_string($line->entity_label);
$_SESSION['m_admin']['entity']['short_label'] = functions::show_string($line->short_label);
+ $_SESSION['m_admin']['entity']['entity_full_name'] = functions::show_string($line->entity_full_name);
$_SESSION['m_admin']['entity']['enabled'] = functions::show_string($line->enabled);
$_SESSION['m_admin']['entity']['adrs1'] = functions::show_string($line->adrs_1);
$_SESSION['m_admin']['entity']['adrs2'] = functions::show_string($line->adrs_2);
@@ -155,6 +156,10 @@ abstract class entity_Abstract extends functions
<label><?php echo _SHORT_LABEL;?> : </label>
<input name="short_label" type="text" id="short_label" value="<?php if(isset($_SESSION['m_admin']['entity']['short_label'])){ functions::xecho($_SESSION['m_admin']['entity']['short_label']);} ?>" /><span class="red_asterisk"><i class="fa fa-star"></i></span>
</p>
+ <p style="text-align:right;">
+ <label><?php echo _ENTITY_FULL_NAME;?> : </label>
+ <textarea name="entity_full_name" style="margin-right: 7px" type="text" id="entity_full_name"><?php if(isset($_SESSION['m_admin']['entity']['entity_full_name'])){ functions::xecho($_SESSION['m_admin']['entity']['entity_full_name']);}?></textarea>
+ </p>
<p style="text-align:right;">
<label><?php echo _ENTITY_ADR_1;?> : </label>
<input name="adrs1" style="margin-right: 7px" type="text" id="adrs1" value="<?php if(isset( $_SESSION['m_admin']['entity']['adrs1'])){functions::xecho($_SESSION['m_admin']['entity']['adrs1']); }?>" />
@@ -736,10 +741,10 @@ abstract class entity_Abstract extends functions
{
$entities = array();
$db = new Database();
- $stmt = $db->query("select e.entity_id,e.entity_label,e.short_label, ue.primary_entity, ue.user_role from ".ENT_ENTITIES." e, ".ENT_USERS_ENTITIES." ue where ue.entity_id = e.entity_id and ue.user_id = ? order by e.entity_label",array(trim($user_id)));
+ $stmt = $db->query("select e.entity_id,e.entity_label,e.short_label,e.entity_full_name ue.primary_entity, ue.user_role from ".ENT_ENTITIES." e, ".ENT_USERS_ENTITIES." ue where ue.entity_id = e.entity_id and ue.user_id = ? order by e.entity_label",array(trim($user_id)));
while($res = $stmt->fetchObject())
{
- array_push($entities, array('ID' => $res->entity_id, 'LABEL' => $res->entity_label, 'SHORT_LABEL' => $res->short_label,'PRIMARY' => $res->entity_label, 'ROLE' => $res->user_role ));
+ array_push($entities, array('ID' => $res->entity_id, 'LABEL' => $res->entity_label, 'SHORT_LABEL' => $res->short_label,'ENTITY_FULL_NAME' => $res->entity_full_name, 'PRIMARY' => $res->entity_label, 'ROLE' => $res->user_role ));
}
return $entities;
}
@@ -941,6 +946,11 @@ abstract class entity_Abstract extends functions
{
$_SESSION['error'].= _SHORT_LABEL_MISSING."<br/>";
}
+ $_SESSION['m_admin']['entity']['entity_full_name'] = '';
+ if(isset($_REQUEST['entity_full_name']) && !empty($_REQUEST['entity_full_name'])){
+ $_SESSION['m_admin']['entity']['entity_full_name'] = functions::wash(utf8_decode($_REQUEST['entity_full_name']), "no", _FULL_NAME, 'yes', 0);
+ $_SESSION['m_admin']['entity']['entity_full_name'] = utf8_encode($_SESSION['m_admin']['entity']['entity_full_name']);
+ }
$_SESSION['m_admin']['entity']['adrs1'] = '';
if(isset($_REQUEST['adrs1']) && !empty($_REQUEST['adrs1']))
{
@@ -1097,7 +1107,7 @@ abstract class entity_Abstract extends functions
$entityPath .= $entityIdForTree . '/' . $_SESSION['m_admin']['entity']['entityId'];
}
- $stmt = $db->query('INSERT INTO '.ENT_ENTITIES." (entity_id, entity_label, short_label, adrs_1, adrs_2, adrs_3, zipcode, city, country, email, business_id, parent_entity_id, entity_type, entity_path, archival_agency, archival_agreement) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",array($_SESSION['m_admin']['entity']['entityId'],$_SESSION['m_admin']['entity']['label'],$_SESSION['m_admin']['entity']['short_label'],$_SESSION['m_admin']['entity']['adrs1'],$_SESSION['m_admin']['entity']['adrs2'],$_SESSION['m_admin']['entity']['adrs3'],$_SESSION['m_admin']['entity']['zcode'],$_SESSION['m_admin']['entity']['city'],$_SESSION['m_admin']['entity']['country'],$_SESSION['m_admin']['entity']['email'],$_SESSION['m_admin']['entity']['business'],$_SESSION['m_admin']['entity']['parent'],$_SESSION['m_admin']['entity']['type'],$entityPath,$_SESSION['m_admin']['entity']['archival_agency'],$_SESSION['m_admin']['entity']['archival_agreement']));
+ $stmt = $db->query('INSERT INTO '.ENT_ENTITIES." (entity_id, entity_label, short_label, adrs_1, adrs_2, adrs_3, zipcode, city, country, email, business_id, parent_entity_id, entity_type, entity_path, archival_agency, archival_agreement, entity_full_name) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",array($_SESSION['m_admin']['entity']['entityId'],$_SESSION['m_admin']['entity']['label'],$_SESSION['m_admin']['entity']['short_label'],$_SESSION['m_admin']['entity']['adrs1'],$_SESSION['m_admin']['entity']['adrs2'],$_SESSION['m_admin']['entity']['adrs3'],$_SESSION['m_admin']['entity']['zcode'],$_SESSION['m_admin']['entity']['city'],$_SESSION['m_admin']['entity']['country'],$_SESSION['m_admin']['entity']['email'],$_SESSION['m_admin']['entity']['business'],$_SESSION['m_admin']['entity']['parent'],$_SESSION['m_admin']['entity']['type'],$entityPath,$_SESSION['m_admin']['entity']['archival_agency'],$_SESSION['m_admin']['entity']['archival_agreement'],$_SESSION['m_admin']['entity']['entity_full_name']));
$_SESSION['service_tag'] = 'entity_add_db';
$core->execute_modules_services($_SESSION['modules_services'], 'entity_add_db', "include");
$core->execute_app_services($_SESSION['app_services'], 'entity_add_db', 'include');
@@ -1147,7 +1157,7 @@ abstract class entity_Abstract extends functions
$entityPath .= $entityIdForTree . '/' . $_SESSION['m_admin']['entity']['entityId'];
}
- $stmt = $db->query('UPDATE '.ENT_ENTITIES." set entity_label = ? , short_label = ? , adrs_1 = ?, adrs_2 = ?, adrs_3 = ?, zipcode = ?, city = ?, country = ?, email = ?, business_id = ?, parent_entity_id = ?, entity_type = ?, entity_path = ?, archival_agency = ?, archival_agreement = ? where entity_id = ?",array($_SESSION['m_admin']['entity']['label'], $_SESSION['m_admin']['entity']['short_label'], $_SESSION['m_admin']['entity']['adrs1'], $_SESSION['m_admin']['entity']['adrs2'],$_SESSION['m_admin']['entity']['adrs3'], $_SESSION['m_admin']['entity']['zcode'], $_SESSION['m_admin']['entity']['city'], $_SESSION['m_admin']['entity']['country'], $_SESSION['m_admin']['entity']['email'], $_SESSION['m_admin']['entity']['business'], $_SESSION['m_admin']['entity']['parent'], $_SESSION['m_admin']['entity']['type'], $entityPath, $_SESSION['m_admin']['entity']['archival_agency'], $_SESSION['m_admin']['entity']['archival_agreement'],$_SESSION['m_admin']['entity']['entityId']));
+ $stmt = $db->query('UPDATE '.ENT_ENTITIES." set entity_label = ? , short_label = ? , adrs_1 = ?, adrs_2 = ?, adrs_3 = ?, zipcode = ?, city = ?, country = ?, email = ?, business_id = ?, parent_entity_id = ?, entity_type = ?, entity_path = ?, archival_agency = ?, archival_agreement = ?, entity_full_name = ? where entity_id = ?",array($_SESSION['m_admin']['entity']['label'], $_SESSION['m_admin']['entity']['short_label'], $_SESSION['m_admin']['entity']['adrs1'], $_SESSION['m_admin']['entity']['adrs2'],$_SESSION['m_admin']['entity']['adrs3'], $_SESSION['m_admin']['entity']['zcode'], $_SESSION['m_admin']['entity']['city'], $_SESSION['m_admin']['entity']['country'], $_SESSION['m_admin']['entity']['email'], $_SESSION['m_admin']['entity']['business'], $_SESSION['m_admin']['entity']['parent'], $_SESSION['m_admin']['entity']['type'], $entityPath, $_SESSION['m_admin']['entity']['archival_agency'], $_SESSION['m_admin']['entity']['archival_agreement'], $_SESSION['m_admin']['entity']['entity_full_name'], $_SESSION['m_admin']['entity']['entityId']));
$_SESSION['service_tag'] = 'entity_up_db';
$core->execute_modules_services($_SESSION['modules_services'], 'entity_up_db', "include");
$core->execute_app_services($_SESSION['app_services'], 'entity_up_db', 'include');
diff --git a/modules/entities/lang/en.php b/modules/entities/lang/en.php
index af57e5a0b94b0df72263dde3363a57a1ee4be2de..49eafc29e003588a145e5ff30b6c86cfe38d768a 100755
--- a/modules/entities/lang/en.php
+++ b/modules/entities/lang/en.php
@@ -118,6 +118,8 @@ if (!defined("_ENTITY_LABEL"))
define("_ENTITY_LABEL", "Name");
if (!defined("_SHORT_LABEL"))
define("_SHORT_LABEL", "Short name");
+if (!defined("_ENTITY_FULL_NAME"))
+ define("_ENTITY_FULL_NAME", "Full name");
if (!defined("_ENTITY_ADR_1"))
define("_ENTITY_ADR_1", "Address 1");
if (!defined("_ENTITY_ADR_2"))
diff --git a/modules/entities/lang/fr.php b/modules/entities/lang/fr.php
index f60df86a340195fd742674c85b10ede4f31f3154..100191e684557f4919601ed989f16abd8d13b117 100755
--- a/modules/entities/lang/fr.php
+++ b/modules/entities/lang/fr.php
@@ -118,6 +118,8 @@ if (!defined("_ENTITY_LABEL"))
define("_ENTITY_LABEL", "Nom");
if (!defined("_SHORT_LABEL"))
define("_SHORT_LABEL", "Nom court");
+if (!defined("_ENTITY_FULL_NAME"))
+ define("_ENTITY_FULL_NAME", "Nom complet");
if (!defined("_ENTITY_ADR_1"))
define("_ENTITY_ADR_1", "Adresse 1");
if (!defined("_ENTITY_ADR_2"))
diff --git a/modules/entities/xml/IVS/validation_rules.xml b/modules/entities/xml/IVS/validation_rules.xml
index 0b94080959aea33d66f4a076c4c8b760cd9eeedd..82049567a0ded787cf29425e1d9db6d82e9eddde 100755
--- a/modules/entities/xml/IVS/validation_rules.xml
+++ b/modules/entities/xml/IVS/validation_rules.xml
@@ -70,6 +70,7 @@
<parameter name="mode" type="mode" />
<parameter name="parententity" type="identifier" />
<parameter name="short_label" type="string" />
+ <parameter name="entity_full_name" type="string" />
<parameter name="type" type="string" />
<parameter name="archival_agreement" type="string" />
<parameter name="archival_agency" type="string" />
diff --git a/sql/17_xx.sql b/sql/17_xx.sql
index 9b2eac3305e704fa43bf876860842678d30927c2..17b476464a5cf9f9c8df069a3b075a6cae0b8462 100755
--- a/sql/17_xx.sql
+++ b/sql/17_xx.sql
@@ -107,3 +107,6 @@ UPDATE users set password = '$2y$10$Vq244c5s2zmldjblmMXEN./Q2qZrqtGVgrbz/l1WfsUJ
/*BASKETS COLOR*/
ALTER TABLE baskets DROP COLUMN IF EXISTS color;
ALTER TABLE baskets ADD color character varying(16);
+/*ENTITIES FULL NAME*/
+ALTER TABLE entities DROP COLUMN IF EXISTS entity_full_name;
+ALTER TABLE entities ADD entity_full_name text;
diff --git a/sql/structure.sql b/sql/structure.sql
index 37cfd797bd2f053f71e0709bf71f20522fb36bcf..0ae9896701acbf780675faca4d62a962842d7f90 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -633,6 +633,7 @@ CREATE TABLE entities
entity_id character varying(32) NOT NULL,
entity_label character varying(255),
short_label character varying(50),
+ entity_full_name text,
enabled character(1) NOT NULL DEFAULT 'Y'::bpchar,
adrs_1 character varying(255),
adrs_2 character varying(255),