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

Merge branch 'refs/heads/master' into cleanup

Browse Source
This commit is contained in:
Andreas Palm 2024-10-04 22:51:33 +02:00
commit 87c9feba1e
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7209,6 +7209,20 @@ title: 'Abschicken',
$navarray['menu']['admin'][$menu]['sec'][] = array('Wiedervorlage','wiedervorlage','list');
$navarray['menu']['admin'][$menu]['sec'][] = array('Wiki','wiki','list');
$navarray['menu']['admin'][$menu]['sec'][] = array('Zeiterfassung','zeiterfassung','create');
foreach ($navarray['menu']['admin'] as $key => $menuitem) {
usort($menuitem['sec'], function ($a, $b) {
$a_val = $a[0];
$b_val = $b[0];
if($a_val > $b_val) return 1;
if($a_val < $b_val) return -1;
return 0;
});
$navarray['menu']['admin'][$key] = $menuitem;
}
// Always the last entry
$navarray['menu']['admin'][$menu]['sec'][] = array('Abmelden','welcome','logout');
return $this->CalculateNavigation($navarray);

2
www/lib/dokumente/class.rechnung.php
View File

@ -232,7 +232,7 @@ class RechnungPDF extends BriefpapierCustom {
FROM lieferschein WHERE id='$lieferscheinid' LIMIT 1");
if($datumlieferschein=="00.00.0000") $datumlieferschein = $datum;
if($lieferdatum=="00.00.0000") $lieferdatum = $datum;
if($lieferdatum=="00.00.0000") $lieferdatum = "";
if($mahnwesen_datum=="00.00.0000") $mahnwesen_datum = "";
$bearbeiteremail = $this->app->DB->Select("SELECT b.email FROM rechnung r LEFT JOIN adresse b ON b.id=r.bearbeiterid WHERE r.id='$id' LIMIT 1");

3
www/pages/importvorlage.php
View File

@ -4008,7 +4008,8 @@ class Importvorlage extends GenImportvorlage {
$feldnameohnepsrache = str_replace($sprachenSet,'',$feldnameohnepsrache);
}
if(in_array($feldnameohnepsrache, $erlaubtefelder,false) && !in_array($sprachenSet,$zuImportierendeSprachen[$sprache],false)){
$haystack = $zuImportierendeSprachen[$sprache]?$zuImportierendeSprachen[$sprache]:array();
if(in_array($feldnameohnepsrache, $erlaubtefelder,false) && !in_array($sprachenSet,$haystack,false)){
$zuImportierendeSprachen[$sprache][] = $sprachenSet;
}
}