Merge remote-tracking branch 'origin/3.5' into 3.6

This commit is contained in:
Laurent Destailleur 2014-11-16 14:11:19 +01:00
commit 64a2cce7c0

View File

@ -611,6 +611,8 @@ abstract class CommonObject
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
$thirdparty = new Societe($this->db);
$result=$thirdparty->fetch(isset($this->socid)?$this->socid:$this->fk_soc);
$this->client = $thirdparty; // deprecated