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

New: Add a new emailing selector

Browse Source
This commit is contained in:
Laurent Destailleur 2009-05-22 15:45:31 +00:00
parent 23ce17b308
commit d580670e0e
9 changed files with 618 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -9,6 +9,8 @@ For users:
- New: Can use a cache for xcal exports. - New: Can use a cache for xcal exports.
- New: Option for faster confirmation process with one ajax popup. - New: Option for faster confirmation process with one ajax popup.
- New: Complete theme bluelagoon and rodolphe - New: Complete theme bluelagoon and rodolphe
- New: Can select third parties emails in emailing module for all
third parties with expired contract's lines.
- Fix: Customer code was not correct on PDF it if contains special - Fix: Customer code was not correct on PDF it if contains special
characters. characters.
- Fix: Can update price even with "NPR" VAT rates. - Fix: Can update price even with "NPR" VAT rates.

209
htdocs/includes/modules/mailings/dolibarr_services_expired.modules.php Normal file
View File

@ -0,0 +1,209 @@
<?php
/* Copyright (C) 2005-2009 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This file is an example to follow to add your own email selector inside
* the Dolibarr email tool.
* Follow instructions given in README file to know what to change to build
* your own emailing list selector.
* Code that need to be changed in this file are marked by "CHANGE THIS" tag.
*/
include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
class mailing_dolibarr_services_expired extends MailingTargets
{
var $name='DolibarrContractsLinesExpired';
var $desc='Third parties with expired contract\'s lines';
var $require_admin=0;
var $require_module=array('contrat');
var $picto='company';
var $db;
var $arrayofproducts=array();
function mailing_dolibarr_services_expired($DB)
{
$this->db=$DB;
$this->arrayofproducts=array();
// List of services
$sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
$sql.= " WHERE fk_product_type = 1";
$sql.= " ORDER BY ref";
$result=$this->db->query($sql);
if ($result)
{
$num = $this->db->num_rows($result);
dolibarr_syslog("dolibarr_services_expired.modules.php:mailing_dolibarr_services_expired ".$num." services found");
$i = 0;
while ($i < $num)
{
$obj = $this->db->fetch_object($result);
$i++;
$this->arrayofproducts[$i]=$obj->ref;
}
}
else
{
dol_print_error($this->db);
}
}
/**
* \brief This is the main function that returns the array of emails
* \param mailing_id Id of mailing. No need to use it.
* \param filterarray If you used the formFilter function. Empty otherwise.
* \return int <0 if error, number of emails added if ok
*/
function add_to_target($mailing_id,$filtersarray=array())
{
$target = array();
// ----- Your code start here -----
$cibles = array();
$j = 0;
$product='';
foreach($filtersarray as $key)
{
if ($key == '0') return "Error: You must choose a filter";
$product=$this->arrayofproducts[$key];
}
// La requete doit retourner: id, email, name
$sql = " select s.rowid, s.email, s.nom as name, cd.rowid as cdid, cd.date_ouverture, cd.date_fin_validite, cd.fk_contrat";
$sql.= " from ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c,";
$sql.= " ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
$sql.= " where s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
$sql.= " AND cd.statut= 4 AND cd.fk_product=p.rowid AND p.ref = '".$product."'";
$sql.= " AND cd.date_fin_validite < '".$this->db->idate(gmmktime())."'";
$sql.= " ORDER BY s.email";
// Stocke destinataires dans cibles
$result=$this->db->query($sql);
if ($result)
{
$num = $this->db->num_rows($result);
$i = 0;
dolibarr_syslog("dolibarr_services_expired.modules.php:add_to_target ".$num." targets found");
$old = '';
while ($i < $num)
{
$obj = $this->db->fetch_object($result);
if ($old <> $obj->email)
{
$cibles[$j] = array(
'email' => $obj->email,
'name' => $obj->name,
'id' => $obj->id,
'other' => dol_print_date($this->db->jdate($obj->date_ouverture),'day').';'.dol_print_date($this->db->jdate($obj->date_fin_validite),'day').';'.$obj->fk_contrat.';'.$obj->cdid,
'url' => $this->url($obj->rowid)
);
$old = $obj->email;
$j++;
}
$i++;
}
}
else
{
dolibarr_syslog($this->db->error());
$this->error=$this->db->error();
return -1;
}
// ----- Your code end here -----
return parent::add_to_target($mailing_id, $cibles);
}
/**
* \brief On the main mailing area, there is a box with statistics.
* If you want to add a line in this report you must provide an
* array of SQL request that returns two field:
* One called "label", One called "nb".
* \return array
*/
function getSqlArrayForStats()
{
//var $statssql=array();
//$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
return array();
}
/**
* \brief Return here number of distinct emails returned by your selector.
* For example if this selector is used to extract 500 different
* emails from a text file, this function must return 500.
* \return int
*/
function getNbOfRecipients($filter=1,$option='')
{
// Example: return parent::getNbOfRecipients("SELECT count(*) as nb from dolibarr_table");
// Example: return 500;
$sql = " select count(*) as nb";
$sql.= " from ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c,";
$sql.= " ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
$sql.= " where s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
$sql.= " AND cd.statut= 4 AND cd.fk_product=p.rowid";
$sql.= " AND p.ref in ('".join("','",$this->arrayofproducts)."')";
$sql.= " AND cd.date_fin_validite < '".$this->db->idate(gmmktime())."'";
$sql.= " ORDER BY s.email";
//print $sql;
$a=parent::getNbOfRecipients($sql);
return $a;
}
/**
* \brief This is to add a form filter to provide variant of selector
* If used, the HTML select must be called "filter"
* \return string A html select zone
*/
function formFilter()
{
$s='';
$s.='<select name="filter" class="flat">';
$s.='<option value="0">&nbsp;</option>';
foreach($this->arrayofproducts as $key => $val)
{
$s.='<option value="'.$key.'">'.$val.'</option>';
}
$s.='</select>';
return $s;
}
/**
* \brief Can include an URL link on each record provided by selector
* shown on target page.
* \return string Url link
*/
function url($id)
{
//$companystatic=new Societe($this->db);
//$companystatic->id=$id;
//$companystatic->nom='';
//return $companystatic->getNomUrl(1); // Url too long
return '<a href="'.DOL_URL_ROOT.'/soc.php?socid='.$id.'">'.img_object('',"company").'</a>';
}
}
?>

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

