Home Explore Help
Sign In
iProspective
/
dolibarr
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Update societe.class.php

ptibogxiv 5 years ago
parent
e820af4aa0
commit
5a1f123994
1 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      htdocs/societe/class/societe.class.php

+ 1 - 1
htdocs/societe/class/societe.class.php
View File 

@@ -1287,7 +1287,7 @@ class Societe extends CommonObject
 
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as te ON s.fk_typent = te.id';
 
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
 
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_remise as sr ON sr.rowid = (SELECT MAX(rowid) FROM '.MAIN_DB_PREFIX.'societe_remise WHERE fk_soc = s.rowid AND entity = '.$conf->entity.')';
 
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_remise as sr ON sr.rowid = (SELECT MAX(rowid) FROM '.MAIN_DB_PREFIX.'societe_remise WHERE fk_soc = s.rowid AND entity IN ('.getEntity('discount').'))';
 
 
 		$sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
 
 		if ($rowid)     $sql .= ' AND s.rowid = '.$rowid;