@@ -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")) { |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | dol_print_error($db, 'Failed to get payment id ' . $id); |
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | -restrictedArea($user, 'salaries', $object->fk_salary, 'salary', ''); // $object is payment of salary |
|
| 58 | +restrictedArea($user, 'salaries', $object->fk_salary, 'salary', ''); // $object is payment of salary |
|
| 59 | 59 | |
| 60 | 60 | |
| 61 | 61 | /* |
@@ -108,7 +108,7 @@ |
||
| 108 | 108 | // Create a line of payments |
| 109 | 109 | $paiement = new PaymentSalary($db); |
| 110 | 110 | $paiement->fk_salary = $id; |
| 111 | - $paiement->chid = $id; // deprecated |
|
| 111 | + $paiement->chid = $id; // deprecated |
|
| 112 | 112 | $paiement->datep = $datepaye; |
| 113 | 113 | $paiement->amounts = $amounts; // Tableau de montant |
| 114 | 114 | $paiement->fk_typepayment = GETPOSTINT("paiementtype"); |
@@ -91,10 +91,10 @@ |
||
| 91 | 91 | */ |
| 92 | 92 | |
| 93 | 93 | $parameters = array(); |
| 94 | -$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks |
|
| 94 | +$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks |
|
| 95 | 95 | // Delete Link |
| 96 | 96 | $permissiondellink = $user->hasRight('expedition', 'delivery', 'supprimer'); // Used by the include of actions_dellink.inc.php |
| 97 | -include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be include, not include_once |
|
| 97 | +include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be include, not include_once |
|
| 98 | 98 | |
| 99 | 99 | if ($action == 'add') { |
| 100 | 100 | $db->begin(); |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | $label = (string) GETPOST('label', 'alphanohtml'); |
| 51 | 51 | |
| 52 | 52 | $exporttype = GETPOSTISSET('exporttype') ? GETPOST('exporttype', 'alphanohtml') : 'deb'; // DEB or DES |
| 53 | -$type_declaration = (string) GETPOST('type_declaration', 'alphanohtml'); // 'introduction' or 'expedition' |
|
| 53 | +$type_declaration = (string) GETPOST('type_declaration', 'alphanohtml'); // 'introduction' or 'expedition' |
|
| 54 | 54 | |
| 55 | 55 | $backtopage = GETPOST('backtopage', 'alpha'); |
| 56 | 56 | |
@@ -124,8 +124,8 @@ discard block |
||
| 124 | 124 | |
| 125 | 125 | if ($action == 'add' && $permissiontoadd) { |
| 126 | 126 | $object->label = trim($label); |
| 127 | - $object->exporttype = trim($exporttype); // 'des' or 'deb' |
|
| 128 | - $object->type_declaration = $type_declaration; // 'introduction' or 'expedition' |
|
| 127 | + $object->exporttype = trim($exporttype); // 'des' or 'deb' |
|
| 128 | + $object->type_declaration = $type_declaration; // 'introduction' or 'expedition' |
|
| 129 | 129 | //$object->subscription = (int) $subscription; |
| 130 | 130 | |
| 131 | 131 | // Fill array 'array_options' with data from add form |