diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 30ccab7725d25..07311a5ca2088 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -908,7 +908,7 @@
$res = $soc->fetch($socid);
}
- if (GETPOST('origin') && GETPOSTINT('originid')) {
+ if (GETPOST('origin', 'alphanohtml') && GETPOSTINT('originid')) {
// Parse element/subelement (ex: project_task)
$regs = array();
$element = $subelement = GETPOST('origin', 'alphanohtml');
@@ -1076,6 +1076,7 @@
if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
$newclassname = $classname;
if ($newclassname == 'Propal') {
+ $langs->load('propal');
$newclassname = 'CommercialProposal';
}
print '
'.$langs->trans($newclassname).' | '.$objectsrc->getNomUrl(1).' |
';
@@ -1119,7 +1120,7 @@
print $form->buttonsSaveCancel("CreateDraftIntervention");
// Show origin lines
- if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
+ if (!empty($origin) && !empty($originid) && is_object($objectsrc) && !getDolGlobalInt('FICHINTER_DISABLE_DETAILS')) {
$title = $langs->trans('Services');
print load_fiche_titre($title);
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index b2debc9e3ca92..f3635cbd02360 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -1063,7 +1063,7 @@
print ''."\n";
- $total += $obj->duree;
+ $total += (isset($obj->duree) ? $obj->duree : 0);
}
$i++;
}
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index c70153127c30e..f6254029ae1be 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -18,21 +18,22 @@
*/
/**
- * \file class/recruitmentcandidature.class.php
+ * \file recruitment/class/recruitmentcandidature.class.php
* \ingroup recruitment
* \brief This file is a CRUD class file for RecruitmentCandidature (Create/Read/Update/Delete)
*/
// Put here all includes required by your class file
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonpeople.class.php';
/**
* Class for RecruitmentCandidature
*/
class RecruitmentCandidature extends CommonObject
{
+ use CommonPeople;
+
/**
* @var string ID of module.
*/
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 8c3030a07e3ed..fe80fcb63de5a 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -287,7 +287,7 @@
// Part to create
if ($action == 'create') {
- print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("RecruitmentCandidature")), '', 'object_'.$object->picto);
+ print load_fiche_titre($title, '', 'object_'.$object->picto);
print '