@ -10,11 +10,11 @@
*/ */
/** /**
\file htdocs/includes/modules/mailings/kiwi.modules.php \file htdocs/includes/modules/mailings/kiwi.modules.php
\ingroup mailing \ingroup mailing
\brief Example file to provide a list of recipients for mailing module \brief Example file to provide a list of recipients for mailing module
\version $Revision$ \version $Revision$
*/ */
include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
@ -26,39 +26,39 @@ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'
class mailing_kiwi extends MailingTargets class mailing_kiwi extends MailingTargets
{ {
// CHANGE THIS: Put here a name not already used // CHANGE THIS: Put here a name not already used
var $name='ContactsCategories'; var $name='ContactsCategories';
// CHANGE THIS: Put here a description of your selector module. // CHANGE THIS: Put here a description of your selector module.
// This label is used if no translation found for key MailingModuleDescXXX where XXX=name is found // This label is used if no translation found for key MailingModuleDescXXX where XXX=name is found
var $desc="Third parties (by categories)"; var $desc="Third parties (by categories)";
// CHANGE THIS: Set to 1 if selector is available for admin users only // CHANGE THIS: Set to 1 if selector is available for admin users only
var $require_admin=0; var $require_admin=0;
var $require_module=array("categorie"); var $require_module=array("categorie");
var $picto='company'; var $picto='company';
var $db; var $db;
// CHANGE THIS: Constructor name must be called mailing_xxx with xxx=name of your selector // CHANGE THIS: Constructor name must be called mailing_xxx with xxx=name of your selector
function mailing_categories($DB) function mailing_categories($DB)
{ {
$this->db=$DB; $this->db=$DB;
} }
/** /**
* \brief This is the main function that returns the array of emails * \brief This is the main function that returns the array of emails
* \param mailing_id Id of mailing. No need to use it. * \param mailing_id Id of mailing. No need to use it.
* \param filterarray If you used the formFilter function. Empty otherwise. * \param filterarray If you used the formFilter function. Empty otherwise.
* \return int <0 if error, number of emails added if ok * \return int <0 if error, number of emails added if ok
*/ */
function add_to_target($mailing_id,$filtersarray=array()) function add_to_target($mailing_id,$filtersarray=array())
{ {
global $conf, $langs; global $conf, $langs;
$cibles = array(); $cibles = array();
// CHANGE THIS // CHANGE THIS
// Select the contacts from category // Select the contacts from category
$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname,"; $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname,";
if ($_POST['filter']) $sql.= " llx_categorie.label as label"; if ($_POST['filter']) $sql.= " llx_categorie.label as label";
else $sql.=" null as label"; else $sql.=" null as label";
@ -68,51 +68,51 @@ class mailing_kiwi extends MailingTargets
$sql.= " WHERE s.email != ''"; $sql.= " WHERE s.email != ''";
$sql.= " AND s.entity = ".$conf->entity; $sql.= " AND s.entity = ".$conf->entity;
if ($_POST['filter']) $sql.= " AND llx_categorie.rowid='".$_POST['filter']."'"; if ($_POST['filter']) $sql.= " AND llx_categorie.rowid='".$_POST['filter']."'";
$sql.= " ORDER BY s.email"; $sql.= " ORDER BY s.email";
// Stocke destinataires dans cibles // Stocke destinataires dans cibles
$result=$this->db->query($sql); $result=$this->db->query($sql);
if ($result) if ($result)
{ {
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);
$i = 0; $i = 0;
$j = 0; $j = 0;
dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found"); dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
$old = ''; $old = '';
while ($i < $num) while ($i < $num)
{ {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
if ($old <> $obj->email) if ($old <> $obj->email)
{ {
$cibles[$j] = array( $cibles[$j] = array(
'email' => $obj->email, 'email' => $obj->email,
'fk_contact' => $obj->fk_contact, 'fk_contact' => $obj->fk_contact,
'name' => $obj->name, 'name' => $obj->name,
'firstname' => $obj->firstname, 'firstname' => $obj->firstname,
'other' => ($obj->label?$langs->transnoentities("Category").'='.$obj->label:''), 'other' => ($obj->label?$langs->transnoentities("Category").'='.$obj->label:''),
'url' => $this->url($obj->id) 'url' => $this->url($obj->id)
); );
$old = $obj->email; $old = $obj->email;
$j++; $j++;
} }
$i++; $i++;
} }
} }
else else
{ {
dol_syslog($this->db->error()); dol_syslog($this->db->error());
$this->error=$this->db->error(); $this->error=$this->db->error();
return -1; return -1;
} }
return parent::add_to_target($mailing_id, $cibles); return parent::add_to_target($mailing_id, $cibles);
} }
/** /**
* \brief On the main mailing area, there is a box with statistics. * \brief On the main mailing area, there is a box with statistics.
* If you want to add a line in this report you must provide an * If you want to add a line in this report you must provide an
* array of SQL request that returns two field: * array of SQL request that returns two field:
@ -121,92 +121,92 @@ class mailing_kiwi extends MailingTargets
*/ */
function getSqlArrayForStats() function getSqlArrayForStats()
{ {
// CHANGE THIS: Optionnal // CHANGE THIS: Optionnal
//var $statssql=array(); //var $statssql=array();
//$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL"; //$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
return array(); return array();
} }
/* /*
* \brief Return here number of distinct emails returned by your selector. * \brief Return here number of distinct emails returned by your selector.
* For example if this selector is used to extract 500 different * For example if this selector is used to extract 500 different
* emails from a text file, this function must return 500. * emails from a text file, this function must return 500.
* \return int * \return int
*/ */
function getNbOfRecipients() function getNbOfRecipients()
{ {
global $conf; global $conf;
$sql = "SELECT count(distinct(s.email)) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= " WHERE s.email != ''";
$sql.= " AND s.entity = ".$conf->entity;
// La requete doit retourner un champ "nb" pour etre comprise $sql = "SELECT count(distinct(s.email)) as nb";
// par parent::getNbOfRecipients $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
return parent::getNbOfRecipients($sql); $sql.= " WHERE s.email != ''";
} $sql.= " AND s.entity = ".$conf->entity;
/** // La requete doit retourner un champ "nb" pour etre comprise
* \brief This is to add a form filter to provide variant of selector // par parent::getNbOfRecipients
* If used, the HTML select must be called "filter" return parent::getNbOfRecipients($sql);
* \return string A html select zone }
*/
function formFilter()
{
global $conf, $langs;
$s=''; /**
$s.='<select name="filter" class="flat">'; * \brief This is to add a form filter to provide variant of selector
* If used, the HTML select must be called "filter"
* \return string A html select zone
*/
function formFilter()
{
global $conf, $langs;
$s='';
$s.='<select name="filter" class="flat">';
$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";
$sql.= " FROM ".MAIN_DB_PREFIX."categorie"; $sql.= " FROM ".MAIN_DB_PREFIX."categorie";
$sql.= " WHERE visible > 0 AND type > 0"; $sql.= " WHERE visible > 0 AND type > 0";
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
$sql.= " ORDER BY label"; $sql.= " ORDER BY label";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
$type=''; $type='';
if ($obj->type == 1) $type=$langs->trans("Supplier"); if ($obj->type == 1) $type=$langs->trans("Supplier");
if ($obj->type == 2) $type=$langs->trans("Customer"); if ($obj->type == 2) $type=$langs->trans("Customer");
$s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->label,48,'middle'); $s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->label,48,'middle');
if ($type) $s.=' ('.$type.')'; if ($type) $s.=' ('.$type.')';
$s.='</option>'; $s.='</option>';
$i++; $i++;
} }
} }
$s.='</select>'; $s.='</select>';
return $s; return $s;
} }
/** /**
* \brief Can include an URL link on each record provided by selector * \brief Can include an URL link on each record provided by selector
* shown on target page. * shown on target page.
* \return string Url link * \return string Url link
*/ */
function url($id) function url($id)
{ {
//$companystatic=new Societe($this->db); //$companystatic=new Societe($this->db);
//$companystatic->id=$id; //$companystatic->id=$id;
//$companystatic->nom=''; //$companystatic->nom='';
//return $companystatic->getNomUrl(1); // Url too long //return $companystatic->getNomUrl(1); // Url too long
return '<a href="'.DOL_URL_ROOT.'/soc.php?socid='.$id.'">'.img_object('',"company").'</a>'; return '<a href="'.DOL_URL_ROOT.'/soc.php?socid='.$id.'">'.img_object('',"company").'</a>';
} }
} }

