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

fix project replace projet

Browse Source
This commit is contained in:
Frédéric FRANCE 2021-03-18 20:51:40 +01:00
parent a420d0acbd
commit c43d3dff92
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/conf.class.php
View File

@ -842,7 +842,7 @@ class Conf
if (isset($this->categorie)) {
$this->category = $this->categorie;
}
if (isset($this->project)) {
if (isset($this->projet) && !isset($this->project)) {
$this->project = $this->projet;
}

2
htdocs/core/photos_resize.php
View File

@ -142,7 +142,7 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
if ($result <= 0) {
dol_print_error($db, 'Failed to load object');
}
$dir = $conf->projet->multidir_output[$object->entity]; // By default
$dir = $conf->project->multidir_output[$object->entity]; // By default
}
} elseif ($modulepart == 'propal') {
require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';

8
htdocs/projet/stats/index.php
View File

@ -99,7 +99,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
$data1 = array(array(0=>$langs->trans("None"), 1=>1));
}
$filenamenb = $conf->projet->dir_output."/stats/projectbystatus.png";
$filenamenb = $conf->project->dir_output."/stats/projectbystatus.png";
$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=projectstats&amp;file=projectbystatus.png';
$px = new DolGraph();
$mesg = $px->isGraphKo();
@ -150,7 +150,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
$data = $stats_project->getNbByMonthWithPrevYear($endyear, $startyear);
//var_dump($data);
$filenamenb = $conf->projet->dir_output."/stats/projectnbprevyear-".$year.".png";
$filenamenb = $conf->project->dir_output."/stats/projectnbprevyear-".$year.".png";
$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=projectstats&amp;file=projectnbprevyear-'.$year.'.png';
$px1 = new DolGraph();
@ -182,7 +182,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
//var_dump($data);
// $data = array(array('Lib',val1,val2,val3),...)
$filenamenb = $conf->projet->dir_output."/stats/projectamountprevyear-".$year.".png";
$filenamenb = $conf->project->dir_output."/stats/projectamountprevyear-".$year.".png";
$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=projectstats&amp;file=projectamountprevyear-'.$year.'.png';
$px2 = new DolGraph();
@ -217,7 +217,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
//var_dump($data);
// $data = array(array('Lib',val1,val2,val3),...)
$filenamenb = $conf->projet->dir_output."/stats/projecttransrateprevyear-".$year.".png";
$filenamenb = $conf->project->dir_output."/stats/projecttransrateprevyear-".$year.".png";
$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=projectstats&amp;file=projecttransrateprevyear-'.$year.'.png';
$px3 = new DolGraph();

4
htdocs/projet/tasks/stats/index.php
View File

@ -65,7 +65,7 @@ $includeuserlist = array();
llxHeader('', $langs->trans('Tasks'));
$title = $langs->trans("TasksStatistics");
$dir = $conf->projet->dir_output.'/temp';
$dir = $conf->project->dir_output.'/temp';
print load_fiche_titre($title, '', 'projecttask');
@ -90,7 +90,7 @@ if (!empty($year)) {
$data = $stats_tasks->getNbByMonthWithPrevYear($endyear, $startyear);
//var_dump($data);
$filenamenb = $conf->projet->dir_output."/stats/tasknbprevyear-".$year.".png";
$filenamenb = $conf->project->dir_output."/stats/tasknbprevyear-".$year.".png";
$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=taskstats&amp;file=tasknbprevyear-'.$year.'.png';
$px1 = new DolGraph();