From 4c70908ea2c9ec96893fb63b2bbc8a221e81c303 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 8 Jun 2017 18:52:01 +0200
Subject: [PATCH] Fix: entity field in combobox

---
 htdocs/core/class/html.form.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7a69172889e..01d28ecde24 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2743,7 +2743,8 @@ class Form
 
         $sql = "SELECT rowid, code, libelle as label";
         $sql.= " FROM ".MAIN_DB_PREFIX.'c_payment_term';
-        $sql.= " WHERE active > 0";
+        $sql.= " WHERE entity = " . getEntity('c_payment_term', 2);
+        $sql.= " AND active > 0";
         $sql.= " ORDER BY sortorder";
 
         $resql = $this->db->query($sql);
@@ -2958,6 +2959,7 @@ class Form
         $sql = "SELECT id, code, libelle as label, type, active";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_paiement";
         //if ($active >= 0) $sql.= " WHERE active = ".$active;
+        $sql.= " WHERE entity = " . getEntity('c_paiement', 2);
 
         $resql = $this->db->query($sql);
         if ($resql)