Index: trunk/SQL/Views/EmisjeReklamy.txt =================================================================== --- trunk/SQL/Views/EmisjeReklamy.txt (revision 349) +++ trunk/SQL/Views/EmisjeReklamy.txt (revision 349) @@ -0,0 +1,25 @@ + +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO + +ALTER VIEW [dbo].[EmisjeReklamy] +AS +SELECT +U.Id AS EmisjaId, +R.ReklamaId, +R.idZamowienia AS ZamowienieId, +N.TYT AS Tytul, +N.NRW AS NrWydania, +N.DATA_W AS DataEmisji +FROM [Uka¿e siê w nr] U +LEFT OUTER JOIN Reklama R ON U.ReklamaId = R.ReklamaId +LEFT OUTER JOIN NR N ON N.TYT=R.[Tytu³] AND N.NRW=U.[Nr Wydania] +GO + +SET ANSI_NULLS OFF +GO +SET QUOTED_IDENTIFIER OFF +GO + Index: trunk/BazaReklam/ZestawienieZamowienForm.resx =================================================================== --- trunk/BazaReklam/ZestawienieZamowienForm.resx (revision 226) +++ trunk/BazaReklam/ZestawienieZamowienForm.resx (revision 349) @@ -200,45 +200,45 @@ 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 AAAAAElFTkSuQmCC @@ -274,29 +274,29 @@ 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 - v9pi5PnftUu61ZRZvr4AAAAASUVORK5CYII= + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABXVJREFUSEuVlQtQ + VFUYx10VG0JbMg0ZSGAmncpycPIxlqESm1CoEYyMj5BU1NDMCgNclwvs8FDUUCRwZWVYFgGFGHmJGqmY + IIkigSAvQXRZQJLF5c2y/76zs5TKgnVmfnP3nnvP/3/Pt9/3Hd64McbWrceN+HyjI9OnG7m1tDxpUyof + 5A0OdmelpUX9Qcv6CegZS2b0ZyEhuaGNja1gQ6sFKiubwHGc1sfnaP369f5HXFy229Pql4nxBO9/uURE + yEwkkkudOvXnBjOrqnqgM9uxQ9zg5uZ9bOVKTwEZmBAT/pNRcHCe840btYb0R8yFhUXD1XWb1tXVq8nR + 8ctQExMTMzIxGtMoICAtRKXqeqFBbGwCdu6MRFERkJr6EEJhCubOtYsncZsxTXx9U9L/VaeYGBgDA/1Y + u1YEf/8kzJ//MYqLB1FdDTg6erSQ+Fpi2qi7CA3NuMk0BwaGoNEYNsjIOIfNmw8iIiIfIpEEzc3Ao0fA + ggVLqkhYRFiNZsCLjs5tGRoCensH0dGhwqkkOcSBgQgODoRUIoFC8RBpaXn9M2bMTF68eFnDhg3f4OJF + FZYuPTjE578qI+E9hKVBg/Pnz5tw3K+avr4hNCtacDIxCYVNLSjXAAVPgDN3WnFMKkOyPKWLBBIoS33M + zc0OW1nZpE6ZYiqhuQOEI8E3aJCQcOFtjvtJ297eiTiZHO0Uql5C0T+Eksf9yH3Qi1P3oUtTCwuLKBKx + I94lVhBuxEfE66OmbExMuqCs7B7Ons3EteYOqEhcQ8lf26NBUXsvsu73QF6lhvxuF7w8N94iISdiKjFF + f2X1wIrvmcEqUVeNYnHsxnv3lBRvMa6rgbpuDSrVA7hO4vnKHqTXqXGyXIWEai18fHzUtOR7fbxHVvOh + QxVT4+NrE+Xy8psiUUaog4PnrO3bhXsbGh6BCwpCTgvwm6IHl5W9yGvqxtl6NZIqOxF9WwV5zRD27hOx + /yGceNNgvENCslLUahZhoK2NFkand7m67q6rqGhGVORRyCgMp+u7cbq2E6mErEKFmNsdkNxSIbFGiy1b + Nt0h4f16g5E7iIzMVCmVHVAqVejrozShoVaT4Ok85Obk46g8HZIqDU6UdeI4CR+5+RgxpSrEVw2Ay8zX + 2NraZlnZ2Ij1BiPiPi4gIKGmsLCGqrAO5eVNaGxsg0rVrTPSaAYhiY1BVHImjt3uRtSfdF8+CCkZxmdd + wX5xIC5e/h2cr+8T+9eMV+rT8tldeHuHeXLcmYH09GIqlAoUFFShpKQed+8qQGeAzqjgyhUEcyL4CffB + fx+HA6FhuhRlFBRdRqtkObBmGpzNDJvwFy1y/mrTJtFVtiAp6RpycsqQn19Bu6onsxp4e++l+xJculRM + ofsFtbVqZGZlq1kG3T/4IVC/C8heA6w3h7sF/4vnd8L6N2tKdrNn2wa4uGy75ufHaaXSAmRnVyA8XIrV + q7+Gk9MG7NkTDXt7Z8TF3cLy5YKrxjyeDE4mgMwJqP4WOOcOrOPDae4sD309/POfsB+sOKwJB2vrtwIE + AvfC3bs5rVD4M7Xj/dTQcuHi4gUvryAEBSXDzMwskd4VmhuNX4dPJwNxn9AptAWtUi/4+gZ10DN22rHC + e2aw3UwmWC93sLS05pYssb9hb++o9fc/gbCwTBw+fIF2IVDyeLwT9M7nrMCsXpqwDIJJaA5ZhdIaBdZ5 + eFTT/I/ETIO1QZNPGwksLWeGz5nzXunChav65s17v8bY2JgdKELiHWIS+6gZE8fZefv5/eXu7l5qamoq + pbnvmPloBsPzw0asSj8jfIhQ4geCNbRXiOEWw0K8SC+8i64f6KPxIg/d84kEa71vEMyMXVkony4sZmSs + /2qL4ed/A6+3utTZ1XpnAAAAAElFTkSuQmCC @@ -405,29 +405,29 @@ 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 Index: trunk/BazaReklam/ZestawienieZamowienForm.cs =================================================================== --- trunk/BazaReklam/ZestawienieZamowienForm.cs (revision 226) +++ trunk/BazaReklam/ZestawienieZamowienForm.cs (revision 349) @@ -26,5 +26,5 @@ } - private ZestawienieZamowienForm(MDIBazaReklam parent) + private ZestawienieZamowienForm(Form parent) { InitializeComponent(); Index: trunk/BazaReklam/ZestawienieZamowienForm.Designer.cs =================================================================== --- trunk/BazaReklam/ZestawienieZamowienForm.Designer.cs (revision 226) +++ trunk/BazaReklam/ZestawienieZamowienForm.Designer.cs (revision 349) @@ -33,11 +33,4 @@ 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(); @@ -51,4 +44,11 @@ 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,5 +90,28 @@ 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.reklamyZestawienieBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + 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(); + this.reklamaTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.REKLAMATableAdapter(); + this.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter(); + this.reklamyZestawienieTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.ReklamyZestawienieTableAdapter(); this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -108,27 +131,4 @@ this.dataGridViewCheckBoxColumn4 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.wyroznienie = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.reklamyZestawienieBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - 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(); - this.reklamaTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.REKLAMATableAdapter(); - this.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter(); - this.reklamyZestawienieTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.ReklamyZestawienieTableAdapter(); - this.agencja = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.agent = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.rokZamowienia = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.nrZamowieniaExt = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.iloscReklam = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.data_od = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.data_od_bez_FK = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.wartoscNetto = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.kwotaWalutaBrutto = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bruttoEuroMianoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.nettoZafakturowane = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.DoZafakturowania = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit(); this.bindingNavigator1.SuspendLayout(); @@ -550,4 +550,137 @@ this.fakturyDataGridView.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.fakturyDataGridView_DataBindingComplete); // + // agencja + // + this.agencja.DataPropertyName = "agencja"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.agencja.DefaultCellStyle = dataGridViewCellStyle3; + this.agencja.HeaderText = "Agencja"; + this.agencja.Name = "agencja"; + this.agencja.ReadOnly = true; + this.agencja.Width = 71; + // + // agent + // + this.agent.DataPropertyName = "agent"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.agent.DefaultCellStyle = dataGridViewCellStyle4; + this.agent.HeaderText = "Agent"; + this.agent.Name = "agent"; + this.agent.ReadOnly = true; + this.agent.Width = 60; + // + // rokZamowienia + // + this.rokZamowienia.DataPropertyName = "rokZamowienia"; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.rokZamowienia.DefaultCellStyle = dataGridViewCellStyle5; + this.rokZamowienia.HeaderText = "Rok"; + this.rokZamowienia.Name = "rokZamowienia"; + this.rokZamowienia.ReadOnly = true; + this.rokZamowienia.Width = 52; + // + // nrZamowieniaExt + // + this.nrZamowieniaExt.DataPropertyName = "nrZamowieniaExt"; + this.nrZamowieniaExt.HeaderText = "Nr zamówienia"; + this.nrZamowieniaExt.Name = "nrZamowieniaExt"; + this.nrZamowieniaExt.ReadOnly = true; + this.nrZamowieniaExt.Width = 93; + // + // iloscReklam + // + this.iloscReklam.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.iloscReklam.DataPropertyName = "iloscReklam"; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.iloscReklam.DefaultCellStyle = dataGridViewCellStyle6; + this.iloscReklam.HeaderText = "# rek"; + this.iloscReklam.Name = "iloscReklam"; + this.iloscReklam.ReadOnly = true; + this.iloscReklam.Width = 40; + // + // data_od + // + this.data_od.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.data_od.DataPropertyName = "data_od"; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.Format = "d"; + this.data_od.DefaultCellStyle = dataGridViewCellStyle7; + this.data_od.HeaderText = "Data 1 em"; + this.data_od.Name = "data_od"; + this.data_od.ReadOnly = true; + this.data_od.Width = 80; + // + // data_od_bez_FK + // + this.data_od_bez_FK.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.data_od_bez_FK.DataPropertyName = "data_od_bez_FK"; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.data_od_bez_FK.DefaultCellStyle = dataGridViewCellStyle8; + this.data_od_bez_FK.HeaderText = "Data 1 em bez FV"; + this.data_od_bez_FK.Name = "data_od_bez_FK"; + this.data_od_bez_FK.ReadOnly = true; + this.data_od_bez_FK.Width = 80; + // + // wartoscNetto + // + this.wartoscNetto.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.wartoscNetto.DataPropertyName = "wartoscNetto"; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle9.Format = "C2"; + this.wartoscNetto.DefaultCellStyle = dataGridViewCellStyle9; + this.wartoscNetto.HeaderText = "Netto"; + this.wartoscNetto.Name = "wartoscNetto"; + this.wartoscNetto.ReadOnly = true; + this.wartoscNetto.Width = 110; + // + // kwotaWalutaBrutto + // + this.kwotaWalutaBrutto.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.kwotaWalutaBrutto.DataPropertyName = "kwotaWalutaBrutto"; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle10.Format = "N2"; + dataGridViewCellStyle10.NullValue = null; + this.kwotaWalutaBrutto.DefaultCellStyle = dataGridViewCellStyle10; + this.kwotaWalutaBrutto.HeaderText = "Waluta - brutto zamówienia"; + this.kwotaWalutaBrutto.Name = "kwotaWalutaBrutto"; + this.kwotaWalutaBrutto.ReadOnly = true; + this.kwotaWalutaBrutto.Width = 110; + // + // bruttoEuroMianoDataGridViewTextBoxColumn + // + this.bruttoEuroMianoDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.bruttoEuroMianoDataGridViewTextBoxColumn.DataPropertyName = "Brutto_Euro_Miano"; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.bruttoEuroMianoDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle11; + this.bruttoEuroMianoDataGridViewTextBoxColumn.HeaderText = "W"; + this.bruttoEuroMianoDataGridViewTextBoxColumn.Name = "bruttoEuroMianoDataGridViewTextBoxColumn"; + this.bruttoEuroMianoDataGridViewTextBoxColumn.ReadOnly = true; + this.bruttoEuroMianoDataGridViewTextBoxColumn.Width = 35; + // + // nettoZafakturowane + // + this.nettoZafakturowane.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.nettoZafakturowane.DataPropertyName = "nettoZafakturowane"; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle12.Format = "C2"; + this.nettoZafakturowane.DefaultCellStyle = dataGridViewCellStyle12; + this.nettoZafakturowane.HeaderText = "Wartoœæ netto FV"; + this.nettoZafakturowane.Name = "nettoZafakturowane"; + this.nettoZafakturowane.ReadOnly = true; + this.nettoZafakturowane.Width = 110; + // + // DoZafakturowania + // + this.DoZafakturowania.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.DoZafakturowania.DataPropertyName = "DoZafakturowania"; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle13.Format = "N2"; + dataGridViewCellStyle13.NullValue = null; + this.DoZafakturowania.DefaultCellStyle = dataGridViewCellStyle13; + this.DoZafakturowania.HeaderText = "Wartoœæ niezafakturowana"; + this.DoZafakturowania.Name = "DoZafakturowania"; + this.DoZafakturowania.ReadOnly = true; + this.DoZafakturowania.Width = 110; + // // reklamyZestawienieDataGridView // @@ -584,4 +717,92 @@ this.reklamyZestawienieDataGridView.TabIndex = 1; // + // reklamyZestawienieBindingSource + // + this.reklamyZestawienieBindingSource.DataMember = "ReklamyZestawienie"; + this.reklamyZestawienieBindingSource.DataSource = this.rEKLAMADataSet; + // + // toolStrip1 + // + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.zamToolStripButton}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(812, 31); + this.toolStrip1.TabIndex = 0; + this.toolStrip1.Text = "reklamaToolStrip"; + // + // zamToolStripButton + // + this.zamToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.zamToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("zamToolStripButton.Image"))); + this.zamToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.zamToolStripButton.Name = "zamToolStripButton"; + this.zamToolStripButton.Size = new System.Drawing.Size(28, 28); + this.zamToolStripButton.Text = "Zamówienie"; + this.zamToolStripButton.Click += new System.EventHandler(this.zamToolStripButton_Click); + // + // panel + // + this.panel.Controls.Add(this.label2); + this.panel.Controls.Add(this.label1); + this.panel.Controls.Add(this.wartoscNettoNiezafakturowanaTextBox); + this.panel.Controls.Add(this.wartoscNettoZafakturowanaTextBox); + this.panel.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel.Location = new System.Drawing.Point(0, 625); + this.panel.Name = "panel"; + this.panel.Size = new System.Drawing.Size(979, 39); + 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 + // + this.wartoscNettoNiezafakturowanaTextBox.BackColor = System.Drawing.Color.White; + this.wartoscNettoNiezafakturowanaTextBox.Location = new System.Drawing.Point(842, 10); + this.wartoscNettoNiezafakturowanaTextBox.Name = "wartoscNettoNiezafakturowanaTextBox"; + this.wartoscNettoNiezafakturowanaTextBox.ReadOnly = true; + this.wartoscNettoNiezafakturowanaTextBox.Size = new System.Drawing.Size(125, 20); + this.wartoscNettoNiezafakturowanaTextBox.TabIndex = 1; + this.wartoscNettoNiezafakturowanaTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + // + // wartoscNettoZafakturowanaTextBox + // + this.wartoscNettoZafakturowanaTextBox.BackColor = System.Drawing.Color.White; + this.wartoscNettoZafakturowanaTextBox.Location = new System.Drawing.Point(521, 10); + this.wartoscNettoZafakturowanaTextBox.Name = "wartoscNettoZafakturowanaTextBox"; + this.wartoscNettoZafakturowanaTextBox.ReadOnly = true; + this.wartoscNettoZafakturowanaTextBox.Size = new System.Drawing.Size(116, 20); + this.wartoscNettoZafakturowanaTextBox.TabIndex = 0; + this.wartoscNettoZafakturowanaTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + // + // reklamaTableAdapter + // + this.reklamaTableAdapter.ClearBeforeFill = true; + // + // VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter + // + this.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter.ClearBeforeFill = true; + // + // reklamyZestawienieTableAdapter + // + this.reklamyZestawienieTableAdapter.ClearBeforeFill = true; + // // dataGridViewTextBoxColumn3 // @@ -623,9 +844,9 @@ // this.dataGridViewTextBoxColumn8.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.dataGridViewTextBoxColumn8.DataPropertyName = "DATA ZAMÓWIENIA"; + this.dataGridViewTextBoxColumn8.DataPropertyName = "1emisja"; dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle14.Format = "d"; this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle14; - this.dataGridViewTextBoxColumn8.HeaderText = "Data zam."; + this.dataGridViewTextBoxColumn8.HeaderText = "1 emisja"; this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; this.dataGridViewTextBoxColumn8.ReadOnly = true; @@ -758,225 +979,4 @@ this.wyroznienie.ReadOnly = true; this.wyroznienie.Width = 30; - // - // reklamyZestawienieBindingSource - // - this.reklamyZestawienieBindingSource.DataMember = "ReklamyZestawienie"; - this.reklamyZestawienieBindingSource.DataSource = this.rEKLAMADataSet; - // - // toolStrip1 - // - this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.zamToolStripButton}); - this.toolStrip1.Location = new System.Drawing.Point(0, 0); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(812, 31); - this.toolStrip1.TabIndex = 0; - this.toolStrip1.Text = "reklamaToolStrip"; - // - // zamToolStripButton - // - this.zamToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.zamToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("zamToolStripButton.Image"))); - this.zamToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.zamToolStripButton.Name = "zamToolStripButton"; - this.zamToolStripButton.Size = new System.Drawing.Size(28, 28); - this.zamToolStripButton.Text = "Zamówienie"; - this.zamToolStripButton.Click += new System.EventHandler(this.zamToolStripButton_Click); - // - // panel - // - this.panel.Controls.Add(this.label2); - this.panel.Controls.Add(this.label1); - this.panel.Controls.Add(this.wartoscNettoNiezafakturowanaTextBox); - this.panel.Controls.Add(this.wartoscNettoZafakturowanaTextBox); - this.panel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel.Location = new System.Drawing.Point(0, 625); - this.panel.Name = "panel"; - this.panel.Size = new System.Drawing.Size(979, 39); - 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 - // - this.wartoscNettoNiezafakturowanaTextBox.BackColor = System.Drawing.Color.White; - this.wartoscNettoNiezafakturowanaTextBox.Location = new System.Drawing.Point(842, 10); - this.wartoscNettoNiezafakturowanaTextBox.Name = "wartoscNettoNiezafakturowanaTextBox"; - this.wartoscNettoNiezafakturowanaTextBox.ReadOnly = true; - this.wartoscNettoNiezafakturowanaTextBox.Size = new System.Drawing.Size(125, 20); - this.wartoscNettoNiezafakturowanaTextBox.TabIndex = 1; - this.wartoscNettoNiezafakturowanaTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - // - // wartoscNettoZafakturowanaTextBox - // - this.wartoscNettoZafakturowanaTextBox.BackColor = System.Drawing.Color.White; - this.wartoscNettoZafakturowanaTextBox.Location = new System.Drawing.Point(521, 10); - this.wartoscNettoZafakturowanaTextBox.Name = "wartoscNettoZafakturowanaTextBox"; - this.wartoscNettoZafakturowanaTextBox.ReadOnly = true; - this.wartoscNettoZafakturowanaTextBox.Size = new System.Drawing.Size(116, 20); - this.wartoscNettoZafakturowanaTextBox.TabIndex = 0; - this.wartoscNettoZafakturowanaTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - // - // reklamaTableAdapter - // - this.reklamaTableAdapter.ClearBeforeFill = true; - // - // VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter - // - this.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter.ClearBeforeFill = true; - // - // reklamyZestawienieTableAdapter - // - this.reklamyZestawienieTableAdapter.ClearBeforeFill = true; - // - // agencja - // - this.agencja.DataPropertyName = "agencja"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.agencja.DefaultCellStyle = dataGridViewCellStyle3; - this.agencja.HeaderText = "Agencja"; - this.agencja.Name = "agencja"; - this.agencja.ReadOnly = true; - this.agencja.Width = 71; - // - // agent - // - this.agent.DataPropertyName = "agent"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.agent.DefaultCellStyle = dataGridViewCellStyle4; - this.agent.HeaderText = "Agent"; - this.agent.Name = "agent"; - this.agent.ReadOnly = true; - this.agent.Width = 60; - // - // rokZamowienia - // - this.rokZamowienia.DataPropertyName = "rokZamowienia"; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.rokZamowienia.DefaultCellStyle = dataGridViewCellStyle5; - this.rokZamowienia.HeaderText = "Rok"; - this.rokZamowienia.Name = "rokZamowienia"; - this.rokZamowienia.ReadOnly = true; - this.rokZamowienia.Width = 52; - // - // nrZamowieniaExt - // - this.nrZamowieniaExt.DataPropertyName = "nrZamowieniaExt"; - this.nrZamowieniaExt.HeaderText = "Nr zamówienia"; - this.nrZamowieniaExt.Name = "nrZamowieniaExt"; - this.nrZamowieniaExt.ReadOnly = true; - this.nrZamowieniaExt.Width = 101; - // - // iloscReklam - // - this.iloscReklam.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.iloscReklam.DataPropertyName = "iloscReklam"; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.iloscReklam.DefaultCellStyle = dataGridViewCellStyle6; - this.iloscReklam.HeaderText = "# rek"; - this.iloscReklam.Name = "iloscReklam"; - this.iloscReklam.ReadOnly = true; - this.iloscReklam.Width = 40; - // - // data_od - // - this.data_od.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.data_od.DataPropertyName = "data_od"; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.Format = "d"; - this.data_od.DefaultCellStyle = dataGridViewCellStyle7; - this.data_od.HeaderText = "Data 1 em"; - this.data_od.Name = "data_od"; - this.data_od.ReadOnly = true; - this.data_od.Width = 80; - // - // data_od_bez_FK - // - this.data_od_bez_FK.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.data_od_bez_FK.DataPropertyName = "data_od_bez_FK"; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.data_od_bez_FK.DefaultCellStyle = dataGridViewCellStyle8; - this.data_od_bez_FK.HeaderText = "Data 1 em bez FV"; - this.data_od_bez_FK.Name = "data_od_bez_FK"; - this.data_od_bez_FK.ReadOnly = true; - this.data_od_bez_FK.Width = 80; - // - // wartoscNetto - // - this.wartoscNetto.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.wartoscNetto.DataPropertyName = "wartoscNetto"; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle9.Format = "C2"; - this.wartoscNetto.DefaultCellStyle = dataGridViewCellStyle9; - this.wartoscNetto.HeaderText = "Netto"; - this.wartoscNetto.Name = "wartoscNetto"; - this.wartoscNetto.ReadOnly = true; - this.wartoscNetto.Width = 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 @@ -1076,4 +1076,18 @@ private System.Windows.Forms.DataGridViewTextBoxColumn iloscDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn wartoscNettoZafakturowanaDataGridViewTextBoxColumn; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.DataGridViewTextBoxColumn agencja; + private System.Windows.Forms.DataGridViewTextBoxColumn agent; + private System.Windows.Forms.DataGridViewTextBoxColumn rokZamowienia; + private System.Windows.Forms.DataGridViewTextBoxColumn nrZamowieniaExt; + private System.Windows.Forms.DataGridViewTextBoxColumn iloscReklam; + private System.Windows.Forms.DataGridViewTextBoxColumn data_od; + private System.Windows.Forms.DataGridViewTextBoxColumn data_od_bez_FK; + private System.Windows.Forms.DataGridViewTextBoxColumn wartoscNetto; + private System.Windows.Forms.DataGridViewTextBoxColumn kwotaWalutaBrutto; + private System.Windows.Forms.DataGridViewTextBoxColumn bruttoEuroMianoDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn nettoZafakturowane; + private System.Windows.Forms.DataGridViewTextBoxColumn DoZafakturowania; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; @@ -1093,18 +1107,4 @@ 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; - private System.Windows.Forms.DataGridViewTextBoxColumn rokZamowienia; - private System.Windows.Forms.DataGridViewTextBoxColumn nrZamowieniaExt; - private System.Windows.Forms.DataGridViewTextBoxColumn iloscReklam; - private System.Windows.Forms.DataGridViewTextBoxColumn data_od; - private System.Windows.Forms.DataGridViewTextBoxColumn data_od_bez_FK; - private System.Windows.Forms.DataGridViewTextBoxColumn wartoscNetto; - private System.Windows.Forms.DataGridViewTextBoxColumn kwotaWalutaBrutto; - private System.Windows.Forms.DataGridViewTextBoxColumn bruttoEuroMianoDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn nettoZafakturowane; - private System.Windows.Forms.DataGridViewTextBoxColumn DoZafakturowania; } Index: trunk/BazaReklam/ZamowieniaForm.Designer.cs =================================================================== --- trunk/BazaReklam/ZamowieniaForm.Designer.cs (revision 102) +++ trunk/BazaReklam/ZamowieniaForm.Designer.cs (revision 349) @@ -36,7 +36,7 @@ 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ZamowieniaForm)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); this.zamowieniaDataGridView = new System.Windows.Forms.DataGridView(); this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); @@ -56,11 +56,4 @@ this.rEKLAMABindingSource = new System.Windows.Forms.BindingSource(this.components); this.rEKLAMADataGridView1 = new System.Windows.Forms.DataGridView(); - this.dataGridViewTextBoxColumn72 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.DATA_ZAMOWIENIA = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn90 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn43 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn44 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ZATWIERDZONO_DO_DRUKU2 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.rEKLAMABindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.dodajButton = new System.Windows.Forms.Button(); @@ -102,4 +95,11 @@ this.KlientLabel = new System.Windows.Forms.Label(); this.errorProvider1 = new System.Windows.Forms.ErrorProvider(this.components); + this.dataGridViewTextBoxColumn72 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Data1Emisji = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn90 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn43 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn44 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ZATWIERDZONO_DO_DRUKU2 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.zamowieniaDataGridView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.zamowieniaBindingSource)).BeginInit(); @@ -306,5 +306,5 @@ this.rEKLAMADataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn72, - this.DATA_ZAMOWIENIA, + this.Data1Emisji, this.dataGridViewTextBoxColumn1, this.dataGridViewTextBoxColumn90, @@ -321,62 +321,4 @@ this.rEKLAMADataGridView1.Size = new System.Drawing.Size(401, 167); this.rEKLAMADataGridView1.TabIndex = 2; - // - // dataGridViewTextBoxColumn72 - // - this.dataGridViewTextBoxColumn72.DataPropertyName = "ID REKLAMY"; - this.dataGridViewTextBoxColumn72.HeaderText = "Symbol"; - this.dataGridViewTextBoxColumn72.Name = "dataGridViewTextBoxColumn72"; - this.dataGridViewTextBoxColumn72.ReadOnly = true; - // - // DATA_ZAMOWIENIA - // - this.DATA_ZAMOWIENIA.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.DATA_ZAMOWIENIA.DataPropertyName = "DATA ZAMÓWIENIA"; - this.DATA_ZAMOWIENIA.HeaderText = "Data zam."; - this.DATA_ZAMOWIENIA.Name = "DATA_ZAMOWIENIA"; - this.DATA_ZAMOWIENIA.ReadOnly = true; - this.DATA_ZAMOWIENIA.Width = 75; - // - // dataGridViewTextBoxColumn1 - // - this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.dataGridViewTextBoxColumn1.DataPropertyName = "TYP"; - this.dataGridViewTextBoxColumn1.HeaderText = "TYP"; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - this.dataGridViewTextBoxColumn1.ReadOnly = true; - this.dataGridViewTextBoxColumn1.Width = 50; - // - // dataGridViewTextBoxColumn90 - // - this.dataGridViewTextBoxColumn90.DataPropertyName = "NETTO"; - this.dataGridViewTextBoxColumn90.HeaderText = "NETTO"; - this.dataGridViewTextBoxColumn90.Name = "dataGridViewTextBoxColumn90"; - this.dataGridViewTextBoxColumn90.ReadOnly = true; - // - // dataGridViewTextBoxColumn43 - // - this.dataGridViewTextBoxColumn43.DataPropertyName = "VAT"; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.Format = "P"; - this.dataGridViewTextBoxColumn43.DefaultCellStyle = dataGridViewCellStyle7; - this.dataGridViewTextBoxColumn43.HeaderText = "VAT"; - this.dataGridViewTextBoxColumn43.Name = "dataGridViewTextBoxColumn43"; - this.dataGridViewTextBoxColumn43.ReadOnly = true; - // - // dataGridViewTextBoxColumn44 - // - this.dataGridViewTextBoxColumn44.DataPropertyName = "Brutto_Euro_Miano"; - this.dataGridViewTextBoxColumn44.HeaderText = "Waluta"; - this.dataGridViewTextBoxColumn44.Name = "dataGridViewTextBoxColumn44"; - this.dataGridViewTextBoxColumn44.ReadOnly = true; - // - // ZATWIERDZONO_DO_DRUKU2 - // - this.ZATWIERDZONO_DO_DRUKU2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.ZATWIERDZONO_DO_DRUKU2.DataPropertyName = "ZATWIERDZONO DO DRUKU"; - this.ZATWIERDZONO_DO_DRUKU2.HeaderText = "ZD"; - this.ZATWIERDZONO_DO_DRUKU2.Name = "ZATWIERDZONO_DO_DRUKU2"; - this.ZATWIERDZONO_DO_DRUKU2.ReadOnly = true; - this.ZATWIERDZONO_DO_DRUKU2.Width = 25; // // rEKLAMABindingSource1 @@ -773,4 +715,60 @@ // this.errorProvider1.ContainerControl = this; + // + // dataGridViewTextBoxColumn72 + // + this.dataGridViewTextBoxColumn72.DataPropertyName = "ID REKLAMY"; + this.dataGridViewTextBoxColumn72.HeaderText = "Symbol"; + this.dataGridViewTextBoxColumn72.Name = "dataGridViewTextBoxColumn72"; + this.dataGridViewTextBoxColumn72.ReadOnly = true; + // + // Data1Emisji + // + this.Data1Emisji.DataPropertyName = "Data1Emisji"; + this.Data1Emisji.HeaderText = "1 Emisja"; + this.Data1Emisji.Name = "Data1Emisji"; + this.Data1Emisji.ReadOnly = true; + // + // dataGridViewTextBoxColumn1 + // + this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.dataGridViewTextBoxColumn1.DataPropertyName = "TYP"; + this.dataGridViewTextBoxColumn1.HeaderText = "TYP"; + this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + this.dataGridViewTextBoxColumn1.ReadOnly = true; + this.dataGridViewTextBoxColumn1.Width = 50; + // + // dataGridViewTextBoxColumn90 + // + this.dataGridViewTextBoxColumn90.DataPropertyName = "NETTO"; + this.dataGridViewTextBoxColumn90.HeaderText = "NETTO"; + this.dataGridViewTextBoxColumn90.Name = "dataGridViewTextBoxColumn90"; + this.dataGridViewTextBoxColumn90.ReadOnly = true; + // + // dataGridViewTextBoxColumn43 + // + this.dataGridViewTextBoxColumn43.DataPropertyName = "VAT"; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.Format = "P"; + this.dataGridViewTextBoxColumn43.DefaultCellStyle = dataGridViewCellStyle7; + this.dataGridViewTextBoxColumn43.HeaderText = "VAT"; + this.dataGridViewTextBoxColumn43.Name = "dataGridViewTextBoxColumn43"; + this.dataGridViewTextBoxColumn43.ReadOnly = true; + // + // dataGridViewTextBoxColumn44 + // + this.dataGridViewTextBoxColumn44.DataPropertyName = "Brutto_Euro_Miano"; + this.dataGridViewTextBoxColumn44.HeaderText = "Waluta"; + this.dataGridViewTextBoxColumn44.Name = "dataGridViewTextBoxColumn44"; + this.dataGridViewTextBoxColumn44.ReadOnly = true; + // + // ZATWIERDZONO_DO_DRUKU2 + // + this.ZATWIERDZONO_DO_DRUKU2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.ZATWIERDZONO_DO_DRUKU2.DataPropertyName = "ZATWIERDZONO DO DRUKU"; + this.ZATWIERDZONO_DO_DRUKU2.HeaderText = "ZD"; + this.ZATWIERDZONO_DO_DRUKU2.Name = "ZATWIERDZONO_DO_DRUKU2"; + this.ZATWIERDZONO_DO_DRUKU2.ReadOnly = true; + this.ZATWIERDZONO_DO_DRUKU2.Width = 25; // // ZamowieniaForm @@ -847,11 +845,4 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Brutto_Euro_Miano; private System.Windows.Forms.DataGridViewCheckBoxColumn ZATWIERDZONO_DO_DRUKU; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn72; - private System.Windows.Forms.DataGridViewTextBoxColumn DATA_ZAMOWIENIA; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn90; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn43; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn44; - private System.Windows.Forms.DataGridViewCheckBoxColumn ZATWIERDZONO_DO_DRUKU2; private System.Windows.Forms.Button usunFaktureButton; private System.Windows.Forms.DateTimePicker dtpZmianaDaty; @@ -874,4 +865,11 @@ private System.Windows.Forms.Button proformaButton; private System.Windows.Forms.ErrorProvider errorProvider1; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn72; + private System.Windows.Forms.DataGridViewTextBoxColumn Data1Emisji; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn90; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn43; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn44; + private System.Windows.Forms.DataGridViewCheckBoxColumn ZATWIERDZONO_DO_DRUKU2; } } Index: trunk/BazaReklam/ZamowieniaForm.resx =================================================================== --- trunk/BazaReklam/ZamowieniaForm.resx (revision 102) +++ trunk/BazaReklam/ZamowieniaForm.resx (revision 349) @@ -151,5 +151,5 @@ 431, 54 - + True Index: trunk/BazaReklam/REKLAMADataSet.xsd =================================================================== --- trunk/BazaReklam/REKLAMADataSet.xsd (revision 347) +++ trunk/BazaReklam/REKLAMADataSet.xsd (revision 349) @@ -445,16 +445,21 @@ - SELECT ReklamaID, CustomerID, [SYMBOL AKWIZYTORA], TYTUŁ, TYP, [ID REKLAMY], [NICK NAME], [DATA ZAMÓWIENIA], SZER, WYS, MOD_TYP, STRONA, [STR NR WT], - [STR NR PT], KROTNOŚĆ, ODSTĘP, KOLOR, [WSKAZANIE MIEJSCA], RABAT, [RABAT WARTOŚĆ], ZAPŁACONO, [ZATWIERDZONO DO DRUKU], [DATA ZAPŁATY], - [SYMBOL POTWIERDZENIA], [RODZAJ POTWIERDZENIA], [CENA JEDN], NETTO, VAT, PVAT, BRUTTO, [PROCENT PROWIZJI], PROWIZJA, INFO, - [FAKTURA NUMER], [FAKTURA ID KONTA], [FAKTURA DATA WYSTAWIENIA], [FAKTURA DATA SPRZEDAŻY], [FAKTURA TERMIN ZAPŁATY], - [FAKTURA FORMA PŁATNOŚCI], [FAKTURA WYSTAWIONO], [FAKTURA RODZAJ], USERID, [DATA OSTATNIEJ MODYFIKACJI], [FK-TR], F_NR, F_NR_ROZ, - F_NR_ROK, ID_FAKTURY, PROMOCJA, GRZBIET, customerId_Sub, kier_notatka, kier_zatwierdzil, zam_notatka, zablokuj_prowizje, Brutto_Euro, Zaliczka_Brutto, - Zaliczka_Data, Brutto_Euro_Miano, waluta_kurs_z_dnia, waluta_kurs, waluta_Przelicznik, waluta_tabela_nr, wyroznienie_procent, wyroznienie_kwota, - wyroznienie, wyroznienie_exported, logo, logoID, ogl_dzial, ogl_rozdzial, idZamowienia -FROM REKLAMA -WHERE (CustomerID = @param1) AND (idZamowienia IS NULL) AND ([FAKTURA WYSTAWIONO] = 0) AND (YEAR([DATA ZAMÓWIENIA]) = 2008) AND - ([ZATWIERDZONO DO DRUKU] = 1) OR - (CustomerID = @param1) AND (idZamowienia IS NULL) AND ([FAKTURA WYSTAWIONO] = 0) AND (YEAR([DATA ZAMÓWIENIA]) >= 2009) + SELECT R.ReklamaID, R.CustomerID, R.[SYMBOL AKWIZYTORA], R.TYTUŁ, R.TYP, R.[ID REKLAMY], R.[NICK NAME], R.[DATA ZAMÓWIENIA], R.SZER, R.WYS, + R.MOD_TYP, R.STRONA, R.[STR NR WT], R.[STR NR PT], R.KROTNOŚĆ, R.ODSTĘP, R.KOLOR, R.[WSKAZANIE MIEJSCA], R.RABAT, + R.[RABAT WARTOŚĆ], R.ZAPŁACONO, R.[ZATWIERDZONO DO DRUKU], R.[DATA ZAPŁATY], R.[SYMBOL POTWIERDZENIA], + R.[RODZAJ POTWIERDZENIA], R.[CENA JEDN], R.NETTO, R.VAT, R.PVAT, R.BRUTTO, R.[PROCENT PROWIZJI], R.PROWIZJA, R.INFO, + R.[FAKTURA NUMER], R.[FAKTURA ID KONTA], R.[FAKTURA DATA WYSTAWIENIA], R.[FAKTURA DATA SPRZEDAŻY], R.[FAKTURA TERMIN ZAPŁATY], + R.[FAKTURA FORMA PŁATNOŚCI], R.[FAKTURA WYSTAWIONO], R.[FAKTURA RODZAJ], R.USERID, R.[DATA OSTATNIEJ MODYFIKACJI], R.[FK-TR], + R.F_NR, R.F_NR_ROZ, R.F_NR_ROK, R.ID_FAKTURY, R.PROMOCJA, R.GRZBIET, R.customerId_Sub, R.kier_notatka, R.kier_zatwierdzil, + R.zam_notatka, R.zablokuj_prowizje, R.Brutto_Euro, R.Zaliczka_Brutto, R.Zaliczka_Data, R.Brutto_Euro_Miano, R.waluta_kurs_z_dnia, R.waluta_kurs, + R.waluta_Przelicznik, R.waluta_tabela_nr, R.wyroznienie_procent, R.wyroznienie_kwota, R.wyroznienie, R.wyroznienie_exported, R.logo, R.logoID, + R.ogl_dzial, R.ogl_rozdzial, R.idZamowienia, E.Data1Emisji +FROM REKLAMA AS R LEFT OUTER JOIN + (SELECT ReklamaId, MIN(DataEmisji) AS Data1Emisji + FROM EmisjeReklamy + GROUP BY ReklamaId) AS E ON E.ReklamaId = R.ReklamaID +WHERE (R.CustomerID = @param1) AND (R.idZamowienia IS NULL) AND (R.[FAKTURA WYSTAWIONO] = 0) AND (YEAR(R.[DATA ZAMÓWIENIA]) = 2008) AND + (R.[ZATWIERDZONO DO DRUKU] = 1) OR + (R.CustomerID = @param1) AND (R.idZamowienia IS NULL) AND (R.[FAKTURA WYSTAWIONO] = 0) AND (YEAR(R.[DATA ZAMÓWIENIA]) >= 2009) @@ -2239,15 +2244,15 @@ R.F_NR, R.F_NR_ROZ, R.F_NR_ROK, R.ID_FAKTURY, R.PROMOCJA, R.GRZBIET, R.customerId_Sub, R.kier_notatka, R.kier_zatwierdzil, R.zam_notatka, R.zablokuj_prowizje, R.Brutto_Euro, R.Zaliczka_Brutto, R.Zaliczka_Data, R.Brutto_Euro_Miano, R.waluta_kurs_z_dnia, R.waluta_kurs, - R.waluta_Przelicznik, R.waluta_tabela_nr, O.OD, O.DO, DATEPART(year, NR.DATA_W) AS 'rok', DATEPART(month, NR.DATA_W) AS 'miesiac', - 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, R.wyroznienie + R.waluta_Przelicznik, R.waluta_tabela_nr, O.OD, O.DO, DATEPART(year, E.data1) AS 'rok', DATEPART(month, E.data1) AS 'miesiac', + E.data1 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, R.wyroznienie FROM AGENCI AS A2 INNER JOIN AGENCJE AS A ON A.Id_agencji = A2.ID_AGENCJI RIGHT OUTER JOIN REKLAMA AS R ON A2.Symbol = R.[SYMBOL AKWIZYTORA] LEFT OUTER JOIN VIEW_REKLAMA_OD_DO AS O ON R.ReklamaID = O.ReklamaID LEFT OUTER JOIN - NR ON R.TYTUŁ = NR.TYT AND O.OD = NR.NRW LEFT OUTER JOIN + ZAMOWIENIA_1EMISJA_bezFK AS E ON R.idZamowienia = E.idZamowienia LEFT OUTER JOIN [NAZWY MODUŁÓW] AS NM ON R.MOD_TYP = NM.MOD_TYP LEFT OUTER JOIN KLIENCI AS K ON R.CustomerID = K.CustomerID -where R.idZamowienia=@idZamowienia +WHERE (R.idZamowienia = @idZamowienia) ORDER BY R.[DATA ZAMÓWIENIA] DESC @@ -4833,4 +4838,5 @@ + Index: trunk/BazaReklam/REKLAMADataSet.xss =================================================================== --- trunk/BazaReklam/REKLAMADataSet.xss (revision 347) +++ trunk/BazaReklam/REKLAMADataSet.xss (revision 349) @@ -5,12 +5,12 @@ the code is regenerated. --> - + - - + + - + - + @@ -35,5 +35,5 @@ - + @@ -82,5 +82,5 @@ - 199 + 138 384 @@ -234,5 +234,5 @@ - 199 + 138 105 Index: trunk/BazaReklam/REKLAMADataSet.Designer.cs =================================================================== --- trunk/BazaReklam/REKLAMADataSet.Designer.cs (revision 347) +++ trunk/BazaReklam/REKLAMADataSet.Designer.cs (revision 349) @@ -1599,4 +1599,6 @@ private global::System.Data.DataColumn columnidZamowienia; + private global::System.Data.DataColumn columnData1Emisji; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public REKLAMADataTable() { @@ -2130,4 +2132,11 @@ get { return this.columnidZamowienia; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn Data1EmisjiColumn { + get { + return this.columnData1Emisji; } } @@ -2233,5 +2242,6 @@ int ogl_dzial, int ogl_rozdzial, - int idZamowienia) { + int idZamowienia, + System.DateTime Data1Emisji) { REKLAMARow rowREKLAMARow = ((REKLAMARow)(this.NewRow())); object[] columnValuesArray = new object[] { @@ -2307,5 +2317,6 @@ ogl_dzial, ogl_rozdzial, - idZamowienia}; + idZamowienia, + Data1Emisji}; if ((parentKLIENCIRowByKLIENCI_REKLAMA != null)) { columnValuesArray[1] = parentKLIENCIRowByKLIENCI_REKLAMA[25]; @@ -2416,4 +2427,5 @@ this.columnogl_rozdzial = base.Columns["ogl_rozdzial"]; this.columnidZamowienia = base.Columns["idZamowienia"]; + this.columnData1Emisji = base.Columns["Data1Emisji"]; } @@ -2566,4 +2578,6 @@ this.columnidZamowienia = new global::System.Data.DataColumn("idZamowienia", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnidZamowienia); + this.columnData1Emisji = new global::System.Data.DataColumn("Data1Emisji", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnData1Emisji); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnReklamaID}, true)); @@ -2627,4 +2641,5 @@ this.columnlogo.AllowDBNull = false; this.columnlogo.DefaultValue = ((bool)(false)); + this.columnData1Emisji.ReadOnly = true; } @@ -19982,4 +19997,19 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public System.DateTime Data1Emisji { + get { + try { + return ((global::System.DateTime)(this[this.tableREKLAMA.Data1EmisjiColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Data1Emisji\' in table \'REKLAMA\' is DBNull.", e); + } + } + set { + this[this.tableREKLAMA.Data1EmisjiColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public KLIENCIRow KLIENCIRow { get { @@ -20669,4 +20699,14 @@ public void SetidZamowieniaNull() { this[this.tableREKLAMA.idZamowieniaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsData1EmisjiNull() { + return this.IsNull(this.tableREKLAMA.Data1EmisjiColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetData1EmisjiNull() { + this[this.tableREKLAMA.Data1EmisjiColumn] = global::System.Convert.DBNull; } @@ -36054,16 +36094,30 @@ this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = @"SELECT ReklamaID, CustomerID, [SYMBOL AKWIZYTORA], TYTUŁ, TYP, [ID REKLAMY], [NICK NAME], [DATA ZAMÓWIENIA], SZER, WYS, MOD_TYP, STRONA, [STR NR WT], - [STR NR PT], KROTNOŚĆ, ODSTĘP, KOLOR, [WSKAZANIE MIEJSCA], RABAT, [RABAT WARTOŚĆ], ZAPŁACONO, [ZATWIERDZONO DO DRUKU], [DATA ZAPŁATY], - [SYMBOL POTWIERDZENIA], [RODZAJ POTWIERDZENIA], [CENA JEDN], NETTO, VAT, PVAT, BRUTTO, [PROCENT PROWIZJI], PROWIZJA, INFO, - [FAKTURA NUMER], [FAKTURA ID KONTA], [FAKTURA DATA WYSTAWIENIA], [FAKTURA DATA SPRZEDAŻY], [FAKTURA TERMIN ZAPŁATY], - [FAKTURA FORMA PŁATNOŚCI], [FAKTURA WYSTAWIONO], [FAKTURA RODZAJ], USERID, [DATA OSTATNIEJ MODYFIKACJI], [FK-TR], F_NR, F_NR_ROZ, - F_NR_ROK, ID_FAKTURY, PROMOCJA, GRZBIET, customerId_Sub, kier_notatka, kier_zatwierdzil, zam_notatka, zablokuj_prowizje, Brutto_Euro, Zaliczka_Brutto, - Zaliczka_Data, Brutto_Euro_Miano, waluta_kurs_z_dnia, waluta_kurs, waluta_Przelicznik, waluta_tabela_nr, wyroznienie_procent, wyroznienie_kwota, - wyroznienie, wyroznienie_exported, logo, logoID, ogl_dzial, ogl_rozdzial, idZamowienia -FROM REKLAMA -WHERE (CustomerID = @param1) AND (idZamowienia IS NULL) AND ([FAKTURA WYSTAWIONO] = 0) AND (YEAR([DATA ZAMÓWIENIA]) = 2008) AND - ([ZATWIERDZONO DO DRUKU] = 1) OR - (CustomerID = @param1) AND (idZamowienia IS NULL) AND ([FAKTURA WYSTAWIONO] = 0) AND (YEAR([DATA ZAMÓWIENIA]) >= 2009)"; + this._commandCollection[3].CommandText = "SELECT R.ReklamaID, R.CustomerID, R.[SYMBOL AKWIZYTORA], R.TYTUŁ, R.TYP, R.[I" + + "D REKLAMY], R.[NICK NAME], R.[DATA ZAMÓWIENIA], R.SZER, R.WYS, \r\n " + + " R.MOD_TYP, R.STRONA, R.[STR NR WT], R.[STR NR PT], R.KROTNOŚĆ, R.ODSTĘP, " + + "R.KOLOR, R.[WSKAZANIE MIEJSCA], R.RABAT, \r\n R.[RABAT WARTOŚ" + + "Ć], R.ZAPŁACONO, R.[ZATWIERDZONO DO DRUKU], R.[DATA ZAPŁATY], R.[SYMBOL POTWIERD" + + "ZENIA], \r\n R.[RODZAJ POTWIERDZENIA], R.[CENA JEDN], R.NETTO" + + ", R.VAT, R.PVAT, R.BRUTTO, R.[PROCENT PROWIZJI], R.PROWIZJA, R.INFO, \r\n " + + " R.[FAKTURA NUMER], R.[FAKTURA ID KONTA], R.[FAKTURA DATA WYSTAWIENI" + + "A], R.[FAKTURA DATA SPRZEDAŻY], R.[FAKTURA TERMIN ZAPŁATY], \r\n " + + " R.[FAKTURA FORMA PŁATNOŚCI], R.[FAKTURA WYSTAWIONO], R.[FAKTURA RODZAJ], R.U" + + "SERID, R.[DATA OSTATNIEJ MODYFIKACJI], R.[FK-TR], \r\n R.F_NR" + + ", R.F_NR_ROZ, R.F_NR_ROK, R.ID_FAKTURY, R.PROMOCJA, R.GRZBIET, R.customerId_Sub," + + " R.kier_notatka, R.kier_zatwierdzil, \r\n R.zam_notatka, R.za" + + "blokuj_prowizje, R.Brutto_Euro, R.Zaliczka_Brutto, R.Zaliczka_Data, R.Brutto_Eur" + + "o_Miano, R.waluta_kurs_z_dnia, R.waluta_kurs, \r\n R.waluta_P" + + "rzelicznik, R.waluta_tabela_nr, R.wyroznienie_procent, R.wyroznienie_kwota, R.wy" + + "roznienie, R.wyroznienie_exported, R.logo, R.logoID, \r\n R.o" + + "gl_dzial, R.ogl_rozdzial, R.idZamowienia, E.Data1Emisji\r\nFROM REKLAMA AS" + + " R LEFT OUTER JOIN\r\n (SELECT ReklamaId, MIN(DataEmi" + + "sji) AS Data1Emisji\r\n FROM EmisjeReklamy\r\n " + + " GROUP BY ReklamaId) AS E ON E.ReklamaId = R.ReklamaID\r" + + "\nWHERE (R.CustomerID = @param1) AND (R.idZamowienia IS NULL) AND (R.[FAKTURA" + + " WYSTAWIONO] = 0) AND (YEAR(R.[DATA ZAMÓWIENIA]) = 2008) AND \r\n " + + " (R.[ZATWIERDZONO DO DRUKU] = 1) OR\r\n (R.CustomerID = @" + + "param1) AND (R.idZamowienia IS NULL) AND (R.[FAKTURA WYSTAWIONO] = 0) AND (YEAR(" + + "R.[DATA ZAMÓWIENIA]) >= 2009)"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@param1", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "CustomerID", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -43186,16 +43240,17 @@ "ka, R.zablokuj_prowizje, R.Brutto_Euro, R.Zaliczka_Brutto, R.Zaliczka_Data, R.Br" + "utto_Euro_Miano, R.waluta_kurs_z_dnia, R.waluta_kurs, \r\n R." + - "waluta_Przelicznik, R.waluta_tabela_nr, O.OD, O.DO, DATEPART(year, NR.DATA_W) AS" + - " \'rok\', DATEPART(month, NR.DATA_W) AS \'miesiac\', \r\n NR.DATA" + - "_W AS \'1emisja\', A.Symbol AS agencja, (R.[CENA JEDN] - R.[RABAT WARTOŚĆ]) / R.SZ" + - "ER * R.WYS AS [CENA MODUŁU], NM.CENA_MIN, \r\n NM.CENA, K.Fir" + - "stName, R.wyroznienie\r\nFROM AGENCI AS A2 INNER JOIN\r\n " + - " AGENCJE AS A ON A.Id_agencji = A2.ID_AGENCJI RIGHT OUTER JOIN\r\n " + - " REKLAMA AS R ON A2.Symbol = R.[SYMBOL AKWIZYTORA] LEFT OUTER JOIN\r\n " + - " VIEW_REKLAMA_OD_DO AS O ON R.ReklamaID = O.ReklamaID LEFT OUTER" + - " JOIN\r\n NR ON R.TYTUŁ = NR.TYT AND O.OD = NR.NRW LEFT OUTER" + - " JOIN\r\n [NAZWY MODUŁÓW] AS NM ON R.MOD_TYP = NM.MOD_TYP LEF" + - "T OUTER JOIN\r\n KLIENCI AS K ON R.CustomerID = K.CustomerID\r" + - "\nwhere R.idZamowienia=@idZamowienia\r\nORDER BY R.[DATA ZAMÓWIENIA] DESC"; + "waluta_Przelicznik, R.waluta_tabela_nr, O.OD, O.DO, DATEPART(year, E.data1) AS \'" + + "rok\', DATEPART(month, E.data1) AS \'miesiac\', \r\n E.data1 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, \r\n K.FirstName" + + ", R.wyroznienie\r\nFROM AGENCI AS A2 INNER JOIN\r\n AGE" + + "NCJE AS A ON A.Id_agencji = A2.ID_AGENCJI RIGHT OUTER JOIN\r\n " + + " REKLAMA AS R ON A2.Symbol = R.[SYMBOL AKWIZYTORA] LEFT OUTER JOIN\r\n " + + " VIEW_REKLAMA_OD_DO AS O ON R.ReklamaID = O.ReklamaID LEFT OUTER JOIN\r" + + "\n ZAMOWIENIA_1EMISJA_bezFK AS E ON R.idZamowienia = E.idZam" + + "owienia LEFT OUTER JOIN\r\n [NAZWY MODUŁÓW] AS NM ON R.MOD_TY" + + "P = NM.MOD_TYP LEFT OUTER JOIN\r\n KLIENCI AS K ON R.Customer" + + "ID = K.CustomerID\r\nWHERE (R.idZamowienia = @idZamowienia)\r\nORDER BY R.[DATA " + + "ZAMÓWIENIA] DESC"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idZamowienia", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idZamowienia", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));