lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft

Browse Source
This commit is contained in:
Florian HENRY 2021-03-11 22:03:51 +01:00
commit f17aa47ad6
5 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/adherents/card.php
View File

@ -1542,12 +1542,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '<tr><td>'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>'; print '<tr><td>'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
print '</tr>'; print '</tr>';
// Gender
print '<tr><td>'.$langs->trans("Gender").'</td>';
print '<td>';
if ($object->gender) {
print $langs->trans("Gender".$object->gender);
}
print '</td></tr>'; print '</td></tr>';
// Company // Company

6
htdocs/adherents/subscription.php
View File

@ -493,12 +493,6 @@ if ($rowid > 0) {
print '<tr><td>'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>'; print '<tr><td>'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
print '</tr>'; print '</tr>';
// Gender
print '<tr><td>'.$langs->trans("Gender").'</td>';
print '<td>';
if ($object->gender) print $langs->trans("Gender".$object->gender);
print '</td></tr>';
// Company // Company
print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>'; print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>';

23
htdocs/core/class/html.form.class.php
View File

@ -7895,6 +7895,23 @@ class Form
$fieldref = 'ref'; $fieldref = 'ref';
} }
// Preparing gender's display if there is one
$addgendertxt = '';
if ($object->gender) {
$addgendertxt = ' ';
switch ($object->gender) {
case 'man':
$addgendertxt .= '<i class="fas fa-mars"></i>';
break;
case 'woman':
$addgendertxt .= '<i class="fas fa-venus"></i>';
break;
case 'other':
$addgendertxt .= '<i class="fas fa-genderless"></i>';
break;
}
}
// Add where from hooks // Add where from hooks
if (is_object($hookmanager)) { if (is_object($hookmanager)) {
$parameters = array(); $parameters = array();
@ -8021,12 +8038,12 @@ class Form
$ret .= $object->ref.'<br>'; $ret .= $object->ref.'<br>';
$fullname = $object->getFullName($langs); $fullname = $object->getFullName($langs);
if ($object->morphy == 'mor' && $object->societe) { if ($object->morphy == 'mor' && $object->societe) {
$ret .= dol_htmlentities($object->societe).((!empty($fullname) && $object->societe != $fullname) ? ' ('.dol_htmlentities($fullname).')' : ''); $ret .= dol_htmlentities($object->societe).((!empty($fullname) && $object->societe != $fullname) ? ' ('.dol_htmlentities($fullname).$addgendertxt.')' : '');
} else { } else {
$ret .= dol_htmlentities($fullname).((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : ''); $ret .= dol_htmlentities($fullname).$addgendertxt.((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : '');
} }
} elseif (in_array($object->element, array('contact', 'user', 'usergroup'))) { } elseif (in_array($object->element, array('contact', 'user', 'usergroup'))) {
$ret .= dol_htmlentities($object->getFullName($langs)); $ret .= dol_htmlentities($object->getFullName($langs)).$addgendertxt;
} elseif (in_array($object->element, array('action', 'agenda'))) { } elseif (in_array($object->element, array('action', 'agenda'))) {
$ret .= $object->ref.'<br>'.$object->label; $ret .= $object->ref.'<br>'.$object->label;
} elseif (in_array($object->element, array('adherent_type'))) { } elseif (in_array($object->element, array('adherent_type'))) {

8
htdocs/core/triggers/interface_50_modEventOrganization_EventOrganization.class.php
View File

@ -74,15 +74,17 @@ class InterfaceEventOrganization extends DolibarrTriggers
if (empty($conf->eventorganization->enabled)) { if (empty($conf->eventorganization->enabled)) {
return 0; // Module not active, we do nothing return 0; // Module not active, we do nothing
} }
$error=0; $error=0;
// Actions // Actions
if ($action == 'PROJECT_VALIDATE') { if ($action == 'PROJECT_VALIDATE') {
// Load translation files required by the page
$langs->loadLangs(array("eventorganization"));
if (!empty($conf->global->EVENTORGANIZATION_TASK_LABEL) && !empty($object->usage_organize_event)) { if (!empty($conf->global->EVENTORGANIZATION_TASK_LABEL) && !empty($object->usage_organize_event)) {
$taskToDo = explode("\n", $conf->global->EVENTORGANIZATION_TASK_LABEL); $taskToDo = explode("\n", $conf->global->EVENTORGANIZATION_TASK_LABEL);
if (is_array($taskToDo) && count($taskToDo)>0) { if (is_array($taskToDo) && count($taskToDo)>0) {
// Load translation files required by the page
$langs->loadLangs(array("eventorganization"));
$this->db->begin(); $this->db->begin();
foreach ($taskToDo as $taskLabel) { foreach ($taskToDo as $taskLabel) {
$task = new Task($this->db); $task = new Task($this->db);

8
htdocs/user/card.php
View File

@ -1466,14 +1466,6 @@ if ($action == 'create' || $action == 'adduserldap') {
print '</td></tr>'."\n"; print '</td></tr>'."\n";
} }
// Gender
print '<tr><td>'.$langs->trans("Gender").'</td>';
print '<td>';
if ($object->gender) {
print $langs->trans("Gender".$object->gender);
}
print '</td></tr>';
// Employee // Employee
print '<tr><td>'.$langs->trans("Employee").'</td><td colspan="2">'; print '<tr><td>'.$langs->trans("Employee").'</td><td colspan="2">';
print yn($object->employee); print yn($object->employee);