blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-24 02:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Anpassung des Inventar an neues WaWi

Browse Source
This commit is contained in:
Andreas Österreicher
2011-01-17 15:56:11 +00:00
parent 8bb313effe
commit 0e49049435
8 changed files with 230 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/tw/vilesci_menu_main.inc.php
+1 -6
View File
@@ -198,12 +198,7 @@ $menu=array
'AfA'=>array('name'=>'AfA', 'link'=>'inventar/inventar_afa.php', 'target'=>'main'),
'Inventur'=>array('name'=>'Inventur', 'link'=>'inventar/inventar_inventur.php', 'target'=>'main'),
'Etiketten'=>array('name'=>'Etiketten', 'link'=>'inventar/etiketten.php', 'target'=>'main'),
),
'WAWI'=> array
(
'name'=>'WAWI', 'permissions'=>array('admin','wawi','support','wawi/inventar'),
'Suche'=>array('name'=>'Suche', 'link'=>'inventar/bestellung.php', 'target'=>'main'),
),
)
),
'Admin'=> array
(
include/tw/wawi_menu_main.inc.php
+2 -2
View File
@@ -65,9 +65,9 @@ $menu=array
'FirmaNeu'=>array('name'=>'Neu', 'link'=>'firma.php?method=new', 'target'=>'content'),
)
),
'Auswertungen'=> array
'Berichte'=> array
(
'name'=>'Auswertungen', 'opener'=>'true', 'hide'=>'false','permissions'=>array('wawi/bestellung','wawi/rechnung'),
'name'=>'Berichte', 'opener'=>'true', 'hide'=>'false','permissions'=>array('wawi/bestellung','wawi/rechnung'),
'Tags'=>array
(
'name'=>'Tags', 'permissions'=>array('wawi/bestellung'),'link'=>'auswertungen/wawi_tags.php', 'target'=>'content',
include/wawi_bestelldetail.class.php
+13 -5
View File
@@ -293,16 +293,25 @@ class wawi_bestelldetail extends basis_db
* Gibt alle Details einer Bestellung zurück
* @param $bestell_id
*/
public function getAllDetailsFromBestellung($bestell_id)
public function getAllDetailsFromBestellung($bestell_id, $filter=null)
{
if(!is_numeric($bestell_id))
{
$this->errormsg ='Keine gültige Bestell ID.';
return false;
}
$qry = "SELECT * from wawi.tbl_bestelldetail as detail
where
detail.bestellung_id = ".$bestell_id." order by position;";
$qry = "SELECT * FROM wawi.tbl_bestelldetail
WHERE
bestellung_id = '".$bestell_id."'";
if(!is_null($filter))
{
$qry.=" AND (beschreibung like '%".addslashes($filter)."%'
OR bestelldetail_id::text like '%".addslashes($filter)."%'
OR artikelnummer like '%".addslashes($filter)."%'
)";
}
$qry.=" ORDER BY position;";
if($this->db_query($qry))
{
@@ -337,5 +346,4 @@ class wawi_bestelldetail extends basis_db
return false;
}
}
}