302
htdocs/includes/modules/mailings/poire.modules.php
View File

@ -20,146 +20,146 @@
*/ */
/** /**
\file htdocs/includes/modules/mailings/poire.modules.php \file htdocs/includes/modules/mailings/poire.modules.php
\ingroup mailing \ingroup mailing
\brief Fichier de la classe permettant de générer la liste de destinataires Poire \brief Fichier de la classe permettant de g<EFBFBD>n<EFBFBD>rer la liste de destinataires Poire
\version $Id$ \version $Id$
*/ */
include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
/** /**
\class mailing_poire \class mailing_poire
\brief Classe permettant de générer la liste des destinataires Poire \brief Classe permettant de g<EFBFBD>n<EFBFBD>rer la liste des destinataires Poire
*/ */
class mailing_poire extends MailingTargets class mailing_poire extends MailingTargets
{ {
var $name='ContactCompanies'; // Identifiant du module mailing var $name='ContactCompanies'; // Identifiant du module mailing
var $desc='Contacts des tiers (prospects, clients, fournisseurs...)'; // Libellé utilisé si aucune traduction pour MailingModuleDescXXX ou XXX=name trouvée var $desc='Contacts des tiers (prospects, clients, fournisseurs...)'; // Libell<EFBFBD> utilis<69> si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv<75>e
var $require_module=array("commercial"); // Module mailing actif si modules require_module actifs var $require_module=array("societe"); // Module mailing actif si modules require_module actifs
var $require_admin=0; // Module mailing actif pour user admin ou non var $require_admin=0; // Module mailing actif pour user admin ou non
var $picto='contact'; var $picto='contact';
var $db; var $db;
function mailing_poire($DB) function mailing_poire($DB)
{ {
$this->db=$DB; $this->db=$DB;
} }
function getSqlArrayForStats() function getSqlArrayForStats()
{ {
global $conf, $langs; global $conf, $langs;
$langs->load("commercial");
$statssql=array(); $langs->load("commercial");
$statssql[0] = "SELECT '".$langs->trans("NbOfCompaniesContacts")."' as label";
$statssql[0].= ", count(distinct(c.email)) as nb"; $statssql=array();
$statssql[0].= " FROM ".MAIN_DB_PREFIX."socpeople as c"; $statssql[0] = "SELECT '".$langs->trans("NbOfCompaniesContacts")."' as label";
$statssql[0].= ", ".MAIN_DB_PREFIX."societe as s"; $statssql[0].= ", count(distinct(c.email)) as nb";
$statssql[0].= " WHERE s.rowid = c.fk_soc"; $statssql[0].= " FROM ".MAIN_DB_PREFIX."socpeople as c";
$statssql[0].= " AND s.entity = ".$conf->entity; $statssql[0].= ", ".MAIN_DB_PREFIX."societe as s";
$statssql[0].= " AND c.entity = ".$conf->entity; $statssql[0].= " WHERE s.rowid = c.fk_soc";
$statssql[0].= " AND s.client = 1"; $statssql[0].= " AND s.entity = ".$conf->entity;
$statssql[0].= " AND c.email != ''"; $statssql[0].= " AND c.entity = ".$conf->entity;
$statssql[0].= " AND s.client = 1";
$statssql[0].= " AND c.email != ''";
return $statssql; return $statssql;
} }
/** /**
* \brief Return here number of distinct emails returned by your selector. * \brief Return here number of distinct emails returned by your selector.
* For example if this selector is used to extract 500 different * For example if this selector is used to extract 500 different
* emails from a text file, this function must return 500. * emails from a text file, this function must return 500.
* \return int * \return int
*/ */
function getNbOfRecipients() function getNbOfRecipients()
{ {
global $conf; global $conf;
$sql = "SELECT count(distinct(c.email)) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
$sql .= ", ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE s.rowid = c.fk_soc";
$sql .= " AND c.entity = ".$conf->entity;
$sql .= " AND s.entity = ".$conf->entity;
$sql .= " AND c.email != ''";
// La requete doit retourner un champ "nb" pour etre comprise $sql = "SELECT count(distinct(c.email)) as nb";
// par parent::getNbOfRecipients $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
return parent::getNbOfRecipients($sql); $sql .= ", ".MAIN_DB_PREFIX."societe as s";
} $sql .= " WHERE s.rowid = c.fk_soc";
$sql .= " AND c.entity = ".$conf->entity;
$sql .= " AND s.entity = ".$conf->entity;
$sql .= " AND c.email != ''";
// La requete doit retourner un champ "nb" pour etre comprise
// par parent::getNbOfRecipients
return parent::getNbOfRecipients($sql);
}
/** /**
* \brief Affiche formulaire de filtre qui apparait dans page de selection * \brief Affiche formulaire de filtre qui apparait dans page de selection
* des destinataires de mailings * des destinataires de mailings
* \return string Retourne zone select * \return string Retourne zone select
*/ */
function formFilter() function formFilter()
{ {
global $langs; global $langs;
$langs->load("companies"); $langs->load("companies");
$langs->load("commercial"); $langs->load("commercial");
$langs->load("suppliers"); $langs->load("suppliers");
$s=''; $s='';
$s.='<select name="filter" class="flat">'; $s.='<select name="filter" class="flat">';
$s.='<option value="all">'.$langs->trans("ContactsAllShort").'</option>'; $s.='<option value="all">'.$langs->trans("ContactsAllShort").'</option>';
$s.='<option value="prospects">'.$langs->trans("ThirdPartyProspects").'</option>'; $s.='<option value="prospects">'.$langs->trans("ThirdPartyProspects").'</option>';
# Add prospect of a particular level # Add prospect of a particular level
$sql = "SELECT code, label"; $sql = "SELECT code, label";
$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel"; $sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
$sql.= " WHERE active > 0"; $sql.= " WHERE active > 0";
$sql.= " ORDER BY label"; $sql.= " ORDER BY label";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
$level=$langs->trans($obj->code); $level=$langs->trans($obj->code);
if ($level == $obj->code) $level=$langs->trans($obj->label); if ($level == $obj->code) $level=$langs->trans($obj->label);
$s.='<option value="prospectslevel'.$obj->code.'">'.$langs->trans("ThirdPartyProspects").' ('.$langs->trans("ProspectLevelShort").'='.$level.')</option>'; $s.='<option value="prospectslevel'.$obj->code.'">'.$langs->trans("ThirdPartyProspects").' ('.$langs->trans("ProspectLevelShort").'='.$level.')</option>';
$i++; $i++;
} }
} }
$s.='<option value="customers">'.$langs->trans("ThirdPartyCustomers").'</option>'; $s.='<option value="customers">'.$langs->trans("ThirdPartyCustomers").'</option>';
//$s.='<option value="customersidprof">'.$langs->trans("ThirdPartyCustomersWithIdProf12",$langs->trans("ProfId1"),$langs->trans("ProfId2")).'</option>'; //$s.='<option value="customersidprof">'.$langs->trans("ThirdPartyCustomersWithIdProf12",$langs->trans("ProfId1"),$langs->trans("ProfId2")).'</option>';
$s.='<option value="suppliers">'.$langs->trans("ThirdPartySuppliers").'</option>'; $s.='<option value="suppliers">'.$langs->trans("ThirdPartySuppliers").'</option>';
$s.='</select>'; $s.='</select>';
return $s; return $s;
} }
/** /**
* \brief Renvoie url lien vers fiche de la source du destinataire du mailing * \brief Renvoie url lien vers fiche de la source du destinataire du mailing
* \return string Url lien * \return string Url lien
*/ */
function url($id) function url($id)
{ {
return '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$id.'">'.img_object('',"contact").'</a>'; return '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$id.'">'.img_object('',"contact").'</a>';
} }
/** /**
* \brief Ajoute destinataires dans table des cibles * \brief Ajoute destinataires dans table des cibles
* \param mailing_id Id du mailing concerné * \param mailing_id Id du mailing concern<EFBFBD>
* \param filterarray Requete sql de selection des destinataires * \param filterarray Requete sql de selection des destinataires
* \return int <0 si erreur, nb ajout si ok * \return int <0 si erreur, nb ajout si ok
*/ */
function add_to_target($mailing_id,$filtersarray=array()) function add_to_target($mailing_id,$filtersarray=array())
{ {
global $conf, $langs; global $conf, $langs;
$cibles = array(); $cibles = array();
# List prospects levels # List prospects levels
$prospectlevel=array(); $prospectlevel=array();
@ -182,69 +182,69 @@ class mailing_poire extends MailingTargets
else dol_print_error($this->db); else dol_print_error($this->db);
// La requete doit retourner: id, email, fk_contact, name, firstname, other // La requete doit retourner: id, email, fk_contact, name, firstname, other
$sql = "SELECT c.rowid as id, c.email as email, c.rowid as fk_contact,"; $sql = "SELECT c.rowid as id, c.email as email, c.rowid as fk_contact,";
$sql.= " c.name as name, c.firstname as firstname, c.civilite,"; $sql.= " c.name as name, c.firstname as firstname, c.civilite,";
$sql.= " s.nom as companyname"; $sql.= " s.nom as companyname";
$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
$sql.= " ".MAIN_DB_PREFIX."societe as s"; $sql.= " ".MAIN_DB_PREFIX."societe as s";
$sql.= " WHERE s.rowid = c.fk_soc"; $sql.= " WHERE s.rowid = c.fk_soc";
$sql.= " AND c.entity = ".$conf->entity; $sql.= " AND c.entity = ".$conf->entity;
$sql.= " AND s.entity = ".$conf->entity; $sql.= " AND s.entity = ".$conf->entity;
$sql.= " AND c.email != ''"; $sql.= " AND c.email != ''";
foreach($filtersarray as $key) foreach($filtersarray as $key)
{ {
if ($key == 'prospects') $sql.= " AND s.client=2"; if ($key == 'prospects') $sql.= " AND s.client=2";
//print "xx".$key; //print "xx".$key;
foreach($prospectlevel as $codelevel=>$valuelevel) if ($key == 'prospectslevel'.$codelevel) $sql.= " AND s.fk_prospectlevel='".$codelevel."'"; foreach($prospectlevel as $codelevel=>$valuelevel) if ($key == 'prospectslevel'.$codelevel) $sql.= " AND s.fk_prospectlevel='".$codelevel."'";
if ($key == 'customers') $sql.= " AND s.client=1"; if ($key == 'customers') $sql.= " AND s.client=1";
if ($key == 'suppliers') $sql.= " AND s.fournisseur=1"; if ($key == 'suppliers') $sql.= " AND s.fournisseur=1";
} }
$sql.= " ORDER BY c.email"; $sql.= " ORDER BY c.email";
//print "x".$sql; //print "x".$sql;
// Stocke destinataires dans cibles // Stocke destinataires dans cibles
$result=$this->db->query($sql); $result=$this->db->query($sql);
if ($result) if ($result)
{ {
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);
$i = 0; $i = 0;
$j = 0; $j = 0;
dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found"); dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
$old = ''; $old = '';
while ($i < $num) while ($i < $num)
{ {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
if ($old <> $obj->email) if ($old <> $obj->email)
{ {
$other=''; $other='';
if ($obj->companyname) { if ($other) $other.=';'; $other.=$langs->transnoentities("ThirdParty").'='.$obj->companyname; } if ($obj->companyname) { if ($other) $other.=';'; $other.=$langs->transnoentities("ThirdParty").'='.$obj->companyname; }
if ($obj->civilite) { if ($other) $other.=';'; $other.=$langs->transnoentities("Civility".$obj->civilite); } if ($obj->civilite) { if ($other) $other.=';'; $other.=$langs->transnoentities("Civility".$obj->civilite); }
$cibles[$j] = array( $cibles[$j] = array(
'email' => $obj->email, 'email' => $obj->email,
'fk_contact' => $obj->fk_contact, 'fk_contact' => $obj->fk_contact,
'name' => $obj->name, 'name' => $obj->name,
'firstname' => $obj->firstname, 'firstname' => $obj->firstname,
'other' => $other, 'other' => $other,
'url' => $this->url($obj->id) 'url' => $this->url($obj->id)
); );
$old = $obj->email; $old = $obj->email;
$j++; $j++;
} }
$i++; $i++;
} }
} }
else else
{ {
dol_syslog($this->db->error()); dol_syslog($this->db->error());
$this->error=$this->db->error(); $this->error=$this->db->error();
return -1; return -1;
} }
return parent::add_to_target($mailing_id, $cibles); return parent::add_to_target($mailing_id, $cibles);
} }
} }

