Index: trunk/SQL/StoredProcedures/sp_GetReklamy.txt
===================================================================
--- trunk/SQL/StoredProcedures/sp_GetReklamy.txt (revision 732)
+++ trunk/SQL/StoredProcedures/sp_GetReklamy.txt (revision 792)
@@ -30,15 +30,30 @@
 DECLARE @query nvarchar(4000)
 
+SET @query = ''
+
+IF (NOT (@rok IS NULL)) AND (NOT (@ms IS NULL))
+BEGIN
+
+SET @query = @query + 
+'
+DECLARE @startDate DATETIME 
+DECLARE @endDate DATETIME 
+
+SELECT @startDate=dateadd(yy,(' + CAST(@rok as nvarchar) + '-1900),0) + dateadd(mm,' + CAST(@ms as nvarchar) + '-1,0) + 0 
+SELECT @endDate=dateadd(yy,(' + CAST(@rok as nvarchar) + '-1900),0) + dateadd(mm,' + CAST(@ms as nvarchar) + '-1+1,0) + 0 
+
+'
+END
 
 
-set @query = '
+SET @query = @query + '
+
 SELECT TOP 1000 
---R.ReklamaID
 R.*, 
 O.wyd_od AS OD, 
 O.wyd_do AS DO, 
-DATEPART(year, NR.DATA_W), 
-DATEPART(month, NR.DATA_W), 
-NR.DATA_W AS ''1emisja'', 
+DATEPART(year, N.DATA_W), 
+DATEPART(month, N.DATA_W), 
+N.DATA_W AS ''1emisja'', 
 A.Symbol AS agencja, 
 (r.[CENA JEDN] - r.[RABAT WARTOŒÆ]) / r.SZER * r.WYS AS [CENA MODU£U], 
@@ -51,5 +66,5 @@
 RIGHT JOIN REKLAMA R ON A2.Symbol = R.[SYMBOL AKWIZYTORA] 
 LEFT JOIN dbo.VIEW_REKLAMA_OD_DO_DATY O ON R.ReklamaID = O.ReklamaId 
-LEFT JOIN NR ON R.TYTU£ = NR.TYT AND O.wyd_od = NR.NRW -- OR O.wyd_do = NR.NRW) 
+LEFT JOIN dbo.NR N ON R.TYTU£ = N.TYT AND O.wyd_od = N.NRW 
 LEFT OUTER JOIN [NAZWY MODU£ÓW] NM ON r.MOD_TYP = NM.MOD_TYP AND r.[Tytu³] = NM.Tytul
 LEFT OUTER JOIN dbo.KLIENCI AS K ON R.customerId=K.CustomerId 
@@ -67,13 +82,21 @@
 
 if NOT (@rok IS NULL)
-SET @query = @query + ' AND DATEPART(year,NR.DATA_W)=' + CAST(@rok as nvarchar) + ' '
+SET @query = @query + ' AND DATEPART(year, N.DATA_W)=' + CAST(@rok as nvarchar) + ' '
 
-if NOT (@ms IS NULL)
+if (NOT (@rok IS NULL)) AND (NOT (@ms IS NULL))
 BEGIN
-SET @query = @query + ' AND DATEPART(month, O.data_od)<=' + CAST(@ms as nvarchar) + ' '
-SET @query = @query + ' AND DATEPART(month, O.data_do)>=' + CAST(@ms as nvarchar) + ' '
+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 dbo.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 '
+IF (NOT @fw IS NULL)
+SET @query = @query + ' AND U.Zafakturowana=' + CAST(@fw as nvarchar)
+
+SET @query = @query + ' ) '
 END
 
-if NOT (@tytul IS NULL)
+IF NOT (@tytul IS NULL)
 SET @query = @query + ' AND R.[tytu³]=''' + @tytul + ''' '
 
@@ -84,15 +107,14 @@
 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 DATEPART(MONTH, N.Data_W)=' + CAST(@ms as nvarchar)
-SET @query = @query + ' AND DATEPART(YEAR, N.Data_W)=' + CAST(@rok as nvarchar)
-SET @query = @query + ' AND U.Zafakturowana=' + CAST(@fw as nvarchar) + ') '
-END
+--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)