Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

fix: use Dolibarr std method and set correct end Year on CA report

Browse Source
This commit is contained in:
Florian HENRY
2022-08-24 22:17:32 +02:00
parent 1c7d3f96a5
commit 282dda8660
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/resultat/clientfourn.php
View File

@@ -69,12 +69,12 @@ if (!$sortorder) {
// Date range // Date range
$year = GETPOST('year', 'int'); $year = GETPOST('year', 'int');
if (empty($year)) { if (empty($year)) {
$year_current = strftime("%Y", dol_now()); $year_current = dol_print_date(dol_now(), "%Y");
$month_current = strftime("%m", dol_now()); $month_current = dol_print_date(dol_now(), "%m");
$year_start = $year_current; $year_start = $year_current;
} else { } else {
$year_current = $year; $year_current = $year;
$month_current = strftime("%m", dol_now()); $month_current = dol_print_date(dol_now(), "%m");
$year_start = $year; $year_start = $year;
} }
$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear); $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);

6
htdocs/compta/resultat/index.php
View File

@@ -47,12 +47,12 @@ $nbofyear = 4;
// Date range // Date range
$year = GETPOST('year', 'int'); $year = GETPOST('year', 'int');
if (empty($year)) { if (empty($year)) {
$year_current = strftime("%Y", dol_now()); $year_current = dol_print_date(dol_now(), "%Y");
$month_current = strftime("%m", dol_now()); $month_current = dol_print_date(dol_now(), "%m");
$year_start = $year_current - ($nbofyear - 1); $year_start = $year_current - ($nbofyear - 1);
} else { } else {
$year_current = $year; $year_current = $year;
$month_current = strftime("%m", dol_now()); $month_current = dol_print_date(dol_now(), "%m");
$year_start = $year - ($nbofyear - 1); $year_start = $year - ($nbofyear - 1);
} }
$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear); $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);

2
htdocs/compta/stats/index.php
View File

@@ -69,6 +69,8 @@ if (empty($date_start) || empty($date_end)) { // We define date_start and date_e
$month_end = $month_start - 1; $month_end = $month_start - 1;
if ($month_end < 1) { if ($month_end < 1) {
$month_end = 12; $month_end = 12;
} else {
$year_end++;
} }
} else { } else {
$month_end = $month_start; $month_end = $month_start;