Index: Baza Reklam 2 - Faktury/FacturesFormNEW.resx =================================================================== --- Baza Reklam 2 - Faktury/FacturesFormNEW.resx (revision 17) +++ Baza Reklam 2 - Faktury/FacturesFormNEW.resx (revision 40) @@ -199,47 +199,47 @@ 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 - 0uCDAAAAAElFTkSuQmCC + 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 + XjwAAAAASUVORK5CYII= @@ -247,29 +247,29 @@ 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 - GRnrv9pi9Pnf/aO7CZ8Vq4QAAAAASUVORK5CYII= + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABXZJREFUSEuVlQtQ + VFUYx10VG0JbMg0ZSGAmncpycPIxljFKbEGhRjAyPkJSUUMzKwxwXS6ww0vUQZHAhZVhWQQUYuQlaqRi + giSKBIK8BFHYBUkWlze7++87zFIqC9aZ+c3de+49//89337fd3iTJhjbt58w4vONjs6ebeSmVD7pUCge + FAwP9+ZkZET/QcsGCeiZSGb8ZyEh+aHNze1gQ6cDqqtbwHEROh+fY40bN/ofdXHZaU+rXyYmE7z/5RIZ + KTORSC51j6g/N5hZTc0DMuN0u3aJm9zcvI+vXu0pIAMTYsp/MgoOLnC+caPekP6YubCwGLi67tC5unq1 + ODp+FWpiYmJGJkYTGgUEZISoVD0vNIiLS8Lu3VEoKQHS0x9CKEzDwoV2iSRuM6GJr29a5r/qFBMDY2ho + EOvXi+Dvn4LFiz9GaekwamsBR0cPJYmvJ2aNu4vQ0KybTHNoSAuNxrBBVtY5bN16CJGRhRCJJGhrAx49 + ApYsWVFDwiLCajwDXkxMvlKrBfr7h9HVpcKpFDnEgYEIDg6EVCJBa+tDZGQUDM6ZMzd1+fKVTZs2fYuL + F1VYteqQls9/VUbC+whLgwbnz5834bhfNQMDWrS1KnEyOQXFLUpUaoCiJ8CZO+04LpUhVZ7WQwJJlKU+ + 5uZmR6ysbNJnzDCV0NxBwpHgGzRISrrwdkREvK6zsxsJMjk6KVT9ROugFmWPB5H/oB+n7mMkTS0sLKJJ + xI54l/iUcCM+Il4fN2VjYzMFFRX3cPZsNq61dUFF4hpK/vo+DUo6+5Fzvw/yGjXkd3vg5bn5Fgk5ETOJ + GforqwdWfM8MVokj1SgWx22+d09B8Rbjuhpo6NWgWj2E6yReqOhDZoMaJytVSKrVwcfHR01LftDHe2w1 + Hz5cNTMxsT5ZLq+8KRJlhTo4eM7buVO4v6npEbigIOQpgd9a+3BZ0Y+Cll6cbVQjpbobMbdVkNdpsf+A + iP0P4cSbBuMdEpKTplazCAMdHbQwJrPH1XVvQ1VVG6KjjkFGYTjd2IvT9d1IJ2RVKsTe7oLklgrJdTps + 27blDglH6A3G7iAqKlulUHRBoVBhYIDShIZaTYKnC5CfV4hj8kxIajSIr+jGCRI+evMxYstVSKwZApdd + qLG1tc2xsrER6w3GxH1SQEBSXXFxHVVhAyorW9Dc3AGVqnfESKMZhiQuFtGp2Th+uxfRf9J95TCkZJiY + cwUR4kBcvPw7OF/fJ/avGa/Wp+Wzu/D2DvPkuDNDmZmlVChVKCqqQVlZI+7ebQWdASNGRVeuIJgTwU94 + AP4HOBwMDRtJUUZRyWW0S1YB62bB2cywCX/ZMuevt2wRXWULUlKuIS+vAoWFVbSrRjKrg7f3frovw6VL + pRS6X1Bfr0Z2Tq6aZdD9Qx8CjXuA3HXARnO4W/C/fH4nrH+zpmQ3f75tgIvLjmt+fpxOKi1Cbm4VwsOl + WLv2Gzg5bcK+fTGwt3dGQsItagmCq8Y8ngxOJoDMCaj9DjjnDmzgw2nhPA99Pfzzn7AfrDisCQdr67cC + BAL34r17OZ1Q+DO14whqaPlwcfGCl1cQgoJSYWZmlkzvCs2NJm/AZ9OBhE/oFNqGdqkXfH2DuugZO+1Y + 4T0z2G6mE6yXO1haWnMrVtjfsLd31Pn7xyMsLBtHjlygXQgUPB4vnt75ghWY1UtTVkIwDW0ha1Be14oN + Hh61NP8TMddgbdDk00YCS8u54QsWvFe+dOmagUWL3q8zNjZmB4qQeIeYxj5qztRJdt5+fn+5u7uXm5qa + Smnue2Y+nsHo/KgRq9LPCR8ilPiRYA3tFWK0xbAQL9ML76HrB/povMhj5PlUgrXeNwhmxq4slE8XFjMy + 1n+1xejzvwHQCrsC+jhLsgAAAABJRU5ErkJggg== @@ -277,29 +277,29 @@ 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 @@ -325,32 +325,32 @@ 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 - Cf8DspALHqnpv9EAAAAASUVORK5CYII= + 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 + +B+xKwsd6gcHwAAAAABJRU5ErkJggg== @@ -378,35 +378,32 @@ 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 - - - - 310, 54 - - + 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 @@ -423,4 +420,22 @@ + + 310, 54 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL + U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI + VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ + QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4 + /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9 + cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j + 3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR + dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb + NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE + s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC + + Index: Baza Reklam 2 - Faktury/Baza Reklam.csproj =================================================================== --- Baza Reklam 2 - Faktury/Baza Reklam.csproj (revision 36) +++ Baza Reklam 2 - Faktury/Baza Reklam.csproj (revision 40) @@ -92,4 +92,10 @@ AgentAddForm.cs + + Form + + + FakturowaniePoznanKatowice.cs + Form @@ -475,4 +481,8 @@ AgentAddForm.cs Designer + + + Designer + FakturowaniePoznanKatowice.cs Index: Baza Reklam 2 - Faktury/REKLAMADataSet.xsd =================================================================== --- Baza Reklam 2 - Faktury/REKLAMADataSet.xsd (revision 34) +++ Baza Reklam 2 - Faktury/REKLAMADataSet.xsd (revision 40) @@ -1603,5 +1603,5 @@ - SELECT TOP 100 BYL_WYDRUK, DATA_SPRZEDAZY, DATA_WYSTAWIENIA, EKSPORT, EXPORTED, EXPORTED_DATA, FAKTURA_PODTYP, FAKTURA_TYP, ID_FAKTURY, ID_FK_KOR, ID_KONTA, ID_NABYWCY, ID_SPRZEDAWCY, ID_TYTUL, KOREKTA, MIEJSCOWOSC_WYSTAWIENIA, NABYWCA_ADRES, NABYWCA_NIP, NUMER, NUMER_ROK, NUMER_ROZ, PODPIS_ODEBRAL, PODPIS_WYSTAWIL, SPOSOB_ZAPLATY, SPRZEDAWCA_ADRES, SPRZEDAWCA_NIP, TERMIN_ZAPLATY, ZAPLACONO, Zaliczka_Brutto, Zaliczka_Data, idFakturyKorekta, idFakturyVAT, idZamowienia, opis, suma_zaplat, waluta_brutto, waluta_kurs, waluta_kurs_z_dnia, waluta_miano, waluta_przelicznik, waluta_tabela_nr, zaplata_data, zaplata_opis FROM FAKTURY WHERE (idZamowienia = @param) + SELECT BYL_WYDRUK, DATA_SPRZEDAZY, DATA_WYSTAWIENIA, EKSPORT, EXPORTED, EXPORTED_DATA, FAKTURA_PODTYP, FAKTURA_TYP, ID_FAKTURY, ID_FK_KOR, ID_KONTA, ID_NABYWCY, ID_SPRZEDAWCY, ID_TYTUL, KOREKTA, MIEJSCOWOSC_WYSTAWIENIA, NABYWCA_ADRES, NABYWCA_NIP, NUMER, NUMER_ROK, NUMER_ROZ, PODPIS_ODEBRAL, PODPIS_WYSTAWIL, SPOSOB_ZAPLATY, SPRZEDAWCA_ADRES, SPRZEDAWCA_NIP, TERMIN_ZAPLATY, ZAPLACONO, Zaliczka_Brutto, Zaliczka_Data, idFakturyKorekta, idFakturyVAT, idZamowienia, opis, suma_zaplat, waluta_brutto, waluta_kurs, waluta_kurs_z_dnia, waluta_miano, waluta_przelicznik, waluta_tabela_nr, zaplata_data, zaplata_opis FROM FAKTURY WHERE (idZamowienia = @param) @@ -1617,4 +1617,64 @@ + + + + + + + + + SELECT ID_FAKTURY, NUMER, NUMER_ROZ, NUMER_ROK, DATA_WYSTAWIENIA, MIEJSCOWOSC_WYSTAWIENIA, ID_SPRZEDAWCY, ID_NABYWCY, + DATA_SPRZEDAZY, PODPIS_WYSTAWIL, PODPIS_ODEBRAL, opis, SPOSOB_ZAPLATY, TERMIN_ZAPLATY, ZAPLACONO, BYL_WYDRUK, + NABYWCA_ADRES, SPRZEDAWCA_ADRES, SPRZEDAWCA_NIP, NABYWCA_NIP, FAKTURA_TYP, FAKTURA_PODTYP, ID_KONTA, EKSPORT, + EXPORTED, ID_TYTUL, EXPORTED_DATA, suma_zaplat, ID_FK_KOR, zaplata_data, zaplata_opis, Zaliczka_Brutto, Zaliczka_Data, waluta_brutto, + waluta_miano, waluta_kurs, waluta_przelicznik, waluta_kurs_z_dnia, waluta_tabela_nr, idZamowienia, idFakturyKorekta, KOREKTA, idFakturyVAT +FROM FAKTURY +WHERE (YEAR(DATA_WYSTAWIENIA) = @rok) AND (DATEPART(week, DATA_WYSTAWIENIA) = @nrTygodnia) AND (KOREKTA = 0) AND + (ID_SPRZEDAWCY = @agencja) AND (NUMER_ROZ <> 'POZ') AND (NUMER_ROZ <> 'KAT') + + + + + + + + + + + + + + + SELECT ID_FAKTURY, NUMER, NUMER_ROZ, NUMER_ROK, DATA_WYSTAWIENIA, MIEJSCOWOSC_WYSTAWIENIA, ID_SPRZEDAWCY, ID_NABYWCY, + DATA_SPRZEDAZY, PODPIS_WYSTAWIL, PODPIS_ODEBRAL, opis, SPOSOB_ZAPLATY, TERMIN_ZAPLATY, ZAPLACONO, BYL_WYDRUK, + NABYWCA_ADRES, SPRZEDAWCA_ADRES, SPRZEDAWCA_NIP, NABYWCA_NIP, FAKTURA_TYP, FAKTURA_PODTYP, ID_KONTA, EKSPORT, + EXPORTED, ID_TYTUL, EXPORTED_DATA, suma_zaplat, ID_FK_KOR, KOREKTA, zaplata_data, zaplata_opis, Zaliczka_Brutto, Zaliczka_Data, + waluta_brutto, waluta_miano, waluta_kurs, waluta_przelicznik, waluta_kurs_z_dnia, waluta_tabela_nr, idZamowienia, idFakturyKorekta, + idFakturyVAT +FROM FAKTURY +WHERE (YEAR(DATA_WYSTAWIENIA) = @rok) AND (DATEPART(week, DATA_WYSTAWIENIA) = @nrTygodnia) AND (KOREKTA = 0) AND (ID_FK_KOR IS NULL) + AND (ID_SPRZEDAWCY = @agencja) AND (NUMER_ROZ <> 'POZ') AND (NUMER_ROZ <> 'KAT') +UNION ALL +SELECT KOREKTY.ID_FAKTURY, KOREKTY.NUMER, KOREKTY.NUMER_ROZ, KOREKTY.NUMER_ROK, KOREKTY.DATA_WYSTAWIENIA, + KOREKTY.MIEJSCOWOSC_WYSTAWIENIA, KOREKTY.ID_SPRZEDAWCY, KOREKTY.ID_NABYWCY, KOREKTY.DATA_SPRZEDAZY, + KOREKTY.PODPIS_WYSTAWIL, KOREKTY.PODPIS_ODEBRAL, KOREKTY.opis, KOREKTY.SPOSOB_ZAPLATY, KOREKTY.TERMIN_ZAPLATY, + KOREKTY.ZAPLACONO, KOREKTY.BYL_WYDRUK, KOREKTY.NABYWCA_ADRES, KOREKTY.SPRZEDAWCA_ADRES, KOREKTY.SPRZEDAWCA_NIP, + KOREKTY.NABYWCA_NIP, KOREKTY.FAKTURA_TYP, KOREKTY.FAKTURA_PODTYP, KOREKTY.ID_KONTA, KOREKTY.EKSPORT, + KOREKTY.EXPORTED, KOREKTY.ID_TYTUL, KOREKTY.EXPORTED_DATA, KOREKTY.suma_zaplat, KOREKTY.ID_FK_KOR, KOREKTY.KOREKTA, + KOREKTY.zaplata_data, KOREKTY.zaplata_opis, KOREKTY.Zaliczka_Brutto, KOREKTY.Zaliczka_Data, KOREKTY.waluta_brutto, + KOREKTY.waluta_miano, KOREKTY.waluta_kurs, KOREKTY.waluta_przelicznik, KOREKTY.waluta_kurs_z_dnia, KOREKTY.waluta_tabela_nr, + KOREKTY.idZamowienia, KOREKTY.idFakturyKorekta, KOREKTY.idFakturyVAT +FROM FAKTURY AS FAKTURY_1 LEFT OUTER JOIN + FAKTURY AS KOREKTY ON FAKTURY_1.ID_FK_KOR = KOREKTY.ID_FAKTURY +WHERE (FAKTURY_1.ID_FK_KOR IS NOT NULL) AND (KOREKTY.ID_FAKTURY IS NOT NULL) AND (YEAR(FAKTURY_1.DATA_WYSTAWIENIA) = @rok) AND + (DATEPART(week, FAKTURY_1.DATA_WYSTAWIENIA) = @nrTygodnia) AND (FAKTURY_1.ID_SPRZEDAWCY = @agencja) AND + (FAKTURY_1.NUMER_ROZ <> 'POZ') AND (FAKTURY_1.NUMER_ROZ <> 'KAT') + + + + + + @@ -1794,4 +1854,65 @@ + + + + + + + + + SELECT FAKTURA_DETAILS.ID_FAKTURA_DETAILS, FAKTURA_DETAILS.ID_FAKTURY, FAKTURA_DETAILS.ROK, FAKTURA_DETAILS.MIESIAC, + FAKTURA_DETAILS.NAZWA_USLUGI, FAKTURA_DETAILS.SYMBOL_SWW, FAKTURA_DETAILS.JM, FAKTURA_DETAILS.ILOSC, + FAKTURA_DETAILS.CENA_JEDN, FAKTURA_DETAILS.UPUST_PR, FAKTURA_DETAILS.UPUST_NETTO, FAKTURA_DETAILS.NETTO, + FAKTURA_DETAILS.S_VAT, FAKTURA_DETAILS.VAT, FAKTURA_DETAILS.BRUTTO, FAKTURA_DETAILS.TYTUL, FAKTURA_DETAILS.NR_WYDANIA, + FAKTURA_DETAILS.TYP, FAKTURA_DETAILS.PODTYP, FAKTURA_DETAILS.wyroznienie, FAKTURA_DETAILS.reklamaId +FROM FAKTURA_DETAILS LEFT OUTER JOIN + FAKTURY ON FAKTURA_DETAILS.ID_FAKTURY = FAKTURY.ID_FAKTURY +WHERE (YEAR(FAKTURY.DATA_WYSTAWIENIA) = @rok) AND (DATEPART(week, FAKTURY.DATA_WYSTAWIENIA) = @nrTygodnia) AND (FAKTURY.KOREKTA = 0) + AND (FAKTURY.ID_FK_KOR IS NULL) AND (FAKTURY.ID_SPRZEDAWCY = @agencja) AND (FAKTURY.NUMER_ROZ <> 'POZ') AND + (FAKTURY.NUMER_ROZ <> 'KAT') +UNION ALL +SELECT FAKTURA_DETAILS_1.ID_FAKTURA_DETAILS, FAKTURA_DETAILS_1.ID_FAKTURY, FAKTURA_DETAILS_1.ROK, FAKTURA_DETAILS_1.MIESIAC, + FAKTURA_DETAILS_1.NAZWA_USLUGI, FAKTURA_DETAILS_1.SYMBOL_SWW, FAKTURA_DETAILS_1.JM, FAKTURA_DETAILS_1.ILOSC, + FAKTURA_DETAILS_1.CENA_JEDN, FAKTURA_DETAILS_1.UPUST_PR, FAKTURA_DETAILS_1.UPUST_NETTO, FAKTURA_DETAILS_1.NETTO, + FAKTURA_DETAILS_1.S_VAT, FAKTURA_DETAILS_1.VAT, FAKTURA_DETAILS_1.BRUTTO, FAKTURA_DETAILS_1.TYTUL, + FAKTURA_DETAILS_1.NR_WYDANIA, FAKTURA_DETAILS_1.TYP, FAKTURA_DETAILS_1.PODTYP, FAKTURA_DETAILS_1.wyroznienie, + FAKTURA_DETAILS_1.reklamaId +FROM FAKTURA_DETAILS AS FAKTURA_DETAILS_1 LEFT OUTER JOIN + FAKTURY AS FAKTURY_1 ON FAKTURA_DETAILS_1.ID_FAKTURY = FAKTURY_1.ID_FAKTURY LEFT OUTER JOIN + FAKTURY AS KOREKTY ON FAKTURY_1.ID_FK_KOR = KOREKTY.ID_FAKTURY +WHERE (KOREKTY.ID_FAKTURY IS NOT NULL) AND (FAKTURY_1.ID_FK_KOR IS NOT NULL) AND (YEAR(FAKTURY_1.DATA_WYSTAWIENIA) = @rok) AND + (DATEPART(week, FAKTURY_1.DATA_WYSTAWIENIA) = @nrTygodnia) AND (FAKTURY_1.ID_SPRZEDAWCY = @agencja) AND + (FAKTURY_1.NUMER_ROZ <> 'POZ') AND (FAKTURY_1.NUMER_ROZ <> 'KAT') + + + + + + + + + + + + + + + SELECT FAKTURA_DETAILS.ID_FAKTURA_DETAILS, FAKTURA_DETAILS.ID_FAKTURY, FAKTURA_DETAILS.ROK, FAKTURA_DETAILS.MIESIAC, + FAKTURA_DETAILS.NAZWA_USLUGI, FAKTURA_DETAILS.SYMBOL_SWW, FAKTURA_DETAILS.JM, FAKTURA_DETAILS.ILOSC, + FAKTURA_DETAILS.CENA_JEDN, FAKTURA_DETAILS.UPUST_PR, FAKTURA_DETAILS.UPUST_NETTO, FAKTURA_DETAILS.NETTO, + FAKTURA_DETAILS.S_VAT, FAKTURA_DETAILS.VAT, FAKTURA_DETAILS.BRUTTO, FAKTURA_DETAILS.TYTUL, FAKTURA_DETAILS.NR_WYDANIA, + FAKTURA_DETAILS.TYP, FAKTURA_DETAILS.PODTYP, FAKTURA_DETAILS.wyroznienie, FAKTURA_DETAILS.reklamaId +FROM FAKTURA_DETAILS LEFT OUTER JOIN + FAKTURY ON FAKTURA_DETAILS.ID_FAKTURY = FAKTURY.ID_FAKTURY +WHERE (YEAR(FAKTURY.DATA_WYSTAWIENIA) = @rok) AND (DATEPART(week, FAKTURY.DATA_WYSTAWIENIA) = @nrTygodnia) AND (FAKTURY.KOREKTA = 0) + AND (FAKTURY.ID_SPRZEDAWCY = @agencja) AND (FAKTURY.NUMER_ROZ <> 'POZ') AND (FAKTURY.NUMER_ROZ <> 'KAT') +ORDER BY FAKTURA_DETAILS.ROK, FAKTURA_DETAILS.MIESIAC + + + + + + @@ -5162,5 +5283,5 @@ - + Index: Baza Reklam 2 - Faktury/REKLAMADataSet.xss =================================================================== --- Baza Reklam 2 - Faktury/REKLAMADataSet.xss (revision 34) +++ Baza Reklam 2 - Faktury/REKLAMADataSet.xss (revision 40) @@ -5,5 +5,5 @@ the code is regenerated. --> - + @@ -14,5 +14,5 @@ - + @@ -39,17 +39,17 @@ - - + + - + -288 - 21 + 28 242 - 21 + 28 @@ -59,13 +59,13 @@ -288 - -227 - - - -119 - -227 - - - - + -251 + + + -194 + -251 + + + + Index: Baza Reklam 2 - Faktury/FacturesFormNEW.Designer.cs =================================================================== --- Baza Reklam 2 - Faktury/FacturesFormNEW.Designer.cs (revision 17) +++ Baza Reklam 2 - Faktury/FacturesFormNEW.Designer.cs (revision 40) @@ -83,9 +83,4 @@ this.treeView1 = new System.Windows.Forms.TreeView(); this.fakturyDataGridView = new System.Windows.Forms.DataGridView(); - this.panel = new System.Windows.Forms.Panel(); - this.bruttoTextBox = new System.Windows.Forms.TextBox(); - this.zaplataTextBox = new System.Windows.Forms.TextBox(); - this.reklamaTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.REKLAMATableAdapter(); - this.VIEW_ZESTAWIENIE_FAKTUR_NOWETableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.VIEW_ZESTAWIENIE_FAKTUR_NOWETableAdapter(); this.FirstName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.TERMIN_ZAPLATY = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -104,4 +99,11 @@ this.bRUTTODataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.suma_zaplat = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.panel = new System.Windows.Forms.Panel(); + this.bruttoTextBox = new System.Windows.Forms.TextBox(); + this.zaplataTextBox = new System.Windows.Forms.TextBox(); + this.reklamaTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.REKLAMATableAdapter(); + this.VIEW_ZESTAWIENIE_FAKTUR_NOWETableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.VIEW_ZESTAWIENIE_FAKTUR_NOWETableAdapter(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.PoznanKatowicetoolStripButton = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit(); this.bindingNavigator1.SuspendLayout(); @@ -141,5 +143,7 @@ this.wplata2toolStripButton, this.zamowieniaToolStripButton, - this.toolStripButton2}); + this.toolStripButton2, + this.toolStripSeparator2, + this.PoznanKatowicetoolStripButton}); this.bindingNavigator1.Location = new System.Drawing.Point(0, 0); this.bindingNavigator1.MoveFirstItem = this.bindingNavigatorMoveFirstItem; @@ -493,42 +497,4 @@ this.fakturyDataGridView.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.fakturyDataGridView_DataBindingComplete); // - // panel - // - this.panel.Controls.Add(this.bruttoTextBox); - this.panel.Controls.Add(this.zaplataTextBox); - this.panel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel.Location = new System.Drawing.Point(0, 630); - this.panel.Name = "panel"; - this.panel.Size = new System.Drawing.Size(979, 34); - this.panel.TabIndex = 4; - // - // bruttoTextBox - // - this.bruttoTextBox.BackColor = System.Drawing.Color.White; - this.bruttoTextBox.Location = new System.Drawing.Point(710, 6); - this.bruttoTextBox.Name = "bruttoTextBox"; - this.bruttoTextBox.ReadOnly = true; - this.bruttoTextBox.Size = new System.Drawing.Size(125, 20); - this.bruttoTextBox.TabIndex = 1; - this.bruttoTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - // - // zaplataTextBox - // - this.zaplataTextBox.BackColor = System.Drawing.Color.White; - this.zaplataTextBox.Location = new System.Drawing.Point(851, 6); - this.zaplataTextBox.Name = "zaplataTextBox"; - this.zaplataTextBox.ReadOnly = true; - this.zaplataTextBox.Size = new System.Drawing.Size(116, 20); - this.zaplataTextBox.TabIndex = 0; - this.zaplataTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - // - // reklamaTableAdapter - // - this.reklamaTableAdapter.ClearBeforeFill = true; - // - // VIEW_ZESTAWIENIE_FAKTUR_NOWETableAdapter - // - this.VIEW_ZESTAWIENIE_FAKTUR_NOWETableAdapter.ClearBeforeFill = true; - // // FirstName // @@ -690,4 +656,57 @@ this.suma_zaplat.Name = "suma_zaplat"; this.suma_zaplat.Width = 70; + // + // panel + // + this.panel.Controls.Add(this.bruttoTextBox); + this.panel.Controls.Add(this.zaplataTextBox); + this.panel.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel.Location = new System.Drawing.Point(0, 630); + this.panel.Name = "panel"; + this.panel.Size = new System.Drawing.Size(979, 34); + this.panel.TabIndex = 4; + // + // bruttoTextBox + // + this.bruttoTextBox.BackColor = System.Drawing.Color.White; + this.bruttoTextBox.Location = new System.Drawing.Point(710, 6); + this.bruttoTextBox.Name = "bruttoTextBox"; + this.bruttoTextBox.ReadOnly = true; + this.bruttoTextBox.Size = new System.Drawing.Size(125, 20); + this.bruttoTextBox.TabIndex = 1; + this.bruttoTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + // + // zaplataTextBox + // + this.zaplataTextBox.BackColor = System.Drawing.Color.White; + this.zaplataTextBox.Location = new System.Drawing.Point(851, 6); + this.zaplataTextBox.Name = "zaplataTextBox"; + this.zaplataTextBox.ReadOnly = true; + this.zaplataTextBox.Size = new System.Drawing.Size(116, 20); + this.zaplataTextBox.TabIndex = 0; + this.zaplataTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + // + // reklamaTableAdapter + // + this.reklamaTableAdapter.ClearBeforeFill = true; + // + // VIEW_ZESTAWIENIE_FAKTUR_NOWETableAdapter + // + this.VIEW_ZESTAWIENIE_FAKTUR_NOWETableAdapter.ClearBeforeFill = true; + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 31); + // + // PoznanKatowicetoolStripButton + // + this.PoznanKatowicetoolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.PoznanKatowicetoolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("PoznanKatowicetoolStripButton.Image"))); + this.PoznanKatowicetoolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.PoznanKatowicetoolStripButton.Name = "PoznanKatowicetoolStripButton"; + this.PoznanKatowicetoolStripButton.Size = new System.Drawing.Size(99, 28); + this.PoznanKatowicetoolStripButton.Text = "Poznañ - Katowice"; + this.PoznanKatowicetoolStripButton.Click += new System.EventHandler(this.PoznanKatowicetoolStripButton_Click); // // FacturesFormNEW @@ -784,4 +803,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn bRUTTODataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn suma_zaplat; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripButton PoznanKatowicetoolStripButton; } Index: Baza Reklam 2 - Faktury/REKLAMADataSet.Designer.cs =================================================================== --- Baza Reklam 2 - Faktury/REKLAMADataSet.Designer.cs (revision 34) +++ Baza Reklam 2 - Faktury/REKLAMADataSet.Designer.cs (revision 40) @@ -6342,4 +6342,5 @@ this.columnSYMBOL_SWW.MaxLength = 30; this.columnJM.MaxLength = 5; + this.columnwyroznienie.DefaultValue = ((bool)(false)); } @@ -39808,5 +39809,5 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; @@ -39835,5 +39836,5 @@ this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = @"SELECT TOP 100 BYL_WYDRUK, DATA_SPRZEDAZY, DATA_WYSTAWIENIA, EKSPORT, EXPORTED, EXPORTED_DATA, FAKTURA_PODTYP, FAKTURA_TYP, ID_FAKTURY, ID_FK_KOR, ID_KONTA, ID_NABYWCY, ID_SPRZEDAWCY, ID_TYTUL, KOREKTA, MIEJSCOWOSC_WYSTAWIENIA, NABYWCA_ADRES, NABYWCA_NIP, NUMER, NUMER_ROK, NUMER_ROZ, PODPIS_ODEBRAL, PODPIS_WYSTAWIL, SPOSOB_ZAPLATY, SPRZEDAWCA_ADRES, SPRZEDAWCA_NIP, TERMIN_ZAPLATY, ZAPLACONO, Zaliczka_Brutto, Zaliczka_Data, idFakturyKorekta, idFakturyVAT, idZamowienia, opis, suma_zaplat, waluta_brutto, waluta_kurs, waluta_kurs_z_dnia, waluta_miano, waluta_przelicznik, waluta_tabela_nr, zaplata_data, zaplata_opis FROM FAKTURY WHERE (idZamowienia = @param)"; + this._commandCollection[4].CommandText = @"SELECT BYL_WYDRUK, DATA_SPRZEDAZY, DATA_WYSTAWIENIA, EKSPORT, EXPORTED, EXPORTED_DATA, FAKTURA_PODTYP, FAKTURA_TYP, ID_FAKTURY, ID_FK_KOR, ID_KONTA, ID_NABYWCY, ID_SPRZEDAWCY, ID_TYTUL, KOREKTA, MIEJSCOWOSC_WYSTAWIENIA, NABYWCA_ADRES, NABYWCA_NIP, NUMER, NUMER_ROK, NUMER_ROZ, PODPIS_ODEBRAL, PODPIS_WYSTAWIL, SPOSOB_ZAPLATY, SPRZEDAWCA_ADRES, SPRZEDAWCA_NIP, TERMIN_ZAPLATY, ZAPLACONO, Zaliczka_Brutto, Zaliczka_Data, idFakturyKorekta, idFakturyVAT, idZamowienia, opis, suma_zaplat, waluta_brutto, waluta_kurs, waluta_kurs_z_dnia, waluta_miano, waluta_przelicznik, waluta_tabela_nr, zaplata_data, zaplata_opis FROM FAKTURY WHERE (idZamowienia = @param)"; this._commandCollection[4].CommandType = global::System.Data.CommandType.Text; this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@param", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idZamowienia", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -39843,4 +39844,58 @@ this._commandCollection[5].CommandType = global::System.Data.CommandType.Text; this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@param", global::System.Data.SqlDbType.NVarChar, 8, global::System.Data.ParameterDirection.Input, 0, 0, "NUMER_ROZ", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[6].Connection = this.Connection; + this._commandCollection[6].CommandText = @"SELECT ID_FAKTURY, NUMER, NUMER_ROZ, NUMER_ROK, DATA_WYSTAWIENIA, MIEJSCOWOSC_WYSTAWIENIA, ID_SPRZEDAWCY, ID_NABYWCY, + DATA_SPRZEDAZY, PODPIS_WYSTAWIL, PODPIS_ODEBRAL, opis, SPOSOB_ZAPLATY, TERMIN_ZAPLATY, ZAPLACONO, BYL_WYDRUK, + NABYWCA_ADRES, SPRZEDAWCA_ADRES, SPRZEDAWCA_NIP, NABYWCA_NIP, FAKTURA_TYP, FAKTURA_PODTYP, ID_KONTA, EKSPORT, + EXPORTED, ID_TYTUL, EXPORTED_DATA, suma_zaplat, ID_FK_KOR, zaplata_data, zaplata_opis, Zaliczka_Brutto, Zaliczka_Data, waluta_brutto, + waluta_miano, waluta_kurs, waluta_przelicznik, waluta_kurs_z_dnia, waluta_tabela_nr, idZamowienia, idFakturyKorekta, KOREKTA, idFakturyVAT +FROM FAKTURY +WHERE (YEAR(DATA_WYSTAWIENIA) = @rok) AND (DATEPART(week, DATA_WYSTAWIENIA) = @nrTygodnia) AND (KOREKTA = 0) AND + (ID_SPRZEDAWCY = @agencja) AND (NUMER_ROZ <> 'POZ') AND (NUMER_ROZ <> 'KAT')"; + this._commandCollection[6].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rok", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nrTygodnia", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@agencja", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "ID_SPRZEDAWCY", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[7].Connection = this.Connection; + this._commandCollection[7].CommandText = "SELECT ID_FAKTURY, NUMER, NUMER_ROZ, NUMER_ROK, DATA_WYSTAWIENIA, MIEJSCOWOSC" + + "_WYSTAWIENIA, ID_SPRZEDAWCY, ID_NABYWCY, \r\n DATA_SPRZEDAZY," + + " PODPIS_WYSTAWIL, PODPIS_ODEBRAL, opis, SPOSOB_ZAPLATY, TERMIN_ZAPLATY, ZAPLACON" + + "O, BYL_WYDRUK, \r\n NABYWCA_ADRES, SPRZEDAWCA_ADRES, SPRZEDAW" + + "CA_NIP, NABYWCA_NIP, FAKTURA_TYP, FAKTURA_PODTYP, ID_KONTA, EKSPORT, \r\n " + + " EXPORTED, ID_TYTUL, EXPORTED_DATA, suma_zaplat, ID_FK_KOR, KOREKTA," + + " zaplata_data, zaplata_opis, Zaliczka_Brutto, Zaliczka_Data, \r\n " + + " waluta_brutto, waluta_miano, waluta_kurs, waluta_przelicznik, waluta_kurs_z" + + "_dnia, waluta_tabela_nr, idZamowienia, idFakturyKorekta, \r\n " + + " idFakturyVAT\r\nFROM FAKTURY\r\nWHERE (YEAR(DATA_WYSTAWIENIA) = @rok) A" + + "ND (DATEPART(week, DATA_WYSTAWIENIA) = @nrTygodnia) AND (KOREKTA = 0) AND (ID_FK" + + "_KOR IS NULL) \r\n AND (ID_SPRZEDAWCY = @agencja) AND (NUMER_" + + "ROZ <> \'POZ\') AND (NUMER_ROZ <> \'KAT\')\r\nUNION ALL\r\nSELECT KOREKTY.ID_FAKTURY" + + ", KOREKTY.NUMER, KOREKTY.NUMER_ROZ, KOREKTY.NUMER_ROK, KOREKTY.DATA_WYSTAWIENIA," + + " \r\n KOREKTY.MIEJSCOWOSC_WYSTAWIENIA, KOREKTY.ID_SPRZEDAWCY," + + " KOREKTY.ID_NABYWCY, KOREKTY.DATA_SPRZEDAZY, \r\n KOREKTY.POD" + + "PIS_WYSTAWIL, KOREKTY.PODPIS_ODEBRAL, KOREKTY.opis, KOREKTY.SPOSOB_ZAPLATY, KORE" + + "KTY.TERMIN_ZAPLATY, \r\n KOREKTY.ZAPLACONO, KOREKTY.BYL_WYDRU" + + "K, KOREKTY.NABYWCA_ADRES, KOREKTY.SPRZEDAWCA_ADRES, KOREKTY.SPRZEDAWCA_NIP, \r\n " + + " KOREKTY.NABYWCA_NIP, KOREKTY.FAKTURA_TYP, KOREKTY.FAKTURA_PO" + + "DTYP, KOREKTY.ID_KONTA, KOREKTY.EKSPORT, \r\n KOREKTY.EXPORTE" + + "D, KOREKTY.ID_TYTUL, KOREKTY.EXPORTED_DATA, KOREKTY.suma_zaplat, KOREKTY.ID_FK_K" + + "OR, KOREKTY.KOREKTA, \r\n KOREKTY.zaplata_data, KOREKTY.zapla" + + "ta_opis, KOREKTY.Zaliczka_Brutto, KOREKTY.Zaliczka_Data, KOREKTY.waluta_brutto, " + + "\r\n KOREKTY.waluta_miano, KOREKTY.waluta_kurs, KOREKTY.walut" + + "a_przelicznik, KOREKTY.waluta_kurs_z_dnia, KOREKTY.waluta_tabela_nr, \r\n " + + " KOREKTY.idZamowienia, KOREKTY.idFakturyKorekta, KOREKTY.idFakturyVA" + + "T\r\nFROM FAKTURY AS FAKTURY_1 LEFT OUTER JOIN\r\n FAKT" + + "URY AS KOREKTY ON FAKTURY_1.ID_FK_KOR = KOREKTY.ID_FAKTURY\r\nWHERE (FAKTURY_1" + + ".ID_FK_KOR IS NOT NULL) AND (KOREKTY.ID_FAKTURY IS NOT NULL) AND (YEAR(FAKTURY_1" + + ".DATA_WYSTAWIENIA) = @rok) AND \r\n (DATEPART(week, FAKTURY_1" + + ".DATA_WYSTAWIENIA) = @nrTygodnia) AND (FAKTURY_1.ID_SPRZEDAWCY = @agencja) AND \r" + + "\n (FAKTURY_1.NUMER_ROZ <> \'POZ\') AND (FAKTURY_1.NUMER_ROZ <" + + "> \'KAT\')"; + this._commandCollection[7].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@agencja", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "ID_SPRZEDAWCY", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rok", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nrTygodnia", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -40022,4 +40077,80 @@ this.Adapter.SelectCommand.Parameters[0].Value = ((string)(param)); } + REKLAMADataSet.FAKTURYDataTable dataTable = new REKLAMADataSet.FAKTURYDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillByNrTygodniaWRoku(REKLAMADataSet.FAKTURYDataTable dataTable, decimal rok, decimal nrTygodnia, global::System.Nullable agencja) { + this.Adapter.SelectCommand = this.CommandCollection[6]; + this.Adapter.SelectCommand.Parameters[0].Value = ((decimal)(rok)); + this.Adapter.SelectCommand.Parameters[1].Value = ((decimal)(nrTygodnia)); + if ((agencja.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((int)(agencja.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual REKLAMADataSet.FAKTURYDataTable GetDataByNrTygodniaWRoku(decimal rok, decimal nrTygodnia, global::System.Nullable agencja) { + this.Adapter.SelectCommand = this.CommandCollection[6]; + this.Adapter.SelectCommand.Parameters[0].Value = ((decimal)(rok)); + this.Adapter.SelectCommand.Parameters[1].Value = ((decimal)(nrTygodnia)); + if ((agencja.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((int)(agencja.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + REKLAMADataSet.FAKTURYDataTable dataTable = new REKLAMADataSet.FAKTURYDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillByNrTygodniaWRokuZKorekta(REKLAMADataSet.FAKTURYDataTable dataTable, global::System.Nullable agencja, decimal rok, decimal nrTygodnia) { + this.Adapter.SelectCommand = this.CommandCollection[7]; + if ((agencja.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[0].Value = ((int)(agencja.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + this.Adapter.SelectCommand.Parameters[1].Value = ((decimal)(rok)); + this.Adapter.SelectCommand.Parameters[2].Value = ((decimal)(nrTygodnia)); + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual REKLAMADataSet.FAKTURYDataTable GetDataByNrTygodniaWRokuZKorekta(global::System.Nullable agencja, decimal rok, decimal nrTygodnia) { + this.Adapter.SelectCommand = this.CommandCollection[7]; + if ((agencja.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[0].Value = ((int)(agencja.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + this.Adapter.SelectCommand.Parameters[1].Value = ((decimal)(rok)); + this.Adapter.SelectCommand.Parameters[2].Value = ((decimal)(nrTygodnia)); REKLAMADataSet.FAKTURYDataTable dataTable = new REKLAMADataSet.FAKTURYDataTable(); this.Adapter.Fill(dataTable); @@ -40903,5 +41034,5 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; @@ -40925,4 +41056,57 @@ this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@param", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "ID_FAKTURY", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[3].Connection = this.Connection; + this._commandCollection[3].CommandText = "SELECT FAKTURA_DETAILS.ID_FAKTURA_DETAILS, FAKTURA_DETAILS.ID_FAKTURY, FAKTUR" + + "A_DETAILS.ROK, FAKTURA_DETAILS.MIESIAC, \r\n FAKTURA_DETAILS." + + "NAZWA_USLUGI, FAKTURA_DETAILS.SYMBOL_SWW, FAKTURA_DETAILS.JM, FAKTURA_DETAILS.IL" + + "OSC, \r\n FAKTURA_DETAILS.CENA_JEDN, FAKTURA_DETAILS.UPUST_PR" + + ", FAKTURA_DETAILS.UPUST_NETTO, FAKTURA_DETAILS.NETTO, \r\n FA" + + "KTURA_DETAILS.S_VAT, FAKTURA_DETAILS.VAT, FAKTURA_DETAILS.BRUTTO, FAKTURA_DETAIL" + + "S.TYTUL, FAKTURA_DETAILS.NR_WYDANIA, \r\n FAKTURA_DETAILS.TYP" + + ", FAKTURA_DETAILS.PODTYP, FAKTURA_DETAILS.wyroznienie, FAKTURA_DETAILS.reklamaId" + + "\r\nFROM FAKTURA_DETAILS LEFT OUTER JOIN\r\n FAKTURY ON" + + " FAKTURA_DETAILS.ID_FAKTURY = FAKTURY.ID_FAKTURY\r\nWHERE (YEAR(FAKTURY.DATA_W" + + "YSTAWIENIA) = @rok) AND (DATEPART(week, FAKTURY.DATA_WYSTAWIENIA) = @nrTygodnia)" + + " AND (FAKTURY.KOREKTA = 0)\r\n AND (FAKTURY.ID_FK_KOR IS NUL" + + "L) AND (FAKTURY.ID_SPRZEDAWCY = @agencja) AND (FAKTURY.NUMER_ROZ <> \'POZ\') AND \r" + + "\n (FAKTURY.NUMER_ROZ <> \'KAT\')\r\nUNION ALL\r\nSELECT FAKTU" + + "RA_DETAILS_1.ID_FAKTURA_DETAILS, FAKTURA_DETAILS_1.ID_FAKTURY, FAKTURA_DETAILS_1" + + ".ROK, FAKTURA_DETAILS_1.MIESIAC, \r\n FAKTURA_DETAILS_1.NAZWA" + + "_USLUGI, FAKTURA_DETAILS_1.SYMBOL_SWW, FAKTURA_DETAILS_1.JM, FAKTURA_DETAILS_1.I" + + "LOSC, \r\n FAKTURA_DETAILS_1.CENA_JEDN, FAKTURA_DETAILS_1.UPU" + + "ST_PR, FAKTURA_DETAILS_1.UPUST_NETTO, FAKTURA_DETAILS_1.NETTO, \r\n " + + " FAKTURA_DETAILS_1.S_VAT, FAKTURA_DETAILS_1.VAT, FAKTURA_DETAILS_1.BRUTTO," + + " FAKTURA_DETAILS_1.TYTUL, \r\n FAKTURA_DETAILS_1.NR_WYDANIA, " + + "FAKTURA_DETAILS_1.TYP, FAKTURA_DETAILS_1.PODTYP, FAKTURA_DETAILS_1.wyroznienie, " + + "\r\n FAKTURA_DETAILS_1.reklamaId\r\nFROM FAKTURA_DETAIL" + + "S AS FAKTURA_DETAILS_1 LEFT OUTER JOIN\r\n FAKTURY AS FAKTURY" + + "_1 ON FAKTURA_DETAILS_1.ID_FAKTURY = FAKTURY_1.ID_FAKTURY LEFT OUTER JOIN\r\n " + + " FAKTURY AS KOREKTY ON FAKTURY_1.ID_FK_KOR = KOREKTY.ID_FAKTURY\r" + + "\nWHERE (KOREKTY.ID_FAKTURY IS NOT NULL) AND (FAKTURY_1.ID_FK_KOR IS NOT NULL" + + ") AND (YEAR(FAKTURY_1.DATA_WYSTAWIENIA) = @rok) AND \r\n (DAT" + + "EPART(week, FAKTURY_1.DATA_WYSTAWIENIA) = @nrTygodnia) AND (FAKTURY_1.ID_SPRZEDA" + + "WCY = @agencja) AND \r\n (FAKTURY_1.NUMER_ROZ <> \'POZ\') AND (" + + "FAKTURY_1.NUMER_ROZ <> \'KAT\')"; + this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@agencja", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rok", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nrTygodnia", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[4].Connection = this.Connection; + this._commandCollection[4].CommandText = @"SELECT FAKTURA_DETAILS.ID_FAKTURA_DETAILS, FAKTURA_DETAILS.ID_FAKTURY, FAKTURA_DETAILS.ROK, FAKTURA_DETAILS.MIESIAC, + FAKTURA_DETAILS.NAZWA_USLUGI, FAKTURA_DETAILS.SYMBOL_SWW, FAKTURA_DETAILS.JM, FAKTURA_DETAILS.ILOSC, + FAKTURA_DETAILS.CENA_JEDN, FAKTURA_DETAILS.UPUST_PR, FAKTURA_DETAILS.UPUST_NETTO, FAKTURA_DETAILS.NETTO, + FAKTURA_DETAILS.S_VAT, FAKTURA_DETAILS.VAT, FAKTURA_DETAILS.BRUTTO, FAKTURA_DETAILS.TYTUL, FAKTURA_DETAILS.NR_WYDANIA, + FAKTURA_DETAILS.TYP, FAKTURA_DETAILS.PODTYP, FAKTURA_DETAILS.wyroznienie, FAKTURA_DETAILS.reklamaId +FROM FAKTURA_DETAILS LEFT OUTER JOIN + FAKTURY ON FAKTURA_DETAILS.ID_FAKTURY = FAKTURY.ID_FAKTURY +WHERE (YEAR(FAKTURY.DATA_WYSTAWIENIA) = @rok) AND (DATEPART(week, FAKTURY.DATA_WYSTAWIENIA) = @nrTygodnia) AND (FAKTURY.KOREKTA = 0) + AND (FAKTURY.ID_SPRZEDAWCY = @agencja) AND (FAKTURY.NUMER_ROZ <> 'POZ') AND (FAKTURY.NUMER_ROZ <> 'KAT') +ORDER BY FAKTURA_DETAILS.ROK, FAKTURA_DETAILS.MIESIAC"; + this._commandCollection[4].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rok", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nrTygodnia", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@agencja", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "ID_SPRZEDAWCY", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -40977,4 +41161,80 @@ else { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + REKLAMADataSet.FAKTURA_DETAILSDataTable dataTable = new REKLAMADataSet.FAKTURA_DETAILSDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillByNrTygodniaRokZKorekta(REKLAMADataSet.FAKTURA_DETAILSDataTable dataTable, global::System.Nullable agencja, decimal rok, decimal nrTygodnia) { + this.Adapter.SelectCommand = this.CommandCollection[3]; + if ((agencja.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[0].Value = ((int)(agencja.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + this.Adapter.SelectCommand.Parameters[1].Value = ((decimal)(rok)); + this.Adapter.SelectCommand.Parameters[2].Value = ((decimal)(nrTygodnia)); + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual REKLAMADataSet.FAKTURA_DETAILSDataTable GetDataByNrTygodniaRokZKorekta(global::System.Nullable agencja, decimal rok, decimal nrTygodnia) { + this.Adapter.SelectCommand = this.CommandCollection[3]; + if ((agencja.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[0].Value = ((int)(agencja.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + this.Adapter.SelectCommand.Parameters[1].Value = ((decimal)(rok)); + this.Adapter.SelectCommand.Parameters[2].Value = ((decimal)(nrTygodnia)); + REKLAMADataSet.FAKTURA_DETAILSDataTable dataTable = new REKLAMADataSet.FAKTURA_DETAILSDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillByNrTygodniaWRoku(REKLAMADataSet.FAKTURA_DETAILSDataTable dataTable, decimal rok, decimal nrTygodnia, global::System.Nullable agencja) { + this.Adapter.SelectCommand = this.CommandCollection[4]; + this.Adapter.SelectCommand.Parameters[0].Value = ((decimal)(rok)); + this.Adapter.SelectCommand.Parameters[1].Value = ((decimal)(nrTygodnia)); + if ((agencja.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((int)(agencja.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual REKLAMADataSet.FAKTURA_DETAILSDataTable GetDataByNrTygodniaWRoku(decimal rok, decimal nrTygodnia, global::System.Nullable agencja) { + this.Adapter.SelectCommand = this.CommandCollection[4]; + this.Adapter.SelectCommand.Parameters[0].Value = ((decimal)(rok)); + this.Adapter.SelectCommand.Parameters[1].Value = ((decimal)(nrTygodnia)); + if ((agencja.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((int)(agencja.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } REKLAMADataSet.FAKTURA_DETAILSDataTable dataTable = new REKLAMADataSet.FAKTURA_DETAILSDataTable(); Index: Baza Reklam 2 - Faktury/Raporty/fakturaReversed2.rdlc =================================================================== --- Baza Reklam 2 - Faktury/Raporty/fakturaReversed2.rdlc (revision 36) +++ Baza Reklam 2 - Faktury/Raporty/fakturaReversed2.rdlc (revision 40) @@ -4723,5 +4723,5 @@ true - =Fields!NR_WYDANIA.Value + =iif(First(Fields!NUMER_ROZ.Value, "Faktura")="POZ" or First(Fields!NUMER_ROZ.Value, "Faktura")="KAT",Split(Fields!NAZWA_USLUGI.Value,"|").GetValue(1) & " " & Split(Fields!NAZWA_USLUGI.Value,"|").GetValue(2),Fields!NR_WYDANIA.Value) Index: Baza Reklam 2 - Faktury/FacturesFormNEW.cs =================================================================== --- Baza Reklam 2 - Faktury/FacturesFormNEW.cs (revision 37) +++ Baza Reklam 2 - Faktury/FacturesFormNEW.cs (revision 40) @@ -580,4 +580,10 @@ } } + + private void PoznanKatowicetoolStripButton_Click(object sender, EventArgs e) + { + FakturowaniePoznanKatowice fpk = new FakturowaniePoznanKatowice(); + fpk.ShowDialog(); + } } }