--- /tmp/dsg/dolibarr/htdocs/salaries/stats/github_19.0.3_index.php
+++ /tmp/dsg/dolibarr/htdocs/salaries/stats/client_index.php
@@ -4 +3,0 @@
- * Copyright (C) 2021		Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>

@@ -26 +24,0 @@
-// Load Dolibarr environment

@@ -32 +30 @@
-$langs->loadLangs(array("salaries", "companies", "bills"));

+$langs->loadLangs(array("salaries", "companies"));

@@ -37,8 +35,2 @@
-$userid = GETPOST('userid', 'int');

-if ($userid < 0) {

-	$userid = 0;

-}

-$socid = GETPOST('socid', 'int');

-if ($socid < 0) {

-	$socid = 0;

-}

+$userid = GETPOST('userid', 'int'); if ($userid < 0) $userid = 0;

+$socid = GETPOST('socid', 'int'); if ($socid < 0) $socid = 0;

@@ -49,3 +41 @@
-if ($user->socid) {

-	$socid = $user->socid;

-}

+if ($user->socid) $socid = $user->socid;

@@ -54,3 +44,4 @@
-$nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');

-$year = GETPOST('year') > 0 ? GETPOST('year') : $nowyear;

-$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));

+$nowyear = strftime("%Y", dol_now());

+$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;

+//$startyear=$year-2;

+$startyear = $year - 1;

@@ -72 +63 @@
-print load_fiche_titre($title, '', 'salary');

+print load_fiche_titre($title, '', 'object_payment');

@@ -77,4 +67,0 @@
-

-if (!$user->hasRight('salaries', 'readall') && empty($useridtofilter)) {

-	$useridtofilter = $user->getAllChildIds(1);

-}

@@ -96 +83,2 @@
-if (!$mesg) {

+if (!$mesg)

+{

@@ -98,3 +86,3 @@
-	$i = $startyear;

-	$legend = array();

-	while ($i <= $endyear) {

+	$i = $startyear; $legend = array();

+	while ($i <= $endyear)

+	{

@@ -127 +115,2 @@
-if (!$mesg) {

+if (!$mesg)

+{

@@ -129,3 +118,3 @@
-	$i = $startyear;

-	$legend = array();

-	while ($i <= $endyear) {

+	$i = $startyear; $legend = array();

+	while ($i <= $endyear)

+	{

@@ -157 +146,2 @@
-if (!$mesg) {

+if (!$mesg)

+{

@@ -159,3 +149,3 @@
-	$i = $startyear;

-	$legend = array();

-	while ($i <= $endyear) {

+	$i = $startyear; $legend = array();

+	while ($i <= $endyear)

+	{

@@ -186,3 +176 @@
-if (!count($arrayyears)) {

-	$arrayyears[$nowyear] = $nowyear;

-}

+if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;

@@ -200 +188 @@
-print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);

+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);

@@ -213,3 +201,2 @@
-print '<tr><td>'.$langs->trans("Employee").'</td><td>';

-print img_picto('', 'user', 'class="pictofixedwidth"');

-print $form->select_dolusers(($userid ? $userid : -1), 'userid', 1, '', 0, !$user->hasRight('salaries', 'readall') ? 'hierarchyme' : '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');

+print '<tr><td>'.$langs->trans("User").'</td><td>';

+print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');

@@ -219,3 +206 @@
-if (!in_array($year, $arrayyears)) {

-	$arrayyears[$year] = $year;

-}

+if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;

@@ -223 +208 @@
-print $form->selectarray('year', $arrayyears, $year, 0, 0, 0, '', 0, 0, 0, '', 'width75');

+print $form->selectarray('year', $arrayyears, $year, 0);

@@ -225 +210 @@
-print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';

+print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';

@@ -240 +225,2 @@
-foreach ($data as $val) {

+foreach ($data as $val)

+{

@@ -242 +228,2 @@
-	while ($year && $oldyear > $year + 1) {

+	while ($year && $oldyear > $year + 1)

+	{

@@ -249,2 +236,2 @@
-		print '<td class="right"><span class="amount">0</span></td>';

-		print '<td class="right"><span class="amount">0</span></td>';

+		print '<td class="right">0</td>';

+		print '<td class="right">0</td>';

@@ -257,2 +244,2 @@
-	print '<td class="right"><span class="amount">'.price(price2num($val['total'], 'MT'), 1).'</span></td>';

-	print '<td class="right"><span class="amount">'.price(price2num($val['avg'], 'MT'), 1).'</span></td>';

+	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';

+	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';

@@ -267 +254 @@
-print '</div><div class="fichetwothirdright">';

+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';

@@ -272,3 +259,2 @@
-if ($mesg) {

-	print $mesg;

-} else {

+if ($mesg) { print $mesg; }

+else {

@@ -284,5 +270,5 @@
-print '</div></div>';

-print '<div class="clearboth"></div>';

-

-

-print dol_get_fiche_end();

+print '</div></div></div>';

+print '<div style="clear:both"></div>';

+

+

+dol_fiche_end();