@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | |
| 144 | 144 | $object->fields = dol_sort_array($object->fields, 'position'); |
| 145 | 145 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
| 146 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
| 146 | +'@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 | 147 | |
| 148 | 148 | $permissiontoread = $user->hasRight('variants', 'read'); |
| 149 | 149 | $permissiontoadd = $user->hasRight('variants', 'write'); |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | //} |
| 325 | 325 | // Add where from hooks |
| 326 | 326 | $parameters = array(); |
| 327 | -$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook |
|
| 327 | +$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook |
|
| 328 | 328 | $sql .= $hookmanager->resPrint; |
| 329 | 329 | $sql = preg_replace("/,\s*$/", "", $sql); |
| 330 | 330 | |
@@ -513,7 +513,7 @@ discard block |
||
| 513 | 513 | } |
| 514 | 514 | |
| 515 | 515 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
| 516 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 516 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 517 | 517 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
| 518 | 518 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
| 519 | 519 | |
@@ -617,7 +617,7 @@ discard block |
||
| 617 | 617 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
| 618 | 618 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
| 619 | 619 | } |
| 620 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 620 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 621 | 621 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
| 622 | 622 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist'])) . "\n"; |
| 623 | 623 | $totalarray['nbfield']++; |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | |
| 344 | 344 | // Loop lines to calculate $totalqty |
| 345 | 345 | for ($i = 1; $i <= $num; $i++) { |
| 346 | - $idl = "idl" . $i; // id line source |
|
| 346 | + $idl = "idl" . $i; // id line source |
|
| 347 | 347 | |
| 348 | 348 | //$sub_qty = array(); |
| 349 | 349 | //$subtotalqty = 0; |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | //$j = 0; |
| 352 | 352 | //$batch = "batchl".$i."_0"; |
| 353 | 353 | //$stockLocation = "ent1".$i."_0"; |
| 354 | - $qty = "qtyl" . $i; // qty |
|
| 354 | + $qty = "qtyl" . $i; // qty |
|
| 355 | 355 | |
| 356 | 356 | //reception line for product with no batch management and no multiple stock location |
| 357 | 357 | if (GETPOST($qty, 'alpha') > 0) { |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | |
| 366 | 366 | if ($totalqty > 0) { // There is at least one thing to ship |
| 367 | 367 | for ($i = 1; $i <= $num; $i++) { |
| 368 | - $idl = "idl" . $i; // id line source |
|
| 368 | + $idl = "idl" . $i; // id line source |
|
| 369 | 369 | $lineToTest = ''; |
| 370 | 370 | $lineId = GETPOSTINT($idl); |
| 371 | 371 | foreach ($objectsrc->lines as $linesrc) { |
@@ -1144,7 +1144,7 @@ discard block |
||
| 1144 | 1144 | |
| 1145 | 1145 | print '<input type="hidden" name="productl' . $indiceAsked . '" value="' . $line->fk_product . '">'; |
| 1146 | 1146 | |
| 1147 | - if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1147 | + if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1148 | 1148 | print '<input type="hidden" name="productid' . $indiceAsked . '" value="' . $line->fk_product . '">'; |
| 1149 | 1149 | |
| 1150 | 1150 | // Show product and description |
@@ -1166,7 +1166,7 @@ discard block |
||
| 1166 | 1166 | print '</td>'; |
| 1167 | 1167 | } else { |
| 1168 | 1168 | print "<td>"; |
| 1169 | - if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1169 | + if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1170 | 1170 | if ($type == 1) { |
| 1171 | 1171 | $text = img_object($langs->trans('Service'), 'service'); |
| 1172 | 1172 | } else { |
@@ -1195,7 +1195,7 @@ discard block |
||
| 1195 | 1195 | |
| 1196 | 1196 | // Qty in source purchase order line |
| 1197 | 1197 | print '<td class="center">'; |
| 1198 | - if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1198 | + if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1199 | 1199 | print $line->qty; |
| 1200 | 1200 | } |
| 1201 | 1201 | print '<input type="hidden" name="fk_commandefournisseurdet' . $indiceAsked . '" value="' . $line->id . '">'; |
@@ -1207,7 +1207,7 @@ discard block |
||
| 1207 | 1207 | // Qty already received |
| 1208 | 1208 | print '<td class="center">'; |
| 1209 | 1209 | $quantityDelivered = $objectsrc->receptions[$line->id]; |
| 1210 | - if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1210 | + if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice |
|
| 1211 | 1211 | print $quantityDelivered; |
| 1212 | 1212 | } |
| 1213 | 1213 | print '<input name="qtydelivered' . $indiceAsked . '" id="qtydelivered' . $indiceAsked . '" type="hidden" value="' . $quantityDelivered . '">'; |
@@ -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'; |