s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-11-14 20:17:14 +01:00
Code Issues Projects Releases Wiki Activity

Bugfix no email account

Browse Source
This commit is contained in:
Xenomporio 2022-07-06 15:12:13 +02:00
parent ba81d2daaa
commit 3cdbc88e56
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
www/lib/class.erpapi.php
View File

@ -29779,8 +29779,14 @@ function ChargenMHDAuslagern($artikel, $menge, $lagerplatztyp, $lpid,$typ,$wert,
*/
// Force only existing emailbackup accounts
$tpl = "<option value=\"\">-</option>";
$email_addr = $this->app->DB->SelectArr("SELECT email, angezeigtername FROM emailbackup WHERE email != '' AND (adresse<=0 OR adresse='".$this->app->User->GetAdresse()."') AND geloescht!=1 ORDER BY email");
if (empty($email_addr)) {
return "";
}
foreach($email_addr AS $mail)
{
if($mail['angezeigtername']!="") $emails[] = $mail['angezeigtername']." &lt;".$mail['email']."&gt;";
@ -29789,7 +29795,6 @@ function ChargenMHDAuslagern($artikel, $menge, $lagerplatztyp, $lpid,$typ,$wert,
$emails = array_keys(array_flip($emails));
for($i=0;$i<(!empty($emails)?count($emails):0);$i++)
{
if($emails[$i]===$selected) $mark="selected"; else $mark="";
@ -29820,8 +29825,14 @@ function ChargenMHDAuslagern($artikel, $menge, $lagerplatztyp, $lpid,$typ,$wert,
*/
// Force only existing emailbackup accounts
$tpl = "<option value=\"\">-</option>";
$email_addr = $this->app->DB->SelectArr("SELECT email FROM emailbackup WHERE email != '' AND (adresse<=0 OR adresse='".$this->app->User->GetAdresse()."') AND geloescht!=1 ORDER BY email");
if (empty($email_addr)) {
return "";
}
foreach($email_addr AS $mail) {
$emails[] = $mail['email'];
}

4
www/pages/firmendaten.php
View File

@ -467,8 +467,8 @@ class Firmendaten {
$this->app->erp->Firmendaten('email'),
$this->app->erp->Firmendaten('absendername'),
$this->app->erp->Firmendaten('testmailempfaenger'),
'Testmail Empfaenger',
'Xentral ERP: Testmail',
$this->app->erp->Firmendaten('testmailempfaenger'),
'Xenomporio ERP: Testmail',
'Dies ist eine Testmail',
'',0,true,'','',
true