Skip to content

Commit

Permalink
FIX DA025494 Rejet
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Sep 19, 2024
1 parent 6af9a69 commit 405c5c0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions htdocs/compta/prelevement/class/rejetprelevement.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public function create($user, $id, $motif, $date_rejet, $bonid, $facturation = 0

//TODO: Must be managed by notifications module
// Send email to sender of the standing order request
$this->_send_email($fac);
//$this->_send_email($fac); DA025494
}

if ($error == 0) {
Expand Down Expand Up @@ -291,7 +291,7 @@ private function _send_email($fac)
$message = $langs->trans("InfoRejectMessage", $facref, $socname, $amount, $userinfo);

$mailfile = new CMailFile($subject, $sendto, $from, $message, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $this->user->email, '', $trackid);

// var_dump($subject, $sendto, $from, $message);exit;
$result = $mailfile->sendfile();
if ($result) {
dol_syslog("RejetPrelevement::_send_email email envoye");
Expand Down
1 change: 1 addition & 0 deletions htdocs/includes/ckeditor/ckeditor/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ CKEDITOR.editorConfig = function( config ) {
// Define changes to default configuration here. For example:
// config.language = 'fr';
// config.uiColor = '#AADC6E';
config.versionCheck = false
};
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ protected function getEncodableWordTokens($string)

$encodedToken = '';
// Split at all whitespace boundaries
//var_dump($string);exit;
foreach (preg_split('~(?=[\t ])~', $string ?? '') as $token) {
if ($this->tokenNeedsEncoding($token)) {
$encodedToken .= $token;
Expand Down

0 comments on commit 405c5c0

Please sign in to comment.