';
// Date
if (!empty($arrayfields['t.task_date']['checked'])) {
- print '| ';
- if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
- print '';
- }
- print '';
- print $formother->selectyear($search_year, 'search_year', 1, 20, 5);
+ print ' | ';
+ print ' ';
+ print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+ print ' ';
+ print '';
+ print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+ print ' ';
print ' | ';
}
// Thirdparty
@@ -1754,8 +1826,18 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
print ' | ';
}
+ // Thirdparty alias
+ if (!empty($arrayfields['s.name_alias']['checked'])) {
+ print ' | ';
+ }
+
if (!empty($allprojectforuser)) {
- print ' | ';
+ if (!empty($arrayfields['p.project_ref']['checked'])) {
+ print ' | ';
+ }
+ if (!empty($arrayfields['p.project_label']['checked'])) {
+ print ' | ';
+ }
}
// Task
if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task
@@ -1810,11 +1892,20 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
if (!empty($arrayfields['t.task_date']['checked'])) {
print_liste_field_titre($arrayfields['t.task_date']['label'], $_SERVER['PHP_SELF'], 't.task_date,t.task_datehour,t.rowid', '', $param, '', $sortfield, $sortorder);
}
+
if (!empty($arrayfields['p.fk_soc']['checked'])) {
print_liste_field_titre($arrayfields['p.fk_soc']['label'], $_SERVER['PHP_SELF'], 't.task_date,t.task_datehour,t.rowid', '', $param, '', $sortfield, $sortorder);
}
+ if (!empty($arrayfields['s.name_alias']['checked'])) {
+ print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER['PHP_SELF'], 's.name_alias', '', $param, '', $sortfield, $sortorder);
+ }
if (!empty($allprojectforuser)) {
- print_liste_field_titre("Project", $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+ if (!empty($arrayfields['p.project_ref']['checked'])) {
+ print_liste_field_titre("Project", $_SERVER['PHP_SELF'], 'p.ref', '', $param, '', $sortfield, $sortorder);
+ }
+ if (!empty($arrayfields['p.project_label']['checked'])) {
+ print_liste_field_titre("ProjectLabel", $_SERVER['PHP_SELF'], 'p.title', '', $param, '', $sortfield, $sortorder);
+ }
}
if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task
if (!empty($arrayfields['t.task_ref']['checked'])) {
@@ -1901,7 +1992,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
} else {
$tmpsociete = $conf->cache['thridparty'][$task_time->fk_soc];
}
- print $tmpsociete->getNomUrl(1);
+ print $tmpsociete->getNomUrl(1, '', 100, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
}
print '';
if (!$i) {
@@ -1909,23 +2000,59 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
}
}
- // Project ref
- if (!empty($allprojectforuser)) {
- print '';
- if (empty($conf->cache['project'][$task_time->fk_projet])) {
- $tmpproject = new Project($db);
- $tmpproject->fetch($task_time->fk_projet);
- $conf->cache['project'][$task_time->fk_projet] = $tmpproject;
- } else {
- $tmpproject = $conf->cache['project'][$task_time->fk_projet];
+ // Thirdparty alias
+ if (!empty($arrayfields['s.name_alias']['checked'])) {
+ print ' | ';
+ if ($task_time->fk_soc > 0) {
+ if (empty($conf->cache['thridparty'][$task_time->fk_soc])) {
+ $tmpsociete = new Societe($db);
+ $tmpsociete->fetch($task_time->fk_soc);
+ $conf->cache['thridparty'][$task_time->fk_soc] = $tmpsociete;
+ } else {
+ $tmpsociete = $conf->cache['thridparty'][$task_time->fk_soc];
+ }
+ print $tmpsociete->name_alias;
}
- print $tmpproject->getNomUrl(1);
print ' | ';
if (!$i) {
$totalarray['nbfield']++;
}
}
+ // Project ref & label
+ if (!empty($allprojectforuser)) {
+ if (!empty($arrayfields['p.project_ref']['checked'])) {
+ print '';
+ if (empty($conf->cache['project'][$task_time->fk_projet])) {
+ $tmpproject = new Project($db);
+ $tmpproject->fetch($task_time->fk_projet);
+ $conf->cache['project'][$task_time->fk_projet] = $tmpproject;
+ } else {
+ $tmpproject = $conf->cache['project'][$task_time->fk_projet];
+ }
+ print $tmpproject->getNomUrl(1);
+ print ' | ';
+ if (! $i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ if (!empty($arrayfields['p.project_label']['checked'])) {
+ print '';
+ if (empty($conf->cache['project'][$task_time->fk_projet])) {
+ $tmpproject = new Project($db);
+ $tmpproject->fetch($task_time->fk_projet);
+ $conf->cache['project'][$task_time->fk_projet] = $tmpproject;
+ } else {
+ $tmpproject = $conf->cache['project'][$task_time->fk_projet];
+ }
+ print $tmpproject->title;
+ print ' | ';
+ if (! $i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ }
+
// Task ref
if (!empty($arrayfields['t.task_ref']['checked'])) {
if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task
diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index 21901753692..e5f03d7fadb 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -819,7 +819,7 @@ if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS
print '
';
// Country
- print '| '.$langs->trans('Country').' | ';
print img_picto('', 'country', 'class="pictofixedwidth"');
$country_id = GETPOST('country_id');
if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 900483bbbfa..b6708a5b5f6 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -319,7 +319,7 @@ $toutsujet = explode(",", $object->sujet);
$listofanswers = array();
foreach ($toutsujet as $value) {
$tmp = explode('@', $value);
- $listofanswers[] = array('label'=>$tmp[0], 'format'=>($tmp[1] ? $tmp[1] : 'checkbox'));
+ $listofanswers[] = array('label'=>$tmp[0], 'format'=>(!empty($tmp[1]) ? $tmp[1] : 'checkbox'));
}
$toutsujet = str_replace("°", "'", $toutsujet);
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index c86713ffb93..38e1ead836e 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -28,6 +28,7 @@
*/
require_once DOL_DOCUMENT_ROOT.'/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -238,7 +239,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
// If $object is id instead of object
if (!is_object($object)) {
$id = $object;
- $object = new Commande($this->db);
+ $object = new RecruitmentJobPosition($this->db);
$result = $object->fetch($id);
if ($result < 0) {
dol_print_error($this->db, $object->error);
@@ -339,7 +340,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
$odfHandler = new odf(
$srctemplatepath,
array(
- 'PATH_TO_TMP' => $conf->commande->dir_temp,
+ 'PATH_TO_TMP' => $conf->recruitment->dir_temp,
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_LEFT' => '{',
'DELIMITER_RIGHT' => '}'
|