From 862b166ffe1a5ad32234da8a23ab97ac25d9d4a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 16 Jul 2010 06:59:05 +0000
Subject: [PATCH] Fix: Filter on email target with third parties categories was
 broken.

---
 htdocs/includes/modules/mailings/kiwi.modules.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/includes/modules/mailings/kiwi.modules.php b/htdocs/includes/modules/mailings/kiwi.modules.php
index 1d6d0d323b6..d5d794308c4 100644
--- a/htdocs/includes/modules/mailings/kiwi.modules.php
+++ b/htdocs/includes/modules/mailings/kiwi.modules.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin       <regis@dolibarr.fr>
  *
  * This file is an example to follow to add your own email selector inside
@@ -165,12 +165,14 @@ class mailing_kiwi extends MailingTargets
 		$s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
 
 		# Show categories
-		$sql = "SELECT rowid, label, type";
+		$sql = "SELECT rowid, label, type, visible";
 		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE visible > 0 AND type > 0";
+		$sql.= " WHERE type in (1,2)";	// We keep only categories for suppliers and customers/prospects
+		// $sql.= " AND visible > 0";	// We ignore the property visible because third party's categories does not use this property (only products categories use it).
 		$sql.= " AND entity = ".$conf->entity;
 		$sql.= " ORDER BY label";
 
+		//print $sql;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -189,6 +191,10 @@ class mailing_kiwi extends MailingTargets
 				$i++;
 			}
 		}
+		else
+		{
+			dol_print_error($db);
+		}
 
 		$s.='</select>';
 		return $s;