From 5a30ee1014c6bf975cecaf6538a92511e866164f Mon Sep 17 00:00:00 2001 From: Aksanti Bahiga tacite <71480535+marcellintacite@users.noreply.github.com> Date: Sun, 9 Nov 2025 21:32:16 +0300 Subject: [PATCH 1/3] Add phone info in form public/members/new.php (#36119) * Add phone info in form public/members/new.php * Use GETPOST instead of GETPOSTISSET --- htdocs/public/members/new.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 6aaef140ce7..8bbf2b9b505 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -419,6 +419,9 @@ if (empty($reshook) && $action == 'add') { // Test on permission not required he $adh->note_private = GETPOST('note_private'); $adh->morphy = getDolGlobalString("MEMBER_NEWFORM_FORCEMORPHY", GETPOST('morphy')); $adh->birth = $birthday; + $adh->phone = GETPOST('phone'); + $adh->phone_perso = GETPOST('phone_perso'); + $adh->phone_mobile= GETPOST('phone_mobile'); $adh->ip = getUserRemoteIP(); @@ -902,6 +905,18 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR print ''; } + // Pro phone + print ''.$langs->trans("PhonePro").''; + print ''.img_picto('', 'object_phoning', 'class="pictofixedwidth"').''; + + // Personal phone + print ''.$langs->trans("PhonePerso").''; + print ''.img_picto('', 'object_phoning', 'class="pictofixedwidth"').''; + + // Mobile phone + print ''.$langs->trans("PhoneMobile").''; + print ''.img_picto('', 'object_phoning_mobile', 'class="pictofixedwidth"').''; + // Birthday print ''.$langs->trans("DateOfBirth").''; print $form->selectDate(!empty($birthday) ? $birthday : "", 'birth', 0, 0, 1, "newmember", 1, 0); From 8c983073a3b6f6ae9e8687a8ddd07edba67681ce Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 9 Nov 2025 19:58:50 +0100 Subject: [PATCH 2/3] FIX wrong path of libraries (#36194) --- htdocs/public/webportal/tpl/header.tpl.php | 4 ++-- htdocs/public/webportal/tpl/header_login.tpl.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/public/webportal/tpl/header.tpl.php b/htdocs/public/webportal/tpl/header.tpl.php index 3153e031a8f..e1788702c22 100644 --- a/htdocs/public/webportal/tpl/header.tpl.php +++ b/htdocs/public/webportal/tpl/header.tpl.php @@ -66,10 +66,10 @@ top_httphead(); // JQuery //$jQueryJSUrl = $context->rootUrl.'includes/jquery/js/jquery.js'; //$jQueryJSUrl = dol_buildpath('/includes/jquery/js/jquery.js', 2); - $jQueryJSUrl = dirname($context->rootUrl).'/includes/jquery/jquery.min.js'; + $jQueryJSUrl = dirname($context->rootUrl).'/includes/jquery/js/jquery.min.js'; print ''."\n"; - $jQueryUIJSUrl = dirname($context->rootUrl).'/includes/jquery/jquery-ui.min.js'; + $jQueryUIJSUrl = dirname($context->rootUrl).'/includes/jquery/js/jquery-ui.min.js'; print ''."\n"; // JNotify diff --git a/htdocs/public/webportal/tpl/header_login.tpl.php b/htdocs/public/webportal/tpl/header_login.tpl.php index 2665d7e184e..26e371d548f 100644 --- a/htdocs/public/webportal/tpl/header_login.tpl.php +++ b/htdocs/public/webportal/tpl/header_login.tpl.php @@ -46,7 +46,7 @@ top_httphead(); // JQuery //$jQueryJSUrl = $context->rootUrl.'includes/jquery/js/jquery.js'; //$jQueryJSUrl = dol_buildpath('/includes/jquery/js/jquery.js', 2); - $jQueryJSUrl = dirname($context->rootUrl).'/includes/jquery/jquery.min.js'; + $jQueryJSUrl = dirname($context->rootUrl).'/includes/jquery/js/jquery.min.js'; print ''."\n"; // JNotify From 48defa3a87c8e786ce1ad1283ca420e4f159aea3 Mon Sep 17 00:00:00 2001 From: William Mead Date: Sun, 9 Nov 2025 19:59:10 +0100 Subject: [PATCH 3/3] Updated PHPDoc (#36191) Co-authored-by: Laurent Destailleur --- .../stock/class/api_stockmovements.class.php | 10 ++++- .../stock/class/api_warehouses.class.php | 44 ++++++++++++------- 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php index b9bcb49fb4a..41c351ec44d 100644 --- a/htdocs/product/stock/class/api_stockmovements.class.php +++ b/htdocs/product/stock/class/api_stockmovements.class.php @@ -25,6 +25,8 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; /** * API class for stock movements * + * @since 5.0.0 Initial implementation + * * @access protected * @class DolibarrApiAccess {@requires user,external} */ @@ -59,6 +61,8 @@ class StockMovements extends DolibarrApi * * Return an array with stock movement information * + * @since 5.0.0 Initial implementation + * * @param int $id ID of movement * @return Object Object with cleaned properties * @@ -84,7 +88,9 @@ class StockMovements extends DolibarrApi }*/ /** - * Get a list of stock movement + * Get a list of stock movements + * + * @since 5.0.0 Initial implementation * * @param string $sortfield Sort field * @param string $sortorder Sort order @@ -181,6 +187,8 @@ class StockMovements extends DolibarrApi * $eatBy Eat-by date. Will be used if a batch does not exist yet and will be created. * sellBy Sell-by date. Will be used if a batch does not exist yet and will be created. * + * @since 5.0.0 Initial implementation + * * @param int $product_id ID product id {@min 1} {@from body} {@required true} * @param int $warehouse_id ID warehouse {@min 1} {@from body} {@required true} * @param float $qty Qty to add (Use negative value for a stock decrease) {@from body} {@required true} diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php index a63bc07338c..b26f35a8aa6 100644 --- a/htdocs/product/stock/class/api_warehouses.class.php +++ b/htdocs/product/stock/class/api_warehouses.class.php @@ -25,6 +25,8 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/api_products.class.php'; /** * API class for warehouses * + * @since 5.0.0 Initial implementation + * * @access protected * @class DolibarrApiAccess {@requires user,external} */ @@ -57,8 +59,10 @@ class Warehouses extends DolibarrApi * * Return an array with warehouse information * + * @since 5.0.0 Initial implementation + * * @param int $id ID of warehouse - * @return Object Object with cleaned properties + * @return Object Object with cleaned properties * * @url GET {id} * @@ -192,7 +196,9 @@ class Warehouses extends DolibarrApi /** - * Create warehouse object + * Create a warehouse + * + * @since 5.0.0 Initial implementation * * @param array $request_data Request data * @phan-param ?array $request_data @@ -238,13 +244,15 @@ class Warehouses extends DolibarrApi } /** - * Update warehouse + * Update a warehouse * - * @param int $id Id of warehouse to update - * @param array $request_data Data + * @since 5.0.0 Initial implementation + * + * @param int $id ID of warehouse to update + * @param array $request_data Data * @phan-param ?array $request_data * @phpstan-param ?array $request_data - * @return Object Updated object + * @return Object Updated object * * @url PUT {id} * @@ -307,10 +315,12 @@ class Warehouses extends DolibarrApi } /** - * Delete warehouse + * Delete a warehouse * - * @param int $id Warehouse ID - * @return array + * @since 5.0.0 Initial implementation + * + * @param int $id Warehouse ID + * @return array * @phan-return array{success:array{code:int,message:string}} * @phpstan-return array{success:array{code:int,message:string}} * @@ -352,24 +362,24 @@ class Warehouses extends DolibarrApi } /** - * List Product in warehouses + * List products in a warehouse * - * Get a list of product in a warehouse + * Get a list of products for a warehouse * * @since 23.0.0 Initial implementation * - * @param int $id warehouse ID + * @param int $id warehouse ID {@min 1} {@from body} {@required true} * @param string $sortfield Sort field * @param string $sortorder Sort order - * @param int $limit Limit for list + * @param int $limit Limit for list * @param int $page Page number * @param int $includestockdata 1=Load also information about stock (slower), 0=No stock data (faster) (default) - * @param bool $includesubproducts Load information about subproducts - * @param bool $includeparentid Load also ID of parent product (if product is a variant of a parent product) + * @param bool $includesubproducts Load information about subproducts + * @param bool $includeparentid Load also ID of parent product (if product is a variant of a parent product) * @param bool $includetrans Load also the translations of product label and description - * @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names + * @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names * @param bool $pagination_data If this parameter is set to true the response will include pagination data. Default value is false. Page starts from 0 - * @return array Array of product in warehouse + * @return array Array of product in warehouse * * @phan-return Product[] * @phpstan-return Product[]