242
htdocs/includes/modules/mailings/pomme.modules.php
View File

@ -19,171 +19,171 @@
*/ */
/** /**
\file htdocs/includes/modules/mailings/pomme.modules.php \file htdocs/includes/modules/mailings/pomme.modules.php
\ingroup mailing \ingroup mailing
\brief Fichier de la classe permettant de générer la liste de destinataires Pomme \brief Fichier de la classe permettant de g<EFBFBD>n<EFBFBD>rer la liste de destinataires Pomme
\version $Id$ \version $Id$
*/ */
include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
/** /**
\class mailing_pomme \class mailing_pomme
\brief Classe permettant de générer la liste des destinataires Pomme \brief Classe permettant de g<EFBFBD>n<EFBFBD>rer la liste des destinataires Pomme
*/ */
class mailing_pomme extends MailingTargets class mailing_pomme extends MailingTargets
{ {
var $name='DolibarrUsers'; // Identifiant du module mailing var $name='DolibarrUsers'; // Identifiant du module mailing
var $desc='Utilisateurs de Dolibarr avec emails'; // Libellé utilisé si aucune traduction pour MailingModuleDescXXX ou XXX=name trouvée var $desc='Utilisateurs de Dolibarr avec emails'; // Libell<EFBFBD> utilis<69> si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv<75>e
var $require_module=array(); // Module mailing actif si modules require_module actifs var $require_module=array(); // Module mailing actif si modules require_module actifs
var $require_admin=1; // Module mailing actif pour user admin ou non var $require_admin=1; // Module mailing actif pour user admin ou non
var $picto='user'; var $picto='user';
var $db; var $db;
function mailing_pomme($DB) function mailing_pomme($DB)
{ {
$this->db=$DB; $this->db=$DB;
} }
function getSqlArrayForStats() function getSqlArrayForStats()
{ {
global $conf, $langs; global $conf, $langs;
$langs->load("users"); $langs->load("users");
$statssql=array(); $statssql=array();
$sql = "SELECT '".$langs->trans("DolibarrUsers")."' as label"; $sql = "SELECT '".$langs->trans("DolibarrUsers")."' as label";
$sql.= ", count(distinct(u.email)) as nb"; $sql.= ", count(distinct(u.email)) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= " WHERE u.email != ''"; // u.email IS NOT NULL est implicite dans ce test $sql.= " WHERE u.email != ''"; // u.email IS NOT NULL est implicite dans ce test
$sql.= " AND u.entity IN (0,".$conf->entity.")"; $sql.= " AND u.entity IN (0,".$conf->entity.")";
$statssql[0]=$sql; $statssql[0]=$sql;
return $statssql; return $statssql;
} }
/* /*
* \brief Return here number of distinct emails returned by your selector. * \brief Return here number of distinct emails returned by your selector.
* For example if this selector is used to extract 500 different * For example if this selector is used to extract 500 different
* emails from a text file, this function must return 500. * emails from a text file, this function must return 500.
* \return int * \return int
*/ */
function getNbOfRecipients() function getNbOfRecipients()
{ {
global $conf; global $conf;
$sql = "SELECT count(distinct(u.email)) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= " WHERE u.email != ''"; // u.email IS NOT NULL est implicite dans ce test
$sql.= " AND u.entity IN (0,".$conf->entity.")";
// La requete doit retourner un champ "nb" pour etre comprise $sql = "SELECT count(distinct(u.email)) as nb";
// par parent::getNbOfRecipients $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
return parent::getNbOfRecipients($sql); $sql.= " WHERE u.email != ''"; // u.email IS NOT NULL est implicite dans ce test
} $sql.= " AND u.entity IN (0,".$conf->entity.")";
// La requete doit retourner un champ "nb" pour etre comprise
/** // par parent::getNbOfRecipients
* \brief Affiche formulaire de filtre qui apparait dans page de selection return parent::getNbOfRecipients($sql);
* des destinataires de mailings }
* \return string Retourne zone select
*/
function formFilter()
{
global $langs;
$langs->load("users");
$s='';
$s.='<select name="filter" class="flat">';
$s.='<option value="1">'.$langs->trans("Enabled").'</option>';
$s.='<option value="0">'.$langs->trans("Disabled").'</option>';
$s.='</select>';
return $s;
}
/** /**
* \brief Renvoie url lien vers fiche de la source du destinataire du mailing * \brief Affiche formulaire de filtre qui apparait dans page de selection
* \return string Url lien * des destinataires de mailings
*/ * \return string Retourne zone select
function url($id) */
{ function formFilter()
return '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$id.'">'.img_object('',"user").'</a>'; {
} global $langs;
$langs->load("users");
$s='';
$s.='<select name="filter" class="flat">';
$s.='<option value="1">'.$langs->trans("Enabled").'</option>';
$s.='<option value="0">'.$langs->trans("Disabled").'</option>';
$s.='</select>';
return $s;
}
/** /**
* \brief Ajoute destinataires dans table des cibles * \brief Renvoie url lien vers fiche de la source du destinataire du mailing
* \param mailing_id Id du mailing concerné * \return string Url lien
* \param filterarray Requete sql de selection des destinataires */
* \return int < 0 si erreur, nb ajout si ok function url($id)
*/ {
function add_to_target($mailing_id,$filtersarray=array()) return '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$id.'">'.img_object('',"user").'</a>';
{ }
global $conf, $langs;
$cibles = array();
// La requete doit retourner: id, email, fk_contact, name, firstname /**
$sql = "SELECT u.rowid as id, u.email as email, null as fk_contact,"; * \brief Ajoute destinataires dans table des cibles
$sql.= " u.name as name, u.firstname as firstname, u.login, u.office_phone"; * \param mailing_id Id du mailing concern<EFBFBD>
$sql.= " FROM ".MAIN_DB_PREFIX."user as u"; * \param filterarray Requete sql de selection des destinataires
$sql.= " WHERE u.email != ''"; // u.email IS NOT NULL est implicite dans ce test * \return int < 0 si erreur, nb ajout si ok
$sql.= " AND u.entity IN (0,".$conf->entity.")"; */
foreach($filtersarray as $key) function add_to_target($mailing_id,$filtersarray=array())
{ {
if ($key == '1') $sql.= " AND u.statut=1"; global $conf, $langs;
if ($key == '0') $sql.= " AND u.statut=0";
}
$sql.= " ORDER BY u.email";
// Stocke destinataires dans cibles $cibles = array();
$result=$this->db->query($sql);
if ($result)
{
$num = $this->db->num_rows($result);
$i = 0;
$j = 0;
dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found"); // La requete doit retourner: id, email, fk_contact, name, firstname
$sql = "SELECT u.rowid as id, u.email as email, null as fk_contact,";
$sql.= " u.name as name, u.firstname as firstname, u.login, u.office_phone";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= " WHERE u.email != ''"; // u.email IS NOT NULL est implicite dans ce test
$sql.= " AND u.entity IN (0,".$conf->entity.")";
foreach($filtersarray as $key)
{
if ($key == '1') $sql.= " AND u.statut=1";
if ($key == '0') $sql.= " AND u.statut=0";
}
$sql.= " ORDER BY u.email";
$old = ''; // Stocke destinataires dans cibles
while ($i < $num) $result=$this->db->query($sql);
{ if ($result)
$obj = $this->db->fetch_object($result); {
if ($old <> $obj->email) $num = $this->db->num_rows($result);
{ $i = 0;
$cibles[$j] = array( $j = 0;
dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
$old = '';
while ($i < $num)
{
$obj = $this->db->fetch_object($result);
if ($old <> $obj->email)
{
$cibles[$j] = array(
'email' => $obj->email, 'email' => $obj->email,
'fk_contact' => $obj->fk_contact, 'fk_contact' => $obj->fk_contact,
'name' => $obj->name, 'name' => $obj->name,
'firstname' => $obj->firstname, 'firstname' => $obj->firstname,
'other' => $langs->transnoentities("Login").'='.$obj->login.';'.$langs->transnoentities("PhonePro").'='.$obj->office_phone, 'other' => $langs->transnoentities("Login").'='.$obj->login.';'.$langs->transnoentities("PhonePro").'='.$obj->office_phone,
'url' => $this->url($obj->id) 'url' => $this->url($obj->id)
); );
$old = $obj->email; $old = $obj->email;
$j++; $j++;
} }
$i++; $i++;
} }
} }
else else
{ {
dol_syslog($this->db->error()); dol_syslog($this->db->error());
$this->error=$this->db->error(); $this->error=$this->db->error();
return -1; return -1;
} }
return parent::add_to_target($mailing_id, $cibles); return parent::add_to_target($mailing_id, $cibles);
} }
} }

