mirror of
https://github.com/OpenXE-org/OpenXE.git
synced 2024-12-25 22:20:29 +01:00
Bugfix gutschriften list subwhere
This commit is contained in:
parent
86165a06bf
commit
2d63ffe7b2
@ -6084,7 +6084,6 @@ r.land as land, p.abkuerzung as projekt, r.zahlungsweise as zahlungsweise,
|
|||||||
|
|
||||||
//if($tmp!="")$tmp .= " AND r.belegnr!='' ";
|
//if($tmp!="")$tmp .= " AND r.belegnr!='' ";
|
||||||
|
|
||||||
|
|
||||||
$more_data1 = $this->app->Secure->GetGET("more_data1");
|
$more_data1 = $this->app->Secure->GetGET("more_data1");
|
||||||
if ($more_data1 == 1) $subwhere[] = " (r.zahlungsstatus!='bezahlt' AND (r.manuell_vorabbezahlt='' OR r.manuell_vorabbezahlt='0000-00-00' OR r.manuell_vorabbezahlt IS NULL)) ";
|
if ($more_data1 == 1) $subwhere[] = " (r.zahlungsstatus!='bezahlt' AND (r.manuell_vorabbezahlt='' OR r.manuell_vorabbezahlt='0000-00-00' OR r.manuell_vorabbezahlt IS NULL)) ";
|
||||||
|
|
||||||
@ -6094,8 +6093,10 @@ r.land as land, p.abkuerzung as projekt, r.zahlungsweise as zahlungsweise,
|
|||||||
$more_data3 = $this->app->Secure->GetGET("more_data3");
|
$more_data3 = $this->app->Secure->GetGET("more_data3");
|
||||||
if ($more_data3 == 1) $subwhere[] = " (r.manuell_vorabbezahlt IS NULL OR r.manuell_vorabbezahlt='0000-00-00') ";
|
if ($more_data3 == 1) $subwhere[] = " (r.manuell_vorabbezahlt IS NULL OR r.manuell_vorabbezahlt='0000-00-00') ";
|
||||||
|
|
||||||
|
$tmp = '';
|
||||||
for ($j = 0;$j < count($subwhere);$j++) $tmp.= " AND " . $subwhere[$j];
|
if (!is_null($subwhere)) {
|
||||||
|
for ($j = 0;$j < count($subwhere);$j++) $tmp.= " AND " . $subwhere[$j];
|
||||||
|
}
|
||||||
|
|
||||||
$where = " r.status!='angelegt' AND r.id!='' ".$tmp ." ". $this->app->erp->ProjektRechte('p.id', true, 'r.vertriebid');
|
$where = " r.status!='angelegt' AND r.id!='' ".$tmp ." ". $this->app->erp->ProjektRechte('p.id', true, 'r.vertriebid');
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user