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

New: Module notification can send mail on order or proposal validation.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-01-09 01:56:33 +00:00
parent 6404866bff
commit 5558b0d081
6 changed files with 220 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

382
htdocs/includes/triggers/interface_modNotification_Notification.class.php
View File

@ -1,176 +1,206 @@
<?php <?php
/* Copyright (C) 2006-2009 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2006-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/includes/triggers/interface_modNotification_notification.class.php * \file htdocs/includes/triggers/interface_modNotification_notification.class.php
* \ingroup notification * \ingroup notification
* \brief Fichier de gestion des notifications sur evenement Dolibarr * \brief Fichier de gestion des notifications sur evenement Dolibarr
* \version $Id$ * \version $Id$
*/ */
/** /**
* \class InterfaceNotification * \class InterfaceNotification
* \brief Classe des fonctions triggers des actions personalisees du workflow * \brief Classe des fonctions triggers des actions personalisees du workflow
*/ */
class InterfaceNotification class InterfaceNotification
{ {
var $db; var $db;
/** /**
* \brief Constructeur. * \brief Constructeur.
* \param DB Handler d'acces base * \param DB Handler d'acces base
*/ */
function InterfaceNotification($DB) function InterfaceNotification($DB)
{ {
$this->db = $DB ; $this->db = $DB ;
$this->name = preg_replace('/^Interface/i','',get_class($this)); $this->name = preg_replace('/^Interface/i','',get_class($this));
$this->family = "notification"; $this->family = "notification";
$this->description = "Triggers of this module send email notifications according to Notification module setup."; $this->description = "Triggers of this module send email notifications according to Notification module setup.";
$this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version $this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version
} }
/** /**
* \brief Renvoi nom du lot de triggers * \brief Renvoi nom du lot de triggers
* \return string Nom du lot de triggers * \return string Nom du lot de triggers
*/ */
function getName() function getName()
{ {
return $this->name; return $this->name;
} }
/** /**
* \brief Renvoi descriptif du lot de triggers * \brief Renvoi descriptif du lot de triggers
* \return string Descriptif du lot de triggers * \return string Descriptif du lot de triggers
*/ */
function getDesc() function getDesc()
{ {
return $this->description; return $this->description;
} }
/** /**
* \brief Renvoi version du lot de triggers * \brief Renvoi version du lot de triggers
* \return string Version du lot de triggers * \return string Version du lot de triggers
*/ */
function getVersion() function getVersion()
{ {
global $langs; global $langs;
$langs->load("admin"); $langs->load("admin");
if ($this->version == 'experimental') return $langs->trans("Experimental"); if ($this->version == 'experimental') return $langs->trans("Experimental");
elseif ($this->version == 'dolibarr') return DOL_VERSION; elseif ($this->version == 'dolibarr') return DOL_VERSION;
elseif ($this->version) return $this->version; elseif ($this->version) return $this->version;
else return $langs->trans("Unknown"); else return $langs->trans("Unknown");
} }
/** /**
* \brief Fonction appelee lors du declenchement d'un evenement Dolibarr. * \brief Fonction appelee lors du declenchement d'un evenement Dolibarr.
* D'autres fonctions run_trigger peuvent etre presentes dans includes/triggers * D'autres fonctions run_trigger peuvent etre presentes dans includes/triggers
* \param action Code de l'evenement * \param action Code de l'evenement
* \param object Objet concerne * \param object Objet concerne
* \param user Objet user * \param user Objet user
* \param lang Objet lang * \param lang Objet lang
* \param conf Objet conf * \param conf Objet conf
* \return int <0 si ko, 0 si aucune action faite, >0 si ok * \return int <0 si ko, 0 si aucune action faite, >0 si ok
*/ */
function run_trigger($action,$object,$user,$langs,$conf) function run_trigger($action,$object,$user,$langs,$conf)
{ {
// Mettre ici le code a executer en reaction de l'action // Mettre ici le code a executer en reaction de l'action
// Les donnees de l'action sont stockees dans $object // Les donnees de l'action sont stockees dans $object
// Si module notification non actif, on ne fait rien // Si module notification non actif, on ne fait rien
if (! $conf->notification->enabled) return 0; if (! $conf->notification->enabled) return 0;
require_once(DOL_DOCUMENT_ROOT .'/notify.class.php'); require_once(DOL_DOCUMENT_ROOT .'/notify.class.php');
if ($action == 'BILL_VALIDATE') if ($action == 'BILL_VALIDATE')
{ {
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$action_notify = 'NOTIFY_VAL_FAC'; $action_notify = 'NOTIFY_VAL_FAC';
$ref = dol_sanitizeFileName($object->ref); $ref = dol_sanitizeFileName($object->ref);
$filepdf = $conf->facture->dir_output . '/' . $ref . '/' . $ref . '.pdf'; $filepdf = $conf->facture->dir_output . '/' . $ref . '/' . $ref . '.pdf';
if (! file_exists($filepdf)) $filepdf=''; if (! file_exists($filepdf)) $filepdf='';
$langs->load("other"); $langs->load("other");
$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref); $mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref);
$notify = new Notify($this->db); $notify = new Notify($this->db);
$notify->send($action_notify, $object->socid, $mesg, 'facture', $object->id, $filepdf); $notify->send($action_notify, $object->socid, $mesg, 'facture', $object->id, $filepdf);
} }
elseif ($action == 'FICHEINTER_VALIDATE') elseif ($action == 'ORDER_VALIDATE')
{ {
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$action_notify = 'NOTIFY_VAL_FICHINTER'; $action_notify = 'NOTIFY_VAL_ORDER';
$ref = dol_sanitizeFileName($object->ref); $ref = dol_sanitizeFileName($object->ref);
$filepdf = $conf->facture->dir_output . '/' . $ref . '/' . $ref . '.pdf'; $filepdf = $conf->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf';
if (! file_exists($filepdf)) $filepdf=''; if (! file_exists($filepdf)) $filepdf='';
$langs->load("other"); $langs->load("other");
$mesg = $langs->transnoentitiesnoconv("EMailTextIntervnetionValidated",$object->ref); $mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$object->ref);
$notify = new Notify($this->db); $notify = new Notify($this->db);
$notify->send($action_notify, $object->socid, $mesg, 'ficheinter', $object->id, $filepdf); $notify->send($action_notify, $object->socid, $mesg, 'order', $object->id, $filepdf);
} }
elseif ($action == 'ORDER_SUPPLIER_APPROVE') elseif ($action == 'PROPOSAL_VALIDATE')
{ {
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$action_notify = 'NOTIFY_APP_ORDER_SUPPLIER'; $action_notify = 'NOTIFY_VAL_PROPOSAL';
$ref = dol_sanitizeFileName($object->ref); $ref = dol_sanitizeFileName($object->ref);
$filepdf = $conf->fournisseur->dir_output . '/commande/' . $ref . '/' . $ref . '.pdf'; $filepdf = $conf->propal->dir_output . '/' . $ref . '/' . $ref . '.pdf';
if (! file_exists($filepdf)) $filepdf=''; if (! file_exists($filepdf)) $filepdf='';
$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; $langs->load("other");
$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->fullname); $mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$object->ref);
$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
$notify = new Notify($this->db);
$notify = new Notify($this->db); $notify->send($action_notify, $object->socid, $mesg, 'propal', $object->id, $filepdf);
$notify->send($action_notify, $object->socid, $mesg, 'order_supplier', $object->id, $filepdf); }
}
elseif ($action == 'FICHEINTER_VALIDATE')
elseif ($action == 'ORDER_SUPPLIER_REFUSE') {
{ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$action_notify = 'NOTIFY_VAL_FICHINTER';
$action_notify = 'NOTIFY_REF_ORDER_SUPPLIER'; $ref = dol_sanitizeFileName($object->ref);
$ref = dol_sanitizeFileName($object->ref); $filepdf = $conf->facture->dir_output . '/' . $ref . '/' . $ref . '.pdf';
$filepdf = $conf->fournisseur->dir_output . '/commande/' . $ref . '/' . $ref . '.pdf'; if (! file_exists($filepdf)) $filepdf='';
if (! file_exists($filepdf)) $filepdf=''; $langs->load("other");
$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; $mesg = $langs->transnoentitiesnoconv("EMailTextIntervnetionValidated",$object->ref);
$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->fullname);
$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; $notify = new Notify($this->db);
$notify->send($action_notify, $object->socid, $mesg, 'ficheinter', $object->id, $filepdf);
$notify = new Notify($this->db); }
$notify->send($action_notify, $object->socid, $mesg, 'order_supplier', $object->id, $filepdf);
} elseif ($action == 'ORDER_SUPPLIER_APPROVE')
{
// If not found dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
/*
else $action_notify = 'NOTIFY_APP_ORDER_SUPPLIER';
{ $ref = dol_sanitizeFileName($object->ref);
dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action."); $filepdf = $conf->fournisseur->dir_output . '/commande/' . $ref . '/' . $ref . '.pdf';
return -1; if (! file_exists($filepdf)) $filepdf='';
} $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
*/ $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->fullname);
return 0; $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
}
$notify = new Notify($this->db);
} $notify->send($action_notify, $object->socid, $mesg, 'order_supplier', $object->id, $filepdf);
?> }
elseif ($action == 'ORDER_SUPPLIER_REFUSE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$action_notify = 'NOTIFY_REF_ORDER_SUPPLIER';
$ref = dol_sanitizeFileName($object->ref);
$filepdf = $conf->fournisseur->dir_output . '/commande/' . $ref . '/' . $ref . '.pdf';
if (! file_exists($filepdf)) $filepdf='';
$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->fullname);
$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
$notify = new Notify($this->db);
$notify->send($action_notify, $object->socid, $mesg, 'order_supplier', $object->id, $filepdf);
}
// If not found
/*
else
{
dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action.");
return -1;
}
*/
return 0;
}
}
?>

