@@ -48,7 +48,7 @@ |
||
48 | 48 | 'receivable_on_assignment' => array('label' => 'AssetAccountancyCodeReceivableOnAssignment'), |
49 | 49 | 'proceeds_from_sales' => array('label' => 'AssetAccountancyCodeProceedsFromSales'), |
50 | 50 | 'vat_collected' => array('label' => 'AssetAccountancyCodeVatCollected'), |
51 | - 'vat_deductible' => array('label' => 'AssetAccountancyCodeVatDeductible','column_break' => true), |
|
51 | + 'vat_deductible' => array('label' => 'AssetAccountancyCodeVatDeductible', 'column_break' => true), |
|
52 | 52 | ), |
53 | 53 | ), |
54 | 54 | 'accelerated_depreciation' => array( |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | // Parameters |
36 | 36 | $action = GETPOST('action', 'aZ09'); |
37 | 37 | $backtopage = GETPOST('backtopage', 'alpha'); |
38 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
38 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
39 | 39 | |
40 | 40 | if (empty($action)) { |
41 | 41 | $action = 'edit'; |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | //'gemini' => 'Gemini' |
72 | 72 | ); |
73 | 73 | |
74 | -$item = $formSetup->newItem('AI_API_SERVICE'); // Name of constant must end with _KEY so it is encrypted when saved into database. |
|
74 | +$item = $formSetup->newItem('AI_API_SERVICE'); // Name of constant must end with _KEY so it is encrypted when saved into database. |
|
75 | 75 | $item->setAsSelect($arrayofia); |
76 | 76 | $item->cssClass = 'minwidth150'; |
77 | 77 | |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | $item->defaultFieldValue = ''; |
82 | 82 | $item->cssClass = 'minwidth500';*/ |
83 | 83 | |
84 | - $item = $formSetup->newItem('AI_API_' . strtoupper($ia) . '_KEY')->setAsSecureKey(); // Name of constant must end with _KEY so it is encrypted when saved into database. |
|
84 | + $item = $formSetup->newItem('AI_API_' . strtoupper($ia) . '_KEY')->setAsSecureKey(); // Name of constant must end with _KEY so it is encrypted when saved into database. |
|
85 | 85 | $item->nameText = $langs->trans("AI_API_KEY") . ' (' . $ialabel . ')'; |
86 | 86 | $item->defaultFieldValue = ''; |
87 | 87 | $item->fieldParams['hideGenerateButton'] = 1; |
@@ -34,7 +34,7 @@ |
||
34 | 34 | // Parameters |
35 | 35 | $action = GETPOST('action', 'aZ09'); |
36 | 36 | $backtopage = GETPOST('backtopage', 'alpha'); |
37 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
37 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
38 | 38 | |
39 | 39 | if (empty($action)) { |
40 | 40 | $action = 'edit'; |
@@ -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 |
@@ -19,11 +19,11 @@ |
||
19 | 19 | * or see https://www.gnu.org/ |
20 | 20 | */ |
21 | 21 | |
22 | - /** |
|
23 | - * \file htdocs/ai/class/ai.class.php |
|
24 | - * \ingroup ai |
|
25 | - * \brief Class files with common methods for Ai |
|
26 | - */ |
|
22 | + /** |
|
23 | + * \file htdocs/ai/class/ai.class.php |
|
24 | + * \ingroup ai |
|
25 | + * \brief Class files with common methods for Ai |
|
26 | + */ |
|
27 | 27 | |
28 | 28 | require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php"; |
29 | 29 | require_once constant('DOL_DOCUMENT_ROOT') . '/core/lib/geturl.lib.php'; |
@@ -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 |
@@ -688,7 +688,7 @@ discard block |
||
688 | 688 | } |
689 | 689 | |
690 | 690 | |
691 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
691 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
692 | 692 | /** |
693 | 693 | * Mise a jour du lien entre le paiement de salaire et la ligne dans llx_bank generee |
694 | 694 | * |
@@ -697,7 +697,7 @@ discard block |
||
697 | 697 | */ |
698 | 698 | public function update_fk_bank($id_bank) |
699 | 699 | { |
700 | - // phpcs:enable |
|
700 | + // phpcs:enable |
|
701 | 701 | $sql = "UPDATE " . MAIN_DB_PREFIX . "payment_salary SET fk_bank = " . ((int) $id_bank) . " WHERE rowid = " . ((int) $this->id); |
702 | 702 | |
703 | 703 | dol_syslog(get_class($this) . "::update_fk_bank", LOG_DEBUG); |
@@ -776,7 +776,7 @@ discard block |
||
776 | 776 | return $this->LibStatut($this->statut, $mode); |
777 | 777 | } |
778 | 778 | |
779 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
779 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
780 | 780 | /** |
781 | 781 | * Return the status |
782 | 782 | * |
@@ -786,7 +786,7 @@ discard block |
||
786 | 786 | */ |
787 | 787 | public function LibStatut($status, $mode = 0) |
788 | 788 | { |
789 | - // phpcs:enable |
|
789 | + // phpcs:enable |
|
790 | 790 | global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage |
791 | 791 | |
792 | 792 | $langs->load('compta'); |
@@ -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(); |