@@ -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"); |
@@ -126,8 +126,8 @@ |
||
126 | 126 | public $usage_bill_time; // Is the time spent on project must be invoiced or not |
127 | 127 | |
128 | 128 | /** |
129 | - * @var integer Event organization: Use Event Organization |
|
130 | - */ |
|
129 | + * @var integer Event organization: Use Event Organization |
|
130 | + */ |
|
131 | 131 | public $usage_organize_event; |
132 | 132 | |
133 | 133 | /** |
@@ -1800,7 +1800,7 @@ discard block |
||
1800 | 1800 | |
1801 | 1801 | foreach (array('internal', 'external') as $source) { |
1802 | 1802 | $tab = $origin_project->liste_contact(-1, $source); |
1803 | - if (is_array($tab) && count($tab)>0) { |
|
1803 | + if (is_array($tab) && count($tab) > 0) { |
|
1804 | 1804 | foreach ($tab as $contacttoadd) { |
1805 | 1805 | $clone_project->add_contact($contacttoadd['id'], $contacttoadd['code'], $contacttoadd['source'], $notrigger); |
1806 | 1806 | if ($clone_project->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { |
@@ -1985,7 +1985,7 @@ discard block |
||
1985 | 1985 | if ($tableName == "actioncomm") { |
1986 | 1986 | $sql .= " SET fk_project=".$this->id; |
1987 | 1987 | $sql .= " WHERE id=".((int) $elementSelectId); |
1988 | - } elseif (in_array($tableName, ["entrepot","mrp_mo","stocktransfer_stocktransfer"])) { |
|
1988 | + } elseif (in_array($tableName, ["entrepot", "mrp_mo", "stocktransfer_stocktransfer"])) { |
|
1989 | 1989 | $sql .= " SET fk_project=".$this->id; |
1990 | 1990 | $sql .= " WHERE rowid=".((int) $elementSelectId); |
1991 | 1991 | } else { |
@@ -2488,7 +2488,7 @@ discard block |
||
2488 | 2488 | $return .= '<br><div class="info-box-ref tdoverflowmax150 inline-block valignmiddle">'.$this->thirdparty->getNomUrl(1); |
2489 | 2489 | $return .= '</div><div class="inline-block valignmiddle">'; |
2490 | 2490 | $return .= dol_print_phone($this->thirdparty->phone, $this->thirdparty->country_code, 0, $this->thirdparty->id, 'tel', 'hidenum', 'phone'); |
2491 | - $return .='</div>'; |
|
2491 | + $return .= '</div>'; |
|
2492 | 2492 | } |
2493 | 2493 | if (!empty($arraydata['assignedusers'])) { |
2494 | 2494 | $return .= '<br>'; |
@@ -2506,7 +2506,7 @@ discard block |
||
2506 | 2506 | $return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Author").'</span>'; |
2507 | 2507 | $return .= '<span> : '.$user->getNomUrl(1).'</span>'; |
2508 | 2508 | }*/ |
2509 | - $return .= '<br><div>'; // start div line status |
|
2509 | + $return .= '<br><div>'; // start div line status |
|
2510 | 2510 | if ($this->usage_opportunity && $this->opp_status_code) { |
2511 | 2511 | //$return .= '<br><span class="info-bo-label opacitymedium">'.$langs->trans("OpportunityStatusShort").'</span>'; |
2512 | 2512 | //$return .= '<div class="small inline-block">'.dol_trunc($langs->trans("OppStatus".$this->opp_status_code), 5).'</div>'; |
@@ -2516,7 +2516,7 @@ discard block |
||
2516 | 2516 | if (method_exists($this, 'getLibStatut')) { |
2517 | 2517 | $return .= '<div class="info-box-status small inline-block">'.$this->getLibStatut(3).'</div>'; |
2518 | 2518 | } |
2519 | - $return .= '</div>'; // end div line status |
|
2519 | + $return .= '</div>'; // end div line status |
|
2520 | 2520 | |
2521 | 2521 | $return .= '</div>'; |
2522 | 2522 | $return .= '</div>'; |
@@ -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'; |
@@ -21,7 +21,10 @@ |
||
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')) { |
|
25 | + define('NOTOKENRENEWAL', '1'); |
|
26 | +} |
|
27 | +// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on) |
|
25 | 28 | |
26 | 29 | require "../../main.inc.php"; |
27 | 30 | 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); |