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

bugfix verbindlichkeit entwuerfe

Browse Source
This commit is contained in:
OpenXE 2025-03-02 11:24:57 +01:00
parent e10bf935f1
commit cc3d98222d
1 changed files with 85 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
www/pages/verbindlichkeit.php
View File

@ -44,6 +44,9 @@ class Verbindlichkeit {
function TableSearch(&$app, $name, $erlaubtevars) { function TableSearch(&$app, $name, $erlaubtevars) {
switch ($name) { switch ($name) {
case 'verbindlichkeit_inbearbeitung':
$entwuerfe = true;
// break ommitted
case "verbindlichkeit_list": case "verbindlichkeit_list":
$allowed['verbindlichkeit_list'] = array('list'); $allowed['verbindlichkeit_list'] = array('list');
$heading = array('','','Belegnr','Adresse', 'Lieferant', 'RE-Nr', 'RE-Datum', 'Betrag (brutto)', 'Währung','Zahlstatus', 'Ziel','Skontoziel','Skonto','Status','Monitor', 'Menü'); $heading = array('','','Belegnr','Adresse', 'Lieferant', 'RE-Nr', 'RE-Datum', 'Betrag (brutto)', 'Währung','Zahlstatus', 'Ziel','Skontoziel','Skonto','Status','Monitor', 'Menü');
@ -114,9 +117,14 @@ class Verbindlichkeit {
) d ON d.parameter = v.id ) d ON d.parameter = v.id
"; ";
$where = "1"; $where = "1";
$count = "SELECT count(DISTINCT id) FROM verbindlichkeit WHERE $where";
// $groupby = "";
if ($entwuerfe) {
$where .= " AND v.belegnr = '' OR v.belegnr IS NULL";
$count = "SELECT count(DISTINCT id) FROM verbindlichkeit v WHERE $where";
}
else {
$where .= " AND v.belegnr <> ''";
$count = "SELECT count(DISTINCT id) FROM verbindlichkeit v WHERE $where";
// Toggle filters // Toggle filters
$this->app->Tpl->Add('JQUERYREADY', "$('#anhang').click( function() { fnFilterColumn1( 0 ); } );"); $this->app->Tpl->Add('JQUERYREADY', "$('#anhang').click( function() { fnFilterColumn1( 0 ); } );");
$this->app->Tpl->Add('JQUERYREADY', "$('#wareneingang').click( function() { fnFilterColumn2( 0 ); } );"); $this->app->Tpl->Add('JQUERYREADY', "$('#wareneingang').click( function() { fnFilterColumn2( 0 ); } );");
@ -199,77 +207,12 @@ class Verbindlichkeit {
} }
$where .= " AND v.status <> 'angelegt'"; $where .= " AND v.status <> 'angelegt'";
// END Toggle filters // END Toggle filters
}
$moreinfo = true; // Allow drop down details $moreinfo = true; // Allow drop down details
$menucol = 1; // For moredata $menucol = 1; // For moredata
break;
case 'verbindlichkeit_inbearbeitung':
$allowed['verbindlichkeit_inbearbeitung'] = array('list');
$heading = array('','','Belegnr','Adresse', 'Lieferant', 'RE-Nr', 'RE-Datum', 'Betrag (brutto)', 'W&auml;hrung','Zahlstatus', 'Ziel','Skontoziel','Skonto','Status','Monitor', 'Men&uuml;');
$width = array('1%','1%','10%'); // Fill out manually later
// columns that are aligned right (numbers etc)
// $alignright = array(4,5,6,7,8);
$findcols = array(
'v.id',
'v.id',
'v.belegnr',
'a.name',
'a.lieferantennummer',
'v.rechnung',
'v.rechnungsdatum',
'v.betrag',
'v.waehrung',
'v.bezahlt',
'v.zahlbarbis',
'v.skontobis',
'v.skonto',
'v.status',
'v.status_beleg',
'v.id'
);
$searchsql = array(
'a.name',
'a.lieferantennummer',
'v.rechnung',
'v.internebemerkung'
);
$defaultorder = 1;
$defaultorderdesc = 0;
$alignright = array(8);
$sumcol = array(8);
$dropnbox = "'<img src=./themes/new/images/details_open.png class=details>' AS `open`, CONCAT('<input type=\"checkbox\" name=\"auswahl[]\" value=\"',v.id,'\" />') AS `auswahl`";
$menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=verbindlichkeit&action=edit&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.svg\" border=\"0\"></a>&nbsp;<a href=\"#\" onclick=DeleteDialog(\"index.php?module=verbindlichkeit&action=delete&id=%value%\");>" . "<img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>" . "</td></tr></table>";
$sql = "SELECT SQL_CALC_FOUND_ROWS
v.id,
$dropnbox,
'ENTWURF' as belegnr,
a.name,
a.lieferantennummer,
v.rechnung,
".$app->erp->FormatDate("v.rechnungsdatum").",
".$app->erp->FormatMenge('v.betrag',2).",
v.waehrung,
if(v.bezahlt,'bezahlt','offen'),
".$app->erp->FormatDate("v.zahlbarbis").",
IF(v.skonto <> 0,".$app->erp->FormatDate("v.skontobis").",''),
IF(v.skonto <> 0,CONCAT(".$app->erp->FormatMenge('v.skonto',0).",'%'),''),
v.status,
".$app->YUI->IconsSQLVerbindlichkeit().",
v.id FROM verbindlichkeit v
LEFT JOIN adresse a ON v.adresse = a.id";
$where = "v.status = 'angelegt'";
$count = "SELECT count(DISTINCT id) FROM verbindlichkeit v WHERE $where";
break; break;
case 'verbindlichkeit_paketdistribution_list': case 'verbindlichkeit_paketdistribution_list':
$allowed['verbindlichkeit_paketdistribution_list'] = array('list'); $allowed['verbindlichkeit_paketdistribution_list'] = array('list');