diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 37435f6b0cb..cb01acc2e45 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -4,7 +4,7 @@ * Copyright (C) 2013 Juanjo Menent * Copyright (C) 2016 Jonathan TISSEAU * Copyright (C) 2023 Anthony Berton - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024-2025 MDW * * This program is free software; you can redistribute it and/or modify @@ -68,12 +68,12 @@ $substitutionarrayfortest = array( '__SENDEREMAIL_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''), // Done into actions_sendmails //'__ID__' => 'RecipientID', //'__EMAIL__' => 'RecipientEMail', // Done into actions_sendmails - '__LASTNAME__' => $langs->trans("Lastname").' ('.$langs->trans("Recipient").')', - '__FIRSTNAME__' => $langs->trans("Firstname").' ('.$langs->trans("Recipient").')', - //'__ADDRESS__'=> $langs->trans("Address").' ('.$langs->trans("Recipient").')', - //'__ZIP__'=> $langs->trans("Zip").' ('.$langs->trans("Recipient").')', - //'__TOWN_'=> $langs->trans("Town").' ('.$langs->trans("Recipient").')', - //'__COUNTRY__'=> $langs->trans("Country").' ('.$langs->trans("Recipient").')', + '__LASTNAME__' => $langs->trans("Lastname").' ('.$langs->trans("MailRecipient").')', + '__FIRSTNAME__' => $langs->trans("Firstname").' ('.$langs->trans("MailRecipient").')', + //'__ADDRESS__'=> $langs->trans("Address").' ('.$langs->trans("MailRecipient").')', + //'__ZIP__'=> $langs->trans("Zip").' ('.$langs->trans("MailRecipient").')', + //'__TOWN_'=> $langs->trans("Town").' ('.$langs->trans("MailRecipient").')', + //'__COUNTRY__'=> $langs->trans("Country").' ('.$langs->trans("MailRecipient").')', '__DOL_MAIN_URL_ROOT__' => DOL_MAIN_URL_ROOT, '__CHECK_READ__' => '', ); diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php index f0dbbd884c1..b0ac57c956b 100644 --- a/htdocs/core/actions_massactions.inc.php +++ b/htdocs/core/actions_massactions.inc.php @@ -248,7 +248,7 @@ if (!$error && $massaction == 'confirm_presend') { } if (!trim(GETPOST('sendto', 'alphawithlgt')) && count($receiver) == 0 && count($listofobjectthirdparties) == 1) { // if only one recipient, receiver is mandatory $error++; - setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Recipient")), null, 'warnings'); + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MailRecipient")), null, 'warnings'); $massaction = 'presend'; } diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 3a82dc1d029..2e53465afbf 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -346,6 +346,12 @@ class Conf extends stdClass * @var stdClass */ public $productbatch; + + /** + * @var stdClass + */ + public $api; + /** * @var ?stdClass * @deprecated Use project diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 2eec22e20d3..37c56cce7ff 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -15011,6 +15011,7 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '', $us $className = $element_prop['classname']; $objecttmp = new $className($db); '@phan-var-force CommonObject $objecttmp'; + /** @var CommonObject $objecttmp */ if ($element_id > 0 || !empty($element_ref)) { $ret = $objecttmp->fetch($element_id, $element_ref); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 3ab373ff21c..7cdba6b1406 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -967,6 +967,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM // Force the typing at this point to get useful analysis below: '@phan-var-force array,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,positionfull:int|string,showtopmenuinframe:int,level?:int,prefix:string}> $menu_array'; + /** @var array,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,positionfull:int|string,showtopmenuinframe:int,level?:int,prefix:string}> $menu_array */ // Show menu diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index 089ccdb4f6e..83f74081d11 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -100,7 +100,7 @@ ToAndDate=To___________________________________ on ____/_____/__________ GoodStatusDeclaration=Have received the goods above in good condition, Deliverer=Deliverer: Sender=Sender -Recipient=Recipient +Recipient=Delivery recipient ErrorStockIsNotEnough=There's not enough stock Shippable=Shippable NonShippable=Not Shippable diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang index 159fe540d46..23fb33a1c58 100644 --- a/htdocs/langs/fr_FR/sendings.lang +++ b/htdocs/langs/fr_FR/sendings.lang @@ -99,7 +99,7 @@ ToAndDate=A___________________________________ le ____/_____/__________ GoodStatusDeclaration=Déclare avoir reçu les marchandises ci-dessus en bon état, Deliverer=Livreur(s) : Sender=Émetteur -Recipient=Email fixe cible destinataires +Recipient=Destinataire ErrorStockIsNotEnough=Le stock est insuffisant Shippable=Expédiable NonShippable=Non expédiable