lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Laurent Destailleur 2022-06-14 16:21:12 +02:00
commit 866fc4d83e
3 changed files with 485 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dev/dolibarr_changes.txt
View File

@ -276,6 +276,13 @@ RESTLER:
$loaders = array_unique(static::$rogueLoaders, SORT_REGULAR); $loaders = array_unique(static::$rogueLoaders, SORT_REGULAR);
* Replace CommentParser.php line 423
elseif (count($value) && is_numeric($value[0]))
with
elseif (count($value) && isset($value[0]) && is_numeric($value[0]))
+With swagger 2 provided into /explorer: +With swagger 2 provided into /explorer:
---------------------------------------- ----------------------------------------

2
htdocs/comm/propal/card.php
View File

@ -124,7 +124,7 @@ $usercancreateorder = $user->rights->commande->creer;
$usercancreateinvoice = $user->rights->facture->creer; $usercancreateinvoice = $user->rights->facture->creer;
$usercancreatecontract = $user->rights->contrat->creer; $usercancreatecontract = $user->rights->contrat->creer;
$usercancreateintervention = $user->hasRight('ficheinter', 'creer'); $usercancreateintervention = $user->hasRight('ficheinter', 'creer');
$usercancreatepurchaseorder = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer); $usercancreatepurchaseorder = ($user->hasRight('fournisseur', 'commande', 'creer') || $user->hasRight('supplier_order', 'creer'));
$permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php $permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php
$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php $permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php

3
htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
View File

@ -107,7 +107,6 @@ class CommentParser
$p->extractData($comment); $p->extractData($comment);
return $p->_data; return $p->_data;
} }
/** /**
@ -420,7 +419,7 @@ class CommentParser
$exception = $v1; $exception = $v1;
array_shift($value); array_shift($value);
} }
} elseif (count($value) && is_numeric($value[0])) { } elseif (count($value) && isset($value[0]) && is_numeric($value[0])) {
$code = $value[0]; $code = $value[0];
array_shift($value); array_shift($value);
} }