lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Filter on email target with third parties categories was broken.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-07-16 06:59:05 +00:00
parent e887eb2dd1
commit 862b166ffe
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/includes/modules/mailings/kiwi.modules.php
View File

@ -1,5 +1,5 @@
<?php <?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> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This file is an example to follow to add your own email selector inside * 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>'; $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
# Show categories # Show categories
$sql = "SELECT rowid, label, type"; $sql = "SELECT rowid, label, type, visible";
$sql.= " FROM ".MAIN_DB_PREFIX."categorie"; $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.= " AND entity = ".$conf->entity;
$sql.= " ORDER BY label"; $sql.= " ORDER BY label";
//print $sql;
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -189,6 +191,10 @@ class mailing_kiwi extends MailingTargets
$i++; $i++;
} }
} }
else
{
dol_print_error($db);
}
$s.='</select>'; $s.='</select>';
return $s; return $s;