s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-11-15 04:27:14 +01:00
Code Issues Projects Releases Wiki Activity

wareneingang usability improvements

Browse Source
This commit is contained in:
OpenXE 2023-05-05 14:25:56 +02:00
parent 2d938e96a0
commit 25cf7de75b
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
www/pages/wareneingang.php
View File

@ -999,7 +999,7 @@ $lagerartikel = "";
LEFT JOIN bestellung on bestellung_position.bestellung = bestellung.id LEFT JOIN bestellung on bestellung_position.bestellung = bestellung.id
where paketannahme = $id GROUP BY bestellung_position, paketdistribution.artikel) as p";*/ where paketannahme = $id GROUP BY bestellung_position, paketdistribution.artikel) as p";*/
$sql = "SELECT p.nummer,p.lieferantnummer, p.nummer, p.bestellbezug, p.name, p.menge, p.bemerkung from $sql = "SELECT SQL_CALC_FOUND_ROWS p.nummer,p.lieferantnummer, p.nummer, p.bestellbezug, p.name, p.menge, p.bemerkung from
(SELECT bestellung.belegnr as bestellbezug, bestellung_position.bestellnummer as lieferantnummer ,artikel.nummer as nummer, artikel.name_de as name, ".$this->app->erp->FormatMenge("paketdistribution.menge")." as menge, paketdistribution.bemerkung (SELECT bestellung.belegnr as bestellbezug, bestellung_position.bestellnummer as lieferantnummer ,artikel.nummer as nummer, artikel.name_de as name, ".$this->app->erp->FormatMenge("paketdistribution.menge")." as menge, paketdistribution.bemerkung
FROM paketdistribution FROM paketdistribution
INNER JOIN artikel ON artikel.id = paketdistribution.artikel INNER JOIN artikel ON artikel.id = paketdistribution.artikel
@ -1008,7 +1008,7 @@ $lagerartikel = "";
where paketannahme = $id) as p"; where paketannahme = $id) as p";
$where = ""; $where = "";
$count = "SELECT count(DISTINCT artikel) FROM paketdistribution p WHERE paketannahme = $id"; $count = "SELECT count(DISTINCT id) FROM paketdistribution p WHERE paketannahme = $id";
// $groupby = ""; // $groupby = "";
break; break;
@ -1032,11 +1032,14 @@ $lagerartikel = "";
// $groupby = ""; // $groupby = "";
*/ */
$allowed['paketannahme_list'] = array('list'); $allowed['paketannahme_list'] = array('list');
$heading = array('Paket-Nr.','Datum','Status','Name', 'Kunde', 'Lieferant','Bestellung','LS-Nr.','RE-Nr.', 'Bearbeiter','Bemerkung', 'Menü'); $heading = array('','Paket-Nr.','Datum','Status','Name', 'Kunde', 'Lieferant','Bestellung','LS-Nr.','RE-Nr.', 'Bearbeiter','Bemerkung', 'Menü');
$width = array('5%','10%','10%','10%','10%','10%','10%','10%','10%','10%'); // Fill out manually later $width = array('1%','5%','10%','10%','10%','10%','10%','10%','10%','10%','10%'); // Fill out manually later
$drop = "'<img src=./themes/new/images/details_open.png class=details>' AS `open`";
$findcols = array( $findcols = array(
'paketannahme.id', 'paketannahme.id',
'paketannahme.id',
'paketannahme.datum', 'paketannahme.datum',
'paketannahme.status', 'paketannahme.status',
'adresse.name', 'adresse.name',
@ -1068,7 +1071,8 @@ $lagerartikel = "";
$menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=wareneingang&action=distriinhalt&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.svg\" border=\"0\"></a>&nbsp;</td></tr></table>"; $menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=wareneingang&action=distriinhalt&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.svg\" border=\"0\"></a>&nbsp;</td></tr></table>";
$sql = "SELECT SQL_CALC_FOUND_ROWS $sql = "SELECT SQL_CALC_FOUND_ROWS
paketannahme.id, paketannahme.id,
".$drop.",
paketannahme.id, paketannahme.id,
DATE_FORMAT(paketannahme.datum, '%d.%m.%Y %H:%i'), DATE_FORMAT(paketannahme.datum, '%d.%m.%Y %H:%i'),
paketannahme.status, paketannahme.status,
@ -1105,7 +1109,9 @@ $lagerartikel = "";
paketannahme.bearbeiter, paketannahme.bearbeiter,
paketannahme.bemerkung, paketannahme.bemerkung,
paketannahme.id "; paketannahme.id ";
$moreinfo = true; // Allow drop down details
$menucol = 1; // For moredata
break; break;
} }
@ -1719,8 +1725,10 @@ $lagerartikel = "";
$cmd = $this->app->Secure->GetGET('cmd'); $cmd = $this->app->Secure->GetGET('cmd');
$lsnr = $this->app->Secure->GetPOST('lsnr'); $lsnr = $this->app->Secure->GetPOST('lsnr');
$renr = $this->app->Secure->GetPOST('renr'); $renr = $this->app->Secure->GetPOST('renr');
$bemerkung = $this->app->Secure->GetPOST('bemerkung'); $bemerkung = $this->app->Secure->GetPOST('bemerkung');
$bemerkung = str_replace(array('\r\n', '\r', '\n'), "\n", $bemerkung);
// Load from DB // Load from DB
if (($lsnr == '' && $renr == '' && $bemerkung == '') && $id != '') { if (($lsnr == '' && $renr == '' && $bemerkung == '') && $id != '') {
$fields = $this->app->DB->SelectArr( $fields = $this->app->DB->SelectArr(
@ -1836,15 +1844,18 @@ $lagerartikel = "";
} }
$this->app->Location->execute("index.php?module=wareneingang&action=distrietiketten&id=$id&$col=$pos&menge=$menge&seriennummer=".$seriennummer); $this->app->Location->execute("index.php?module=wareneingang&action=distrietiketten&id=$id&$col=$pos&menge=$menge&seriennummer=".$seriennummer);
} }
} }
$sql =sprintf(
$adresse= $this->app->DB->Select( 'SELECT `adresse`,%s FROM `paketannahme` WHERE `id` = %d LIMIT 1',
sprintf( $this->app->erp->FormatDate('datum','datum'),
'SELECT `adresse` FROM `paketannahme` WHERE `id` = %d LIMIT 1',
$id $id
) );
);
$paketannahme = $this->app->DB->SelectArr($sql)[0];
$adresse = $paketannahme['adresse'];
$datum = $paketannahme['datum'];
$addressRow = empty($adresse)?null: $this->app->DB->SelectRow( $addressRow = empty($adresse)?null: $this->app->DB->SelectRow(
sprintf( sprintf(
@ -1896,7 +1907,7 @@ $lagerartikel = "";
if (!empty($addressRow['name'])) { if (!empty($addressRow['name'])) {
$this->app->Tpl->Set('LEGENDE',"Paket <b>Nr.$id</b> erfassen f&uuml;r Adresse '".$addressRow['name']."':"); $this->app->Tpl->Set('LEGENDE',"Paket <b>Nr.$id</b> vom $datum erfassen f&uuml;r Adresse '".$addressRow['name']."':");
} }
$this->app->Tpl->Add('TAB1_SECOND',"<br><h1>Paketinhalt (eingebucht):</h1><br>"); $this->app->Tpl->Add('TAB1_SECOND',"<br><h1>Paketinhalt (eingebucht):</h1><br>");