From b3fd8185f747f663b3072872788689de9c8ecd32 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Fri, 5 Aug 2005 14:05:29 +0000
Subject: [PATCH] =?UTF-8?q?Mise=20=E0=20jour?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/bon-prelevement.class.php | 30 +++++++++++++++++++++---------
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/htdocs/bon-prelevement.class.php b/htdocs/bon-prelevement.class.php
index 5efcafcf8ad..559a7e18c9b 100644
--- a/htdocs/bon-prelevement.class.php
+++ b/htdocs/bon-prelevement.class.php
@@ -354,10 +354,10 @@ class BonPrelevement
if ($this->db->query($sql))
{
- $subject = "Cr�dit pr�l�vement ".$this->ref." � la banque";
+ $subject = "Cr�dit pr�l�vement ".$this->ref." � la banque";
$message = "Le bon de pr�l�vement ".$this->ref;
- $message .= " a �t� cr�dit� par la banque ";
- $message .="le ".strftime("%A %e %B %Y", $date);
+ $message .= " a �t� cr�dit� par la banque.\n";
+ $message .= "Date cr�dit : ".strftime("%A %e %B %Y", $date);
$this->Notify($user,"cr", $subject, $message);
}
@@ -422,15 +422,15 @@ class BonPrelevement
{
$this->method_trans = $method;
- $subject = "Transmission du pr�l�vement ".$this->ref." � la banque";
+ $subject = "Transmission du pr�l�vement ".$this->ref." � la banque";
$message = "Le bon de pr�l�vement ".$this->ref;
$message .= " a �t� transmis � la banque par ".$user->prenom. " ".$user->nom;
$message .= "\n\n";
- $message .= "M�thode : ".$this->methodes_trans[$this->method_trans];
- $message .="\nLe :".strftime("%a %e %B %Y", $date);
+ $message .= "\nMontant : ".price($this->amount);
+ $message .= "\nM�thode : ".$this->methodes_trans[$this->method_trans];
+ $message .= "\nDate : ".strftime("%A %e %B %Y", $date);
-
- $this->Notify($user,"tr", $subject, $message);
+ $this->Notify($user,"tr", $subject, $message, 1);
}
else
{
@@ -467,7 +467,7 @@ class BonPrelevement
*
*
*/
- function Notify($user, $action, $subject, $message)
+ function Notify($user, $action, $subject, $message, $joinfile=0)
{
$message .= "\n\n--\n";
$message .= "Ceci est un message automatique envoy� par Dolibarr";
@@ -498,6 +498,18 @@ class BonPrelevement
$sendto,
$from,
$message);
+
+ if ($joinfile == 1)
+ {
+
+ $arr_file = array(DOL_DATA_ROOT.'/prelevement/bon/'.$this->ref.'.ps');
+ $arr_mime = array("application/ps");
+ $arr_name = array($this->ref.".ps");
+
+ $mailfile->PrepareFile($arr_file, $arr_mime, $arr_name);
+ }
+
+
$mailfile->sendfile();
--
GitLab