s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-26 06:30:29 +01:00
Code Issues Projects Releases Wiki Activity

Bugfixes adresse

Browse Source
This commit is contained in:
Xenomporio 2022-05-23 18:04:57 +02:00
parent f1c0a10017
commit bc3cbb173e
3 changed files with 6516 additions and 6508 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpwf/plugins/class.yui.php
View File

@ -4440,19 +4440,21 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
$heading[$startindex]="Menü"; $heading[$startindex]="Menü";
$findcols[$startindex]="b.menu"; $findcols[$startindex]="b.menu";
if (!is_null($tmpsql)) {
$tmpsqlstring = implode(',',$tmpsql); $tmpsqlstring = implode(',',$tmpsql);
}
if($tmpsqlstring!="")$tmpsqlstring .=","; if($tmpsqlstring!="")$tmpsqlstring .=",";
} }
if (!is_null($tmp_or)) {
if(count($tmp_or)>0) if(count($tmp_or)>0)
{ {
$tmp = "AND (".implode(' or ',$tmp_or).")"; $tmp = "AND (".implode(' or ',$tmp_or).")";
} }
}
//auftrag //auftrag
if($fauftrag && $this->app->erp->RechteVorhanden('auftrag','list')){ if($fauftrag && $this->app->erp->RechteVorhanden('auftrag','list')){

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

@ -18022,10 +18022,12 @@ function SendPaypalFromAuftrag($auftrag, $test = false)
} }
// wenn ziel formular // wenn ziel formular
//return $abkuerzung; if ($value != "") {
if($value == round($value, 2)) { //return $abkuerzung;
return number_format((float)$value,2,',',''); if($value == round($value, 2)) {
} return number_format((float)$value,2,',','');
}
}
return rtrim(str_replace('.',',',$value),'0'); return rtrim(str_replace('.',',',$value),'0');
} }

10
www/pages/adresse.php
View File

@ -2268,7 +2268,7 @@ function AdresseRollen()
DATE_FORMAT(a.von,'%d.%m.%Y') as seit, if(a.bis='0000-00-00','aktuell',DATE_FORMAT(a.bis,'%d.%m.%Y')) as bis, a.id DATE_FORMAT(a.von,'%d.%m.%Y') as seit, if(a.bis='0000-00-00','aktuell',DATE_FORMAT(a.bis,'%d.%m.%Y')) as bis, a.id
FROM adresse_rolle a LEFT JOIN projekt p ON a.parameter=p.id FROM adresse_rolle a LEFT JOIN projekt p ON a.parameter=p.id
LEFT JOIN gruppen g ON g.id=a.parameter LEFT JOIN gruppen g ON g.id=a.parameter
WHERE a.adresse='$id'"); WHERE a.adresse='$id'",0,"");
$table->DisplayNew('TAB1NEXT', "<!--<a href=\"index.php?module=adresse&action=rolleeditpopup&frame=false&id=%value%\" $table->DisplayNew('TAB1NEXT', "<!--<a href=\"index.php?module=adresse&action=rolleeditpopup&frame=false&id=%value%\"
onclick=\"makeRequest(this);return false\"><img src=\"./themes/[THEME]/images/edit.svg\" border=\"0\"></a>&nbsp;--> onclick=\"makeRequest(this);return false\"><img src=\"./themes/[THEME]/images/edit.svg\" border=\"0\"></a>&nbsp;-->
@ -5078,8 +5078,12 @@ function AdresseBelege()
$von = $this->app->Secure->GetGET("von"); $von = $this->app->Secure->GetGET("von");
$bis = $this->app->Secure->GetGET("bis"); $bis = $this->app->Secure->GetGET("bis");
} }
$von = date_format(date_create_from_format('d.m.Y', $von), 'Y-m-d');
$bis = date_format(date_create_from_format('d.m.Y', $bis), 'Y-m-d'); if (!is_null($von) && !is_null($bis))
{
$von = date_format(date_create_from_format('d.m.Y', $von), 'Y-m-d');
$bis = date_format(date_create_from_format('d.m.Y', $bis), 'Y-m-d');
}
$rechnungt = $this->app->DB->Select("SELECT SUM(soll-ist) FROM rechnung WHERE status != 'angelegt' AND zahlungsstatus != 'bezahlt' AND adresse = '$id' AND datum >= '$von' AND datum <= '$bis'"); $rechnungt = $this->app->DB->Select("SELECT SUM(soll-ist) FROM rechnung WHERE status != 'angelegt' AND zahlungsstatus != 'bezahlt' AND adresse = '$id' AND datum >= '$von' AND datum <= '$bis'");
//$gutschriftt = $this->app->DB->Select("SELECT SUM(soll-ist) FROM gutschrift WHERE status != 'angelegt' AND (manuell_vorabbezahlt != '0000-00-00' OR manuell_vorabbezahlt IS NOT NULL) AND adresse = '$id' AND datum >= '$von' AND datum <= '$bis'"); //$gutschriftt = $this->app->DB->Select("SELECT SUM(soll-ist) FROM gutschrift WHERE status != 'angelegt' AND (manuell_vorabbezahlt != '0000-00-00' OR manuell_vorabbezahlt IS NOT NULL) AND adresse = '$id' AND datum >= '$von' AND datum <= '$bis'");