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

Browse Source 
develop

Conflicts:
	htdocs/compta/cashcontrol/report.php
This commit is contained in:
Laurent Destailleur 2021-06-23 13:08:05 +02:00
parent ad15de572b
commit 293b67a693
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/product/inventory/class/inventory.class.php
View File

@ -643,25 +643,27 @@ class Inventory extends CommonObject
if ($result) { if ($result) {
if ($this->db->num_rows($result)) { if ($this->db->num_rows($result)) {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
$this->id = $obj->rowid; $this->id = $obj->rowid;
if ($obj->fk_user_creat) {
if ($obj->fk_user_creat > 0) {
$cuser = new User($this->db); $cuser = new User($this->db);
$cuser->fetch($obj->fk_user_creat); $cuser->fetch($obj->fk_user_creat);
$this->user_creation = $cuser; $this->user_creation = $cuser;
} }
if ($obj->fk_user_valid) { if ($obj->fk_user_modif > 0) {
$muser = new User($this->db);
$muser->fetch($obj->fk_user_modif);
$this->user_creation = $muser;
}
if ($obj->fk_user_valid > 0) {
$vuser = new User($this->db); $vuser = new User($this->db);
$vuser->fetch($obj->fk_user_valid); $vuser->fetch($obj->fk_user_valid);
$this->user_validation = $vuser; $this->user_validation = $vuser;
} }
if ($obj->fk_user_cloture) {
$cluser = new User($this->db);
$cluser->fetch($obj->fk_user_cloture);
$this->user_cloture = $cluser;
}
$this->date_creation = $this->db->jdate($obj->datec); $this->date_creation = $this->db->jdate($obj->datec);
$this->date_modification = $this->db->jdate($obj->datem); $this->date_modification = $this->db->jdate($obj->datem);
$this->date_validation = $this->db->jdate($obj->datev); $this->date_validation = $this->db->jdate($obj->datev);