X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=assistants%2Fstats%2Freserve.inc.php;h=d8e92dbcbf35f4a1e565a45effb4b3ef8a52ce29;hb=113c586b885aeaf164dba3c421057c7ad3544ceb;hp=b60ec2d5a4d5c2385ebffa82c15bc474aefd2e48;hpb=eca3fc1db94c023c08354046b96cca0401fc49fc;p=mirrors%2FSokoMan.git

diff --git a/assistants/stats/reserve.inc.php b/assistants/stats/reserve.inc.php
index b60ec2d..d8e92db 100644
--- a/assistants/stats/reserve.inc.php
+++ b/assistants/stats/reserve.inc.php
@@ -1,14 +1,12 @@
 <?php
 $queries += array(
-/*
-	"Nakoupit: Došlo úplně (Urgent WishList)" //TODO: Reinvent
-		=> 'SELECT model_id,model_name,model_barcode,model_reserve,model_reserve as item_quantity_to_buy'.
-		' FROM model'.
+	"Nakoupit: Došlo úplně (Urgent WishList)"
+		=> 'SELECT model_id,model_name,barcode_name,model_reserve,model_reserve as item_quantity_to_buy'.
+		' FROM model LEFT JOIN barcode USING(model_id)'.
 		' WHERE model_reserve>0 AND NOT EXISTS'.
-		' (SELECT item_id FROM item WHERE model.model_id=item.model_id AND status_id=1 AND item_quantity>0 AND item_valid_till=0)',
-*/
+		' (SELECT item_id FROM item WHERE barcode.barcode_id=item.barcode_id AND status_id=1 AND item_quantity>0 AND item_valid_till=0)',
 	"Nakoupit: Dochází (WishList)"
-		=> 'SELECT model_id,model_name,model_barcode,model_reserve,'.
+		=> 'SELECT model_id,model_name,barcode_name,model_reserve,'.
 		' COUNT(item_id),SUM(item_quantity),model_reserve-SUM(item_quantity) as item_quantity_to_buy'.
 		' FROM item LEFT JOIN barcode USING(barcode_id) LEFT JOIN model USING(model_id)'.
 		' WHERE item_valid_till=0 AND status_id=1'.