X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=assistants%2Fstats%2Freserve.inc.php;h=f161fa4a07436503c586ddcc2a122facd43259a7;hb=af6ae18de08fdcbbe6a371f6ccd78ecaf6af6001;hp=a2a4c131fff529b81bfffcfbb609f9f14f46a574;hpb=efb88362d58916610049d37fa783d63f7f003a55;p=mirrors%2FSokoMan.git

diff --git a/assistants/stats/reserve.inc.php b/assistants/stats/reserve.inc.php
index a2a4c13..f161fa4 100644
--- a/assistants/stats/reserve.inc.php
+++ b/assistants/stats/reserve.inc.php
@@ -1,14 +1,14 @@
 <?php
 $queries += array(
 	"Nakoupit: Došlo úplně (Urgent WishList)"
-		=> 'SELECT model_id,model_name,model_barcode,model_reserve,model_reserve as item_quantity_to_buy'.
+		=> 'SELECT model_id,model_name,model_reserve,model_reserve as item_quantity_to_buy'.
 		' FROM model'.
 		' 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 LEFT JOIN barcode USING(barcode_id) WHERE barcode.model_id=model.model_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 model USING(model_id)'.
+		' FROM item LEFT JOIN barcode USING(barcode_id) LEFT JOIN model USING(model_id)'.
 		' WHERE item_valid_till=0 AND status_id=1'.
 		' GROUP BY model_id'.
 		' HAVING SUM(item_quantity)<model_reserve'.