Index: /branches/Emisje/BazaReklamSetup/BazaReklamSetup.vdproj =================================================================== --- /branches/Emisje/BazaReklamSetup/BazaReklamSetup.vdproj (revision 765) +++ /branches/Emisje/BazaReklamSetup/BazaReklamSetup.vdproj (revision 796) @@ -656,6 +656,6 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Baza Reklam" - "ProductCode" = "8:{F0CEF34A-E815-4D04-8A8E-28047479257F}" - "PackageCode" = "8:{22ABD221-8699-47FA-96A6-F0FC1D3952C9}" + "ProductCode" = "8:{ED038D25-96BE-4894-83A5-B1E699B7B0A8}" + "PackageCode" = "8:{A623D699-24EA-4721-A69D-87D3F8DD32C0}" "UpgradeCode" = "8:{4E2DBBA4-3139-4790-8DDB-7AADFC963A7D}" "RestartWWWService" = "11:FALSE" @@ -663,5 +663,5 @@ "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:1.1.23" + "ProductVersion" = "8:1.1.24" "Manufacturer" = "8:AACT" "ARPHELPTELEPHONE" = "8:" Index: /branches/Emisje/SQL/StoredProcedures/sp_GetZestawienieZamowien.txt =================================================================== --- /branches/Emisje/SQL/StoredProcedures/sp_GetZestawienieZamowien.txt (revision 796) +++ /branches/Emisje/SQL/StoredProcedures/sp_GetZestawienieZamowien.txt (revision 796) @@ -0,0 +1,145 @@ + +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO + +-- ============================================= +-- Author: +-- Create date: +-- Description: +-- ============================================= +ALTER PROCEDURE [dbo].[sp_GetZestawienieZamowien] + -- Add the parameters for the stored procedure here + @agencja NVARCHAR(50)=NULL, + @nrZamowienia INT=NULL, + @rokZamowienia INT=NULL, + @miesiacZamowienia INT=NULL, + @kodAgenta NVARCHAR(3)=NULL, + @kodKlienta NVARCHAR(10)=NULL + +AS +BEGIN + +SET NOCOUNT ON; + +DECLARE @query nvarchar(4000) + +SET @query = ' +DECLARE @ZestawienieZamowien TABLE +( + idZamowienia INT, + agencja NVARCHAR(50), + agent NVARCHAR(50), + idKlienta INT, + nrZamowienia INT, + rokZamowienia INT, + kodAgenta NVARCHAR(3), + nrZamowieniaExt NVARCHAR(76), + iloscReklam INT, + wartoscNetto FLOAT, + kwotaWalutaBrutto float, + data_od SMALLDATETIME, + data_od_bez_FK SMALLDATETIME, + nettoZafakturowane MONEY, + DoZafakturowania FLOAT, + kodKlienta NVARCHAR(10), + Brutto_Euro_Miano NVARCHAR(4) +) + +DECLARE @SumaNaNastepnejFakturze TABLE +( + idZamowienia INT, + SumaNaNastepnejFakturze DECIMAL(18,2) +) + +INSERT INTO @ZestawienieZamowien +SELECT TOP 1000 idZamowienia, agencja, agent, idKlienta, nrZamowienia, rokZamowienia, + kodAgenta, nrZamowieniaExt, iloscReklam, wartoscNetto, kwotaWalutaBrutto, data_od, data_od_bez_FK, + nettoZafakturowane, DoZafakturowania, kodKlienta, Brutto_Euro_Miano + FROM VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE WHERE 1=1 ' + +IF NOT (@agencja IS NULL) +SET @query = @query + ' AND agencja=''' + @agencja + ''' ' + +IF NOT (@nrZamowienia IS NULL) +SET @query = @query + ' AND nrZamowienia=' + CAST(@nrZamowienia as nvarchar) + ' ' + +IF NOT (@rokZamowienia IS NULL) +SET @query = @query + ' AND rokZamowienia=' + CAST(@rokZamowienia as nvarchar) + ' ' + +IF NOT (@miesiacZamowienia IS NULL) +SET @query = @query + ' AND (DATEPART(MONTH, data_od)=' + CAST(@miesiacZamowienia as nvarchar) + ' OR DATEPART(MONTH, data_od_bez_FK)=' + CAST(@miesiacZamowienia as nvarchar) + ') ' + +IF NOT (@kodAgenta IS NULL) +SET @query = @query + ' AND kodAgenta=''' + @kodAgenta + ''' ' + +IF NOT (@kodKlienta IS NULL) +SET @query = @query + ' AND kodKlienta=''' + @kodKlienta + ''' ' + +IF (NOT (@rokZamowienia IS NULL)) AND (NOT (@miesiacZamowienia IS NULL)) +BEGIN + +SET @query = @query + ' + DECLARE @startDate DATETIME + DECLARE @endDate DATETIME + + SELECT @startDate=dateadd(yy,(' + CAST(@rokZamowienia as nvarchar) + '-1900),0) + dateadd(mm,' + CAST(@miesiacZamowienia as nvarchar) + '-1,0) + 0 + SELECT @endDate=dateadd(yy,(' + CAST(@rokZamowienia as nvarchar) + '-1900),0) + dateadd(mm,' + CAST(@miesiacZamowienia as nvarchar) + '-1+3,0) + 0 + + INSERT INTO @SumaNaNastepnejFakturze + SELECT Z.idZamowienia, SUM(ROUND((R.[Cena Jedn] * (1-R.Rabat)), 2)) AS SumaFaktura FROM Reklama R + INNER JOIN Zamowienia Z ON R.idZamowienia=Z.idZamowienia + INNER JOIN [Uka¿e siê w nr] U ON U.ReklamaId=R.ReklamaId + INNER JOIN Nr N ON N.Tyt=R.[Tytu³] AND N.NRW=U.[Nr Wydania] + WHERE + Z.rodzajFakturowania=0 + AND U.Status=0 + AND U.Zafakturowana=0 + AND YEAR(N.Data_W)=' + CAST(@rokZamowienia as nvarchar) + ' AND MONTH(N.Data_W)=' + CAST(@miesiacZamowienia as nvarchar) + ' + GROUP BY Z.idZamowienia + UNION + SELECT Z.idZamowienia, SUM(ROUND((R.[Cena Jedn] * (1-R.Rabat)), 2)) AS SumaFaktura FROM Reklama R + INNER JOIN Zamowienia Z ON R.idZamowienia=Z.idZamowienia + INNER JOIN [Uka¿e siê w nr] U ON U.ReklamaId=R.ReklamaId + INNER JOIN Nr N ON N.Tyt=R.[Tytu³] AND N.NRW=U.[Nr Wydania] + WHERE + Z.rodzajFakturowania=1 + AND U.Status=0 + AND U.Zafakturowana=0 + AND N.Data_W>=@startDate AND N.Data_W<@endDate + GROUP BY Z.idZamowienia + UNION + SELECT Z.idZamowienia, SUM(ROUND((R.[Cena Jedn] * (1-R.Rabat)), 2)) AS SumaFaktura FROM Reklama R + INNER JOIN Zamowienia Z ON R.idZamowienia=Z.idZamowienia + INNER JOIN [Uka¿e siê w nr] U ON U.ReklamaId=R.ReklamaId + INNER JOIN Nr N ON N.Tyt=R.[Tytu³] AND N.NRW=U.[Nr Wydania] + WHERE + Z.rodzajFakturowania=2 + AND U.Status=0 + AND U.Zafakturowana=0 + GROUP BY Z.idZamowienia + ' +END + + + + +SET @query = @query + ' SELECT ZZ.*, SNF.SumaNaNastepnejFakturze FROM @ZestawienieZamowien ZZ ' +SET @query = @query + ' LEFT OUTER JOIN @SumaNaNastepnejFakturze SNF ON SNF.idZamowienia=ZZ.idZamowienia ' +SET @query = @query + ' ORDER BY ZZ.data_od_bez_FK, ZZ.nrZamowienia, ZZ.kodKlienta ' + +--PRINT @query + + +EXECUTE sp_executesql @query +RETURN + +END +GO + +SET ANSI_NULLS OFF +GO +SET QUOTED_IDENTIFIER OFF +GO + Index: /branches/Emisje/SQL/StoredProcedures/sp_GetReklamy.txt =================================================================== --- /branches/Emisje/SQL/StoredProcedures/sp_GetReklamy.txt (revision 732) +++ /branches/Emisje/SQL/StoredProcedures/sp_GetReklamy.txt (revision 796) @@ -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 @@ -57,32 +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) -SET @query = @query + ' AND DATEPART(year,NR.DATA_W)=' + CAST(@rok as nvarchar) + ' ' +IF NOT (@rok IS NULL) +SET @query = @query + ' AND DATEPART(year, N.DATA_W)=' + CAST(@rok as nvarchar) + ' ' -if 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) + ' ' -END - -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 (@fw IS NULL) AND NOT(@ms IS NULL) AND NOT(@rok IS NULL)) +IF (NOT (@rok IS NULL)) AND (NOT (@ms IS NULL)) BEGIN SET @query = @query + ' AND R.ReklamaId IN ' @@ -90,9 +90,40 @@ 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) + ') ' +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) +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 + ' ) ' END + +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) @@ -114,5 +145,5 @@ -print @query +--PRINT @query Index: /branches/Emisje/SQL/Views/ZAMOWIENIA_NETTO_ZAFAKTUROWANE.txt =================================================================== --- /branches/Emisje/SQL/Views/ZAMOWIENIA_NETTO_ZAFAKTUROWANE.txt (revision 421) +++ /branches/Emisje/SQL/Views/ZAMOWIENIA_NETTO_ZAFAKTUROWANE.txt (revision 796) @@ -8,10 +8,20 @@ AS -SELECT Z.idZamowienia,round(sum (U.netto),2) AS nettoZafakturowane +SELECT T.idZamowienia, (T.FakturyNetto + COALESCE(K.nettoKorekta, 0)) AS nettoZafakturowane FROM +( +SELECT Z.idZamowienia, ROUND(SUM(FD.Netto),2) AS FakturyNetto FROM dbo.zamowienia AS Z -LEFT JOIN Reklama R ON Z.idZamowienia = R.idZamowienia -LEFT JOIN [UKA¯E SIÊ W NR] U ON U.reklamaId = R.reklamaId -WHERE u.status<>2 AND zafakturowana=1 +INNER JOIN Faktury F ON F.idZamowienia=Z.idZamowienia +INNER JOIN Faktura_Details FD ON F.ID_Faktury = FD.ID_Faktury +WHERE F.Korekta=0 --AND Z.idZamowienia=@idZamowienia GROUP BY Z.idZamowienia +) T LEFT OUTER JOIN +( +SELECT idZamowienia, ROUND(SUM(COALESCE(K.roznica_netto, 0)), 2) AS nettoKorekta +FROM VIEW_KOREKTY K +--WHERE idZamowienia=@idZamowienia +GROUP BY idZamowienia +) K ON T.idZamowienia = K.idZamowienia + GO Index: /branches/Emisje/SQL/Views/VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.txt =================================================================== --- /branches/Emisje/SQL/Views/VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.txt (revision 443) +++ /branches/Emisje/SQL/Views/VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.txt (revision 796) @@ -22,35 +22,16 @@ ZFK.data1 AS data_od_bez_FK, ZNFK.nettoZafakturowane, -DoZafakturowania = -CASE -WHEN (R.kwotaWalutaBrutto IS NULL OR R.kwotaWalutaBrutto=0) THEN - CASE COALESCE(Korekta.Netto, 0) - WHEN 0 THEN (R.wartoscNetto - ZNFK.nettoZafakturowane) - ELSE Korekta.Netto - ZNFK.nettoZafakturowane - END -ELSE - CASE COALESCE(Korekta.waluta_brutto, 0) - WHEN 0 THEN - CASE - WHEN F.waluta_kurs IS NULL THEN (R.wartoscNetto - ZNFK.nettoZafakturowane) - ELSE ROUND(F.waluta_kurs * (R.kwotaWalutaBrutto - (ZNFK.nettoZafakturowane/F.waluta_kurs)), 0) - END - ELSE - ROUND(F.waluta_kurs * (Korekta.waluta_brutto - (ZNFK.nettoZafakturowane/F.waluta_kurs)), 0) - END -END, +DoZafakturowania = R.wartoscNetto - ZNFK.nettoZafakturowane, K.kodKlienta, -r.Brutto_Euro_Miano, -COALESCE(Korekta.Netto, 0) AS Korekta -FROM dbo.zamowienia AS z +r.Brutto_Euro_Miano, +0 AS Korekta +FROM dbo.zamowienia AS Z LEFT OUTER JOIN dbo.AGENCI AS A1 ON z.kodAgenta = A1.F_ROZ LEFT OUTER JOIN dbo.AGENCJE AS A2 ON A1.ID_AGENCJI = A2.Id_agencji LEFT OUTER JOIN dbo.KLIENCI AS K ON K.CustomerID = z.idKlienta -LEFT OUTER JOIN dbo.ZAMOWIENIA_REKLAMY AS r ON z.idZamowienia = r.idZamowienia +LEFT OUTER JOIN dbo.ZAMOWIENIA_REKLAMY AS R ON z.idZamowienia = R.idZamowienia LEFT OUTER JOIN dbo.ZAMOWIENIA_1EMISJA AS ZE ON ZE.idZamowienia = z.idZamowienia LEFT OUTER JOIN dbo.ZAMOWIENIA_1EMISJA_bezFK AS ZFK ON ZFK.idZamowienia = z.idZamowienia LEFT OUTER JOIN dbo.ZAMOWIENIA_NETTO_ZAFAKTUROWANE AS ZNFK ON ZNFK.idZamowienia = z.idZamowienia -LEFT OUTER JOIN dbo.VIEW_KOREKTY AS Korekta ON Korekta.idZamowienia = z.idZamowienia -LEFT OUTER JOIN dbo.Faktury AS F ON F.idZamowienia = z.idZamowienia GO Index: /branches/Emisje/BazaReklam/ZestawienieZamowienForm.resx =================================================================== --- /branches/Emisje/BazaReklam/ZestawienieZamowienForm.resx (revision 597) +++ /branches/Emisje/BazaReklam/ZestawienieZamowienForm.resx (revision 796) @@ -125,5 +125,5 @@ - 17, 54 + 814, 17 @@ -199,5 +199,5 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAACZ5JREFUWEellwlU + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAACZ9JREFUWEellwlU lOUax19AwwVScYmkEFxCQQS83YtLat5cTlGWp4yyyDQ0DVEyFB3QGVlkhxEQEXBDDAoIIwoRZRnWYRcY UGAYFlklBEREQP73eYG695yr515ozvmf75vvm3l//+d5t+dVYs/5RO5nG7oG2B5lFWasqsImqaiyjsGn @@ -213,33 +213,33 @@ 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 - AAAAAElFTkSuQmCC + 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 + pwAAAABJRU5ErkJggg== @@ -275,28 +275,28 @@ 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 - v9pi5Pnfjj+6zscujmsAAAAASUVORK5CYII= + VFUYx10VG0JbMg0ZSGAmncpycPIxlqESW1CoEYyMj5BU1NDMCgNclwvs8FDQQZHAlZVhWQQUYuQlaqRi + giSKBIK8BFFYQJLF5c3u/vvOzlIqC9aZ+c3de+49//89337fd3gTxhnbth034vONjsycaeTW1vakQ6F4 + kD883Judnh79By0bJKBnPJmxn4WE5IU2NbWDDa0WqKpqBsdxWh+fow0bNvgfcXHZYU+rXyYmErz/5RIR + ITORSC5169SfG8ysuvqBzmznTnGjm5v3sVWrPAVkYEJM+k9GwcH5zjdu1BnSHzUXFhYDV9ftWldXr2ZH + x69CTUxMzMjEaFyjgID0EKWy54UGcXGJ2LUrCsXFQFraQwiFqZg/3y6BxG3GNfH1Tc34V51iYmAMDQ1i + 3ToR/P2TsXDhxygpGUZNDeDo6NFG4uuIGWPuIjQ08ybTHBrSQK02bJCZeQ5btkQiIqIAIpEEra3Ao0fA + okXLqklYRFiNZcCLiclr02iA/v5hdHUpcSpZDnFgIIKDAyGVSNDS8hDp6fmDs2bNTlm6dEXjxo3f4uJF + JZYvj9Tw+a/KSHgvYWnQ4Pz58yYc96t6YECD1pY2nExKRlFzGyrUQOET4MyddhyTypAiT+0hgUTKUh9z + c7PDVlY2adOmmUpo7iDhSPANGiQmXnib48Tazs5uxMvk6KRQ9RMtgxqUPh5E3oN+nLoPXZpaWFhEk4gd + 8S7xKeFGfES8PmbKxsZmCMrL7+Hs2Sxca+2CksTVlPx1fWoUd/Yj+34f5NUqyO/2wMtz0y0SciKmE9P0 + V1YPrPieGawSddUoFsdtundPQfEW47oKqO9Vo0o1hOskXqDoQ0a9CicrlEis0cLHx0dFS37Qx3t0NR86 + VDk9IaEuSS6vuCkSZYY6OHjO2bFDuK+x8RG4oCDktgG/tfThsqIf+c29ONugQnJVN2JuKyGv1WDffhH7 + H8KJNw3GOyQkO1WlYhEGOjpoYUxGj6vrnvrKylZERx2FjMJwuqEXp+u6kUbIKpWIvd0FyS0lkmq12Lp1 + 8x0SPqA3GL2DqKgspULRBYVCiYEBShMaKhUJns5HXm4BjsozIKlW40R5N46T8JGbjxFbpkRC9RC4rAK1 + ra1ttpWNjVhvMCruEwICEmuLimqpCutRUdGMpqYOKJW9OiO1ehiSuFhEp2Th2O1eRP9J9xXDkJJhQvYV + HBAH4uLl38H5+j6xf814lT4tn92Ft3eYJ8edGcrIKKFCqURhYTVKSxtw924L6AzQGRVeuYJgTgQ/4X74 + 7+dwMDRMl6KMwuLLaJesBNbOgLOZYRP+kiXOX2/eLLrKFiQnX0NubjkKCippVw1kVgtv7310X4pLl0oo + dL+grk6FrOwcFcug+5EfAg27gZy1wAZzuFvwv3x+J6x/s6ZkN3eubYCLy/Zrfn6cViotRE5OJcLDpViz + 5hs4OW3E3r0xsLd3Rnz8LaxcKbhqzOPJ4GQCyJyAmu+Ac+7Aej6c5s/x0NfDP/8J+8GKw5pwsLZ+K0Ag + cC/as4fTCoU/Uzs+QA0tDy4uXvDyCkJQUArMzMyS6F2hudHE9fhsKhD/CZ1CW9Eu9YKvb1AXPWOnHSu8 + ZwbbzVSC9XIHS0trbtky+xv29o5af/8TCAvLwuHDF2gXAgWPxztB73zBCszqpUkrIJiC1pDVKKttwXoP + jxqa/4mYbbA2aPJpI4Gl5ezwefPeK1u8ePXAggXv1xobG7MDRUi8Q0xhHzVr8gQ7bz+/v9zd3ctMTU2l + NPc9Mx/LYGR+xIhV6eeEDxFK/EiwhvYKMdJiWIiX6IV30/UDfTRe5KF7PplgrfcNgpmxKwvl04XFjIz1 + X20x8vxvbMe6yP+pQ2kAAAAASUVORK5CYII= @@ -405,33 +405,33 @@ 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 - 310, 54 + 1107, 17 @@ -495,4 +495,7 @@ True + + True + True @@ -502,8 +505,8 @@ - 451, 54 + 17, 54 - 233, 91 + 454, 54 @@ -532,5 +535,5 @@ - 153, 54 + 950, 17 @@ -538,8 +541,8 @@ - 17, 91 + 238, 54 - 25 + 97 Index: /branches/Emisje/BazaReklam/MDIBazaReklam.cs =================================================================== --- /branches/Emisje/BazaReklam/MDIBazaReklam.cs (revision 777) +++ /branches/Emisje/BazaReklam/MDIBazaReklam.cs (revision 796) @@ -273,8 +273,8 @@ if (!_forms.ContainsKey("ZestawienieZamowienForm")) - _forms.Add("ZestawienieZamowienForm", ZestawienieZamowienForm.getZestawienieZamowienForm(this)); - - ZestawienieZamowienForm.getZestawienieZamowienForm(this).WindowState = FormWindowState.Maximized; - ZestawienieZamowienForm.getZestawienieZamowienForm(this).Show(); + _forms.Add("ZestawienieZamowienForm", ZestawienieZamowienForm.GetZestawienieZamowienForm(this)); + + ZestawienieZamowienForm.GetZestawienieZamowienForm(this).WindowState = FormWindowState.Maximized; + ZestawienieZamowienForm.GetZestawienieZamowienForm(this).Show(); Cursor = Cursors.Default; Index: /branches/Emisje/BazaReklam/Docs/versioninfo.html =================================================================== --- /branches/Emisje/BazaReklam/Docs/versioninfo.html (revision 765) +++ /branches/Emisje/BazaReklam/Docs/versioninfo.html (revision 796) @@ -6,4 +6,12 @@

