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

Merge pull request #19086 from FHenry/14_fix_various_warning

Browse Source 
fix: fix various php warning
This commit is contained in:
Laurent Destailleur 2021-10-22 11:39:48 +02:00 committed by GitHub
commit e4a757ff9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 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);

2
htdocs/core/lib/admin.lib.php
View File

@ -1101,7 +1101,7 @@ function activateModule($value, $withdeps = 1)
if (!count($ret['errors'])) { if (!count($ret['errors'])) {
$ret['nbmodules']++; $ret['nbmodules']++;
$ret['nbperms'] += count($objMod->rights); $ret['nbperms'] += (is_array($objMod->rights)?count($objMod->rights):0);
} }
return $ret; return $ret;

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

@ -384,6 +384,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();
} }
/** /**