@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | |
39 | 39 | // Load translation files required by the page |
40 | -$langs->loadLangs(array('hrm', 'other', 'products')); // why products? |
|
40 | +$langs->loadLangs(array('hrm', 'other', 'products')); // why products? |
|
41 | 41 | |
42 | 42 | // Get parameters |
43 | 43 | $id = GETPOSTINT('id'); |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'skillcard'; // To manage different context of search |
49 | 49 | $backtopage = GETPOST('backtopage', 'alpha'); |
50 | 50 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); |
51 | -$lineid = GETPOSTINT('lineid'); |
|
51 | +$lineid = GETPOSTINT('lineid'); |
|
52 | 52 | |
53 | 53 | // Initialize technical objects |
54 | 54 | $object = new Skill($db); |
@@ -533,7 +533,7 @@ discard block |
||
533 | 533 | |
534 | 534 | // Default sort order (if not yet defined by previous GETPOST) |
535 | 535 | if (!$sortfield) { |
536 | - reset($objectline->fields); // Reset is required to avoid key() to return null. |
|
536 | + reset($objectline->fields); // Reset is required to avoid key() to return null. |
|
537 | 537 | $sortfield = "t." . key($objectline->fields); // Set here default search field. By default 1st field in definition. |
538 | 538 | } |
539 | 539 | if (!$sortorder) { |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | // Default sort order (if not yet defined by previous GETPOST) |
86 | 86 | if (!$sortfield) { |
87 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
87 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
88 | 88 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
89 | 89 | } |
90 | 90 | if (!$sortorder) { |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | $sql .= $object->getFieldList('t'); |
228 | 228 | $sql .= ','; |
229 | 229 | $sql .= $userstatic->getFieldList('u', array('rowid')); |
230 | -$sql .= ', u.email, u.statut, u.photo, u.login'; // Add more field not yet into the user->fields |
|
230 | +$sql .= ', u.email, u.statut, u.photo, u.login'; // Add more field not yet into the user->fields |
|
231 | 231 | $sql .= ', j.rowid as job_id, j.label as job_label'; |
232 | 232 | // Add fields from extrafields |
233 | 233 | if (!empty($extrafields->attributes[$object->table_element]['label'])) { |
@@ -571,7 +571,7 @@ discard block |
||
571 | 571 | } 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'])) { |
572 | 572 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
573 | 573 | } |
574 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
574 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
575 | 575 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
576 | 576 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : '')) . "\n"; |
577 | 577 | $totalarray['nbfield']++; |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | |
84 | 84 | // Default sort order (if not yet defined by previous GETPOST) |
85 | 85 | if (!$sortfield) { |
86 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
86 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
87 | 87 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
88 | 88 | } |
89 | 89 | if (!$sortorder) { |
@@ -560,7 +560,7 @@ discard block |
||
560 | 560 | } 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'])) { |
561 | 561 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
562 | 562 | } |
563 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
563 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
564 | 564 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
565 | 565 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : '')) . "\n"; |
566 | 566 | $totalarray['nbfield']++; |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | $action = GETPOST('action', 'aZ09'); |
39 | 39 | $value = GETPOST('value', 'alpha'); |
40 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
40 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
41 | 41 | |
42 | 42 | if (!$user->admin) { |
43 | 43 | accessforbidden(); |
@@ -665,7 +665,7 @@ discard block |
||
665 | 665 | print '<td class="center">' . $langs->trans("MustBeInvoiceMandatory") . '</td>'; |
666 | 666 | print "</tr>\n"; |
667 | 667 | |
668 | -$profid = array('IDPROF1' => array(), 'IDPROF2' => array(), 'IDPROF3' => array(), 'IDPROF4' => array(), 'IDPROF5' => array(),'IDPROF6' => array(), 'EMAIL' => array()); |
|
668 | +$profid = array('IDPROF1' => array(), 'IDPROF2' => array(), 'IDPROF3' => array(), 'IDPROF4' => array(), 'IDPROF5' => array(), 'IDPROF6' => array(), 'EMAIL' => array()); |
|
669 | 669 | $profid['IDPROF1'][0] = $langs->trans("ProfId1"); |
670 | 670 | $profid['IDPROF1'][1] = $langs->transcountry('ProfId1', $mysoc->country_code); |
671 | 671 | $profid['IDPROF2'][0] = $langs->trans("ProfId2"); |
@@ -87,7 +87,7 @@ |
||
87 | 87 | } |
88 | 88 | |
89 | 89 | // Generate list of companies |
90 | -if (! $socid) { |
|
90 | +if (!$socid) { |
|
91 | 91 | echo json_encode(array('nom' => 'ErrorBadParameter', 'label' => 'ErrorBadParameter', 'key' => 'ErrorBadParameter', 'value' => 'ErrorBadParameter')); |
92 | 92 | exit; |
93 | 93 | } |
@@ -105,7 +105,7 @@ |
||
105 | 105 | $match = preg_grep('/(' . preg_quote($htmlname, '/') . '[0-9]+)/', array_keys($_GET)); |
106 | 106 | sort($match); |
107 | 107 | |
108 | - $id = (!empty($match[0]) ? $match[0] : ''); // Take first key found into GET array with matching $htmlname123 |
|
108 | + $id = (!empty($match[0]) ? $match[0] : ''); // Take first key found into GET array with matching $htmlname123 |
|
109 | 109 | |
110 | 110 | // When used from jQuery, the search term is added as GET param $htmlname. |
111 | 111 | $searchkey = (($id && GETPOST($id, 'alpha')) ? GETPOST($id, 'alpha') : (($htmlname && GETPOST($htmlname, 'alpha')) ? GETPOST($htmlname, 'alpha') : '')); |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | |
206 | 206 | if ($action == 'confirm_merge' && $confirm == 'yes' && $user->hasRight('societe', 'creer')) { |
207 | 207 | $soc_origin_id = GETPOSTINT('soc_origin'); |
208 | - $soc_origin = new Societe($db); // The thirdparty that we will delete |
|
208 | + $soc_origin = new Societe($db); // The thirdparty that we will delete |
|
209 | 209 | |
210 | 210 | if ($soc_origin_id <= 0) { |
211 | 211 | $langs->load('errors'); |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | } |
400 | 400 | } |
401 | 401 | if (GETPOSTISSET('accountancy_code_buy')) { |
402 | - $accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha'); |
|
402 | + $accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha'); |
|
403 | 403 | |
404 | 404 | if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') { |
405 | 405 | $object->accountancy_code_buy = ''; |
@@ -1030,7 +1030,7 @@ discard block |
||
1030 | 1030 | $object->default_lang = GETPOST('default_lang'); |
1031 | 1031 | |
1032 | 1032 | if (GETPOSTISSET('accountancy_code_sell')) { |
1033 | - $accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha'); |
|
1033 | + $accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha'); |
|
1034 | 1034 | |
1035 | 1035 | if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') { |
1036 | 1036 | $object->accountancy_code_sell = ''; |
@@ -1039,7 +1039,7 @@ discard block |
||
1039 | 1039 | } |
1040 | 1040 | } |
1041 | 1041 | if (GETPOSTISSET('accountancy_code_buy')) { |
1042 | - $accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha'); |
|
1042 | + $accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha'); |
|
1043 | 1043 | |
1044 | 1044 | if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') { |
1045 | 1045 | $object->accountancy_code_buy = ''; |
@@ -1236,7 +1236,7 @@ discard block |
||
1236 | 1236 | print '</td><td' . (!getDolGlobalString('SOCIETE_USEPREFIX') ? ' colspan="3"' : '') . '>'; |
1237 | 1237 | |
1238 | 1238 | print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="' . dol_escape_htmltag($object->name) . '" autofocus="autofocus">'; |
1239 | - print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alphanohtml', 'minwidth300'); // For some countries that need the company name in 2 languages |
|
1239 | + print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alphanohtml', 'minwidth300'); // For some countries that need the company name in 2 languages |
|
1240 | 1240 | // This implementation of the feature to search already existing company has been disabled. It must be implemented by keeping the "input text" and we must call the search ajax societe/ajax/ajaxcompanies.php |
1241 | 1241 | // on a keydown of the input. We should show data about a duplicate found if we found less than 5 answers into a div under the input. |
1242 | 1242 | /* |
@@ -1898,14 +1898,14 @@ discard block |
||
1898 | 1898 | $object->tva_assuj = GETPOSTINT('assujtva_value'); |
1899 | 1899 | $object->vat_reverse_charge = GETPOST('vat_reverse_charge') == 'on' ? 1 : 0; |
1900 | 1900 | $object->tva_intra = GETPOST('tva_intra', 'alphanohtml'); |
1901 | - $object->status = GETPOSTINT('status'); |
|
1901 | + $object->status = GETPOSTINT('status'); |
|
1902 | 1902 | |
1903 | 1903 | // Webservices url/key |
1904 | 1904 | $object->webservices_url = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL); |
1905 | 1905 | $object->webservices_key = GETPOST('webservices_key', 'san_alpha'); |
1906 | 1906 | |
1907 | 1907 | if (GETPOSTISSET('accountancy_code_sell')) { |
1908 | - $accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha'); |
|
1908 | + $accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha'); |
|
1909 | 1909 | |
1910 | 1910 | if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') { |
1911 | 1911 | $object->accountancy_code_sell = ''; |
@@ -1914,7 +1914,7 @@ discard block |
||
1914 | 1914 | } |
1915 | 1915 | } |
1916 | 1916 | if (GETPOSTISSET('accountancy_code_buy')) { |
1917 | - $accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha'); |
|
1917 | + $accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha'); |
|
1918 | 1918 | |
1919 | 1919 | if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') { |
1920 | 1920 | $object->accountancy_code_buy = ''; |
@@ -2537,7 +2537,7 @@ discard block |
||
2537 | 2537 | $maxfilesizearray = getMaxFileSizeArray(); |
2538 | 2538 | $maxmin = $maxfilesizearray['maxmin']; |
2539 | 2539 | if ($maxmin > 0) { |
2540 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
2540 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
2541 | 2541 | } |
2542 | 2542 | print '<input type="file" class="flat" name="photo" id="photoinput">'; |
2543 | 2543 | print '</td></tr>'; |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | // Ajout |
299 | 299 | $companybankaccount = new CompanyBankAccount($db); |
300 | 300 | |
301 | - $companybankaccount->socid = $object->id; |
|
301 | + $companybankaccount->socid = $object->id; |
|
302 | 302 | |
303 | 303 | $companybankaccount->fetch_thirdparty(); |
304 | 304 | |
@@ -525,8 +525,8 @@ discard block |
||
525 | 525 | 'use_companybankid' => GETPOST('companybankid'), |
526 | 526 | 'force_dir_output' => $conf->societe->multidir_output[$object->entity] . '/' . dol_sanitizeFileName($object->id) |
527 | 527 | ); |
528 | - $_POST['lang_id'] = GETPOST('lang_idrib' . GETPOSTINT('companybankid'), 'alphanohtml'); // This is required by core/action_builddoc.inc.php |
|
529 | - $_POST['model'] = GETPOST('modelrib' . GETPOSTINT('companybankid'), 'alphanohtml'); // This is required by core/action_builddoc.inc.php |
|
528 | + $_POST['lang_id'] = GETPOST('lang_idrib' . GETPOSTINT('companybankid'), 'alphanohtml'); // This is required by core/action_builddoc.inc.php |
|
529 | + $_POST['model'] = GETPOST('modelrib' . GETPOSTINT('companybankid'), 'alphanohtml'); // This is required by core/action_builddoc.inc.php |
|
530 | 530 | } |
531 | 531 | |
532 | 532 | $id = $socid; |
@@ -596,7 +596,7 @@ discard block |
||
596 | 596 | } |
597 | 597 | if ($action == 'syncsepatostripe') { |
598 | 598 | // Create the bank account on current Stripe env |
599 | - $companypaymentmode = new CompanyPaymentMode($db); // Get record in llx_societe_rib |
|
599 | + $companypaymentmode = new CompanyPaymentMode($db); // Get record in llx_societe_rib |
|
600 | 600 | $companypaymentmode->fetch($id); |
601 | 601 | |
602 | 602 | if ($companypaymentmode->type != 'ban') { |
@@ -1197,7 +1197,7 @@ discard block |
||
1197 | 1197 | print '<table class="liste centpercent">' . "\n"; |
1198 | 1198 | print '<tr class="liste_titre">'; |
1199 | 1199 | print '<td>' . $langs->trans('Label') . '</td>'; |
1200 | - print '<td>' . $form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem")) . '</td>'; // external system ID |
|
1200 | + print '<td>' . $form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem")) . '</td>'; // external system ID |
|
1201 | 1201 | print '<td>' . $langs->trans('Type') . '</td>'; |
1202 | 1202 | print '<td>' . $langs->trans('Informations') . '</td>'; |
1203 | 1203 | print '<td></td>'; |
@@ -1556,7 +1556,7 @@ discard block |
||
1556 | 1556 | |
1557 | 1557 | print '<tr class="liste_titre">'; |
1558 | 1558 | print_liste_field_titre("Label"); |
1559 | - print_liste_field_titre($form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem"))); // external system ID |
|
1559 | + print_liste_field_titre($form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem"))); // external system ID |
|
1560 | 1560 | print_liste_field_titre("Bank"); |
1561 | 1561 | print_liste_field_titre("RIB"); |
1562 | 1562 | print_liste_field_titre("IBAN"); |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | } |
78 | 78 | |
79 | 79 | |
80 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
80 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
81 | 81 | /** |
82 | 82 | * Assign custom values for canvas (for example into this->tpl to be used by templates) |
83 | 83 | * |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | */ |
89 | 89 | public function assign_values(&$action, $id = 0, $ref = '') |
90 | 90 | { |
91 | - // phpcs:enable |
|
91 | + // phpcs:enable |
|
92 | 92 | global $conf, $langs, $user, $mysoc; |
93 | 93 | global $form, $formcompany; |
94 | 94 |