@@ -118,7 +118,7 @@ |
||
118 | 118 | if ($this->apiService == 'groq') { |
119 | 119 | $this->apiEndpoint = 'https://api.groq.com/openai/v1/chat/completions'; |
120 | 120 | if ($model == 'auto') { |
121 | - $model = getDolGlobalString('AI_API_GROK_MODEL_TEXT', 'mixtral-8x7b-32768'); // 'llama3-8b-8192', 'gemma-7b-it' |
|
121 | + $model = getDolGlobalString('AI_API_GROK_MODEL_TEXT', 'mixtral-8x7b-32768'); // 'llama3-8b-8192', 'gemma-7b-it' |
|
122 | 122 | } |
123 | 123 | } elseif ($this->apiService == 'chatgpt') { |
124 | 124 | $this->apiEndpoint = 'https://api.openai.com/v1/chat/completions'; |
@@ -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 | /* |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | } else { |
177 | 177 | //Checking error |
178 | 178 | $error = 0; |
179 | - $listofSalries = array(); |
|
179 | + $listofSalries = array(); |
|
180 | 180 | $arrayofselected = is_array($toselect) ? $toselect : array(); |
181 | 181 | foreach ($arrayofselected as $toselectid) { |
182 | 182 | $objecttmp = new Salary($db); |
@@ -439,7 +439,7 @@ discard block |
||
439 | 439 | // Output page |
440 | 440 | // -------------------------------------------------------------------- |
441 | 441 | |
442 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
442 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
443 | 443 | |
444 | 444 | $arrayofselected = is_array($toselect) ? $toselect : array(); |
445 | 445 | |
@@ -566,7 +566,7 @@ discard block |
||
566 | 566 | } |
567 | 567 | |
568 | 568 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
569 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
569 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
570 | 570 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
571 | 571 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
572 | 572 | |
@@ -733,7 +733,7 @@ discard block |
||
733 | 733 | $userstatic->login = $obj->login; |
734 | 734 | $userstatic->email = $obj->email; |
735 | 735 | $userstatic->socid = $obj->fk_soc; |
736 | - $userstatic->statut = $obj->status; // deprecated |
|
736 | + $userstatic->statut = $obj->status; // deprecated |
|
737 | 737 | $userstatic->status = $obj->status; |
738 | 738 | $userstatic->photo = $obj->photo; |
739 | 739 |
@@ -294,7 +294,7 @@ |
||
294 | 294 | $this->amount = $totalamount; |
295 | 295 | $this->total = $totalamount; // deprecated |
296 | 296 | $this->db->commit(); |
297 | - return $this->id; // id of the last payment inserted |
|
297 | + return $this->id; // id of the last payment inserted |
|
298 | 298 | } else { |
299 | 299 | $this->error = $this->db->error(); |
300 | 300 | $this->db->rollback(); |
@@ -619,7 +619,7 @@ |
||
619 | 619 | } elseif ($multicurrency) { |
620 | 620 | //$this->sumpayed_multicurrency = $obj->multicurrency_amount; |
621 | 621 | //return (float) $obj->multicurrency_amount; |
622 | - return -1; // Not yet supported |
|
622 | + return -1; // Not yet supported |
|
623 | 623 | } else { |
624 | 624 | //$this->sumpayed = $obj->amount; |
625 | 625 | return (float) $obj->amount; |
@@ -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 |