Index: trunk/SQL/StoredProcedures/sp_GetReklamy.txt
===================================================================
--- trunk/SQL/StoredProcedures/sp_GetReklamy.txt (revision 792)
+++ trunk/SQL/StoredProcedures/sp_GetReklamy.txt (revision 794)
@@ -72,17 +72,17 @@
 where 1=1 and (r.SZER * r.WYS)<>0 '
 
-if NOT (@agencja IS NULL)
+IF NOT (@agencja IS NULL)
 SET @query = @query + ' AND A.Symbol=''' + @agencja + ''' '
 
-if NOT (@agent IS NULL)
+IF NOT (@agent IS NULL)
 SET @query = @query + ' AND [symbol akwizytora] like ''%' + @agent + '%'' '
 
-if NOT (@reklama IS NULL)
+IF NOT (@reklama IS NULL)
 SET @query = @query + ' AND r.[id reklamy] like ''%' + @reklama + '%'' '
 
-if NOT (@rok IS NULL)
+IF NOT (@rok IS NULL)
 SET @query = @query + ' AND DATEPART(year, N.DATA_W)=' + CAST(@rok as nvarchar) + ' '
 
-if (NOT (@rok IS NULL)) AND (NOT (@ms IS NULL))
+IF (NOT (@rok IS NULL)) AND (NOT (@ms IS NULL))
 BEGIN
 SET @query = @query + ' AND R.ReklamaId IN '
@@ -94,4 +94,24 @@
 IF (NOT @fw IS NULL)
 SET @query = @query + ' AND U.Zafakturowana=' + CAST(@fw as nvarchar)
+IF NOT (@agent IS NULL)
+SET @query = @query + ' AND R.[symbol akwizytora] like ''%' + @agent + '%'' '
+
+IF NOT (@tytul IS NULL)
+SET @query = @query + ' AND R.[tytu³]=''' + @tytul + ''' '
+
+IF NOT (@typ IS NULL)
+SET @query = @query + ' AND R.[TYP]=''' + @typ + ''' '
+
+IF NOT (@promocja IS NULL)
+SET @query = @query + ' AND R.[Promocja]=' + CAST(@promocja as nvarchar) + ' '
+
+IF NOT (@zd IS NULL)
+SET @query = @query + ' AND R.[Zatwierdzono do druku]=' + CAST(@zd as nvarchar) + ' '
+
+IF NOT (@kz IS NULL)
+SET @query = @query + ' AND R.[Kier_zatwierdzil]=' + CAST(@kz as nvarchar) + ' '
+
+IF NOT (@wy IS NULL)
+SET @query = @query + ' AND R.[wyroznienie]=' + CAST(@wy as nvarchar) + ' '
 
 SET @query = @query + ' ) '
@@ -101,20 +121,9 @@
 SET @query = @query + ' AND R.[tytu³]=''' + @tytul + ''' '
 
-if NOT (@typ IS NULL)
+IF NOT (@typ IS NULL)
 SET @query = @query + ' AND R.[TYP]=''' + @typ + ''' '
 
-if NOT (@promocja IS NULL)
+IF NOT (@promocja IS NULL)
 SET @query = @query + ' AND R.[Promocja]=' + CAST(@promocja as nvarchar) + ' '
-
---if (NOT (@fw IS NULL) AND NOT(@ms IS NULL) AND NOT(@rok IS NULL))
---BEGIN
---SET @query = @query + ' AND R.ReklamaId IN '
---SET @query = @query + ' (SELECT DISTINCT U.reklamaid '
---SET @query = @query + ' FROM [Uka¿e siê w Nr] U '
---SET @query = @query + ' INNER JOIN Reklama R on R.ReklamaID=U.ReklamaID '
---SET @query = @query + ' INNER JOIN nr N on u.[nr wydania]=N.nrw and N.TYT=R.[Tytu³] '
---SET @query = @query + ' WHERE N.Data_W>=@startDate AND N.Data_W<@endDate '
---SET @query = @query + ' AND U.Zafakturowana=' + CAST(@fw as nvarchar) + ') '
---END
 
 IF NOT (@zd IS NULL)
@@ -136,5 +145,5 @@
 
 
-print @query
+--PRINT @query