Baza reklam - Informacje o wersji

+

+ +

Wersja 1.1.24 (2009-07-30)

Opis zmian wprowadzonych do wersji 1.1.24

Zgłoszenie #196: poprawiono Zestawienie zamówień - kolumna "Do zafakturowania" posiada wartość tylko gdy został wprowadzony rok i miesiąc i przedstawia ona wartość jaka zostanie zafakturowana. Gdy zamówienie jest w walucie obcej, wartość w tej kolumnie jest przedstawiona w PLN wg kursu wymiany waluty z dnia zatwierdzenia reklamy do druku.

Index: /branches/Emisje/BazaReklam/ZestawienieZamowienForm.cs =================================================================== --- /branches/Emisje/BazaReklam/ZestawienieZamowienForm.cs (revision 789) +++ /branches/Emisje/BazaReklam/ZestawienieZamowienForm.cs (revision 796) @@ -3,5 +3,4 @@ using System.Data; using System.Data.SqlClient; -using System.Drawing; using System.Windows.Forms; using Baza_Reklam.Classes.Helpers; @@ -12,13 +11,9 @@ public partial class ZestawienieZamowienForm : Form, IForm { - private const string query = "SELECT top 2000 * from VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE "; private static ZestawienieZamowienForm form; - private SqlCommand command; - private SqlDataAdapter sqlDataAdapter = new SqlDataAdapter(); - private bool commandExecuted; - public static ZestawienieZamowienForm getZestawienieZamowienForm(MDIBazaReklam parent) + public static ZestawienieZamowienForm GetZestawienieZamowienForm(MDIBazaReklam parent) { if (form == null){ @@ -33,10 +28,5 @@ MdiParent = parent; - - //obiekty wykorzytywane przy wyszukiwaniu - SqlConnection conn = new SqlConnection(ConnString.getConnString().Value); - - command = new SqlCommand(query,conn); - + //generuje piersze wêz³y w drzewie generateNodes(); @@ -46,7 +36,4 @@ { WindowState = FormWindowState.Maximized; - command.CommandText = query; - sqlDataAdapter.SelectCommand = command; - DBBindings.bindujAgencje(agencjaToolStripComboBox); } @@ -58,50 +45,34 @@ node.Name = "Biura"; treeView1.Nodes.Add(node); - - command.Connection.Close(); } private void treeView1_AfterSelect(object sender, TreeViewEventArgs e) { - if (e.Node != null) - { - command.CommandText = query; - command.Parameters.Clear(); - - switch (e.Node.Level) - { - case 0: - break; - case 1: - break; - case 2: - break; - case 3: - switch (e.Node.Parent.Parent.Parent.Name) - { - case "Biura": - - Cursor = Cursors.WaitCursor; - - rEKLAMADataSet.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.Clear(); - command.CommandText += " where agent=@agent"; - command.Parameters.AddWithValue("@agent", e.Node.Name); - sqlDataAdapter.Fill(rEKLAMADataSet.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE); - commandExecuted = true; - fakturyDataGridView.Refresh(); - - Cursor = Cursors.Default; - - break; - default: - break; - } - break; - case 4: - break; - default: - break; - } - } + if (e.Node == null || e.Node.Level != 3) return; + + SqlCommand cmd = new SqlCommand(); + SqlDataAdapter dataAdapter = new SqlDataAdapter(cmd); + cmd.Connection = new SqlConnection(ConnString.getConnString().Value); + cmd.CommandType = CommandType.StoredProcedure; + + cmd.CommandText = "sp_GetZestawienieZamowien"; + cmd.Parameters.Clear(); + + switch (e.Node.Parent.Parent.Parent.Name) + { + case "Biura": + Cursor = Cursors.WaitCursor; + + rEKLAMADataSet.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.Clear(); + cmd.Parameters.AddWithValue("@agent", e.Node.Name); + dataAdapter.Fill(rEKLAMADataSet.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE); + commandExecuted = true; + fakturyDataGridView.Refresh(); + + Cursor = Cursors.Default; + break; + default: + break; + } } @@ -241,8 +212,13 @@ rEKLAMADataSet.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.Clear(); - sqlDataAdapter.Fill(rEKLAMADataSet.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE); - fakturyDataGridView.Refresh(); - - Cursor = Cursors.Default; + + try + { + BindZestawienieZamowien(); + } + finally + { + Cursor = Cursors.Default; + } } } @@ -268,78 +244,8 @@ private void szukajToolStripButton_Click(object sender, EventArgs e) { - command.CommandText = query; - - rEKLAMADataSet.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.Clear(); - rEKLAMADataSet.ReklamyZestawienie.Clear(); - - command.CommandText += " where 1=1 "; - - command.Parameters.Clear(); - - if (nrZamToolStripTextBox.Text.Trim() != "") - { - int i; - if (!Int32.TryParse(nrZamToolStripTextBox.Text.Trim(), out i)) - { - MessageBox.Show("Podaj prawid³owy numer zamówienia."); - return; - } - - command.CommandText += " AND nrZamowienia=@nr"; - command.Parameters.AddWithValue("@nr", nrZamToolStripTextBox.Text.Trim()); - } - - if (rokToolStripTextBox.Text.Trim() != "") - { - int i; - if (!Int32.TryParse(rokToolStripTextBox.Text.Trim(), out i)) - { - MessageBox.Show("Podaj prawid³owy rok."); - return; - } - - command.CommandText += " AND rokZamowienia=@rok"; - command.Parameters.AddWithValue("@rok", rokToolStripTextBox.Text.Trim()); - } - - if (txtMiesiac.Text.Trim() != "") - { - int i; - if (!Int32.TryParse(txtMiesiac.Text.Trim(), out i) || i > 12 || i <= 0) - { - MessageBox.Show("Podaj prawid³owy miesi¹c."); - return; - } - - command.CommandText += " AND (DATEPART(MONTH, data_od)=@ms OR DATEPART(MONTH, data_od_bez_FK)=@ms)"; - command.Parameters.AddWithValue("@ms", txtMiesiac.Text.Trim()); - } - - if (kodRozliczeniowyToolStripTextBox.Text.Trim() != "") - { - command.CommandText += " AND kodAgenta = @kod "; - command.Parameters.AddWithValue("@kod", kodRozliczeniowyToolStripTextBox.Text.Trim()); - } - - if (kodKlientaToolStripTextBox.Text.Trim() != "") - { - command.CommandText += " AND kodKlienta like '%' + @kodKlienta + '%'"; - command.Parameters.AddWithValue("@kodKlienta", kodKlientaToolStripTextBox.Text.Trim()); - } - - if (agencjaToolStripComboBox.Text.Trim() != "") - { - command.CommandText += " AND Agencja=@agencja"; - command.Parameters.AddWithValue("@agencja", agencjaToolStripComboBox.Text.Trim()); - } - - sqlDataAdapter.SelectCommand = command; - Cursor = Cursors.WaitCursor; - try { - sqlDataAdapter.Fill(rEKLAMADataSet.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE); - commandExecuted = true; + BindZestawienieZamowien(); } finally @@ -349,4 +255,65 @@ Cursor = Cursors.Default; } + } + + private void BindZestawienieZamowien() + { + SqlCommand cmd = new SqlCommand(); + SqlDataAdapter dataAdapter = new SqlDataAdapter(cmd); + cmd.CommandText = "sp_GetZestawienieZamowien"; + cmd.CommandType = CommandType.StoredProcedure; + + rEKLAMADataSet.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.Clear(); + rEKLAMADataSet.ReklamyZestawienie.Clear(); + + cmd.Parameters.Clear(); + + if (nrZamToolStripTextBox.Text.Trim() != "") + { + int i; + if (!Int32.TryParse(nrZamToolStripTextBox.Text.Trim(), out i)) + { + MessageBox.Show("Podaj prawid³owy numer zamówienia."); + return; + } + cmd.Parameters.AddWithValue("@nrZamowienia", nrZamToolStripTextBox.Text.Trim()); + } + + if (rokToolStripTextBox.Text.Trim() != "") + { + int i; + if (!Int32.TryParse(rokToolStripTextBox.Text.Trim(), out i)) + { + MessageBox.Show("Podaj prawid³owy rok."); + return; + } + cmd.Parameters.AddWithValue("@rokZamowienia", rokToolStripTextBox.Text.Trim()); + } + + if (txtMiesiac.Text.Trim() != "") + { + int i; + if (!Int32.TryParse(txtMiesiac.Text.Trim(), out i) || i > 12 || i <= 0) + { + MessageBox.Show("Podaj prawid³owy miesi¹c."); + return; + } + cmd.Parameters.AddWithValue("@miesiacZamowienia", txtMiesiac.Text.Trim()); + } + + if (kodRozliczeniowyToolStripTextBox.Text.Trim() != "") + cmd.Parameters.AddWithValue("@kodAgenta", kodRozliczeniowyToolStripTextBox.Text.Trim()); + + if (kodKlientaToolStripTextBox.Text.Trim() != "") + cmd.Parameters.AddWithValue("@kodKlienta", kodKlientaToolStripTextBox.Text.Trim()); + + if (agencjaToolStripComboBox.Text.Trim() != "") + cmd.Parameters.AddWithValue("@agencja", agencjaToolStripComboBox.Text.Trim()); + + dataAdapter.SelectCommand = cmd; + + dataAdapter.SelectCommand.Connection = new SqlConnection(ConnString.getConnString().Value); + dataAdapter.Fill(rEKLAMADataSet.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE); + commandExecuted = true; } @@ -381,9 +348,4 @@ if (Convert.IsDBNull(r.Row["DoZafakturowania"])) continue; - - if (Convert.ToDouble(r.Row["Korekta"]) > 0.0) - { - row.DefaultCellStyle.ForeColor = Color.Red; - } } } Index: /branches/Emisje/BazaReklam/Baza Reklam.csproj =================================================================== --- /branches/Emisje/BazaReklam/Baza Reklam.csproj (revision 784) +++ /branches/Emisje/BazaReklam/Baza Reklam.csproj (revision 796) @@ -33,5 +33,5 @@ index.htm false - 1.1.23.0 + 1.1.24.0 false Index: /branches/Emisje/BazaReklam/ZestawienieZamowienForm.Designer.cs =================================================================== --- /branches/Emisje/BazaReklam/ZestawienieZamowienForm.Designer.cs (revision 597) +++ /branches/Emisje/BazaReklam/ZestawienieZamowienForm.Designer.cs (revision 796) @@ -33,4 +33,11 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -45,10 +52,4 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components); this.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWEBindingSource = new System.Windows.Forms.BindingSource(this.components); @@ -92,16 +93,4 @@ this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.fakturyDataGridView = new System.Windows.Forms.DataGridView(); - this.agencja = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.agent = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.rokZamowienia = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.nrZamowieniaExt = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.iloscReklam = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.data_od = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.data_od_bez_FK = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.wartoscNetto = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.kwotaWalutaBrutto = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bruttoEuroMianoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.nettoZafakturowane = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.DoZafakturowania = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.reklamyZestawienieDataGridView = new System.Windows.Forms.DataGridView(); this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -133,4 +122,17 @@ this.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter(); this.reklamyZestawienieTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.ReklamyZestawienieTableAdapter(); + this.agencja = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.agent = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.rokZamowienia = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.nrZamowieniaExt = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.iloscReklam = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.data_od = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.data_od_bez_FK = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wartoscNetto = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.kwotaWalutaBrutto = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bruttoEuroMianoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.nettoZafakturowane = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.DoZafakturowania = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.SumaNaNastepnejFakturze = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit(); this.bindingNavigator1.SuspendLayout(); @@ -489,4 +491,5 @@ // this.splitContainer1.Panel1.Controls.Add(this.treeView1); + this.splitContainer1.Panel1Collapsed = true; // // splitContainer1.Panel2 @@ -502,5 +505,5 @@ this.treeView1.Location = new System.Drawing.Point(0, 0); this.treeView1.Name = "treeView1"; - this.treeView1.Size = new System.Drawing.Size(163, 569); + this.treeView1.Size = new System.Drawing.Size(163, 100); this.treeView1.TabIndex = 0; this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect); @@ -523,5 +526,5 @@ this.splitContainer2.Panel2.Controls.Add(this.reklamyZestawienieDataGridView); this.splitContainer2.Panel2.Controls.Add(this.toolStrip1); - this.splitContainer2.Size = new System.Drawing.Size(812, 569); + this.splitContainer2.Size = new System.Drawing.Size(979, 569); this.splitContainer2.SplitterDistance = 355; this.splitContainer2.TabIndex = 0; @@ -558,5 +561,6 @@ this.bruttoEuroMianoDataGridViewTextBoxColumn, this.nettoZafakturowane, - this.DoZafakturowania}); + this.DoZafakturowania, + this.SumaNaNastepnejFakturze}); this.fakturyDataGridView.DataSource = this.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWEBindingSource; this.fakturyDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; @@ -569,140 +573,7 @@ this.fakturyDataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.fakturyDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.fakturyDataGridView.Size = new System.Drawing.Size(812, 355); + this.fakturyDataGridView.Size = new System.Drawing.Size(979, 355); this.fakturyDataGridView.TabIndex = 1; this.fakturyDataGridView.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.fakturyDataGridView_DataBindingComplete); - // - // agencja - // - this.agencja.DataPropertyName = "agencja"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.agencja.DefaultCellStyle = dataGridViewCellStyle3; - this.agencja.HeaderText = "Agencja"; - this.agencja.Name = "agencja"; - this.agencja.ReadOnly = true; - this.agencja.Width = 71; - // - // agent - // - this.agent.DataPropertyName = "agent"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.agent.DefaultCellStyle = dataGridViewCellStyle4; - this.agent.HeaderText = "Agent"; - this.agent.Name = "agent"; - this.agent.ReadOnly = true; - this.agent.Width = 60; - // - // rokZamowienia - // - this.rokZamowienia.DataPropertyName = "rokZamowienia"; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.rokZamowienia.DefaultCellStyle = dataGridViewCellStyle5; - this.rokZamowienia.HeaderText = "Rok"; - this.rokZamowienia.Name = "rokZamowienia"; - this.rokZamowienia.ReadOnly = true; - this.rokZamowienia.Width = 52; - // - // nrZamowieniaExt - // - this.nrZamowieniaExt.DataPropertyName = "nrZamowieniaExt"; - this.nrZamowieniaExt.HeaderText = "Nr zamówienia"; - this.nrZamowieniaExt.Name = "nrZamowieniaExt"; - this.nrZamowieniaExt.ReadOnly = true; - this.nrZamowieniaExt.Width = 93; - // - // iloscReklam - // - this.iloscReklam.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.iloscReklam.DataPropertyName = "iloscReklam"; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.iloscReklam.DefaultCellStyle = dataGridViewCellStyle6; - this.iloscReklam.HeaderText = "# rek"; - this.iloscReklam.Name = "iloscReklam"; - this.iloscReklam.ReadOnly = true; - this.iloscReklam.Width = 40; - // - // data_od - // - this.data_od.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.data_od.DataPropertyName = "data_od"; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.Format = "d"; - this.data_od.DefaultCellStyle = dataGridViewCellStyle7; - this.data_od.HeaderText = "Data 1 em"; - this.data_od.Name = "data_od"; - this.data_od.ReadOnly = true; - this.data_od.Width = 80; - // - // data_od_bez_FK - // - this.data_od_bez_FK.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.data_od_bez_FK.DataPropertyName = "data_od_bez_FK"; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.data_od_bez_FK.DefaultCellStyle = dataGridViewCellStyle8; - this.data_od_bez_FK.HeaderText = "Data 1 em bez FV"; - this.data_od_bez_FK.Name = "data_od_bez_FK"; - this.data_od_bez_FK.ReadOnly = true; - this.data_od_bez_FK.Width = 80; - // - // wartoscNetto - // - this.wartoscNetto.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.wartoscNetto.DataPropertyName = "wartoscNetto"; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle9.Format = "C2"; - this.wartoscNetto.DefaultCellStyle = dataGridViewCellStyle9; - this.wartoscNetto.HeaderText = "Netto"; - this.wartoscNetto.Name = "wartoscNetto"; - this.wartoscNetto.ReadOnly = true; - this.wartoscNetto.Width = 110; - // - // kwotaWalutaBrutto - // - this.kwotaWalutaBrutto.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.kwotaWalutaBrutto.DataPropertyName = "kwotaWalutaBrutto"; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle10.Format = "N2"; - dataGridViewCellStyle10.NullValue = null; - this.kwotaWalutaBrutto.DefaultCellStyle = dataGridViewCellStyle10; - this.kwotaWalutaBrutto.HeaderText = "Waluta - brutto zamówienia"; - this.kwotaWalutaBrutto.Name = "kwotaWalutaBrutto"; - this.kwotaWalutaBrutto.ReadOnly = true; - this.kwotaWalutaBrutto.Width = 110; - // - // bruttoEuroMianoDataGridViewTextBoxColumn - // - this.bruttoEuroMianoDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.bruttoEuroMianoDataGridViewTextBoxColumn.DataPropertyName = "Brutto_Euro_Miano"; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.bruttoEuroMianoDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle11; - this.bruttoEuroMianoDataGridViewTextBoxColumn.HeaderText = "W"; - this.bruttoEuroMianoDataGridViewTextBoxColumn.Name = "bruttoEuroMianoDataGridViewTextBoxColumn"; - this.bruttoEuroMianoDataGridViewTextBoxColumn.ReadOnly = true; - this.bruttoEuroMianoDataGridViewTextBoxColumn.Width = 35; - // - // nettoZafakturowane - // - this.nettoZafakturowane.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.nettoZafakturowane.DataPropertyName = "nettoZafakturowane"; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle12.Format = "C2"; - this.nettoZafakturowane.DefaultCellStyle = dataGridViewCellStyle12; - this.nettoZafakturowane.HeaderText = "Wartoæ netto FV"; - this.nettoZafakturowane.Name = "nettoZafakturowane"; - this.nettoZafakturowane.ReadOnly = true; - this.nettoZafakturowane.Width = 110; - // - // DoZafakturowania - // - this.DoZafakturowania.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.DoZafakturowania.DataPropertyName = "DoZafakturowania"; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle13.Format = "N2"; - dataGridViewCellStyle13.NullValue = null; - this.DoZafakturowania.DefaultCellStyle = dataGridViewCellStyle13; - this.DoZafakturowania.HeaderText = "Wartoæ niezafakturowana"; - this.DoZafakturowania.Name = "DoZafakturowania"; - this.DoZafakturowania.ReadOnly = true; - this.DoZafakturowania.Width = 110; // // reklamyZestawienieDataGridView @@ -739,5 +610,5 @@ this.reklamyZestawienieDataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.reklamyZestawienieDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.reklamyZestawienieDataGridView.Size = new System.Drawing.Size(812, 179); + this.reklamyZestawienieDataGridView.Size = new System.Drawing.Size(979, 179); this.reklamyZestawienieDataGridView.TabIndex = 1; // @@ -782,7 +653,7 @@ this.dataGridViewTextBoxColumn8.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn8.DataPropertyName = "1emisja"; - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle14.Format = "d"; - this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle15.Format = "d"; + this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewTextBoxColumn8.HeaderText = "1 emisja"; this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; @@ -830,7 +701,7 @@ this.dataGridViewTextBoxColumn23.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn23.DataPropertyName = "CENA JEDN"; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle15.Format = "C2"; - this.dataGridViewTextBoxColumn23.DefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle16.Format = "C2"; + this.dataGridViewTextBoxColumn23.DefaultCellStyle = dataGridViewCellStyle16; this.dataGridViewTextBoxColumn23.HeaderText = "Cena jedn."; this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23"; @@ -842,7 +713,7 @@ this.RABAT_WARTOSC.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.RABAT_WARTOSC.DataPropertyName = "RABAT WARTOÆ"; - dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle16.Format = "C2"; - this.RABAT_WARTOSC.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle17.Format = "C2"; + this.RABAT_WARTOSC.DefaultCellStyle = dataGridViewCellStyle17; this.RABAT_WARTOSC.HeaderText = "Rabat"; this.RABAT_WARTOSC.Name = "RABAT_WARTOSC"; @@ -854,7 +725,7 @@ this.dataGridViewTextBoxColumn24.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn24.DataPropertyName = "NETTO"; - dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle17.Format = "C2"; - this.dataGridViewTextBoxColumn24.DefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle18.Format = "C2"; + this.dataGridViewTextBoxColumn24.DefaultCellStyle = dataGridViewCellStyle18; this.dataGridViewTextBoxColumn24.HeaderText = "NETTO"; this.dataGridViewTextBoxColumn24.Name = "dataGridViewTextBoxColumn24"; @@ -866,8 +737,8 @@ this.dataGridViewTextBoxColumn25.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn25.DataPropertyName = "VAT"; - dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle18.Format = "P"; - dataGridViewCellStyle18.NullValue = null; - this.dataGridViewTextBoxColumn25.DefaultCellStyle = dataGridViewCellStyle18; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle19.Format = "P"; + dataGridViewCellStyle19.NullValue = null; + this.dataGridViewTextBoxColumn25.DefaultCellStyle = dataGridViewCellStyle19; this.dataGridViewTextBoxColumn25.HeaderText = "VAT"; this.dataGridViewTextBoxColumn25.Name = "dataGridViewTextBoxColumn25"; @@ -879,7 +750,7 @@ this.dataGridViewTextBoxColumn26.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn26.DataPropertyName = "PVAT"; - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle19.Format = "C2"; - this.dataGridViewTextBoxColumn26.DefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle20.Format = "C2"; + this.dataGridViewTextBoxColumn26.DefaultCellStyle = dataGridViewCellStyle20; this.dataGridViewTextBoxColumn26.HeaderText = "PVAT"; this.dataGridViewTextBoxColumn26.Name = "dataGridViewTextBoxColumn26"; @@ -891,7 +762,7 @@ this.dataGridViewTextBoxColumn27.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn27.DataPropertyName = "BRUTTO"; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle20.Format = "C2"; - this.dataGridViewTextBoxColumn27.DefaultCellStyle = dataGridViewCellStyle20; + dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle21.Format = "C2"; + this.dataGridViewTextBoxColumn27.DefaultCellStyle = dataGridViewCellStyle21; this.dataGridViewTextBoxColumn27.HeaderText = "BRUTTO"; this.dataGridViewTextBoxColumn27.Name = "dataGridViewTextBoxColumn27"; @@ -929,5 +800,5 @@ this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(812, 31); + this.toolStrip1.Size = new System.Drawing.Size(979, 31); this.toolStrip1.TabIndex = 0; this.toolStrip1.Text = "reklamaToolStrip"; @@ -1004,4 +875,155 @@ // this.reklamyZestawienieTableAdapter.ClearBeforeFill = true; + // + // agencja + // + this.agencja.DataPropertyName = "agencja"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.agencja.DefaultCellStyle = dataGridViewCellStyle3; + this.agencja.HeaderText = "Agencja"; + this.agencja.Name = "agencja"; + this.agencja.ReadOnly = true; + this.agencja.Width = 71; + // + // agent + // + this.agent.DataPropertyName = "agent"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.agent.DefaultCellStyle = dataGridViewCellStyle4; + this.agent.HeaderText = "Agent"; + this.agent.Name = "agent"; + this.agent.ReadOnly = true; + this.agent.Width = 60; + // + // rokZamowienia + // + this.rokZamowienia.DataPropertyName = "rokZamowienia"; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.rokZamowienia.DefaultCellStyle = dataGridViewCellStyle5; + this.rokZamowienia.HeaderText = "Rok"; + this.rokZamowienia.Name = "rokZamowienia"; + this.rokZamowienia.ReadOnly = true; + this.rokZamowienia.Width = 52; + // + // nrZamowieniaExt + // + this.nrZamowieniaExt.DataPropertyName = "nrZamowieniaExt"; + this.nrZamowieniaExt.HeaderText = "Nr zamówienia"; + this.nrZamowieniaExt.Name = "nrZamowieniaExt"; + this.nrZamowieniaExt.ReadOnly = true; + this.nrZamowieniaExt.Width = 101; + // + // iloscReklam + // + this.iloscReklam.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.iloscReklam.DataPropertyName = "iloscReklam"; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.iloscReklam.DefaultCellStyle = dataGridViewCellStyle6; + this.iloscReklam.HeaderText = "# rek"; + this.iloscReklam.Name = "iloscReklam"; + this.iloscReklam.ReadOnly = true; + this.iloscReklam.Width = 40; + // + // data_od + // + this.data_od.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.data_od.DataPropertyName = "data_od"; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.Format = "d"; + this.data_od.DefaultCellStyle = dataGridViewCellStyle7; + this.data_od.HeaderText = "Data 1 em"; + this.data_od.Name = "data_od"; + this.data_od.ReadOnly = true; + this.data_od.Width = 80; + // + // data_od_bez_FK + // + this.data_od_bez_FK.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.data_od_bez_FK.DataPropertyName = "data_od_bez_FK"; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.data_od_bez_FK.DefaultCellStyle = dataGridViewCellStyle8; + this.data_od_bez_FK.HeaderText = "Data 1 em bez FV"; + this.data_od_bez_FK.Name = "data_od_bez_FK"; + this.data_od_bez_FK.ReadOnly = true; + this.data_od_bez_FK.Width = 80; + // + // wartoscNetto + // + this.wartoscNetto.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.wartoscNetto.DataPropertyName = "wartoscNetto"; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle9.Format = "C2"; + this.wartoscNetto.DefaultCellStyle = dataGridViewCellStyle9; + this.wartoscNetto.HeaderText = "Netto"; + this.wartoscNetto.Name = "wartoscNetto"; + this.wartoscNetto.ReadOnly = true; + this.wartoscNetto.Width = 90; + // + // kwotaWalutaBrutto + // + this.kwotaWalutaBrutto.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.kwotaWalutaBrutto.DataPropertyName = "kwotaWalutaBrutto"; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle10.Format = "N2"; + dataGridViewCellStyle10.NullValue = null; + this.kwotaWalutaBrutto.DefaultCellStyle = dataGridViewCellStyle10; + this.kwotaWalutaBrutto.HeaderText = "Waluta - brutto zamówienia"; + this.kwotaWalutaBrutto.Name = "kwotaWalutaBrutto"; + this.kwotaWalutaBrutto.ReadOnly = true; + this.kwotaWalutaBrutto.Width = 90; + // + // bruttoEuroMianoDataGridViewTextBoxColumn + // + this.bruttoEuroMianoDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.bruttoEuroMianoDataGridViewTextBoxColumn.DataPropertyName = "Brutto_Euro_Miano"; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.bruttoEuroMianoDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle11; + this.bruttoEuroMianoDataGridViewTextBoxColumn.HeaderText = "W"; + this.bruttoEuroMianoDataGridViewTextBoxColumn.Name = "bruttoEuroMianoDataGridViewTextBoxColumn"; + this.bruttoEuroMianoDataGridViewTextBoxColumn.ReadOnly = true; + this.bruttoEuroMianoDataGridViewTextBoxColumn.Width = 35; + // + // nettoZafakturowane + // + this.nettoZafakturowane.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.nettoZafakturowane.DataPropertyName = "nettoZafakturowane"; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle12.Format = "C2"; + this.nettoZafakturowane.DefaultCellStyle = dataGridViewCellStyle12; + this.nettoZafakturowane.HeaderText = "Wartoæ netto FV"; + this.nettoZafakturowane.Name = "nettoZafakturowane"; + this.nettoZafakturowane.ReadOnly = true; + this.nettoZafakturowane.Width = 90; + // + // DoZafakturowania + // + this.DoZafakturowania.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.DoZafakturowania.DataPropertyName = "DoZafakturowania"; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle13.Format = "C2"; + dataGridViewCellStyle13.NullValue = null; + this.DoZafakturowania.DefaultCellStyle = dataGridViewCellStyle13; + this.DoZafakturowania.HeaderText = "Do zafakturowania"; + this.DoZafakturowania.Name = "DoZafakturowania"; + this.DoZafakturowania.ReadOnly = true; + this.DoZafakturowania.ToolTipText = "Wartoæ jaka bêdzie zafakturowana na nastêpnej fakturze. Jeli faktura w walucie " + + "to wartoæ w PLN zgodna z kursem z dnia zatwierdzenia do druku."; + this.DoZafakturowania.Width = 90; + // + // SumaNaNastepnejFakturze + // + this.SumaNaNastepnejFakturze.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.SumaNaNastepnejFakturze.DataPropertyName = "SumaNaNastepnejFakturze"; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle14.Format = "C2"; + dataGridViewCellStyle14.NullValue = null; + this.SumaNaNastepnejFakturze.DefaultCellStyle = dataGridViewCellStyle14; + this.SumaNaNastepnejFakturze.HeaderText = "Wartoæ nastêpnej faktury w PLN"; + this.SumaNaNastepnejFakturze.Name = "SumaNaNastepnejFakturze"; + this.SumaNaNastepnejFakturze.ReadOnly = true; + this.SumaNaNastepnejFakturze.ToolTipText = "Jeli faktura w walucie to wartoæ w PLN zgodna z kursem z dnia zatwierdzenia do " + + "druku"; + this.SumaNaNastepnejFakturze.Visible = false; + this.SumaNaNastepnejFakturze.Width = 90; // // ZestawienieZamowienForm @@ -1064,5 +1086,4 @@ private System.Windows.Forms.ToolStrip wyszukajToolStrip; private System.Windows.Forms.SplitContainer splitContainer1; - private System.Windows.Forms.TreeView treeView1; private System.Windows.Forms.Panel panel; private System.Windows.Forms.ToolStripButton szukajToolStripButton; @@ -1103,16 +1124,4 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; - private System.Windows.Forms.DataGridViewTextBoxColumn agencja; - private System.Windows.Forms.DataGridViewTextBoxColumn agent; - private System.Windows.Forms.DataGridViewTextBoxColumn rokZamowienia; - private System.Windows.Forms.DataGridViewTextBoxColumn nrZamowieniaExt; - private System.Windows.Forms.DataGridViewTextBoxColumn iloscReklam; - private System.Windows.Forms.DataGridViewTextBoxColumn data_od; - private System.Windows.Forms.DataGridViewTextBoxColumn data_od_bez_FK; - private System.Windows.Forms.DataGridViewTextBoxColumn wartoscNetto; - private System.Windows.Forms.DataGridViewTextBoxColumn kwotaWalutaBrutto; - private System.Windows.Forms.DataGridViewTextBoxColumn bruttoEuroMianoDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn nettoZafakturowane; - private System.Windows.Forms.DataGridViewTextBoxColumn DoZafakturowania; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; @@ -1134,4 +1143,18 @@ private System.Windows.Forms.ToolStripLabel toolStripLabel6; private System.Windows.Forms.ToolStripTextBox txtMiesiac; + private System.Windows.Forms.TreeView treeView1; + private System.Windows.Forms.DataGridViewTextBoxColumn agencja; + private System.Windows.Forms.DataGridViewTextBoxColumn agent; + private System.Windows.Forms.DataGridViewTextBoxColumn rokZamowienia; + private System.Windows.Forms.DataGridViewTextBoxColumn nrZamowieniaExt; + private System.Windows.Forms.DataGridViewTextBoxColumn iloscReklam; + private System.Windows.Forms.DataGridViewTextBoxColumn data_od; + private System.Windows.Forms.DataGridViewTextBoxColumn data_od_bez_FK; + private System.Windows.Forms.DataGridViewTextBoxColumn wartoscNetto; + private System.Windows.Forms.DataGridViewTextBoxColumn kwotaWalutaBrutto; + private System.Windows.Forms.DataGridViewTextBoxColumn bruttoEuroMianoDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn nettoZafakturowane; + private System.Windows.Forms.DataGridViewTextBoxColumn DoZafakturowania; + private System.Windows.Forms.DataGridViewTextBoxColumn SumaNaNastepnejFakturze; } Index: /branches/Emisje/BazaReklam/REKLAMADataSet.xsd =================================================================== --- /branches/Emisje/BazaReklam/REKLAMADataSet.xsd (revision 782) +++ /branches/Emisje/BazaReklam/REKLAMADataSet.xsd (revision 796) @@ -6455,4 +6455,5 @@ + Index: /branches/Emisje/BazaReklam/REKLAMADataSet.xss =================================================================== --- /branches/Emisje/BazaReklam/REKLAMADataSet.xss (revision 777) +++ /branches/Emisje/BazaReklam/REKLAMADataSet.xss (revision 796) @@ -5,5 +5,5 @@ the code is regenerated. --> - + @@ -36,5 +36,5 @@ - + Index: /branches/Emisje/BazaReklam/REKLAMADataSet.Designer.cs =================================================================== --- /branches/Emisje/BazaReklam/REKLAMADataSet.Designer.cs (revision 782) +++ /branches/Emisje/BazaReklam/REKLAMADataSet.Designer.cs (revision 796) @@ -16454,4 +16454,6 @@ private global::System.Data.DataColumn columnkodKlienta; + private global::System.Data.DataColumn columnSumaNaNastepnejFakturze; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public VIEW_ZESTAWIENIE_ZAMOWIEN_NOWEDataTable() { @@ -16600,4 +16602,11 @@ get { return this.columnkodKlienta; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn SumaNaNastepnejFakturzeColumn { + get { + return this.columnSumaNaNastepnejFakturze; } } @@ -16649,5 +16658,6 @@ double nettoZafakturowane, string Brutto_Euro_Miano, - string kodKlienta) { + string kodKlienta, + decimal SumaNaNastepnejFakturze) { VIEW_ZESTAWIENIE_ZAMOWIEN_NOWERow rowVIEW_ZESTAWIENIE_ZAMOWIEN_NOWERow = ((VIEW_ZESTAWIENIE_ZAMOWIEN_NOWERow)(this.NewRow())); object[] columnValuesArray = new object[] { @@ -16668,5 +16678,6 @@ nettoZafakturowane, Brutto_Euro_Miano, - kodKlienta}; + kodKlienta, + SumaNaNastepnejFakturze}; rowVIEW_ZESTAWIENIE_ZAMOWIEN_NOWERow.ItemArray = columnValuesArray; this.Rows.Add(rowVIEW_ZESTAWIENIE_ZAMOWIEN_NOWERow); @@ -16716,4 +16727,5 @@ this.columnBrutto_Euro_Miano = base.Columns["Brutto_Euro_Miano"]; this.columnkodKlienta = base.Columns["kodKlienta"]; + this.columnSumaNaNastepnejFakturze = base.Columns["SumaNaNastepnejFakturze"]; } @@ -16754,4 +16766,6 @@ this.columnkodKlienta = new global::System.Data.DataColumn("kodKlienta", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnkodKlienta); + this.columnSumaNaNastepnejFakturze = new global::System.Data.DataColumn("SumaNaNastepnejFakturze", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnSumaNaNastepnejFakturze); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidZamowienia}, true)); @@ -32676,4 +32690,20 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public decimal SumaNaNastepnejFakturze { + get { + try { + return ((decimal)(this[this.tableVIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.SumaNaNastepnejFakturzeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'SumaNaNastepnejFakturze\' in table \'VIEW_ZESTAWIENIE_ZAMOWIE" + + "N_NOWE\' is DBNull.", e); + } + } + set { + this[this.tableVIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.SumaNaNastepnejFakturzeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public bool IsDoZafakturowaniaNull() { return this.IsNull(this.tableVIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.DoZafakturowaniaColumn); @@ -32803,4 +32833,14 @@ public void SetkodKlientaNull() { this[this.tableVIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.kodKlientaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsSumaNaNastepnejFakturzeNull() { + return this.IsNull(this.tableVIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.SumaNaNastepnejFakturzeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetSumaNaNastepnejFakturzeNull() { + this[this.tableVIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.SumaNaNastepnejFakturzeColumn] = global::System.Convert.DBNull; } } Index: /branches/Emisje/BazaReklam/Properties/AssemblyInfo.cs =================================================================== --- /branches/Emisje/BazaReklam/Properties/AssemblyInfo.cs (revision 765) +++ /branches/Emisje/BazaReklam/Properties/AssemblyInfo.cs (revision 796) @@ -30,3 +30,3 @@ // [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.1.23")] +[assembly: AssemblyFileVersion("1.1.24")] Index: /branches/Emisje/Wierszowki/Wierszowki.Web/Global.asax.cs =================================================================== --- /branches/Emisje/Wierszowki/Wierszowki.Web/Global.asax.cs (revision 752) +++ /branches/Emisje/Wierszowki/Wierszowki.Web/Global.asax.cs (revision 796) @@ -45,4 +45,10 @@ routes.MapRoute( + "All", // Route name + "Report/All/{year}/{month}/{user}", // URL with parameters + new { controller = "Report", action = "All", year = DateTime.Now.Year, month = DateTime.Now.Month, user = 0 } // Parameter defaults + ); + + routes.MapRoute( "Default", // Route name "{controller}/{action}/{id}", // URL with parameters Index: /branches/Emisje/Wierszowki/Wierszowki.Web/Controllers/MagazineItemController.cs =================================================================== --- /branches/Emisje/Wierszowki/Wierszowki.Web/Controllers/MagazineItemController.cs (revision 752) +++ /branches/Emisje/Wierszowki/Wierszowki.Web/Controllers/MagazineItemController.cs (revision 796) @@ -50,6 +50,5 @@ if (ModelState.IsValid) { - var author = _context.Authors.Single(a => a.Id == magazineItem.AuthorId); - return RedirectToAction("Confirm", author); + return RedirectToAction("Confirm", _context.Authors.Single(a => a.Id == magazineItem.AuthorId)); } @@ -95,4 +94,5 @@ { var author = _context.Authors.Single(a => a.Id == magazineItem.AuthorId); + return RedirectToAction("Confirm", author); } Index: /branches/Emisje/Wierszowki/Wierszowki.Web/Controllers/ReportController.cs =================================================================== --- /branches/Emisje/Wierszowki/Wierszowki.Web/Controllers/ReportController.cs (revision 752) +++ /branches/Emisje/Wierszowki/Wierszowki.Web/Controllers/ReportController.cs (revision 796) @@ -40,7 +40,8 @@ } - public ActionResult All() + public ActionResult All(int year, int month, int user) { - var items = _context.MagazineItems.ToList(); + var items = _repository.Find(m => m.Date.Month == month && m.Date.Year == year && m.CreatedBy == user) + .OrderByDescending(m => m.UpdatedOn).ToList(); return View(items); } Index: /branches/Emisje/Wierszowki/Wierszowki.Web/Views/MagazineItem/Edit.aspx =================================================================== --- /branches/Emisje/Wierszowki/Wierszowki.Web/Views/MagazineItem/Edit.aspx (revision 752) +++ /branches/Emisje/Wierszowki/Wierszowki.Web/Views/MagazineItem/Edit.aspx (revision 796) @@ -73,5 +73,5 @@

Opis: - <%= Html.TextBox("MagazineItem.Description", Model.MagazineItem.Description, new { title = "Proszê wprowadziæ opis artyku³u." })%> + <%= Html.TextArea("MagazineItem.Description", Model.MagazineItem.Description, new { title = "Proszê wprowadziæ opis artyku³u." })%>

Index: /branches/Emisje/Wierszowki/Wierszowki.Web/Views/MagazineItem/Confirm.aspx =================================================================== --- /branches/Emisje/Wierszowki/Wierszowki.Web/Views/MagazineItem/Confirm.aspx (revision 752) +++ /branches/Emisje/Wierszowki/Wierszowki.Web/Views/MagazineItem/Confirm.aspx (revision 796) @@ -9,5 +9,5 @@

Pomylnie dodano/zaktualizowano wierszówkê dla: <%= Html.Encode(ViewData.Model.FirstName + " " + ViewData.Model.LastName)%>

- <%=Html.ActionLink("Powrót", "Index", "Home") %> + <%=Html.ActionLink("Powrót", "Index", "Report") %>

Index: /branches/Emisje/Wierszowki/Wierszowki.Web/Views/MagazineItem/Create.aspx =================================================================== --- /branches/Emisje/Wierszowki/Wierszowki.Web/Views/MagazineItem/Create.aspx (revision 752) +++ /branches/Emisje/Wierszowki/Wierszowki.Web/Views/MagazineItem/Create.aspx (revision 796) @@ -72,5 +72,5 @@

Opis: - <%= Html.TextBox("MagazineItem.Description", Model.MagazineItem.Description, new { title = "Proszê wprowadziæ opis artyku³u." })%> + <%= Html.TextArea("MagazineItem.Description", Model.MagazineItem.Description, new { title = "Proszê wprowadziæ opis artyku³u." })%>

Index: /branches/Emisje/Wierszowki/Wierszowki.Web/Views/Report/Index.aspx =================================================================== --- /branches/Emisje/Wierszowki/Wierszowki.Web/Views/Report/Index.aspx (revision 772) +++ /branches/Emisje/Wierszowki/Wierszowki.Web/Views/Report/Index.aspx (revision 796) @@ -64,4 +64,42 @@ <%= Html.MonthSelect("month")%> + + + + + + + + <% } %> + + +

Wierszówki miesiêczne wg wprowadzaj¹cego i wybranego miesi¹ca

+ <% using (Html.BeginForm("All", "Report")) { %> + + + + + + + + + + + + @@ -142,4 +180,5 @@ <% } %> +

+ Rok: +	+ <%= Html.YearSelect("year")%> +
+ Miesi¹c: +	+ <%= Html.MonthSelect("month")%> +
+ Wprowadzaj¹cy: +	+

Index: /branches/Emisje/Wierszowki/Wierszowki.Web/Views/Report/All.aspx =================================================================== --- /branches/Emisje/Wierszowki/Wierszowki.Web/Views/Report/All.aspx (revision 752) +++ /branches/Emisje/Wierszowki/Wierszowki.Web/Views/Report/All.aspx (revision 796) @@ -64,5 +64,5 @@

- <%= Html.ActionLink("Powrót", "Index", "Home") %> + <%= Html.ActionLink("Powrót", "Index", "Report") %>