diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 6b50c73da8e..0eab527bc6b 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -826,23 +826,29 @@ class Conf
unset($this->global->MAIN_NO_CONCAT_DESCRIPTION);
}
- // For backward compatibility
+ // product is new use
if (isset($this->product)) {
+ // For backward compatibility
$this->produit = $this->product;
}
+ // invoice is new use, facture is old use still initialised
if (isset($this->facture)) {
$this->invoice = $this->facture;
}
+ // order is new use, commande is old use still initialised
if (isset($this->commande)) {
$this->order = $this->commande;
}
+ // contract is new use, contrat is old use still initialised
if (isset($this->contrat)) {
$this->contract = $this->contrat;
}
+ // category is new use, categorie is old use still initialised
if (isset($this->categorie)) {
$this->category = $this->categorie;
}
- if (isset($this->project)) {
+ // project is new use, projet is old use still initialised
+ if (isset($this->projet) && !isset($this->project)) {
$this->project = $this->projet;
}
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index f25e78bceda..6b1b0eac4c1 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -65,7 +65,7 @@ $includeuserlist = array();
llxHeader('', $langs->trans('Projects'));
$title = $langs->trans("ProjectsStatistics");
-$dir = $conf->projet->dir_output.'/temp';
+$dir = $conf->project->dir_output.'/temp';
print load_fiche_titre($title, '', 'project');
@@ -224,7 +224,8 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
$mesg = $px3->isGraphKo();
if (!$mesg) {
$px3->SetData($data);
- $i = $startyear; $legend = array();
+ $i = $startyear;
+ $legend = array();
while ($i <= $endyear) {
$legend[] = $i;
$i++;
@@ -268,7 +269,7 @@ $head[$h][1] = $langs->trans("ByMonthYear");
$head[$h][2] = 'byyear';
$h++;
-complete_head_from_modules($conf, $langs, null, $head, $h, $type);
+complete_head_from_modules($conf, $langs, null, $head, $h, 'project_stats');
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1, '');
@@ -337,9 +338,9 @@ foreach ($data_all_year as $val) {
print '
0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.' | ';
print ''.$val['nb'].' | ';
if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
- print ''.($val['total'] ?price(price2num($val['total'], 'MT'), 1) : '0').' | ';
- print ''.($val['avg'] ?price(price2num($val['avg'], 'MT'), 1) : '0').' | ';
- print ''.($val['weighted'] ?price(price2num($val['weighted'], 'MT'), 1) : '0').' | ';
+ print ''.($val['total'] ? price(price2num($val['total'], 'MT'), 1) : '0').' | ';
+ print ''.($val['avg'] ? price(price2num($val['avg'], 'MT'), 1) : '0').' | ';
+ print ''.(isset($val['weighted']) ? price(price2num($val['weighted'], 'MT'), 1) : '0').' | ';
}
print '';
$oldyear = $year;
@@ -350,7 +351,7 @@ print '';
print '';
-$stringtoshow .= '
';
+$stringtoshow = '| ';
if ($mesg) {
print $mesg;
} else {
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index 81c05fde59d..531b9eb7b3a 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -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');
@@ -134,12 +134,12 @@ if (!count($arrayyears)) {
$h = 0;
$head = array();
-$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/stats/index.php?mode='.$mode;
+$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/stats/index.php';
$head[$h][1] = $langs->trans("ByMonthYear");
$head[$h][2] = 'byyear';
$h++;
-complete_head_from_modules($conf, $langs, null, $head, $h, $type);
+complete_head_from_modules($conf, $langs, null, $head, $h, 'project_tasks_stats');
print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1, '');
@@ -191,13 +191,13 @@ foreach ($data_all_year as $val) {
$oldyear--;
print ' | ';
- print '| 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.' | ';
+ print ' 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.' | ';
print '0 | ';
print ' ';
}
print '';
- print '| 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.' | ';
+ print ' 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.' | ';
print ''.$val['nb'].' | ';
print ' ';
$oldyear = $year;
@@ -208,7 +208,7 @@ print '';
print '';
-$stringtoshow .= ' ';
+$stringtoshow = '| ';
if ($mesg) {
print $mesg;
} else {
|
|
|