update code

This commit is contained in:
Philippe GRAND 2022-08-31 21:41:12 +02:00
parent 57bcc2177a
commit 9cf33bb932

View File

@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
if (!empty($conf->project->enabled)) { if (isModEnabled('project')) {
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
} }
@ -244,7 +244,7 @@ $companystatic = new Societe($db);
if (!empty($conf->contrat->enabled)) { if (!empty($conf->contrat->enabled)) {
$contratstatic = new Contrat($db); $contratstatic = new Contrat($db);
} }
if (!empty($conf->project->enabled)) { if (isModEnabled('project')) {
$projectstatic = new Project($db); $projectstatic = new Project($db);
} }
@ -272,7 +272,7 @@ if ($action == 'create') {
print dol_get_fiche_head(); print dol_get_fiche_head();
$rowspan = 4; $rowspan = 4;
if (!empty($conf->project->enabled) && $object->fk_project > 0) { if (isModEnabled('project') && $object->fk_project > 0) {
$rowspan++; $rowspan++;
} }
if (!empty($conf->contrat->enabled) && $object->fk_contrat > 0) { if (!empty($conf->contrat->enabled) && $object->fk_contrat > 0) {
@ -314,7 +314,7 @@ if ($action == 'create') {
} }
// Project // Project
if (!empty($conf->project->enabled)) { if (isModEnabled('project')) {
$formproject = new FormProjets($db); $formproject = new FormProjets($db);
print "<tr><td>".$langs->trans("Project")."</td><td>"; print "<tr><td>".$langs->trans("Project")."</td><td>";
$projectid = GETPOST('projectid') ?GETPOST('projectid') : $object->fk_project; $projectid = GETPOST('projectid') ?GETPOST('projectid') : $object->fk_project;
@ -484,7 +484,7 @@ if ($action == 'create') {
$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1); $morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
// Project // Project
if (!empty($conf->project->enabled)) { if (isModEnabled('project')) {
$formproject = new FormProjets($db); $formproject = new FormProjets($db);
$langs->load("projects"); $langs->load("projects");
$morehtmlref .= '<br>'.$langs->trans('Project').' '; $morehtmlref .= '<br>'.$langs->trans('Project').' ';
@ -803,7 +803,7 @@ if ($action == 'create') {
if (!empty($conf->contrat->enabled)) { if (!empty($conf->contrat->enabled)) {
print_liste_field_titre("Contract", $_SERVER['PHP_SELF'], "f.fk_contrat", "", "", 'width="100px"', $sortfield, $sortorder, 'left '); print_liste_field_titre("Contract", $_SERVER['PHP_SELF'], "f.fk_contrat", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
} }
if (!empty($conf->project->enabled)) { if (isModEnabled('project')) {
print_liste_field_titre("Project", $_SERVER['PHP_SELF'], "f.fk_project", "", "", 'width="100px"', $sortfield, $sortorder, 'left '); print_liste_field_titre("Project", $_SERVER['PHP_SELF'], "f.fk_project", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
} }
print_liste_field_titre("Duration", $_SERVER['PHP_SELF'], 'f.duree', '', '', 'width="50px"', $sortfield, $sortorder, 'right '); print_liste_field_titre("Duration", $_SERVER['PHP_SELF'], 'f.duree', '', '', 'width="50px"', $sortfield, $sortorder, 'right ');
@ -842,7 +842,7 @@ if ($action == 'create') {
} }
print '</td>'; print '</td>';
} }
if (!empty($conf->project->enabled)) { if (isModEnabled('project')) {
print '<td>'; print '<td>';
if ($objp->fk_project > 0) { if ($objp->fk_project > 0) {
$projectstatic->fetch($objp->fk_project); $projectstatic->fetch($objp->fk_project);