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

fix various warning

Browse Source
This commit is contained in:
Florian HENRY 2021-10-22 10:49:47 +02:00
parent fe3e11a104
commit 64bb2e6ece
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
View File

@ -97,6 +97,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
} }
$sql .= " WHERE c.fk_soc = s.rowid"; $sql .= " WHERE c.fk_soc = s.rowid";
$sql .= " AND c.entity IN (".getEntity('supplier_order').")"; $sql .= " AND c.entity IN (".getEntity('supplier_order').")";
$sql .= " AND c.date_livraison IS NOT NULL";
$sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.")"; $sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.")";
if (!$user->rights->societe->client->voir && !$user->socid) { if (!$user->rights->societe->client->voir && !$user->socid) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id); $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

5
htdocs/user/class/user.class.php
View File

@ -289,6 +289,7 @@ class User extends CommonObject
*/ */
public $rights; public $rights;
/** /**
* @var int All permissions are loaded * @var int All permissions are loaded
*/ */
@ -365,6 +366,7 @@ class User extends CommonObject
*/ */
public function __construct($db) public function __construct($db)
{ {
global $conf;
$this->db = $db; $this->db = $db;
// User preference // User preference
@ -384,6 +386,9 @@ class User extends CommonObject
$this->rights->user = new stdClass(); $this->rights->user = new stdClass();
$this->rights->user->user = new stdClass(); $this->rights->user->user = new stdClass();
$this->rights->user->self = new stdClass(); $this->rights->user->self = new stdClass();
$this->rights->user->user_advance = new stdClass();
$this->rights->user->self_advance = new stdClass();
$this->rights->user->group_advance = new stdClass();
} }
/** /**