1
htdocs/langs/en_US/mails.lang
View File

@ -68,6 +68,7 @@ MailingModuleDescDolibarrUsers=All Dolibarr users with emails
MailingModuleDescFundationMembers=Fundation members with emails MailingModuleDescFundationMembers=Fundation members with emails
MailingModuleDescEmailsFromFile=EMails from a text file (email;name;surname;comments) MailingModuleDescEmailsFromFile=EMails from a text file (email;name;surname;comments)
MailingModuleDescContactsCategories=Third parties with emails (by category) MailingModuleDescContactsCategories=Third parties with emails (by category)
MailingModuleDescDolibarrContractsLinesExpired=Third parties with expired contract's lines
LineInFile=Line %s in file LineInFile=Line %s in file
RecipientSelectionModules=Defined requests for recipients' selection RecipientSelectionModules=Defined requests for recipients' selection

1
htdocs/langs/fr_FR/mails.lang
View File

@ -68,6 +68,7 @@ MailingModuleDescDolibarrUsers=Utilisateurs de Dolibarr avec e-mail
MailingModuleDescFundationMembers=Adhérents avec e-mail MailingModuleDescFundationMembers=Adhérents avec e-mail
MailingModuleDescEmailsFromFile=EMails issus d'un fichier texte (email;nom;prenom;divers) MailingModuleDescEmailsFromFile=EMails issus d'un fichier texte (email;nom;prenom;divers)
MailingModuleDescContactsCategories=Tiers avec e-mail (par categorie) MailingModuleDescContactsCategories=Tiers avec e-mail (par categorie)
MailingModuleDescDolibarrContractsLinesExpired=Tiers avec lignes de contrats de services expirées
LineInFile=Ligne %s du fichier LineInFile=Ligne %s du fichier
RecipientSelectionModules=Modules de sélection des destinataires RecipientSelectionModules=Modules de sélection des destinataires

2
htdocs/product.class.php
View File

@ -60,7 +60,7 @@ class Product extends CommonObject
var $multiprices_base_type=array(); var $multiprices_base_type=array();
//! Taux de TVA //! Taux de TVA
var $tva_tx; var $tva_tx;
//! Type 0 for regural product, 1 for service, 2 for assembly kit, 3 for stock kit //! Type 0 for regular product, 1 for service, 2 for assembly kit, 3 for stock kit
var $type; var $type;
var $typestring; var $typestring;
var $stock_reel; var $stock_reel;

2
mysql/tables/llx_product.sql
View File

@ -38,7 +38,7 @@ create table llx_product
tva_tx double(6,3), tva_tx double(6,3),
fk_user_author integer, fk_user_author integer,
envente tinyint DEFAULT 1, envente tinyint DEFAULT 1,
fk_product_type integer DEFAULT 0, fk_product_type integer DEFAULT 0, -- Type 0 for regular product, 1 for service
duration varchar(6), duration varchar(6),
seuil_stock_alerte integer DEFAULT 0, seuil_stock_alerte integer DEFAULT 0,
stock_loc varchar(10), -- emplacement dans le stock stock_loc varchar(10), -- emplacement dans le stock