@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $search_date_delivery_endday = GETPOSTINT('search_date_delivery_endday'); |
69 | 69 | $search_date_delivery_endmonth = GETPOSTINT('search_date_delivery_endmonth'); |
70 | 70 | $search_date_delivery_endyear = GETPOSTINT('search_date_delivery_endyear'); |
71 | -$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear); // Use tzserver |
|
71 | +$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear); // Use tzserver |
|
72 | 72 | $search_date_delivery_end = dol_mktime(23, 59, 59, $search_date_delivery_endmonth, $search_date_delivery_endday, $search_date_delivery_endyear); |
73 | 73 | $search_date_create_startday = GETPOSTINT('search_date_create_startday'); |
74 | 74 | $search_date_create_startmonth = GETPOSTINT('search_date_create_startmonth'); |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | $search_date_create_endday = GETPOSTINT('search_date_create_endday'); |
77 | 77 | $search_date_create_endmonth = GETPOSTINT('search_date_create_endmonth'); |
78 | 78 | $search_date_create_endyear = GETPOSTINT('search_date_create_endyear'); |
79 | -$search_date_create_start = dol_mktime(0, 0, 0, $search_date_create_startmonth, $search_date_create_startday, $search_date_create_startyear); // Use tzserver |
|
79 | +$search_date_create_start = dol_mktime(0, 0, 0, $search_date_create_startmonth, $search_date_create_startday, $search_date_create_startyear); // Use tzserver |
|
80 | 80 | $search_date_create_end = dol_mktime(23, 59, 59, $search_date_create_endmonth, $search_date_create_endday, $search_date_create_endyear); |
81 | 81 | $search_billed = GETPOST("search_billed", 'intcomma'); |
82 | 82 | $search_status = GETPOST('search_status', 'intcomma'); |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | |
145 | 145 | $object->fields = dol_sort_array($object->fields, 'position'); |
146 | 146 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
147 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
147 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
148 | 148 | |
149 | 149 | $error = 0; |
150 | 150 | |
@@ -336,7 +336,7 @@ discard block |
||
336 | 336 | // if the VAT reverse-charge is activated by default in supplier card to resume the information |
337 | 337 | $objecttmp->vat_reverse_charge = $soc->vat_reverse_charge; |
338 | 338 | |
339 | - $objecttmp->fk_project = $rcp->fk_project; |
|
339 | + $objecttmp->fk_project = $rcp->fk_project; |
|
340 | 340 | //$objecttmp->multicurrency_code = $rcp->multicurrency_code; |
341 | 341 | if (empty($createbills_onebythird)) { |
342 | 342 | $objecttmp->ref_supplier = $rcp->ref; |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | } |
370 | 370 | } |
371 | 371 | |
372 | - $res = $objecttmp->create($user); // This should create the supplier invoice + links into $objecttmp->linked_objects + add a link to ->origin_id |
|
372 | + $res = $objecttmp->create($user); // This should create the supplier invoice + links into $objecttmp->linked_objects + add a link to ->origin_id |
|
373 | 373 | |
374 | 374 | //var_dump($objecttmp->error);exit; |
375 | 375 | if ($res > 0) { |
@@ -576,7 +576,7 @@ discard block |
||
576 | 576 | $db->rollback(); |
577 | 577 | |
578 | 578 | $action = 'create'; |
579 | - $_GET["origin"] = $_POST["origin"]; // Keep this ? |
|
579 | + $_GET["origin"] = $_POST["origin"]; // Keep this ? |
|
580 | 580 | $_GET["originid"] = $_POST["originid"]; // Keep this ? |
581 | 581 | setEventMessages($object->error, $errors, 'errors'); |
582 | 582 | $error++; |
@@ -33,9 +33,9 @@ |
||
33 | 33 | |
34 | 34 | // If socid provided by ajax company selector |
35 | 35 | if (GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha')) { |
36 | - $_GET['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha'); // Keep this ? |
|
37 | - $_POST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha'); // Keep this ? |
|
38 | - $_REQUEST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha'); // Keep this ? |
|
36 | + $_GET['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha'); // Keep this ? |
|
37 | + $_POST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha'); // Keep this ? |
|
38 | + $_REQUEST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha'); // Keep this ? |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | // Security check |
@@ -39,8 +39,8 @@ |
||
39 | 39 | accessforbidden('Auto order is not allwed'); // If Auto Order is disabled never allow access to this page (that is a NO LOGIN access) |
40 | 40 | } |
41 | 41 | |
42 | -$_SESSION["basiclayout"] = 1; // For the simple layout for public submission |
|
43 | -$_SESSION["takeposterminal"] = getDolGlobalInt('TAKEPOS_TERMINAL_NB_FOR_PUBLIC', 1); // Default terminal for public submission is 1 |
|
42 | +$_SESSION["basiclayout"] = 1; // For the simple layout for public submission |
|
43 | +$_SESSION["takeposterminal"] = getDolGlobalInt('TAKEPOS_TERMINAL_NB_FOR_PUBLIC', 1); // Default terminal for public submission is 1 |
|
44 | 44 | |
45 | 45 | define('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE', 1); |
46 | 46 | if (GETPOSTISSET("mobilepage")) { |
@@ -202,7 +202,7 @@ |
||
202 | 202 | $i++; |
203 | 203 | |
204 | 204 | if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS') { |
205 | - $keyforprovider = ''; // @BUG This must be set |
|
205 | + $keyforprovider = ''; // @BUG This must be set |
|
206 | 206 | |
207 | 207 | // Token |
208 | 208 | print '<tr class="oddeven">'; |
@@ -104,7 +104,7 @@ |
||
104 | 104 | $match = preg_grep('/(' . preg_quote($htmlname, '/') . '[0-9]+)/', array_keys($_GET)); |
105 | 105 | sort($match); |
106 | 106 | |
107 | - $id = (!empty($match[0]) ? $match[0] : ''); // Take first key found into GET array with matching $htmlname123 |
|
107 | + $id = (!empty($match[0]) ? $match[0] : ''); // Take first key found into GET array with matching $htmlname123 |
|
108 | 108 | |
109 | 109 | // When used from jQuery, the search term is added as GET param "term". |
110 | 110 | $searchkey = (($id && GETPOST($id, 'alpha')) ? GETPOST($id, 'alpha') : (($htmlname && GETPOST($htmlname, 'alpha')) ? GETPOST($htmlname, 'alpha') : '')); |
@@ -94,7 +94,7 @@ |
||
94 | 94 | } |
95 | 95 | $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission |
96 | 96 | |
97 | -$permissiontoadd = $user->hasRight('societe', 'contact', 'creer'); // Used by the include of actions_dellink.inc.php |
|
97 | +$permissiontoadd = $user->hasRight('societe', 'contact', 'creer'); // Used by the include of actions_dellink.inc.php |
|
98 | 98 | |
99 | 99 | |
100 | 100 | /* |
@@ -337,7 +337,7 @@ |
||
337 | 337 | print '<table class="border centpercent tableforfield">' . "\n"; |
338 | 338 | |
339 | 339 | // Common attributes |
340 | - $keyforbreak = 'date_acquisition'; // We change column just before this field |
|
340 | + $keyforbreak = 'date_acquisition'; // We change column just before this field |
|
341 | 341 | //unset($object->fields['fk_project']); // Hide field already shown in banner |
342 | 342 | //unset($object->fields['fk_soc']); // Hide field already shown in banner |
343 | 343 | include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php'; |
@@ -64,7 +64,7 @@ |
||
64 | 64 | $ai = new Ai($db); |
65 | 65 | |
66 | 66 | // Get parameters |
67 | -$function = empty($jsonData['function']) ? 'textgeneration' : $jsonData['function']; // Default value. Can also be 'textgenerationemail', 'textgenerationwebpage', ... |
|
67 | +$function = empty($jsonData['function']) ? 'textgeneration' : $jsonData['function']; // Default value. Can also be 'textgenerationemail', 'textgenerationwebpage', ... |
|
68 | 68 | $instructions = dol_string_nohtmltag($jsonData['instructions'], 1, 'UTF-8'); |
69 | 69 | $format = empty($jsonData['format']) ? '' : $jsonData['format']; |
70 | 70 |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | // Create a line of payments |
301 | 301 | $paiement = new PaymentSalary($db); |
302 | 302 | $paiement->fk_salary = $object->id; |
303 | - $paiement->chid = $object->id; // deprecated |
|
303 | + $paiement->chid = $object->id; // deprecated |
|
304 | 304 | $paiement->datep = $datep; |
305 | 305 | $paiement->datev = $datev; |
306 | 306 | $paiement->amounts = array($object->id => $amount); // Tableau de montant |
@@ -621,7 +621,7 @@ discard block |
||
621 | 621 | |
622 | 622 | // Auto create payment |
623 | 623 | print '<tr><td><label for="auto_create_paiement">' . $langs->trans('AutomaticCreationPayment') . '</label></td>'; |
624 | - print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_paiement) ? '' : 'checked="checked"') . ' value="1"></td></tr>' . "\n"; // Date payment |
|
624 | + print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_paiement) ? '' : 'checked="checked"') . ' value="1"></td></tr>' . "\n"; // Date payment |
|
625 | 625 | |
626 | 626 | // Bank |
627 | 627 | if (isModEnabled("bank")) { |