From 8f35b53dd0ed1eb533875418bfb94e2e7e8607be Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 13 Jan 2012 12:25:01 +0100
Subject: [PATCH] Fix: custom language file was not loaded

---
 htdocs/core/class/translate.class.php | 6 +++---
 htdocs/fourn/facture/impayees.php     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 4496c18ff1f..e48bfa98f86 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -246,7 +246,7 @@ class Translate {
 								$tab=explode('=',$line,2);
 								$key=trim($tab[0]);
 								//print "Domain=$domain, found a string for $tab[0] with value $tab[1]<br>";
-								if (empty($this->tab_translate[$key]) && isset($tab[1]))
+								if ((! empty($conf->global->MAIN_FORCELANGDIR) || empty($this->tab_translate[$key])) && isset($tab[1]))
 								{
 									$value=trim(preg_replace('/\\n/',"\n",$tab[1]));
 
@@ -287,8 +287,8 @@ class Translate {
 							require_once(DOL_DOCUMENT_ROOT ."/lib/memory.lib.php");
 							$size=dol_setcache($usecachekey,$tabtranslatedomain);
 						}
-						//exit;
-						break;		// Break loop on each root dir
+						
+						if (empty($conf->global->MAIN_FORCELANGDIR)) break;		// Break loop on each root dir. If a module has forced dir, we do not stop loop.
 					}
 				}
 			}
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 422f1b6bddc..fc076c6f565 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -130,7 +130,7 @@ if ($user->rights->fournisseur->facture->lire)
 	{
 		$sql .= " AND f.facnumber like '%".$_POST["sf_ref"] . "%'";
 	}
-	$sql.= " GROUP BY f.facnumber";
+	$sql.= " GROUP BY f.facnumber,s.nom, s.rowid, f.rowid, f.total_ht, f.total_ttc, f.datef, f.date_lim_reglement, f.paye, f.fk_statut";
 
 	$sql.= " ORDER BY ";
 	$listfield=explode(',',$sortfield);