Index: /trunk/SQL/Views/VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.txt =================================================================== --- /trunk/SQL/Views/VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.txt (revision 226) +++ /trunk/SQL/Views/VIEW_ZESTAWIENIE_ZAMOWIEN_NOWE.txt (revision 230) @@ -30,7 +30,7 @@ END ELSE - CASE - WHEN F.waluta_brutto IS NULL THEN R.kwotaWalutaBrutto - ELSE R.kwotaWalutaBrutto - F.waluta_brutto + CASE COALESCE(Korekta.waluta_brutto, 0) + WHEN 0 THEN R.kwotaWalutaBrutto + ELSE ROUND(Korekta.waluta_brutto - (ZNFK.nettoZafakturowane/F.waluta_kurs),0) END END, Index: /trunk/SQL/Views/VIEW_ZESTAWIENIE_FAKTUR_NOWE.txt =================================================================== --- /trunk/SQL/Views/VIEW_ZESTAWIENIE_FAKTUR_NOWE.txt (revision 228) +++ /trunk/SQL/Views/VIEW_ZESTAWIENIE_FAKTUR_NOWE.txt (revision 230) @@ -19,5 +19,8 @@ T.VAT, -- jesli zostala wystawiona faktura korekta, wyswietl wartosc brutto po korekcie -COALESCE(T.KorektaBrutto, T.BRUTTO) AS BRUTTO, +BRUTTO = CASE + WHEN (T.KorektaBrutto IS NULL) THEN T.BRUTTO + ELSE T.KorektaBrutto + END, T.suma_zaplat, T.ID_FAKTURY, @@ -32,5 +35,9 @@ T.idWplaty, G.sumaNettoZEmisji, -T.waluta_brutto, +Waluta_Brutto = + CASE + WHEN (T.KorektaWalutaBrutto IS NULL) THEN T.waluta_brutto + ELSE T.KorektaWalutaBrutto + END, T.waluta_miano, T.KOREKTA, @@ -54,5 +61,6 @@ dbo.FAKTURY.SPOSOB_ZAPLATY AS SposobZaplaty, COALESCE(Korekta.Netto, NULL) AS KorektaNetto, - COALESCE(Korekta.Brutto, NULL) AS KorektaBrutto + COALESCE(Korekta.Brutto, NULL) AS KorektaBrutto, + COALESCE(Korekta.waluta_brutto, NULL) AS KorektaWalutaBrutto FROM dbo.FAKTURY LEFT OUTER JOIN dbo.FAKTURA_DETAILS ON dbo.FAKTURY.ID_FAKTURY = dbo.FAKTURA_DETAILS.ID_FAKTURY LEFT OUTER JOIN @@ -72,5 +80,5 @@ dbo.FAKTURY.ID_FK_KOR, Wplaty.brutto, Wplaty.waluta_brutto, dbo.FAKTURY.SPOSOB_ZAPLATY, - Korekta.Netto, Korekta.Brutto + Korekta.Netto, Korekta.Brutto, Korekta.waluta_brutto ) AS T LEFT OUTER JOIN (SELECT idFaktury, round(SUM(netto),2) AS sumaNettoZEmisji, count(id) as ilEmisji Index: /trunk/BazaReklam/OrdersForm.cs =================================================================== --- /trunk/BazaReklam/OrdersForm.cs (revision 192) +++ /trunk/BazaReklam/OrdersForm.cs (revision 230) @@ -4,8 +4,10 @@ using System.Data; using System.Data.SqlClient; +using System.Diagnostics; using System.Drawing; using System.Text; using System.Windows.Forms; using System.IO; +using Baza_Reklam.REKLAMADataSetTableAdapters; namespace Baza_Reklam @@ -983,15 +985,12 @@ if (reklamyZestawienieBindingSource.Current != null) { + DataRowView row = (DataRowView)reklamyZestawienieBindingSource.Current; - int idRek = Int32.Parse(row["reklamaId"].ToString()); - PaymentForm p = new PaymentForm(idRek); - DialogResult result = p.ShowDialog(); - - /* - if (result == DialogResult.OK) { - this.rEKLAMADataSet.ReklamyZestawienie.Clear(); - sqlDataAdapter.Fill(this.rEKLAMADataSet.ReklamyZestawienie); - } - */ + REKLAMADataSet.ReklamyZestawienieRow rek = (REKLAMADataSet.ReklamyZestawienieRow)row.Row; + if (rek.IsID_FAKTURYNull()) return; + + + PaymentForm2 p = new PaymentForm2(rek.ID_FAKTURY); + p.ShowDialog(); } } Index: /trunk/BazaReklam/OrdersForm.resx =================================================================== --- /trunk/BazaReklam/OrdersForm.resx (revision 76) +++ /trunk/BazaReklam/OrdersForm.resx (revision 230) @@ -383,31 +383,31 @@ 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 - Gf8AE/ygp4u0h2IAAAAASUVORK5CYII= + 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 + 8Q8LSqCkc8s9uwAAAABJRU5ErkJggg== @@ -505,29 +505,29 @@ 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 @@ -570,4 +570,7 @@ + + 339, 17 + 670, 56 @@ -615,4 +618,7 @@ 190, 56 + + 190, 56 + 506, 56 @@ -643,5 +649,5 @@ - 876, 17 + 475, 14 @@ -661,5 +667,5 @@ - 72 + 185 Index: /trunk/BazaReklam/PaymentForm2.cs =================================================================== --- /trunk/BazaReklam/PaymentForm2.cs (revision 229) +++ /trunk/BazaReklam/PaymentForm2.cs (revision 230) @@ -14,4 +14,10 @@ } private readonly int idFaktury; + + public PaymentForm2(int idFaktury) + { + this.idFaktury = idFaktury; + InitializeComponent(); + } public PaymentForm2(int idWplaty, int idFaktury) @@ -31,31 +37,34 @@ zestawienieFakturTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value; - if (idWplaty == 0) + if (idWplaty != 0) { - /* - DataRowView row = (DataRowView)wplatyBindingSource.AddNew(); - row["idFaktury"] = idFaktury; - row["idZamowienia"] = this.rEKLAMADataSet.VIEW_ZESTAWIENIE_FAKTUR_NOWE[0].idZamowienia; - wplatyBindingSource.EndEdit(); - */ + wplatyTableAdapter.FillByIdWplaty(rEKLAMADataSet.Wplaty, idWplaty); + VIEW_ZESTAWIENIE_FAKTUR_NOWETableAdapter.FillByIdFaktury(rEKLAMADataSet.VIEW_ZESTAWIENIE_FAKTUR_NOWE, idFaktury); } else { - wplatyTableAdapter.FillByIdWplaty(rEKLAMADataSet.Wplaty, idWplaty); + REKLAMADataSet.WplatyRow wplata = rEKLAMADataSet.Wplaty.FindByidWplaty(idWplaty); + if (wplata == null || wplata.IsdataWplatyNull()) + { + //stara faktura + UstawBindowanieDlaStarychFaktur(); + + zestawienieFakturTableAdapter.FillByIdFaktury(rEKLAMADataSet.ZestawienieFaktur, idFaktury); + } } - REKLAMADataSet.WplatyRow wplata = rEKLAMADataSet.Wplaty[0]; + //REKLAMADataSet.WplatyRow wplata = rEKLAMADataSet.Wplaty.FindByidWplaty(idWplaty); - if (wplata.IsidZamowieniaNull()) - { - //stara faktura - UstawBindowanieDlaStarychFaktur(); + //if (wplata == null || wplata.IsdataWplatyNull()) + //{ + // //stara faktura + // UstawBindowanieDlaStarychFaktur(); - zestawienieFakturTableAdapter.FillByIdFaktury(rEKLAMADataSet.ZestawienieFaktur, wplata.idFaktury); - } - else - { - VIEW_ZESTAWIENIE_FAKTUR_NOWETableAdapter.FillByIdFaktury(rEKLAMADataSet.VIEW_ZESTAWIENIE_FAKTUR_NOWE, idFaktury); - } + // zestawienieFakturTableAdapter.FillByIdFaktury(rEKLAMADataSet.ZestawienieFaktur, idFaktury); + //} + //else + //{ + // VIEW_ZESTAWIENIE_FAKTUR_NOWETableAdapter.FillByIdFaktury(rEKLAMADataSet.VIEW_ZESTAWIENIE_FAKTUR_NOWE, idFaktury); + //} } Index: /trunk/BazaReklam/OrdersForm.Designer.cs =================================================================== --- /trunk/BazaReklam/OrdersForm.Designer.cs (revision 76) +++ /trunk/BazaReklam/OrdersForm.Designer.cs (revision 230) @@ -31,13 +31,13 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OrdersForm)); - 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(); + 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(); 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; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.MintCream; - this.reklamaDataGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.MintCream; + this.reklamaDataGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; 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; - 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; + 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; 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"; - dataGridViewCellStyle3.Format = "C2"; - dataGridViewCellStyle3.NullValue = null; - this.NETTO.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle12.Format = "C2"; + dataGridViewCellStyle12.NullValue = null; + this.NETTO.DefaultCellStyle = dataGridViewCellStyle12; this.NETTO.HeaderText = "Netto"; this.NETTO.Name = "NETTO"; @@ -722,6 +722,6 @@ // this.BRUTTO.DataPropertyName = "BRUTTO"; - dataGridViewCellStyle4.Format = "C"; - this.BRUTTO.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle13.Format = "C"; + this.BRUTTO.DefaultCellStyle = dataGridViewCellStyle13; this.BRUTTO.HeaderText = "Brutto"; this.BRUTTO.Name = "BRUTTO"; @@ -732,7 +732,7 @@ // this.CENA_MIN.DataPropertyName = "CENA_MIN"; - dataGridViewCellStyle5.Format = "C2"; - dataGridViewCellStyle5.NullValue = null; - this.CENA_MIN.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle14.Format = "C2"; + dataGridViewCellStyle14.NullValue = null; + this.CENA_MIN.DefaultCellStyle = dataGridViewCellStyle14; this.CENA_MIN.HeaderText = "Cena min."; this.CENA_MIN.Name = "CENA_MIN"; @@ -743,7 +743,7 @@ // this.CENA.DataPropertyName = "CENA"; - dataGridViewCellStyle6.Format = "C2"; - dataGridViewCellStyle6.NullValue = null; - this.CENA.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle15.Format = "C2"; + dataGridViewCellStyle15.NullValue = null; + this.CENA.DefaultCellStyle = dataGridViewCellStyle15; this.CENA.HeaderText = "Cena"; this.CENA.Name = "CENA"; @@ -754,7 +754,7 @@ // this.PROCENT_PROWIZJI.DataPropertyName = "PROCENT PROWIZJI"; - dataGridViewCellStyle7.Format = "P"; - dataGridViewCellStyle7.NullValue = null; - this.PROCENT_PROWIZJI.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle16.Format = "P"; + dataGridViewCellStyle16.NullValue = null; + this.PROCENT_PROWIZJI.DefaultCellStyle = dataGridViewCellStyle16; this.PROCENT_PROWIZJI.HeaderText = "Prowizja"; this.PROCENT_PROWIZJI.Name = "PROCENT_PROWIZJI"; @@ -833,7 +833,7 @@ // this.rABATDataGridViewTextBoxColumn.DataPropertyName = "RABAT"; - dataGridViewCellStyle8.Format = "P"; - dataGridViewCellStyle8.NullValue = null; - this.rABATDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle17.Format = "P"; + dataGridViewCellStyle17.NullValue = null; + this.rABATDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle17; this.rABATDataGridViewTextBoxColumn.FillWeight = 118.9644F; this.rABATDataGridViewTextBoxColumn.HeaderText = "RB"; @@ -963,7 +963,7 @@ // this.CENA_MODULU.DataPropertyName = "CENA MODU£U"; - dataGridViewCellStyle9.Format = "C2"; - dataGridViewCellStyle9.NullValue = null; - this.CENA_MODULU.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle18.Format = "C2"; + dataGridViewCellStyle18.NullValue = null; + this.CENA_MODULU.DefaultCellStyle = dataGridViewCellStyle18; this.CENA_MODULU.HeaderText = "Cena modu³u"; this.CENA_MODULU.Name = "CENA_MODULU";