Prepare v21

Dolibarr · Jan 7, 2025 · 75c2c93 · 75c2c93
1 parent 1db2897
commit 75c2c93
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -7,6 +7,7 @@ English Dolibarr ChangeLog
 For users:
 ----------
 NEW: NEW Module - help to setup OpenID Connect (#30317)
+NEW: Module AI moved from experimental to stable
 NEW: Add hidden option CONTRACT_HIDE_MYCOMPANY_SIGNATURE_SECTION_PDF
 NEW: Add a tab on recurring invoice card to see the list of invoices generated from this recurring invoice (customer and supplier invoices) (#31463)
 NEW: #28871 signed_status to commande (#30359)

diff --git a/htdocs/ai/admin/custom_prompt.php b/htdocs/ai/admin/custom_prompt.php
@@ -281,23 +281,29 @@
 	$out .= '</tr>';
 	$out .= '<tr class="oddeven">';
 	$out .= '<td class="col-setup-title">';
-	$out .= '<span id="prePrompt" class="spanforparamtooltip">'.$langs->trans("Pre-Prompt").'</span>';
+	$out .= '<span id="prePrompt" class="spanforparamtooltip">';
+	$out .= $form->textwithpicto($langs->trans("Pre-Prompt"), $langs->trans("Pre-PromptHelp"));
+	$out .= '</span>';
 	$out .= '</td>';
 	$out .= '<td>';
 	$out .= '<textarea class="flat minwidth500 quatrevingtpercent" id="prePromptInput" name="prePrompt" rows="3"></textarea>';
 	$out .= '</td>';
 	$out .= '</tr>';
 	$out .= '<tr class="oddeven">';
 	$out .= '<td class="col-setup-title">';
-	$out .= '<span id="postPrompt" class="spanforparamtooltip">'.$langs->trans("Post-Prompt").'</span>';
+	$out .= '<span id="postPrompt" class="spanforparamtooltip">';
+	$out .= $form->textwithpicto($langs->trans("Post-Prompt"), $langs->trans("Post-PromptHelp"));
+	$out .= '</span>';
 	$out .= '</td>';
 	$out .= '<td>';
 	$out .= '<textarea class="flat minwidth500 quatrevingtpercent" id="postPromptInput" name="postPrompt" rows="3"></textarea>';
 	$out .= '</td>';
 	$out .= '</tr>';
 	$out .= '<tr class="oddeven">';
 	$out .= '<td class="col-setup-title">';
-	$out .= '<span id="blacklists" class="spanforparamtooltip">'.$langs->trans("BlackListWords").' '.img_help(1, 'Words must be separated by a coma (",")').'</span>';
+	$out .= '<span id="blacklists" class="spanforparamtooltip">';
+	$out .= $form->textwithpicto($langs->trans("BlackListWords"), $langs->trans("BlackListWordsAIHelp").'.<br>'.$langs->trans("BlackListWordsHelp"));
+	$out .= '</span>';
 	$out .= '</td>';
 	$out .= '<td>';
 	$out .= '<textarea class="flat minwidth500 quatrevingtpercent" id="blacklistsInput" name="blacklists" rows="3"></textarea>';

diff --git a/htdocs/core/modules/modAi.class.php b/htdocs/core/modules/modAi.class.php
@@ -69,7 +69,7 @@ public function __construct($db)
 		$this->descriptionlong = "AiDescriptionLong";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = 'experimental';
+		$this->version = 'dolibarr';
 
 		// Key used in llx_const table to save module status enabled/disabled (where BOOKCAL is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
@@ -2507,7 +2507,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2557,6 +2557,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse