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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2023-04-25 20:55:30 +02:00
commit 302f5eb68d
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/commande/class/commande.class.php
View File

@ -3727,6 +3727,7 @@ class Commande extends CommonOrder
{
global $conf, $langs, $user;
$langs->load('orders');
$datas = [];
$nofetch = !empty($params['nofetch']);

22
htdocs/compta/facture/class/facture.class.php
View File

@ -114,22 +114,42 @@ class Facture extends CommonInvoice
public $author;
/**
* @var int ID
* @deprecated
* @see $fk_user_author
*/
public $user_author;
/**
* @var int ID
*/
public $fk_user_author;
/**
* @var int ID
* @deprecated
* @see $fk_user_valid
*/
public $user_valid;
/**
* @var int ID
*/
public $fk_user_valid;
/**
* @var int ID
* @deprecated
* @see $fk_uesr_modif
*/
public $user_modification;
/**
* @var int ID
*/
public $fk_user_modif;
public $date; // Date invoice
public $datem;

8
htdocs/core/lib/security.lib.php
View File

@ -336,7 +336,7 @@ function dolGetLdapPasswordHash($password, $type = 'md5')
* @param string $features Features to check (it must be module name or $object->element. Can be a 'or' check with 'levela|levelb'.
* Examples: 'societe', 'contact', 'produit&service', 'produit|service', ...)
* This is used to check permission $user->rights->features->...
* @param int|string|object $object Object or Object ID or list of Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
* @param int|string|Object $object Object or Object ID or list of Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
* @param string $tableandshare 'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany module. Param not used if objectid is null (optional).
* @param string $feature2 Feature to check, second level of permission (optional). Can be a 'or' check with 'sublevela|sublevelb'.
* This is used to check permission $user->rights->features->feature2...
@ -401,11 +401,11 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
if ($features == 'productbatch') {
$features = 'produit';
}
if ($features == 'fournisseur') { // When vendor invoice and pruchase order are into module 'fournisseur'
if ($features == 'fournisseur') { // When vendor invoice and purchase order are into module 'fournisseur'
$features = 'fournisseur';
if ($object->element == 'invoice_supplier') {
if (is_object($object) && $object->element == 'invoice_supplier') {
$feature2 = 'facture';
} elseif ($object->element == 'order_supplier') {
} elseif (is_object($object) && $object->element == 'order_supplier') {
$feature2 = 'commande';
}
}