Index: /trunk/SQL/Views/VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.txt =================================================================== --- /trunk/SQL/Views/VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.txt (revision 216) +++ /trunk/SQL/Views/VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.txt (revision 226) @@ -7,19 +7,45 @@ ALTER VIEW [dbo].[VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE] AS -SELECT A2.Symbol AS agencja, A1.Symbol AS agent, z.idZamowienia, z.idKlienta, z.nrZamowienia, z.rokZamowienia, z.kodAgenta, - K.kodKlienta + '/' + CAST(z.nrZamowienia AS nvarchar) + '/' + z.kodAgenta + '/' + CAST(z.rokZamowienia AS nvarchar) AS nrZamowieniaExt, - R.iloscReklam, - R.wartoscNetto, - R.kwotaWalutaBrutto, -ZE.data1 AS data_od, ZFK.data1 AS data_od_bez_FK, ZNFK.nettoZafakturowane, -R.wartoscNetto - ZNFK.nettoZafakturowane AS DoZafakturowania, K.kodKlienta, r.Brutto_Euro_Miano -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_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 +SELECT DISTINCT +A2.Symbol AS agencja, +A1.Symbol AS agent, +z.idZamowienia, +z.idKlienta, +z.nrZamowienia, +z.rokZamowienia, +z.kodAgenta, +K.kodKlienta + '/' + CAST(z.nrZamowienia AS nvarchar) + '/' + z.kodAgenta + '/' + CAST(z.rokZamowienia AS nvarchar) AS nrZamowieniaExt, +R.iloscReklam, +R.wartoscNetto, +R.kwotaWalutaBrutto, +ZE.data1 AS data_od, +ZFK.data1 AS data_od_bez_FK, +ZNFK.nettoZafakturowane, +DoZafakturowania = +CASE +WHEN (R.kwotaWalutaBrutto IS NULL) THEN + CASE COALESCE(Korekta.Netto, 0) + WHEN 0 THEN (R.wartoscNetto - ZNFK.nettoZafakturowane) + ELSE Korekta.Netto - ZNFK.nettoZafakturowane + END +ELSE + CASE + WHEN F.waluta_brutto IS NULL THEN R.kwotaWalutaBrutto + ELSE R.kwotaWalutaBrutto - F.waluta_brutto + END +END, +K.kodKlienta, +r.Brutto_Euro_Miano, +COALESCE(Korekta.Netto, 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_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: /trunk/BazaReklam/ZestawienieZamowienForm.resx =================================================================== --- /trunk/BazaReklam/ZestawienieZamowienForm.resx (revision 142) +++ /trunk/BazaReklam/ZestawienieZamowienForm.resx (revision 226) @@ -199,47 +199,47 @@ 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 - TAAAAABJRU5ErkJggg== + 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 + AAAAAElFTkSuQmCC @@ -274,29 +274,29 @@ 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 - ZKz/aouR538D1CK62hUZ8T0AAAAASUVORK5CYII= + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABXRJREFUSEuVlQtQ + VFUYx10VG0JbMg0ZSGAmncpycPIxlqESW1CoEYyMj5BU1NDMCgNcl8tjWFDQQZHAlZVhWQSUjZGXqJGK + CZIoEgjyEkRhAUkWlzfL/vvOzlIqC9aZ+c3de+49//89337fd3gTxhnbth034vONjsycaeTW2vqkXal8 + kDc01JOVnh79By0bIKBnPJmxn4WG5oobG9vAhlYLVFY2geM4rY/P0foNG/yPuLjssKfVLxMTCd7/comI + kJlIJJe6dOrPDWZWVfVAZ7ZzZ0iDm5v3sVWrPAVkYEJM+k9GwcF5zjdu1BrSHzUXFhYDV9ftWldXryZH + x6/EJiYmZmRiNK5RQEB6qErV/UKDuLhE7NoVhaIiIC3tIYTCVMyfb5dA4jbjmvj6pir+VaeYGBiDgwNY + t04Ef/9kLFz4MYqLh1BdDTg6erSS+Dpixpi7EIszbjLNwcFhaDSGDTIyzmHLlkhERORDJJKgpQV49AhY + tGhZFQmLCKuxDHgxMbmtw8NAX98QOjtVOJUsR0hgIIKDAyGVSNDc/BDp6XkDs2bNTlm6dEXDxo3f4uJF + FZYvjxzm81+VkfBewtKgwfnz50047ldNf/8wWppbcTIpGYVNrSjXAAVPgDN32nBMKkOKPLWbBBIpS33M + zc0OW1nZpE2bZiqhuYOEI8E3aJCYeOFtjovSdnR0IV4mRweFqo9oHhhGyeMB5D7ow6n70KWphYVFNInY + Ee8SnxJuxEfE62OmbGysQlBWdg9nz2biWksnVCSuoeSv7dWgqKMPWfd7Ia9SQ363G16em26RkBMxnZim + v7J6YMX3zGCVqKvGkJC4TffuKSneIbiuBup6NKhUD+I6iecre6GoU+NkuQqJ1Vr4+PioackP+niPruZD + hyqmJyTUJsnl5TdFogyxg4PnnB07hPsaGh6BCwpCTivwW3MvLiv7kNfUg7P1aiRXdiHmtgrymmHs2y9i + /0M48abBeIeGZqWq1SzCQHs7LYxRdLu67qmrqGhBdNRRyCgMp+t7cLq2C2mErEKF2NudkNxSIalGi61b + N98h4QN6g9E7iIrKVCmVnVAqVejvpzShoVaT4Ok85Obk46hcAUmVBifKunCchI/cfIzYUhUSqgbBZeZr + bG1ts6xsbEL0BqPiPiEgILGmsLCGqrAO5eVNaGxsh0rVozPSaIYgiYtFdEomjt3uQfSfdF8+BCkZJmRd + wYGQQFy8/Ds4X98n9q8Zr9Kn5bO78PYO8+S4M4MKRTEVSgUKCqpQUlKPu3ebQWeAzqjgyhUEcyL4CffD + fz+Hg+IwXYoyCoouo02yElg7A85mhk34S5Y4f715s+gqW5CcfA05OWXIz6+gXdWTWQ28vffRfQkuXSqm + 0P2C2lo1MrOy1SyD7kd+CNTvBrLXAhvM4W7B//L5nbD+zZqS3dy5tgEuLtuv+flxWqm0ANnZFQgPl2LN + mm/g5LQRe/fGwN7eGfHxt7BypeCqMY8ng5MJIHMCqr8DzrkD6/lwmj/HQ18P//wn7AcrDmvCwdr6rQCB + wL1wzx5OKxT+TO34ADW0XLi4eMHLKwhBQSkwMzNLoneF5kYT1+OzqUD8J3QKbUWb1Au+vkGd9Iyddqzw + nhlsN1MJ1ssdLC2tuWXL7G/Y2ztq/f1PICwsE4cPX6BdCJQ8Hu8EvfMFKzCrlyatgGAKWkJXo7SmGes9 + PKpp/iditsHaoMmnjQSWlrPD5817r3Tx4tX9Cxa8X2NsbMwOFCHxDjGFfdSsyRPsvP38/nJ3dy81NTWV + 0tz3zHwsg5H5ESNWpZ8TPoSY+JFgDe0VYqTFsBAv0QvvpusH+mi8yEP3fDLBWu8bBDNjVxbKpwuLGRnr + v9pi5PnftUu61ZRZvr4AAAAASUVORK5CYII= @@ -405,29 +405,29 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABX9JREFUSEudlQtQ - zXkUx0+lbrfYWiVWJY+1TYNYochOK5WlIo+IliVhZ9vWe+00o7spilAKXd2lqBR1eyzuqobI+1XZtR6L - sRRl12P2lsaUe797fv7XjhIz9jfzmf/93//v9z3nd37nnJ8RvWusrOpPTdrvyFjm+0EXi17Pn7c0tzxs - qKHGB/lUGZtP2jotL3/xTo23foy7v6pz9K3nQ5WtmLAPmMiEFAFzSoBRyfdBweoqGrLAi9dbMkbvZ2Td - w83dEp9igBJw3tqKT9MBjwzAMxPw2g0E5AHB+3Uw++rw3zQwdDqLW7Uz8g6Divrp8ui1evOoS1oK2VVO - XivUFJBcLo84p/VQNsOfxf33AkH7gWkFgGlIUT3ZuU98aWT80ankXVBMw1Nn8XsXxrjtzhQKY1pedZsW - HsoludUa/pjALGcWkYXNSvJfV+aWXI+ZHKoZLB52AJhf1AryTjlLToFT7GceebahGrCanPuI14jwiZ29 - NqLu2dPSy/H8z2xmDjOC6cX0kJ6dPMgvodAn/REWHQKWlQExJ3hHW+6A3NOebjqlR/w5wNJvx22e/71h - bRsTYktCbCTThzE3xFbEVCAnS4eBFJR3ZVU5EMviCaeAJBb94VATks4Dmy8C5Ly0kucqmN5tdyCJmDGd - mU7tPxreZeQWOc09pkKXcoHFzwDbWDiNhbczMaXPQD2nFvLcpYx9RxqvvO1Y/wuNjDxTxpNnRu2WMzqk - s+gujntmDZB1BfgmqxZkM2o3L57L2Eki6//pTz/eTqOoq4m08vxiiuBsCCseRoGq7oadSEZDzzpYzjta - F5R6E6s1WqiqJOG9vwH7WLzwD86uhBqQuWM6zw9ipEOWxd+t1tzUQ321BQknGhFW+Bh+O2sxSBGnt1Pc - eGIUea6MHMf0I++MkNCMBqSxoOqy5HH+NaD4BlByHdDcAYZFKvRkYp7GsiKL5ERLLnzkpUjU1zUCZbck - bzJ4yyKmyXx4sXyIY5R/gVynRZNN32Hkn19mG37skatXhW5cXDXClDehKHyAHacakXGxBcYeG2pYOIkZ - LO0+8tiYBep6nK0DCn5nr9iz9EtAKot/+3MTRqbeg8WiklqSW2/kBZ8xA5gwMpGvJYueSWQ1eDv18N1F - 9qF51HteEZl1VfL3SMbxZVgpvDQivkKLQt5qzq9STJWcFQkndaAZOXfJyimLjExETEVWuDAiw0Qqf8wM - YjwYX2YyE8oEM65SeMSY80uK6uIL7GHPhfgODs0W9l6EZ+jGCh3ZOm/jWaLffMJYSF79h0hlmcGoNT9t - ma7Mq/rhn3PLS7P5sFQclujyZmzj3E7kuMdWAsu5Uik49wqZyUWv+dAgLDn25ug4vW0XH/8znQ91bSWH - ZFbJ46mZDYg/CaxgcdEOxqqegHzXFBOZim0Lb98cE46sJ9dYUfmiSNt2Utslp59u4ph3jzitJXm3bJqk - Ov/1wVYs5EY2S81wY3PbXAcat0lDDt6iN4nYSt76ltqRrzqHfNTX+d2TEXXTroMG/DSb/FUacvQUBxlP - ti7zTcM1DaHFwHQ2IC6aAGakshGW4cebaNyeAzQ2W0m+eQflMyueyUI473sHr+a1XzIOHYVRVJsoCpEB - n7+cNGR+sLhMAnP1COC+75MlXTSe/HTbCbhs1cGFLyCbZXF6conM4TWitYtMateepWiKLYnLQWTAqyZn - RU4+Uygws9p5zR14ZUviI/hGG8L0SWyCud/hZnIMzOY1qYy4YIT3Jm8eUMf/iBhbcyGOpn4T15N7zHHT - Sfn1sikFT4xGp16jPjO4oKx38hxxIYm8d2Le1n3falMYERe6KKgJjKjOWGYdE8WIS2k40+3/iL9uVXgm - YtuT6WswKDwWIX2toDp29F8StbIX4rHw0AAAAABJRU5ErkJggg== + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABX9JREFUSEudlQlM + lFcQxwcQlgUtVBCtQPGoJURFKyooNlRksQooHihKtYqoTSn1rg2JbGFVQFQQVFa2CgoICstRlQpEUbwv + wNZ6VI1VULD1SBckBtz9d54fNoJo0r7kl2+//d77z7x5M/OM6F1jVdUAatJ9S8YyxXvdLD58/rylueVh + Qw01PsijSlUe6ep0vPzFOzXe+nHt/dVdo249H6ZuxcR9wCQmuBCYWwyMTroPCtJW0dCFXrzekjH6b0bW + P9zcI+EpBqoB562t+CQN8EgHPDMAr92Afy4QtF8Psy8P/0WDQmawuFUHI+8wqKyfIY9SGcwjL+koeFc5 + ea3Ukn9SuTz8nM5D3Qw/FvfbCwTuB6bnA6bBhfVk5z7ppZEJR6eRd34RjUiZze/dGOP2O1MqjWlF1W1a + dCiH5FYx/DGOWcEsJgubVeS3vswtqR6zOFQzWTz0ALCgsBXknXyWnAKm2s868mxDNWA1JecRrxHhEzt7 + bUTes6dll2P5nznMXGYk8yHTS3p28SDfuAKftEdYfAhYXgZEn+AdbbkDck99uumUAbHnAEvfHbd5/ndt + a9uZEFsSYqOYvox5W2xFTAVysnQYRIG5V1aXAyoWjzsFJLLo94eakHge2HwRIOdllTxXyfRpvwNJxIzp + ynTp+LHtXUZuEdPdoyv0yRdY/AywjYVTWXg7E136DNR7WgHPXcbYd6bxytvO9T8vkZFn8gTyTK/dckaP + NBbdxXHPqAEyrwBfZ9aCbEbv5sXzGDtJJP7vAfTD7VSKvJpAq84voXDOhtCi4RSg6dm2E8loyFkHy/lH + 6wJTbmJNiQ6aKkl476/APhYv+J2zK64GZO6YxvMDGemQZbF3q0tuGqC92oK4E40ILXgM3521GKyMMdgp + bzwxijhXRo5j+5N3enBIegNSWVBzWfI47xpQdAMovg6U3AGGRygNZGKeyrIii+RESy984KWMN9Q1AmW3 + JG/Secsipkl8eCo+xLHqP0Gu06PIpt9w8ssrsw079sjVq0I/fm01QtU3oSx4gB2nGpF+sQXGHhtqWDiR + GSLtPuLY2IXaepytA/J/Y6/Ys7RLQAqLf/NTE0al3IPF4uJakltv5AWfMgOZUDKRryOL3olkNWQ79VLs + IvuQXOozv5DMuqv5ewTj+DKsFFYaHluhQwFvNfsXKaZqzoq4k3rQzOy7ZOWUSUYmIqYiK1wYkWEilT9i + BjMejIKZwoQwQYyrFB4x5v6crLn4AnvYcyG+g0Ozhb0X4Rm2sUJPts7beJboNx8zFpJX/yJSWdZm1Jqf + tkx35lX98M955aVZfFgaDktUeTO2cW4ncNxVlcAKrlQKyrlCZnLRa95vE5Yce3N0nt62S47/kcaHuq6S + QzK7+PG0jAbEngRWsrhoB+M0T0CKmCIiU7Ft4e2bY+KReHJVicoXRdq+k9ouPf10E8e8Z/hpHcl7ZNFk + zfmvDrZiETey2VqGG5vb5jrQ+E0l5OAtepOIreStotSOFNps8tFe53dPRtRNhw7q/+Mc8tOUkKOnOMhY + snVZYBpW0hBSBMxgA+Ki8WdGqRthGXa8icbvOUDjstSkyD0on1XxTBbMed8naA2v/YJx6CyMotpEUYgM + +OzlpKELgsRlEpBjgD/3fZ9M6aLx5KfbTsBlqx4ufAHZLI8xkEtENq8RrV1kUof2LEVTbElcDiIDXjU5 + K3LymUoBGdXOMXfglSWJj+QbbSjTN6EJ5r6Hm8kxIIvXpDDighHem7x5QJ3/I2JszYU4hvpPiif36OOm + k/PqZVPznxiNSblGfWdyQVnv5DniQhJ578S8rfu+1aYwIi50UVATGVGdKmY9E8mIS2kE0+P/iL9uVXgm + Ytub6ddmUHgsQvpaQXXu6D/rdLIP2mZLogAAAABJRU5ErkJggg== Index: /trunk/BazaReklam/ZestawienieZamowienForm.cs =================================================================== --- /trunk/BazaReklam/ZestawienieZamowienForm.cs (revision 207) +++ /trunk/BazaReklam/ZestawienieZamowienForm.cs (revision 226) @@ -3,4 +3,5 @@ using System.Data; using System.Data.SqlClient; +using System.Drawing; using System.Windows.Forms; @@ -364,4 +365,19 @@ } + private void fakturyDataGridView_DataBindingComplete(object sender, DataGridViewBindingCompleteEventArgs e) + { + foreach (DataGridViewRow row in fakturyDataGridView.Rows) + { + DataRowView r = (DataRowView)row.DataBoundItem; + + if (Convert.IsDBNull(r.Row["DoZafakturowania"])) continue; + + if (Convert.ToDouble(r.Row["Korekta"]) > 0.0) + { + row.DefaultCellStyle.ForeColor = Color.Red; + } + } + } + } } Index: /trunk/BazaReklam/ZestawienieZamowienForm.Designer.cs =================================================================== --- /trunk/BazaReklam/ZestawienieZamowienForm.Designer.cs (revision 142) +++ /trunk/BazaReklam/ZestawienieZamowienForm.Designer.cs (revision 226) @@ -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 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(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -44,11 +51,4 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); 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); @@ -90,16 +90,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(); @@ -124,4 +112,6 @@ this.zamToolStripButton = new System.Windows.Forms.ToolStripButton(); this.panel = new System.Windows.Forms.Panel(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); this.wartoscNettoNiezafakturowanaTextBox = new System.Windows.Forms.TextBox(); this.wartoscNettoZafakturowanaTextBox = new System.Windows.Forms.TextBox(); @@ -129,6 +119,16 @@ this.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter(); this.reklamyZestawienieTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.ReklamyZestawienieTableAdapter(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + 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(); ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit(); this.bindingNavigator1.SuspendLayout(); @@ -548,136 +548,5 @@ this.fakturyDataGridView.Size = new System.Drawing.Size(812, 355); this.fakturyDataGridView.TabIndex = 1; - // - // 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 = "C2"; - this.DoZafakturowania.DefaultCellStyle = dataGridViewCellStyle13; - this.DoZafakturowania.HeaderText = "Wartoœæ niezafakturowana"; - this.DoZafakturowania.Name = "DoZafakturowania"; - this.DoZafakturowania.ReadOnly = true; - this.DoZafakturowania.Width = 110; + this.fakturyDataGridView.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.fakturyDataGridView_DataBindingComplete); // // reklamyZestawienieDataGridView @@ -928,4 +797,22 @@ this.panel.TabIndex = 4; // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(672, 17); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(164, 13); + this.label2.TabIndex = 3; + this.label2.Text = "Wartoœæ netto niezafakturowana:"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(365, 17); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(150, 13); + this.label1.TabIndex = 2; + this.label1.Text = "Wartoœæ netto zafakturowana:"; + // // wartoscNettoNiezafakturowanaTextBox // @@ -960,21 +847,136 @@ this.reklamyZestawienieTableAdapter.ClearBeforeFill = true; // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(365, 17); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(150, 13); - this.label1.TabIndex = 2; - this.label1.Text = "Wartoœæ netto zafakturowana:"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(672, 17); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(164, 13); - this.label2.TabIndex = 3; - this.label2.Text = "Wartoœæ netto niezafakturowana:"; + // 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 = 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; // // ZestawienieZamowienForm @@ -1091,4 +1093,6 @@ private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn4; private System.Windows.Forms.DataGridViewCheckBoxColumn wyroznienie; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; private System.Windows.Forms.DataGridViewTextBoxColumn agencja; private System.Windows.Forms.DataGridViewTextBoxColumn agent; @@ -1103,6 +1107,4 @@ private System.Windows.Forms.DataGridViewTextBoxColumn nettoZafakturowane; private System.Windows.Forms.DataGridViewTextBoxColumn DoZafakturowania; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; } Index: /trunk/BazaReklam/app.config =================================================================== --- /trunk/BazaReklam/app.config (revision 219) +++ /trunk/BazaReklam/app.config (revision 226) @@ -8,7 +8,7 @@ - + providerName="System.Data.SqlClient" />