@@ -142,7 +142,7 @@ |
||
| 142 | 142 | |
| 143 | 143 | $calc = getDolGlobalString('MAIN_INFO_LOCALTAX_CALC').$local; |
| 144 | 144 | // Affiche en-tete du rapport |
| 145 | -$description=''; |
|
| 145 | +$description = ''; |
|
| 146 | 146 | if ($calc == 0 || $calc == 1) { // Calculate on invoice for goods and services |
| 147 | 147 | $calcmode = $calc == 0 ? $langs->trans("CalcModeLT".$local) : $langs->trans("CalcModeLT".$local."Rec"); |
| 148 | 148 | $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>'; |
@@ -124,8 +124,8 @@ |
||
| 124 | 124 | // Ref customer |
| 125 | 125 | //$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', 0, 1); |
| 126 | 126 | //$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', null, null, '', 1); |
| 127 | - $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1); |
|
| 128 | - $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1); |
|
| 127 | + $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1); |
|
| 128 | + $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1); |
|
| 129 | 129 | // Thirdparty |
| 130 | 130 | $morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'customer'); |
| 131 | 131 | // Project |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | unset($_SESSION["dol_login"]); |
| 51 | 51 | unset($_SESSION['dol_entity']); |
| 52 | 52 | unset($_SESSION['urlfrom']); |
| 53 | - die("Applicative disconnection should be useless when connection was made in mode ".$_SESSION["dol_authmode"]); // TODO Really ? It at least delete the session file ?! |
|
| 53 | + die("Applicative disconnection should be useless when connection was made in mode ".$_SESSION["dol_authmode"]); // TODO Really ? It at least delete the session file ?! |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | //global $conf, $langs, $user; |
@@ -142,12 +142,12 @@ |
||
| 142 | 142 | $messagewarning .= '</div>'; |
| 143 | 143 | |
| 144 | 144 | if ($result <= 0 && $edituser->error == 'USERNOTFOUND') { |
| 145 | - usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
| 145 | + usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
| 146 | 146 | $message .= $messagewarning; |
| 147 | 147 | $username = ''; |
| 148 | 148 | } else { |
| 149 | 149 | if (empty($edituser->email)) { |
| 150 | - usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
| 150 | + usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s) |
|
| 151 | 151 | $message .= $messagewarning; |
| 152 | 152 | } else { |
| 153 | 153 | $newpassword = $edituser->setPassword($user, '', 1); |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | |
| 43 | 43 | $type = GETPOST('type', 'alpha'); |
| 44 | 44 | $value = GETPOST('value', 'alpha'); |
| 45 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 45 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 46 | 46 | |
| 47 | 47 | $label = GETPOST('label', 'alpha'); |
| 48 | 48 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -24,8 +24,8 @@ discard block |
||
| 24 | 24 | * \brief Page with information on database tables. Add also some maintenance action to convert tables. |
| 25 | 25 | */ |
| 26 | 26 | |
| 27 | -if (! defined('CSRFCHECK_WITH_TOKEN')) { |
|
| 28 | - define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET |
|
| 27 | +if (!defined('CSRFCHECK_WITH_TOKEN')) { |
|
| 28 | + define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | // Load Dolibarr environment |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | //print $shortsqlfilename.' '; |
| 115 | 115 | $shortsqlfilename = preg_replace('/\-[a-z]+\./', '.', $value['name']); |
| 116 | 116 | $arrayoffiles[$value['name']] = $shortsqlfilename; |
| 117 | - if ($value['name'] == $shortsqlfilename && ! preg_match('/\.key\.sql$/', $value['name'])) { |
|
| 117 | + if ($value['name'] == $shortsqlfilename && !preg_match('/\.key\.sql$/', $value['name'])) { |
|
| 118 | 118 | // This is a sql file automatically created |
| 119 | 119 | $arrayoftablesautocreated[$value['name']] = $shortsqlfilename; |
| 120 | 120 | } |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | |
| 133 | 133 | print '<tr class="oddeven">'; |
| 134 | 134 | |
| 135 | - print '<td>'.($i+1).'</td>'; |
|
| 135 | + print '<td>'.($i + 1).'</td>'; |
|
| 136 | 136 | print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a>'; |
| 137 | 137 | $tablename = preg_replace('/^'.MAIN_DB_PREFIX.'/', 'llx_', $obj->Name); |
| 138 | 138 | |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | while ($i < $num) { |
| 205 | 205 | $row = $db->fetch_row($resql); |
| 206 | 206 | print '<tr class="oddeven">'; |
| 207 | - print '<td>'.($i+1).'</td>'; |
|
| 207 | + print '<td>'.($i + 1).'</td>'; |
|
| 208 | 208 | print '<td>'.$row[0].'</td>'; |
| 209 | 209 | print '<td class="right">'.$row[1].'</td>'; |
| 210 | 210 | print '<td class="right">'.$row[2].'</td>'; |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | } |
| 244 | 244 | |
| 245 | 245 | print '<tr class="oddeven">'; |
| 246 | - print '<td>'.($i+1).'</td>'; |
|
| 246 | + print '<td>'.($i + 1).'</td>'; |
|
| 247 | 247 | print '<td>'.$row[0].'</td>'; |
| 248 | 248 | print '<td>'.$count.'</td>'; |
| 249 | 249 | print '</tr>'; |
@@ -28,8 +28,8 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | |
| 30 | 30 | require '../main.inc.php'; |
| 31 | -require_once DOL_DOCUMENT_ROOT . '/bom/lib/bom.lib.php'; |
|
| 32 | -require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; |
|
| 31 | +require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php'; |
|
| 32 | +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; |
|
| 33 | 33 | |
| 34 | 34 | // Load translation files required by the page |
| 35 | 35 | $langs->loadLangs(array('mrp', 'admin')); |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | * Actions |
| 58 | 58 | */ |
| 59 | 59 | |
| 60 | -require DOL_DOCUMENT_ROOT . '/core/actions_extrafields.inc.php'; |
|
| 60 | +require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; |
|
| 61 | 61 | |
| 62 | 62 | |
| 63 | 63 | /* |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | llxHeader('', $langs->trans("BOMsSetup"), $help_url); |
| 69 | 69 | |
| 70 | 70 | |
| 71 | -$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>'; |
|
| 71 | +$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>'; |
|
| 72 | 72 | print load_fiche_titre($langs->trans("BOMsSetup"), $linkback, 'title_setup'); |
| 73 | 73 | |
| 74 | 74 | |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | |
| 77 | 77 | print dol_get_fiche_head($head, 'bomline_extrafields', $langs->trans("ExtraFields"), -1, 'account'); |
| 78 | 78 | |
| 79 | -require DOL_DOCUMENT_ROOT . '/core/tpl/admin_extrafields_view.tpl.php'; |
|
| 79 | +require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; |
|
| 80 | 80 | |
| 81 | 81 | print dol_get_fiche_end(); |
| 82 | 82 | |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | // Buttons |
| 85 | 85 | if ($action != 'create' && $action != 'edit') { |
| 86 | 86 | print '<div class="tabsAction">'; |
| 87 | - print '<a class="butAction reposition" href="' . $_SERVER["PHP_SELF"] . '?action=create">' . $langs->trans("NewAttribute") . '</a>'; |
|
| 87 | + print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>'; |
|
| 88 | 88 | print "</div>"; |
| 89 | 89 | } |
| 90 | 90 | |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | print '<br><div id="newattrib"></div>'; |
| 97 | 97 | print load_fiche_titre($langs->trans('NewAttribute')); |
| 98 | 98 | |
| 99 | - require DOL_DOCUMENT_ROOT . '/core/tpl/admin_extrafields_add.tpl.php'; |
|
| 99 | + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | /* |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | print "<br>"; |
| 107 | 107 | print load_fiche_titre($langs->trans("FieldEdition", $attrname)); |
| 108 | 108 | |
| 109 | - require DOL_DOCUMENT_ROOT . '/core/tpl/admin_extrafields_edit.tpl.php'; |
|
| 109 | + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | // End of page |
@@ -199,12 +199,12 @@ discard block |
||
| 199 | 199 | print '<div class="div-table-responsive-no-min">'; |
| 200 | 200 | print '<table class="noborder centpercent">'; |
| 201 | 201 | print '<tr class="liste_titre">'; |
| 202 | -print getTitleFieldOfList('Name', 0, $_SERVER['PHP_SELF'], 'name', '', $param, '', $sortfield, $sortorder, '') . "\n"; |
|
| 202 | +print getTitleFieldOfList('Name', 0, $_SERVER['PHP_SELF'], 'name', '', $param, '', $sortfield, $sortorder, '')."\n"; |
|
| 203 | 203 | print getTitleFieldOfList("Value", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder); |
| 204 | 204 | print getTitleFieldOfList("Comment", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder); |
| 205 | -print getTitleFieldOfList('DateModificationShort', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ') . "\n"; |
|
| 205 | +print getTitleFieldOfList('DateModificationShort', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n"; |
|
| 206 | 206 | if (isModEnabled('multicompany') && !$user->entity) { |
| 207 | - print getTitleFieldOfList('Entity', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ') . "\n"; |
|
| 207 | + print getTitleFieldOfList('Entity', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n"; |
|
| 208 | 208 | } |
| 209 | 209 | print getTitleFieldOfList("", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center '); |
| 210 | 210 | print "</tr>\n"; |
@@ -227,12 +227,12 @@ discard block |
||
| 227 | 227 | // Limit to superadmin |
| 228 | 228 | if (isModEnabled('multicompany') && !$user->entity) { |
| 229 | 229 | print '<td>'; |
| 230 | - print '<input type="text" class="flat" size="1" name="entity" value="' . $conf->entity . '">'; |
|
| 230 | + print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">'; |
|
| 231 | 231 | print '</td>'; |
| 232 | 232 | print '<td class="center">'; |
| 233 | 233 | } else { |
| 234 | 234 | print '<td class="center">'; |
| 235 | - print '<input type="hidden" name="entity" value="' . $conf->entity . '">'; |
|
| 235 | + print '<input type="hidden" name="entity" value="'.$conf->entity.'">'; |
|
| 236 | 236 | } |
| 237 | 237 | print '<input type="submit" class="button button-add small" id="add" name="add" value="'.$langs->trans("Add").'">'; |
| 238 | 238 | print "</td>\n"; |
@@ -56,8 +56,8 @@ |
||
| 56 | 56 | |
| 57 | 57 | // Permissions |
| 58 | 58 | $permissionnote = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); // Used by the include of actions_setnotes.inc.php |
| 59 | -$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
| 60 | -$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
| 59 | +$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
| 60 | +$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
| 61 | 61 | |
| 62 | 62 | |
| 63 | 63 | /* |