Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0

Browse Source
This commit is contained in:
ldestailleur
2025-08-20 19:43:21 +02:00
parent 4e90457cd6 751dfd561e
commit 770cc4c1ff
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/modulebuilder/template/class/actions_mymodule.class.php
View File

@@ -301,13 +301,14 @@ class ActionsMyModule extends CommonHookActions
* Overload the restrictedArea function : check permission on an object
*
* @param array<string,mixed> $parameters Hook metadata (context, etc...)
* @param CommonObject $object The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
* @param string $action Current action (if set). Generally create or edit or null
* @param HookManager $hookmanager Hook manager propagated to allow calling another hook
* @return int Return integer <0 if KO,
* =0 if OK but we want to process standard actions too,
* >0 if OK and we want to replace standard actions.
*/
public function restrictedArea($parameters, &$action, $hookmanager)
public function restrictedArea($parameters, $object, &$action, $hookmanager)
{
global $user;
@@ -380,7 +381,7 @@ class ActionsMyModule extends CommonHookActions
/**
* Overload the showLinkToObjectBlock function : add or replace array of object likable
* Overload the showLinkToObjectBlock function : add or replace array of object linkable
*
* @param array<string,mixed> $parameters Hook metadata (context, etc...)
* @param CommonObject $object The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)

15
htdocs/product/stock/product.php
View File

@@ -89,6 +89,21 @@ if (!empty($batchnumber)) {
}
$cost_price = GETPOST('cost_price', 'alpha');
// Load variable for pagination
$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma');
$sortorder = GETPOST('sortorder', 'aZ09comma');
$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT('page');
if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
// If $page is not defined, or '' or -1 or if we click on clear filters
$page = 0;
}
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
// Security check
if ($user->socid) {
$socid = $user->socid;