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

Update card_presend.tpl.php

Browse Source
This commit is contained in:
Oarces DEV 2023-02-18 03:24:17 +01:00 committed by GitHub
parent aa7fdaf194
commit 25634fbb50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/core/tpl/card_presend.tpl.php
View File

@ -1,6 +1,8 @@
<?php <?php
/* Copyright (C) 2017-2018 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2017-2018 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2022 Charlene Benke <charlene@patas-monkey.com> * Copyright (C) 2022 Charlene Benke <charlene@patas-monkey.com>
* Copyright (C) 2023 Maxime Nicolas <maxime@oarces.com>
* Copyright (C) 2023 Benjamin GREMBI <benjamin@oarces.com>
* *
* 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
@ -129,7 +131,11 @@ if ($action == 'presend') {
if ($formmail->fromtype === 'user') { if ($formmail->fromtype === 'user') {
$formmail->fromid = $user->id; $formmail->fromid = $user->id;
} }
if ($object->element == 'salary' && !empty($conf->global->INVOICE_EMAIL_SENDER)) {
$formmail->frommail = $conf->global->SINVOICE_EMAIL_SENDER;
$formmail->fromname = (!empty($conf->global->INVOICE_EMAIL_SENDER_NAME) ? $conf->global->INVOICE_EMAIL_SENDER_NAME : '');
$formmail->fromtype = 'special';
}
if ($object->element === 'facture' && !empty($conf->global->INVOICE_EMAIL_SENDER)) { if ($object->element === 'facture' && !empty($conf->global->INVOICE_EMAIL_SENDER)) {
$formmail->frommail = $conf->global->INVOICE_EMAIL_SENDER; $formmail->frommail = $conf->global->INVOICE_EMAIL_SENDER;
$formmail->fromname = (!empty($conf->global->INVOICE_EMAIL_SENDER_NAME) ? $conf->global->INVOICE_EMAIL_SENDER_NAME : ''); $formmail->fromname = (!empty($conf->global->INVOICE_EMAIL_SENDER_NAME) ? $conf->global->INVOICE_EMAIL_SENDER_NAME : '');
@ -194,6 +200,10 @@ if ($action == 'presend') {
$liste['contact'] = $object->getFullName($outputlangs)." <".$object->email.">"; $liste['contact'] = $object->getFullName($outputlangs)." <".$object->email.">";
} elseif ($object->element == 'user' || $object->element == 'member') { } elseif ($object->element == 'user' || $object->element == 'member') {
$liste['thirdparty'] = $object->getFullName($outputlangs)." <".$object->email.">"; $liste['thirdparty'] = $object->getFullName($outputlangs)." <".$object->email.">";
} elseif ($object->element == 'salary') {
$fuser = new User($db);
$fuser->fetch($object->fk_user);
$liste['thirdparty'] = $fuser->getFullName($outputlangs)." <".$fuser->email.">";
} else { } else {
if (!empty($object->socid) && $object->socid > 0 && !is_object($object->thirdparty) && method_exists($object, 'fetch_thirdparty')) { if (!empty($object->socid) && $object->socid > 0 && !is_object($object->thirdparty) && method_exists($object, 'fetch_thirdparty')) {
$object->fetch_thirdparty(); $object->fetch_thirdparty();