@@ -48,13 +48,13 @@ discard block |
||
48 | 48 | $confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation |
49 | 49 | $cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button |
50 | 50 | $toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
51 | -$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'salestaxeslist'; |
|
51 | +$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'salestaxeslist'; |
|
52 | 52 | $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page |
53 | 53 | $optioncss = GETPOST('optioncss', 'alpha'); |
54 | 54 | $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
55 | 55 | $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...) |
56 | 56 | |
57 | -$search_ref = GETPOST('search_ref', 'alpha'); |
|
57 | +$search_ref = GETPOST('search_ref', 'alpha'); |
|
58 | 58 | $search_label = GETPOST('search_label', 'alpha'); |
59 | 59 | $search_dateend_start = dol_mktime(0, 0, 0, GETPOSTINT('search_dateend_startmonth'), GETPOSTINT('search_dateend_startday'), GETPOSTINT('search_dateend_startyear')); |
60 | 60 | $search_dateend_end = dol_mktime(23, 59, 59, GETPOSTINT('search_dateend_endmonth'), GETPOSTINT('search_dateend_endday'), GETPOSTINT('search_dateend_endyear')); |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | } |
100 | 100 | |
101 | 101 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
102 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
102 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
103 | 103 | |
104 | 104 | // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context |
105 | 105 | $hookmanager->initHooks(array('salestaxeslist')); |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | } |
407 | 407 | |
408 | 408 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
409 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
409 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
410 | 410 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
411 | 411 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
412 | 412 |
@@ -81,7 +81,7 @@ |
||
81 | 81 | } |
82 | 82 | $result = restrictedArea($user, 'tax', '', 'tva', 'charges'); |
83 | 83 | |
84 | -$permissiontoadd = $user->hasRight('tax', 'charges', 'creer'); // Used by the include of actions_dellink.inc.php |
|
84 | +$permissiontoadd = $user->hasRight('tax', 'charges', 'creer'); // Used by the include of actions_dellink.inc.php |
|
85 | 85 | |
86 | 86 | |
87 | 87 | /* |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | $month_current = (int) dol_print_date(dol_now(), "%m"); |
51 | 51 | $year_start = $year - $nbofyear + (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1); |
52 | 52 | } |
53 | -$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 |
|
54 | -$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 |
|
53 | +$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 |
|
54 | +$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 |
|
55 | 55 | |
56 | 56 | // We define date_start and date_end |
57 | 57 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | $sql .= " AND b.numero_compte = aa.account_number"; |
271 | 271 | $sql .= " AND aa.entity = " . $conf->entity; |
272 | 272 | $sql .= " AND aa.fk_pcg_version = '" . $db->escape($pcgvercode) . "'"; |
273 | - $sql .= " AND aa.pcg_type = 'EXPENSE'"; // TODO Be able to use a custom group |
|
273 | + $sql .= " AND aa.pcg_type = 'EXPENSE'"; // TODO Be able to use a custom group |
|
274 | 274 | } |
275 | 275 | $sql .= " GROUP BY dm"; |
276 | 276 | $sql .= " ORDER BY dm"; |
@@ -93,8 +93,8 @@ discard block |
||
93 | 93 | $month_current = (int) dol_print_date(dol_now(), "%m"); |
94 | 94 | $year_start = $year - $nbofyear + (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1); |
95 | 95 | } |
96 | -$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 |
|
97 | -$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 |
|
96 | +$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 |
|
97 | +$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 |
|
98 | 98 | |
99 | 99 | // We define date_start and date_end |
100 | 100 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | $address_town[$obj->socid] = $obj->town; |
370 | 370 | $address_pays[$obj->socid] = getCountry($obj->fk_pays); |
371 | 371 | |
372 | - $catotal_ht += (empty($obj->amount) ? 0 : $obj->amount); |
|
372 | + $catotal_ht += (empty($obj->amount) ? 0 : $obj->amount); |
|
373 | 373 | $catotal += $obj->amount_ttc; |
374 | 374 | |
375 | 375 | $i++; |
@@ -82,7 +82,7 @@ |
||
82 | 82 | $year_start = $year; |
83 | 83 | } |
84 | 84 | $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 |
85 | -$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 |
|
85 | +$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 |
|
86 | 86 | // Quarter |
87 | 87 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
88 | 88 | $q = GETPOSTINT("q"); |
@@ -56,7 +56,7 @@ |
||
56 | 56 | $year_start = $year; |
57 | 57 | } |
58 | 58 | $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 |
59 | -$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 |
|
59 | +$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 |
|
60 | 60 | |
61 | 61 | // Quarter |
62 | 62 | $q = ''; |
@@ -86,8 +86,8 @@ |
||
86 | 86 | $month_current = (int) dol_print_date(dol_now(), "%m"); |
87 | 87 | $year_start = $year - $nbofyear + (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1); |
88 | 88 | } |
89 | -$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 |
|
90 | -$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 |
|
89 | +$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 |
|
90 | +$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 |
|
91 | 91 | |
92 | 92 | // We define date_start and date_end |
93 | 93 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
@@ -105,7 +105,7 @@ |
||
105 | 105 | $year_start = $year; |
106 | 106 | } |
107 | 107 | $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 |
108 | -$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 |
|
108 | +$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 |
|
109 | 109 | // Quarter |
110 | 110 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
111 | 111 | $q = GETPOSTINT("q") ? GETPOSTINT("q") : 0; |
@@ -53,8 +53,8 @@ discard block |
||
53 | 53 | $month_current = dol_print_date(dol_now(), "%m"); |
54 | 54 | $year_start = $year - $nbofyear + (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1); |
55 | 55 | } |
56 | -$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 |
|
57 | -$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 |
|
56 | +$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 |
|
57 | +$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 |
|
58 | 58 | |
59 | 59 | // We define date_start and date_end |
60 | 60 | if (empty($date_start) || empty($date_end)) { // We define date_start and date_end |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | $sql .= " AND b.doc_type = 'customer_invoice'"; |
257 | 257 | $sql .= " AND aa.entity = " . $conf->entity; |
258 | 258 | $sql .= " AND aa.fk_pcg_version = '" . $db->escape($pcgvercode) . "'"; |
259 | - $sql .= " AND aa.pcg_type = 'INCOME'"; // TODO Be able to use a custom group |
|
259 | + $sql .= " AND aa.pcg_type = 'INCOME'"; // TODO Be able to use a custom group |
|
260 | 260 | } |
261 | 261 | $sql .= " GROUP BY dm"; |
262 | 262 | $sql .= " ORDER BY dm"; |