diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php index 05ddabc1cb6..e52f1d2c991 100644 --- a/htdocs/adherents/class/api_members.class.php +++ b/htdocs/adherents/class/api_members.class.php @@ -3,7 +3,7 @@ * Copyright (C) 2017 Regis Houssin * Copyright (C) 2020 Thibault FOUCART * Copyright (C) 2020-2025 Frédéric France - * Copyright (C) 2024-2025 MDW + * Copyright (C) 2024-2026 MDW * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -384,7 +384,7 @@ class Members extends DolibarrApi // This properties can't be set/modified with API throw new RestException(405, 'The property '.$field." can't be set/modified using the APIs"); } - if (in_array($field, array('user_id') && !DolibarrApiAccess::$user->hasRight('user', 'user', 'creer'))) { + if (in_array($field, array('user_id')) && !DolibarrApiAccess::$user->hasRight('user', 'user', 'creer')) { // This properties can't be set/modified with API without permission user->user->creer throw new RestException(405, 'The property '.$field." can't be set/modified using the APIs without permission user->user->create"); } @@ -438,7 +438,7 @@ class Members extends DolibarrApi // This properties can't be set/modified with API throw new RestException(405, 'The property '.$field." can't be set/modified using the APIs"); } - if (in_array($field, array('user_id') && !DolibarrApiAccess::$user->hasRight('user', 'user', 'creer'))) { + if (in_array($field, array('user_id')) && !DolibarrApiAccess::$user->hasRight('user', 'user', 'creer')) { // This properties can't be set/modified with API without permission user->user->creer throw new RestException(405, 'The property '.$field." can't be set/modified using the APIs without the permission user->user->create"); } diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 31e2595590d..5323201034b 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -752,6 +752,11 @@ if (($filtert != '-1' && $filtert != '-2') || $usergroup > 0) { } } +// Add table from hooks +$parameters = array(); +$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook +$sql .= $hookmanager->resPrint; + $sql .= " WHERE a.fk_action = ca.id"; $sql .= " AND a.entity IN (".getEntity('agenda').")"; // bookcal is a "virtual view" of agenda diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index fcaa3787480..5a7dde19cfb 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -898,7 +898,7 @@ if (empty($reshook)) { if (!$error) { // Actions on extra fields - $result = $object->updateExtraField($attribute_name, 'INTERVENTION_MODIFY'); + $result = $object->updateExtraField($attribute_name, 'FICHINTER_MODIFY'); if ($result < 0) { setEventMessages($object->error, $object->errors, 'errors'); $error++; diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 7df8f642140..9d873c03b78 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -314,7 +314,7 @@ SetMode=Set Payment Type SetRevenuStamp=Set revenue stamp RecurringInvoices=Recurring invoices RecurringInvoice=Recurring invoice -RecurringInvoiceSource=Source recurring invoice +RecurringInvoiceSource=Recurring invoice source RepeatableInvoice=Template invoice RepeatableInvoices=Template invoices RecurringInvoicesJob=Generation of recurring invoices (sales invoices)