@@ -43,7 +43,7 @@ |
||
43 | 43 | * View |
44 | 44 | */ |
45 | 45 | |
46 | -$form = new Form($db); // $form is required as global value into dol_banner_tab |
|
46 | +$form = new Form($db); // $form is required as global value into dol_banner_tab |
|
47 | 47 | |
48 | 48 | llxHeader('', $langs->trans("CronInfo")); |
49 | 49 |
@@ -98,8 +98,8 @@ |
||
98 | 98 | $month_current = dol_print_date(dol_now(), '%m'); |
99 | 99 | $year_start = $year; |
100 | 100 | } |
101 | -$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
102 | -$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
101 | +$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
102 | +$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
103 | 103 | // Quarter |
104 | 104 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
105 | 105 | $q = GETPOST("q", "int") ?GETPOST("q", "int") : 0; |
@@ -57,7 +57,9 @@ |
||
57 | 57 | |
58 | 58 | // Category |
59 | 59 | $selected_cat = (int) GETPOST('search_categ', 'int'); |
60 | -if ($selected_cat == -1) $selected_cat = ''; |
|
60 | +if ($selected_cat == -1) { |
|
61 | + $selected_cat = ''; |
|
62 | +} |
|
61 | 63 | $subcat = false; |
62 | 64 | if (GETPOST('subcat', 'alpha') === 'yes') { |
63 | 65 | $subcat = true; |
@@ -97,8 +97,8 @@ |
||
97 | 97 | $month_current = dol_print_date(dol_now(), '%m'); |
98 | 98 | $year_start = $year; |
99 | 99 | } |
100 | -$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
101 | -$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
100 | +$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
101 | +$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
102 | 102 | // Quarter |
103 | 103 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
104 | 104 | $q = GETPOST("q", "int"); |
@@ -78,8 +78,8 @@ |
||
78 | 78 | $month_current = dol_print_date(dol_now(), '%m'); |
79 | 79 | $year_start = $year; |
80 | 80 | } |
81 | -$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
82 | -$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
81 | +$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
82 | +$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
83 | 83 | // Quarter |
84 | 84 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
85 | 85 | $q = GETPOST("q") ?GETPOST("q") : 0; |
@@ -98,8 +98,8 @@ |
||
98 | 98 | $month_current = dol_print_date(dol_now(), '%m'); |
99 | 99 | $year_start = $year; |
100 | 100 | } |
101 | -$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
102 | -$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
101 | +$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
102 | +$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
103 | 103 | // Quarter |
104 | 104 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
105 | 105 | $q = GETPOST("q", "int") ?GETPOST("q", "int") : 0; |
@@ -97,8 +97,8 @@ |
||
97 | 97 | $month_current = dol_print_date(dol_now(), '%m'); |
98 | 98 | $year_start = $year; |
99 | 99 | } |
100 | -$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
101 | -$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
100 | +$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
101 | +$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
102 | 102 | // Quarter |
103 | 103 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
104 | 104 | $q = GETPOST("q", "int"); |
@@ -241,7 +241,7 @@ |
||
241 | 241 | $sql .= " AND b.doc_type = 'customer_invoice'"; |
242 | 242 | $sql .= " AND aa.entity = ".$conf->entity; |
243 | 243 | $sql .= " AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'"; |
244 | - $sql .= " AND aa.pcg_type = 'INCOME'"; // TODO Be able to use a custom group |
|
244 | + $sql .= " AND aa.pcg_type = 'INCOME'"; // TODO Be able to use a custom group |
|
245 | 245 | } |
246 | 246 | $sql .= " GROUP BY dm"; |
247 | 247 | $sql .= " ORDER BY dm"; |
@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | $month_current = strftime("%m", dol_now()); |
48 | 48 | $year_start = $year - ($nbofyear - 1); |
49 | 49 | } |
50 | -$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
51 | -$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
50 | +$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
51 | +$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere |
|
52 | 52 | |
53 | 53 | // We define date_start and date_end |
54 | 54 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | $sql .= " AND b.numero_compte = aa.account_number"; |
208 | 208 | $sql .= " AND aa.entity = ".$conf->entity; |
209 | 209 | $sql .= " AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'"; |
210 | - $sql .= " AND aa.pcg_type = 'EXPENSE'"; // TODO Be able to use a custom group |
|
210 | + $sql .= " AND aa.pcg_type = 'EXPENSE'"; // TODO Be able to use a custom group |
|
211 | 211 | } |
212 | 212 | //print $sql; |
213 | 213 |
@@ -97,8 +97,8 @@ |
||
97 | 97 | $month_current = dol_print_date(dol_now(), '%m'); |
98 | 98 | $year_start = $year; |
99 | 99 | } |
100 | -$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
101 | -$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
100 | +$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
101 | +$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere |
|
102 | 102 | // Quarter |
103 | 103 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
104 | 104 | $q = GETPOST("q", "int"); |