mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
parent
6c38fcf909
commit
b1c4912afc
|
|
@ -93,7 +93,6 @@ parameters:
|
|||
- '#(?:(?:Asset::addDepreciationL|Facture(?:(?:(?:Fournisseur)?::add|Fournisseur::update)l))ine\(\)|calcul_price_total|dol_convertToWord|(?:loanCalcMonthlyPaymen|print_paypal_redirec)t) expects float, string given.#'
|
||||
- '#EvalMath::trigger\(\) expects string\|null,#'
|
||||
- '#(?:F(?:acture(?:(?:Fournisseur)?Rec::addline\(\))|ichinterRec::addLineRec\(\))|dolMd2Html|setEventMessages) expects string\|null,#'
|
||||
- '# (envoi_mail|sendEmailTo) expects string, \(float\|int\) given.#'
|
||||
- '#::printStdColumnContent\(\) expects string, float(\|(int|array)(\<.*\>)?)* given.#'
|
||||
- '#::HTML2OpenIDServer\(\) expects string, array given.#'
|
||||
- '#create_line\(\) expects string, float given.#'
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
#!/usr/bin/env php
|
||||
<?php
|
||||
/*
|
||||
* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2005-2013 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2005-2013 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -155,7 +155,7 @@ if ($resql) {
|
|||
if ($startbreak) {
|
||||
// Break onto sales representative (new email or cid)
|
||||
if (dol_strlen($oldemail) && $oldemail != 'none' && empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) {
|
||||
sendEmailTo($mode, $oldemail, $message, $total, $oldlang, $oldtarget, (int) $duration_value);
|
||||
sendEmailTo($mode, $oldemail, $message, price2num($total), $oldlang, $oldtarget, (int) $duration_value);
|
||||
$trackthirdpartiessent[$oldsid.'|'.$oldemail] = 'contact id '.$oldcid;
|
||||
} else {
|
||||
if ($oldemail != 'none') {
|
||||
|
|
@ -209,7 +209,7 @@ if ($resql) {
|
|||
// If there are remaining messages to send in the buffer
|
||||
if ($foundtoprocess) {
|
||||
if (dol_strlen($oldemail) && $oldemail != 'none' && empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) { // Break onto email (new email)
|
||||
sendEmailTo($mode, $oldemail, $message, $total, $oldlang, $oldtarget, (int) $duration_value);
|
||||
sendEmailTo($mode, $oldemail, $message, price2num($total), $oldlang, $oldtarget, (int) $duration_value);
|
||||
$trackthirdpartiessent[$oldsid.'|'.$oldemail] = 'contact id '.$oldcid;
|
||||
} else {
|
||||
if ($oldemail != 'none') {
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ if ($resql) {
|
|||
if (($obj->email != $oldemail || $obj->uid != $olduid) || $oldemail == 'none') {
|
||||
// Break onto sales representative (new email or uid)
|
||||
if (dol_strlen($oldemail) && $oldemail != 'none') {
|
||||
envoi_mail($mode, $oldemail, $message, $total, $oldlang, $oldsalerepresentative);
|
||||
envoi_mail($mode, $oldemail, $message, price2num($total), $oldlang, $oldsalerepresentative);
|
||||
} else {
|
||||
if ($oldemail != 'none') {
|
||||
print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
|
||||
|
|
@ -173,7 +173,7 @@ if ($resql) {
|
|||
// If there are remaining messages to send in the buffer
|
||||
if ($foundtoprocess) {
|
||||
if (dol_strlen($oldemail) && $oldemail != 'none') { // Break onto email (new email)
|
||||
envoi_mail($mode, $oldemail, $message, $total, $oldlang, $oldsalerepresentative);
|
||||
envoi_mail($mode, $oldemail, $message, price2num($total), $oldlang, $oldsalerepresentative);
|
||||
} else {
|
||||
if ($oldemail != 'none') {
|
||||
print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user