s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2025-03-03 13:29:24 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #175 from faser2k/sort_fixes

Browse Source 
fix sorting/search for buchungen and kontoauszuege
This commit is contained in:
OpenXE-ERP 2025-02-23 21:30:17 +01:00 committed by GitHub
commit 7795016db1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/pages/fibu_buchungen.php
View File

@ -273,7 +273,7 @@ class Fibu_buchungen {
'' AS dummy, '' AS dummy,
'' AS dummy2, '' AS dummy2,
auswahl, auswahl,
datum, ".$this->app->erp->FormatDate(" datum ").",
".$this->app->erp->FormatUCfirst("typ").", ".$this->app->erp->FormatUCfirst("typ").",
objektlink, objektlink,
saldo, saldo,
@ -308,7 +308,7 @@ class Fibu_buchungen {
FROM FROM
( (
SELECT SELECT
".$this->app->erp->FormatDate(" fb.datum ")." AS datum, fb.datum,
fb.typ, fb.typ,
fb.id, fb.id,
fo.info, fo.info,

9
www/pages/kontoauszuege.php
View File

@ -120,8 +120,8 @@ class Kontoauszuege {
$sumcol = array(10); $sumcol = array(10);
$findcols = array('q.id','q.id','q.kurzbezeichnung', 'q.importdatum', 'q.buchung', 'q.soll', 'q.waehrung', 'q.buchungstext','q.internebemerkung','q.saldo'); $findcols = array('q.id','q.id', 'q.importdatum', 'q.kurzbezeichnung', 'q.buchungdatum', 'q.soll', 'q.waehrung', 'q.buchungstext','q.internebemerkung','q.saldo');
$searchsql = array('q.kurzbezeichnung', 'q.buchung', 'q.soll', 'q.buchungstext','q.internebemerkung'); $searchsql = array('q.kurzbezeichnung', 'q.buchungdatum', 'q.soll', 'q.buchungstext','q.internebemerkung');
$defaultorder = 1; $defaultorder = 1;
$defaultorderdesc = 0; $defaultorderdesc = 0;
@ -173,13 +173,14 @@ class Kontoauszuege {
".$app->erp->FormatMenge('(k.soll)',2).", ".$app->erp->FormatMenge('(k.soll)',2).",
'</del>' '</del>'
), ),
".$app->erp->FormatMenge('(k.soll)',2)."), ".$app->erp->FormatMenge('(k.soll)',2).") AS soll,
k.waehrung, k.waehrung,
k.buchungstext, k.buchungstext,
k.internebemerkung, k.internebemerkung,
".$app->erp->FormatMenge('SUM(fb.betrag)',2)." AS saldo, ".$app->erp->FormatMenge('SUM(fb.betrag)',2)." AS saldo,
k.id as menuid, k.id as menuid,
SUM(fb.betrag) AS saldonum SUM(fb.betrag) AS saldonum,
k.buchung AS buchungdatum
FROM kontoauszuege k FROM kontoauszuege k
LEFT JOIN fibu_buchungen_alle fb ON LEFT JOIN fibu_buchungen_alle fb ON
fb.id = k.id AND fb.typ = 'kontoauszuege' fb.id = k.id AND fb.typ = 'kontoauszuege'