From c17f5e7f007a8600282a50d6c64a0601eabdb0af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <ldestailleur@teclib.com>
Date: Thu, 14 Aug 2014 16:04:42 +0200
Subject: [PATCH] Accept property fk_thirdparty instead of fk_soc
---
htdocs/core/class/commonobject.class.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e36eef20ff4..3306d38f214 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -598,10 +598,10 @@ abstract class CommonObject
{
global $conf;
- if (empty($this->socid) && empty($this->fk_soc)) return 0;
+ if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty)) return 0;
$thirdparty = new Societe($this->db);
- $result=$thirdparty->fetch(isset($this->socid)?$this->socid:$this->fk_soc);
+ $result=$thirdparty->fetch(isset($this->socid)?$this->socid:(isset($this->fk_soc)?$this->fk_soc:$this->fk_thirdparty));
$this->client = $thirdparty; // deprecated
$this->thirdparty = $thirdparty;
--
GitLab