Index: trunk/BazaReklam/OrdersForm.cs =================================================================== --- trunk/BazaReklam/OrdersForm.cs (revision 303) +++ trunk/BazaReklam/OrdersForm.cs (revision 306) @@ -3,4 +3,5 @@ using System.Data; using System.Data.SqlClient; +using System.Diagnostics; using System.Windows.Forms; using System.IO; @@ -20,5 +21,5 @@ /// private const string query = " SELECT TOP 1000 R.*, O.OD, O.DO, DATEPART(year, NR.DATA_W), DATEPART(month, NR.DATA_W)," + - " NR.DATA_W AS '1emisja', A.Symbol AS agencja, (r.[CENA JEDN] - r.[RABAT WARTOŒÆ]) / r.SZER * r.WYS AS [CENA MODU£U],NM.CENA_MIN, NM.CENA, K.firstname " + + " NR.DATA_W AS '1emisja', A.Symbol AS agencja, (r.[CENA JEDN] - r.[RABAT WARTOŒÆ]) / r.SZER * r.WYS AS [CENA MODU£U],NM.CENA_MIN, NM.CENA, K.firstname, Z.idZamowienia " + " FROM dbo.AGENCI A2 JOIN dbo.AGENCJE A ON A.Id_agencji = A2.ID_AGENCJI " + " RIGHT JOIN REKLAMA R ON A2.Symbol = R.[SYMBOL AKWIZYTORA] " + @@ -26,5 +27,6 @@ " LEFT JOIN NR ON R.TYTU£ = NR.TYT AND O.OD = NR.NRW " + " LEFT OUTER JOIN [NAZWY MODU£ÓW] NM ON r.MOD_TYP = NM.MOD_TYP" + - " LEFT OUTER JOIN dbo.KLIENCI AS K ON R.customerId=K.CustomerId "; + " LEFT OUTER JOIN dbo.KLIENCI AS K ON R.customerId=K.CustomerId " + + " LEFT OUTER JOIN dbo.Zamowienia AS Z ON R.idZamowienia=Z.idZamowienia "; public static OrdersForm getOrderForm(MDIBazaReklam parent) @@ -58,31 +60,6 @@ sqlDataAdapter.SelectCommand = command; - szukajToolStrip.Items.Insert(13, new ToolStripLabel("DR")); - szukajToolStrip.Items.Insert(14, new ToolStripControlHost(new CheckBox(), "DRCheckBox")); - - szukajToolStrip.Items.Insert(15, new ToolStripLabel("FW")); - szukajToolStrip.Items.Insert(16, new ToolStripControlHost(new CheckBox(), "FWCheckBox")); - - szukajToolStrip.Items.Insert(17, new ToolStripLabel("KZ")); - szukajToolStrip.Items.Insert(18, new ToolStripControlHost(new CheckBox(), "KZCheckBox")); - - szukajToolStrip.Items.Insert(19, new ToolStripLabel("PR")); - szukajToolStrip.Items.Insert(20, new ToolStripControlHost(new CheckBox(), "PRCheckBox")); - - szukajToolStrip.Items.Insert(21, new ToolStripLabel("WYR")); - szukajToolStrip.Items.Insert(22, new ToolStripControlHost(new CheckBox(), "WyrCheckBox")); - - ((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["DRCheckBox"]).Control).ThreeState = true; - ((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["FWCheckBox"]).Control).ThreeState = true; - ((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["KZCheckBox"]).Control).ThreeState = true; - ((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["PRCheckBox"]).Control).ThreeState = true; - ((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["WyrCheckBox"]).Control).ThreeState = true; - - ((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["DRCheckBox"]).Control).CheckState = CheckState.Indeterminate; - ((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["FWCheckBox"]).Control).CheckState = CheckState.Indeterminate; - ((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["KZCheckBox"]).Control).CheckState = CheckState.Indeterminate; - ((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["PRCheckBox"]).Control).CheckState = CheckState.Indeterminate; - ((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["WyrCheckBox"]).Control).CheckState = CheckState.Indeterminate; - + InitToolStrip(szukajToolStrip); + generateNodes(); @@ -101,5 +78,49 @@ DBBindings.bindujTytuly(tytToolStripComboBox); DBBindings.bindujTypyReklam(typToolStripComboBox); - + } + + private static void InitToolStrip(ToolStrip toolStrip) + { + ToolStripLabel toolStripLabel = new ToolStripLabel("DR"); + toolStripLabel.ToolTipText = "Zatwierdzone do druku"; + toolStrip.Items.Insert(13, toolStripLabel); + toolStrip.Items.Insert(14, new ToolStripControlHost(new CheckBox(), "DRCheckBox")); + + toolStripLabel = new ToolStripLabel("FW"); + toolStripLabel.ToolTipText = "Wystawiona faktura"; + toolStrip.Items.Insert(15, toolStripLabel); + toolStrip.Items.Insert(16, new ToolStripControlHost(new CheckBox(), "FWCheckBox")); + + toolStripLabel = new ToolStripLabel("KZ"); + toolStripLabel.ToolTipText = "Kierownik zatwierdzi³"; + toolStrip.Items.Insert(17, toolStripLabel); + toolStrip.Items.Insert(18, new ToolStripControlHost(new CheckBox(), "KZCheckBox")); + + toolStripLabel = new ToolStripLabel("WYR"); + toolStripLabel.ToolTipText = "Wyró¿nienie"; + toolStrip.Items.Insert(19, toolStripLabel); + toolStrip.Items.Insert(20, new ToolStripControlHost(new CheckBox(), "WyrCheckBox")); + + toolStripLabel = new ToolStripLabel("BZ"); + toolStripLabel.ToolTipText = "Bez zamówienia"; + toolStrip.Items.Insert(21, toolStripLabel); + toolStrip.Items.Insert(22, new ToolStripControlHost(new CheckBox(), "BZCheckBox")); + + ((CheckBox)((ToolStripControlHost)toolStrip.Items["DRCheckBox"]).Control).ThreeState = true; //Zatwierdzone do druku + ((CheckBox)((ToolStripControlHost)toolStrip.Items["FWCheckBox"]).Control).ThreeState = true; //Wystawiona faktura + ((CheckBox)((ToolStripControlHost)toolStrip.Items["KZCheckBox"]).Control).ThreeState = true; //Kierownik zatwierdzi³ + ((CheckBox)((ToolStripControlHost)toolStrip.Items["WyrCheckBox"]).Control).ThreeState = true; //Wyró¿nienie + ((CheckBox)((ToolStripControlHost)toolStrip.Items["BZCheckBox"]).Control).ThreeState = true; //Bez zamówienia + + ResetCheckBoxes(toolStrip); + } + + private static void ResetCheckBoxes(ToolStrip toolStrip) + { + foreach (object item in toolStrip.Items) + { + if (item is ToolStripControlHost && ((ToolStripControlHost)item).Control is CheckBox) + ((CheckBox)((ToolStripControlHost)item).Control).CheckState = CheckState.Indeterminate; + } } @@ -563,5 +584,5 @@ command.Parameters.Clear(); - if (agencjaToolStripComboBox.Text.Trim() != "") + if (!string.IsNullOrEmpty(agencjaToolStripComboBox.Text.Trim())) { command.CommandText += " AND A.Symbol=@agencja "; @@ -569,5 +590,5 @@ } - if (agentToolStripComboBox.Text.Trim() != "") + if (!string.IsNullOrEmpty(agentToolStripComboBox.Text.Trim())) { command.CommandText += "AND ([symbol akwizytora] like '%' + @agent + '%' )"; @@ -576,5 +597,5 @@ } - if (symbolToolStripTextBox.Text.Trim() != "") + if (!string.IsNullOrEmpty(symbolToolStripTextBox.Text.Trim())) { command.CommandText += "AND r.[id reklamy] like '%' + @symbol + '%' "; @@ -583,5 +604,5 @@ } - if (rokToolStripTextBox.Text.Trim() != "") + if (!string.IsNullOrEmpty(rokToolStripTextBox.Text.Trim())) { int i; @@ -596,5 +617,5 @@ } - if (msToolStripTextBox.Text.Trim() != "") + if (!string.IsNullOrEmpty(msToolStripTextBox.Text.Trim())) { int i; @@ -617,5 +638,5 @@ } - if (typToolStripComboBox.Text.Trim() != "") + if (!string.IsNullOrEmpty(typToolStripComboBox.Text.Trim())) { command.CommandText += "AND R.[TYP]=@typ "; @@ -648,19 +669,20 @@ } - if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["PRCheckBox"]).Control).CheckState == CheckState.Checked) - { - command.CommandText += " AND R.[zablokuj_prowizje]=1 "; - } - else if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["PRCheckBox"]).Control).CheckState == CheckState.Unchecked) - { - command.CommandText += " AND R.[zablokuj_prowizje]=0 "; - } - if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["WyrCheckBox"]).Control).CheckState == CheckState.Checked) { command.CommandText += " AND R.[wyroznienie]=1 "; - } if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["WyrCheckBox"]).Control).CheckState == CheckState.Unchecked) + } + else if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["WyrCheckBox"]).Control).CheckState == CheckState.Unchecked) { command.CommandText += " AND R.[wyroznienie]=0 "; + } + + if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["BZCheckBox"]).Control).CheckState == CheckState.Checked) + { + command.CommandText += " AND Z.idZamowienia IS NULL "; + } + else if (((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["BZCheckBox"]).Control).CheckState == CheckState.Unchecked) + { + command.CommandText += " AND Z.idZamowienia IS NOT NULL "; } @@ -902,9 +924,5 @@ typToolStripComboBox.Text = ""; - ((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["DRCheckBox"]).Control).CheckState = CheckState.Indeterminate; - ((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["FWCheckBox"]).Control).CheckState = CheckState.Indeterminate; - ((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["KZCheckBox"]).Control).CheckState = CheckState.Indeterminate; - ((CheckBox)((ToolStripControlHost)szukajToolStrip.Items["PRCheckBox"]).Control).CheckState = CheckState.Indeterminate; - + ResetCheckBoxes(szukajToolStrip); } Index: trunk/BazaReklam/OrdersForm.resx =================================================================== --- trunk/BazaReklam/OrdersForm.resx (revision 230) +++ trunk/BazaReklam/OrdersForm.resx (revision 306) @@ -383,31 +383,31 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABehJREFUSEuVlWlQ - U1cYhk8aFlewYkWrbSpSpYyDW3GkHYexxVbRECBgZXFDEBSFIJtQVg0KghYVkQKiVmRREWkVEcSiRSgI - oohrQRZlNGwKVRYhvP3ulbb+cOPMPHOSMzfP957v5twrYIMY3+VMHK32QmWNAKqmGkM0J/X29ymbW9vu - dTX1ZNcef5auKH7eRjolgUFoX166vFzPcmWhUfPeejdk/h2JjPYdONEejvTWMGy5uQoLDk+qmSobJaZL - RxIfDKqAXcU0e6/r+n2cOO2JHMlNITisCMKhR4E8yYpgIgSSlBkdE8yH25N8NCF4Y5FgxlQILoXAsvRz - HZfLRs9OdkTiaEsoDj8OwsFHAUhq9EfiAz8kNGwmfJHY4IdDjQGYu19UIxzOvhnYyf81WnSZRrcuC+yc - qV7VaDL+RdV8jc7aMezKmh3afyS2BiCldQuf9qV4M+LrfRBX54399z0Ry1HjSWu+8CmyxtiFQ3aTWY9Q - 4St067EpPYbCv/pCTIFDLkCCExDnAEQ7wjV3NhJOmSCJkh8geTyljav1IuEmxFR7YO89Gfbcc8fuu+40 - yxBf64MJbsMukVZCaDI++RxhNeJWA7HELlsgYhkQtgz9oVbYWrUASoULwtOMEE872H/fC/t4sTt23dmI - qNsbsOOWKyJurkcEzTHVnjCImFBPcnfiY9YoYiF9QYuAmFUktgHkS4FgKyDAEr2+5ggqnwO0LUVFwSxE - FtthX40Xou+6IZJk26vWQV7pgtDrzsRafo66I4OefOwDkocQk9iDacJbiKeWhFPqUGteDB8J4GkGuJpB - dl4HeDwVqB2NbWkzkdDoit3VLth20wUhlWsRUOEIv3IHbCa4eeut9RjjqF5C8lBCh9WKxvZiz4qXcn8L - wMsM/e5iYKMp+pyXYLosEEZ+mZgXeg9jNpRBW3YRM0Ji4Ve6FkGVK+F1ZRU8SlZARniVrcbynCVQNxSm - ktyTmMjqp2t2Icoe+JGSU2qlmxj9rqa45LgSmk4l8E+qQ0TFNaCzFbJzRUiAEhsrFdBwKoRFqic2ldtg - 3WVbrCu0gwcVEPlpNQuE7ADJrfjz8Od4VoLttuj3lkBJyXtcF6PS8Qdoud3ApYJ25J9RwDO9DDsLS2Cf - V4aojnaEtSggb2nEWNciSDOc4VS0FE7FyyH6SdSrIhL8MtAeA5rV2MFRzK3Jahbga4HuDZTexQST7U/g - dO4T5JxVIPNkPc4cr4NNTD6MswvhW1eHrY8eIqihFpvvV0PDLgNWufMwPljrqYqO4AhJdxGLiFH8aZ5I - 2zimyQqfOXyLXpk5ytbYwCi0BhdyHuNUZgOyMuoQHVsK6c6rsM3vw4zka9BLLoBB+nkYHMvDaM+LUJ2v - nydQY4dJGEaYEtrEf88jla9V2fSUEexCxrzJ/WE2XvD9uQ45WfVIPnobm+T5WBxVBvuLwLLzgHUeIM0F - LM4BVvT9+7ROMJFtOgn9CSO+74wJ+RP8yhhCnw2sPmBBs/XtyyzkxVgdXgBpdDlsstphQ3JOKM4mzvRB - fLoX4t9ewOysEgszu8B0nTPp9w7EOL4trxncIlfkMzY3LEia3gGPUsDhEqXOByQ5A+JfeyA+1QXxyU7i - OSRZ3TBOagL71Jr7W64kPnqd/NU1ITMKNfxC/LtyYzFgSy2wyOl/mZpknFR8vAPi9Kc8lpnPMcU7vp+N - 1E0gydKB9ryrBlNnkuyzdrm9fHpxthJiLjknP9YOcWobxEdb6NnfCklqK5hhdCUZYwhjYtg77XwPp8m+ - VLPLbZLSDsyp92Zcei55ShvMkptgfqQJFskKDDVJ6WBq2ty/hzu1OsR7v8mGsin25kKztBrDmIewyu6D - NKsT0hNPIU1rgZH8BlSM4xrZcBEn30bMI0a8T/p/r+FuuiZT15rPdO1i2FdRpSPNMpo0zI81M0P5VTbO - JI0J1BLpmkCCe3u9/RX5hspcES6VPmE50AY5zdxh8iasiWl8kEG05nW1VGnxQ4IOPZs8wCcDqdX4e/aW - 8Q8LSqCkc8s9uwAAAABJRU5ErkJggg== + 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 + jvEPApigoZ/DeeQAAAAASUVORK5CYII= @@ -505,29 +505,29 @@ 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 @@ -570,7 +570,4 @@ - - 339, 17 - 670, 56 @@ -618,7 +615,4 @@ 190, 56 - - 190, 56 - 506, 56 Index: trunk/BazaReklam/OrdersForm.Designer.cs =================================================================== --- trunk/BazaReklam/OrdersForm.Designer.cs (revision 230) +++ trunk/BazaReklam/OrdersForm.Designer.cs (revision 306) @@ -31,13 +31,13 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OrdersForm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - 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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components); this.reklamyZestawienieBindingSource = new System.Windows.Forms.BindingSource(this.components); @@ -641,18 +641,18 @@ this.reklamaDataGridView.AllowUserToAddRows = false; this.reklamaDataGridView.AllowUserToDeleteRows = false; - dataGridViewCellStyle10.BackColor = System.Drawing.Color.MintCream; - this.reklamaDataGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.MintCream; + this.reklamaDataGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.reklamaDataGridView.AutoGenerateColumns = false; this.reklamaDataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells; this.reklamaDataGridView.BackgroundColor = System.Drawing.Color.White; this.reklamaDataGridView.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); - dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.reklamaDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.reklamaDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.reklamaDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.reklamaDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -711,7 +711,7 @@ // this.NETTO.DataPropertyName = "NETTO"; - dataGridViewCellStyle12.Format = "C2"; - dataGridViewCellStyle12.NullValue = null; - this.NETTO.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle3.Format = "C2"; + dataGridViewCellStyle3.NullValue = null; + this.NETTO.DefaultCellStyle = dataGridViewCellStyle3; this.NETTO.HeaderText = "Netto"; this.NETTO.Name = "NETTO"; @@ -722,6 +722,6 @@ // this.BRUTTO.DataPropertyName = "BRUTTO"; - dataGridViewCellStyle13.Format = "C"; - this.BRUTTO.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle4.Format = "C"; + this.BRUTTO.DefaultCellStyle = dataGridViewCellStyle4; this.BRUTTO.HeaderText = "Brutto"; this.BRUTTO.Name = "BRUTTO"; @@ -732,7 +732,7 @@ // this.CENA_MIN.DataPropertyName = "CENA_MIN"; - dataGridViewCellStyle14.Format = "C2"; - dataGridViewCellStyle14.NullValue = null; - this.CENA_MIN.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle5.Format = "C2"; + dataGridViewCellStyle5.NullValue = null; + this.CENA_MIN.DefaultCellStyle = dataGridViewCellStyle5; this.CENA_MIN.HeaderText = "Cena min."; this.CENA_MIN.Name = "CENA_MIN"; @@ -743,7 +743,7 @@ // this.CENA.DataPropertyName = "CENA"; - dataGridViewCellStyle15.Format = "C2"; - dataGridViewCellStyle15.NullValue = null; - this.CENA.DefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle6.Format = "C2"; + dataGridViewCellStyle6.NullValue = null; + this.CENA.DefaultCellStyle = dataGridViewCellStyle6; this.CENA.HeaderText = "Cena"; this.CENA.Name = "CENA"; @@ -754,7 +754,7 @@ // this.PROCENT_PROWIZJI.DataPropertyName = "PROCENT PROWIZJI"; - dataGridViewCellStyle16.Format = "P"; - dataGridViewCellStyle16.NullValue = null; - this.PROCENT_PROWIZJI.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle7.Format = "P"; + dataGridViewCellStyle7.NullValue = null; + this.PROCENT_PROWIZJI.DefaultCellStyle = dataGridViewCellStyle7; this.PROCENT_PROWIZJI.HeaderText = "Prowizja"; this.PROCENT_PROWIZJI.Name = "PROCENT_PROWIZJI"; @@ -833,7 +833,7 @@ // this.rABATDataGridViewTextBoxColumn.DataPropertyName = "RABAT"; - dataGridViewCellStyle17.Format = "P"; - dataGridViewCellStyle17.NullValue = null; - this.rABATDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle8.Format = "P"; + dataGridViewCellStyle8.NullValue = null; + this.rABATDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8; this.rABATDataGridViewTextBoxColumn.FillWeight = 118.9644F; this.rABATDataGridViewTextBoxColumn.HeaderText = "RB"; @@ -963,7 +963,7 @@ // this.CENA_MODULU.DataPropertyName = "CENA MODU£U"; - dataGridViewCellStyle18.Format = "C2"; - dataGridViewCellStyle18.NullValue = null; - this.CENA_MODULU.DefaultCellStyle = dataGridViewCellStyle18; + dataGridViewCellStyle9.Format = "C2"; + dataGridViewCellStyle9.NullValue = null; + this.CENA_MODULU.DefaultCellStyle = dataGridViewCellStyle9; this.CENA_MODULU.HeaderText = "Cena modu³u"; this.CENA_MODULU.Name = "CENA_MODULU";