Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Regis Houssin
2012-07-08 23:22:36 +02:00
parent 887f210618 320fe741cb
commit 07ddd75b99
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/action/class/actioncomm.class.php
View File

@@ -294,19 +294,25 @@ class ActionComm extends CommonObject
$this->note = $obj->note; $this->note = $obj->note;
$this->percentage = $obj->percentage; $this->percentage = $obj->percentage;
$this->author = (object) array();
$this->author->id = $obj->fk_user_author; $this->author->id = $obj->fk_user_author;
$this->author->firstname = $obj->firstname; $this->author->firstname = $obj->firstname;
$this->author->lastname = $obj->lastname; $this->author->lastname = $obj->lastname;
$this->usermod = (object) array();
$this->usermod->id = $obj->fk_user_mod; $this->usermod->id = $obj->fk_user_mod;
$this->usertodo = (object) array();
$this->usertodo->id = $obj->fk_user_action; $this->usertodo->id = $obj->fk_user_action;
$this->userdone = (object) array();
$this->userdone->id = $obj->fk_user_done; $this->userdone->id = $obj->fk_user_done;
$this->priority = $obj->priority; $this->priority = $obj->priority;
$this->fulldayevent = $obj->fulldayevent; $this->fulldayevent = $obj->fulldayevent;
$this->location = $obj->location; $this->location = $obj->location;
$this->socid = $obj->fk_soc; // To have fetch_thirdparty method working $this->socid = $obj->fk_soc; // To have fetch_thirdparty method working
$this->societe = (object) array();
$this->societe->id = $obj->fk_soc; $this->societe->id = $obj->fk_soc;
$this->contact = (object) array();
$this->contact->id = $obj->fk_contact; $this->contact->id = $obj->fk_contact;
$this->fk_project = $obj->fk_project; $this->fk_project = $obj->fk_project;