@@ -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"); |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | $result = $object->fetch($id); |
| 48 | 48 | if (!$result) dol_print_error($db, 'Failed to get payment id '.$id); |
| 49 | 49 | } |
| 50 | -restrictedArea($user, 'salaries', $object->fk_salary, 'salary', ''); // $object is payment of salary |
|
| 50 | +restrictedArea($user, 'salaries', $object->fk_salary, 'salary', ''); // $object is payment of salary |
|
| 51 | 51 | |
| 52 | 52 | |
| 53 | 53 | /* |
@@ -286,19 +286,19 @@ |
||
| 286 | 286 | |
| 287 | 287 | // sort list |
| 288 | 288 | if ($sortfield == "name" && $sortorder == "asc") { |
| 289 | - usort($moduleList, function (stdClass $a, stdClass $b) { |
|
| 289 | + usort($moduleList, function(stdClass $a, stdClass $b) { |
|
| 290 | 290 | return strcasecmp($a->name, $b->name); |
| 291 | 291 | }); |
| 292 | 292 | } elseif ($sortfield == "name" && $sortorder == "desc") { |
| 293 | - usort($moduleList, function (stdClass $a, stdClass $b) { |
|
| 293 | + usort($moduleList, function(stdClass $a, stdClass $b) { |
|
| 294 | 294 | return strcasecmp($b->name, $a->name); |
| 295 | 295 | }); |
| 296 | 296 | } elseif ($sortfield == "version" && $sortorder == "asc") { |
| 297 | - usort($moduleList, function (stdClass $a, stdClass $b) { |
|
| 297 | + usort($moduleList, function(stdClass $a, stdClass $b) { |
|
| 298 | 298 | return strcasecmp($a->version, $b->version); |
| 299 | 299 | }); |
| 300 | 300 | } elseif ($sortfield == "version" && $sortorder == "desc") { |
| 301 | - usort($moduleList, function (stdClass $a, stdClass $b) { |
|
| 301 | + usort($moduleList, function(stdClass $a, stdClass $b) { |
|
| 302 | 302 | return strcasecmp($b->version, $a->version); |
| 303 | 303 | }); |
| 304 | 304 | } elseif ($sortfield == "id" && $sortorder == "asc") { |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | * \brief Popup screen to validate VAT |
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | -if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on) |
|
| 24 | +if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on) |
|
| 25 | 25 | |
| 26 | 26 | require "../../main.inc.php"; |
| 27 | 27 | require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; |
@@ -469,7 +469,7 @@ |
||
| 469 | 469 | $object->fetch($obj->rowid); |
| 470 | 470 | $object->id = $obj->rowid; |
| 471 | 471 | |
| 472 | - $action = 'anonymize'; // TODO Offer also action "delete" in setup of module |
|
| 472 | + $action = 'anonymize'; // TODO Offer also action "delete" in setup of module |
|
| 473 | 473 | |
| 474 | 474 | if ($action == 'anonymize') { |
| 475 | 475 | if ($object->isObjectUsed($obj->rowid) == 0) { // If object to clean is used |
@@ -129,11 +129,11 @@ |
||
| 129 | 129 | unset($object->barcode_type_code); |
| 130 | 130 | unset($object->barcode_type_label); |
| 131 | 131 | |
| 132 | - unset($object->mode_reglement); // We use mode_reglement_id now |
|
| 133 | - unset($object->cond_reglement); // We use cond_reglement_id now |
|
| 134 | - unset($object->note); // We use note_public or note_private now |
|
| 135 | - unset($object->contact); // We use contact_id now |
|
| 136 | - unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now |
|
| 132 | + unset($object->mode_reglement); // We use mode_reglement_id now |
|
| 133 | + unset($object->cond_reglement); // We use cond_reglement_id now |
|
| 134 | + unset($object->note); // We use note_public or note_private now |
|
| 135 | + unset($object->contact); // We use contact_id now |
|
| 136 | + unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now |
|
| 137 | 137 | |
| 138 | 138 | unset($object->projet); // Should be fk_project |
| 139 | 139 | unset($object->project); // Should be fk_project |
@@ -193,7 +193,7 @@ |
||
| 193 | 193 | $facavoir->fetch($facid); |
| 194 | 194 | $invoicecredits[] = $facavoir->getNomUrl(1); |
| 195 | 195 | } |
| 196 | - print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')'; |
|
| 196 | + print ' ('.$langs->transnoentities("InvoiceHasAvoir").(count($invoicecredits) ? ' ' : '').implode(',', $invoicecredits).')'; |
|
| 197 | 197 | } |
| 198 | 198 | /* |
| 199 | 199 | if ($facidnext > 0) { |
@@ -335,10 +335,10 @@ |
||
| 335 | 335 | if (in_array($element, ['context1', 'context2'])) { |
| 336 | 336 | $datacount = 0; |
| 337 | 337 | |
| 338 | - $parameters['head'][$counter][0] = dol_buildpath('/mymodule/mymodule_tab.php', 1) . '?id=' . $id . '&module='.$element; |
|
| 338 | + $parameters['head'][$counter][0] = dol_buildpath('/mymodule/mymodule_tab.php', 1).'?id='.$id.'&module='.$element; |
|
| 339 | 339 | $parameters['head'][$counter][1] = $langs->trans('MyModuleTab'); |
| 340 | 340 | if ($datacount > 0) { |
| 341 | - $parameters['head'][$counter][1] .= '<span class="badge marginleftonlyshort">' . $datacount . '</span>'; |
|
| 341 | + $parameters['head'][$counter][1] .= '<span class="badge marginleftonlyshort">'.$datacount.'</span>'; |
|
| 342 | 342 | } |
| 343 | 343 | $parameters['head'][$counter][2] = 'mymoduleemails'; |
| 344 | 344 | $counter++; |
@@ -270,7 +270,7 @@ |
||
| 270 | 270 | $reponsesadd = str_split($obj->reponses); |
| 271 | 271 | $lengthresponses = count($reponsesadd); |
| 272 | 272 | for ($cpt = $lengthresponses; $cpt > $cleinsertion; $cpt--) { |
| 273 | - $reponsesadd[$cpt] = $reponsesadd[$cpt-1]; |
|
| 273 | + $reponsesadd[$cpt] = $reponsesadd[$cpt - 1]; |
|
| 274 | 274 | } |
| 275 | 275 | $reponsesadd[$cleinsertion] = '0'; |
| 276 | 276 | $reponsesadd = implode($reponsesadd); |