2
htdocs/install/mysql/data/llx_action_def.sql
View File

@ -36,3 +36,5 @@ insert into llx_action_def (rowid,code,titre,description,objet_type) values (1,'
insert into llx_action_def (rowid,code,titre,description,objet_type) values (2,'NOTIFY_VAL_FAC','Validation facture client','Executed when a customer invoice is approved','facture'); insert into llx_action_def (rowid,code,titre,description,objet_type) values (2,'NOTIFY_VAL_FAC','Validation facture client','Executed when a customer invoice is approved','facture');
insert into llx_action_def (rowid,code,titre,description,objet_type) values (3,'NOTIFY_APP_ORDER_SUPPLIER','Approbation commande fournisseur','Executed when a supplier order is approved','order_supplier'); insert into llx_action_def (rowid,code,titre,description,objet_type) values (3,'NOTIFY_APP_ORDER_SUPPLIER','Approbation commande fournisseur','Executed when a supplier order is approved','order_supplier');
insert into llx_action_def (rowid,code,titre,description,objet_type) values (4,'NOTIFY_REF_ORDER_SUPPLIER','Refus commande fournisseur','Executed when a supplier order is refused','order_supplier'); insert into llx_action_def (rowid,code,titre,description,objet_type) values (4,'NOTIFY_REF_ORDER_SUPPLIER','Refus commande fournisseur','Executed when a supplier order is refused','order_supplier');
insert into llx_action_def (rowid,code,titre,description,objet_type) values (5,'NOTIFY_VAL_ORDER','Validation commande client','Executed when a customer order is validated','order');
insert into llx_action_def (rowid,code,titre,description,objet_type) values (6,'NOTIFY_VAL_PROPAL','Validation proposition client','Executed when a commercial proposal is validated','propal');

3
htdocs/install/mysql/migration/2.7.0-2.8.0.sql
View File

@ -33,3 +33,6 @@ ALTER TABLE llx_facture_fourn_det MODIFY COLUMN qty real;
ALTER TABLE llx_projet ADD COLUMN datee DATE AFTER dateo; ALTER TABLE llx_projet ADD COLUMN datee DATE AFTER dateo;
insert into llx_action_def (rowid,code,titre,description,objet_type) values (5,'NOTIFY_VAL_ORDER','Validation commande client','Executed when a customer order is validated','order');
insert into llx_action_def (rowid,code,titre,description,objet_type) values (6,'NOTIFY_VAL_PROPAL','Validation proposition client','Executed when a commercial proposal is validated','propal');

4
htdocs/langs/en_US/other.lang
View File

@ -26,9 +26,11 @@ DateToBirth=Date to birth
BirthdayAlertOn = birthday alert active BirthdayAlertOn = birthday alert active
BirthdayAlertOff = birthday alert inactive BirthdayAlertOff = birthday alert inactive
Notify_NOTIFY_VAL_FICHINTER=Intervention validated Notify_NOTIFY_VAL_FICHINTER=Intervention validated
Notify_NOTIFY_VAL_FAC=Invoice validated Notify_NOTIFY_VAL_FAC=Customer invoice validated
Notify_NOTIFY_APP_ORDER_SUPPLIER=Supplier order approved Notify_NOTIFY_APP_ORDER_SUPPLIER=Supplier order approved
Notify_NOTIFY_REF_ORDER_SUPPLIER=Supplier order refused Notify_NOTIFY_REF_ORDER_SUPPLIER=Supplier order refused
Notify_NOTIFY_VAL_ORDER=Customer order validated
Notify_NOTIFY_VAL_PROPAL=Customer proposal validated
NbOfAttachedFiles=Number of attached files/documents NbOfAttachedFiles=Number of attached files/documents
TotalSizeOfAttachedFiles=Total size of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents
MaxSize=Maximum size MaxSize=Maximum size

4
htdocs/langs/fr_FR/other.lang
View File

@ -26,9 +26,11 @@ DateToBirth=Date de naissance
BirthdayAlertOn = alerte anniversaire active BirthdayAlertOn = alerte anniversaire active
BirthdayAlertOff = alerte anniversaire inactive BirthdayAlertOff = alerte anniversaire inactive
Notify_NOTIFY_VAL_FICHINTER=Validation fiche intervention Notify_NOTIFY_VAL_FICHINTER=Validation fiche intervention
Notify_NOTIFY_VAL_FAC=Validation facture Notify_NOTIFY_VAL_FAC=Validation facture client
Notify_NOTIFY_APP_ORDER_SUPPLIER=Approbation commande fournisseur Notify_NOTIFY_APP_ORDER_SUPPLIER=Approbation commande fournisseur
Notify_NOTIFY_REF_ORDER_SUPPLIER=Refus commande fournisseur Notify_NOTIFY_REF_ORDER_SUPPLIER=Refus commande fournisseur
Notify_NOTIFY_VAL_ORDER=Validation commande client
Notify_NOTIFY_VAL_PROPAL=Validation proposition commerciale client
NbOfAttachedFiles=Nombre de fichiers/documents liés NbOfAttachedFiles=Nombre de fichiers/documents liés
TotalSizeOfAttachedFiles=Taille total fichiers/documents liés TotalSizeOfAttachedFiles=Taille total fichiers/documents liés
MaxSize=Taille maximum MaxSize=Taille maximum

6
htdocs/notify.class.php
View File

@ -108,12 +108,12 @@ class Notify
/** /**
* \brief Check if notification are active for couple action/company. * \brief Check if notification are active for couple action/company.
* If yes, send mail and save trace. * If yes, send mail and save trace into llx_notify.
* \param action Code of action to check and send (list in llx_action_def) * \param action Code of action to check and send (list in llx_action_def)
* \param socid Id of third party * \param socid Id of third party
* \param texte Message to send * \param texte Message to send
* \param objet_type Type of object notification deals on * \param objet_type Type of object the notification deals on (facture, order, propal, order_supplier...). Just for log in llx_notify.
* \param objet_id Id of object notification deals on * \param objet_id Id of object the notification deals on
* \param file Attach a file * \param file Attach a file
* \return int <0 if KO or number of changes if OK * \return int <0 if KO or number of changes if OK
*/ */