Index: trunk/BazaReklam/Docs/versioninfo.html =================================================================== --- trunk/BazaReklam/Docs/versioninfo.html (revision 544) +++ trunk/BazaReklam/Docs/versioninfo.html (revision 547) @@ -6,4 +6,13 @@

Baza reklam - Informacje o wersji

+
+ +

+ Wersja 1.0.0.95 (2009-04-07)

+

Opis zmian wprowadzonych do wersji 1.0.0.95

+ +
Index: trunk/BazaReklam/FactureViewer.cs =================================================================== --- trunk/BazaReklam/FactureViewer.cs (revision 539) +++ trunk/BazaReklam/FactureViewer.cs (revision 547) @@ -339,34 +339,4 @@ } - ///// - ///// WERSJA DLA POZNANIA - ///// - //private void zapiszPoznanButton_Click(object sender, EventArgs e) - //{ - // Cursor = Cursors.WaitCursor; - - // //zapisanie zmian w polu "opis" faktury - // fAKTURYBindingSource.EndEdit(); - // fAKTURYTableAdapter.Update(rEKLAMADataSet.FAKTURY); - // fAKTURYTableAdapter.FillByIdFaktury(rEKLAMADataSet.FAKTURY, idKorekty); - - // //ustawienie parametrów, nowych datasoure dla raportu - // List paramList = new List(); - - // paramList.Add(new ReportParameter("jezyk", jezykComboBox.SelectedItem.ToString(), true)); - // paramList.Add(new ReportParameter("podpis", podpisCheckBox.Checked.ToString(), true)); - // reportViewer1.LocalReport.SetParameters(paramList); - // reportViewer1.LocalReport.DataSources.Clear(); - // reportViewer1.LocalReport.DataSources.Add(new ReportDataSource("Faktura", fakturaTableAdapter1.GetDataByIdFaktury(idFaktury))); - // reportViewer1.LocalReport.DataSources.Add(new ReportDataSource("Korekta", fakturaTableAdapter1.GetDataByIdFaktury(idKorekty))); - // reportViewer1.LocalReport.DataSources.Add(new ReportDataSource("FakturaDetails", fakturA_DETAILSTableAdapter1.GetDataByIdFaktury(idFaktury))); - // reportViewer1.LocalReport.DataSources.Add(new ReportDataSource("tlumaczenia", ds.Tables[0])); - - // reportViewer1.RefreshReport(); - // //MessageBox.Show(reportViewer1.LocalReport.ReportEmbeddedResource); - // Cursor = Cursors.Default; - - //} - private void zapiszKorektaButton_Click(object sender, EventArgs e) { @@ -437,8 +407,16 @@ reportViewer1.LocalReport.SetParameters(paramList); + + + reportViewer1.LocalReport.DataSources.Clear(); reportViewer1.LocalReport.DataSources.Add(new ReportDataSource("Faktura", fakturaTableAdapter1.GetDataByIdFaktury(idFaktury))); reportViewer1.LocalReport.DataSources.Add(new ReportDataSource("FakturaDetails2", fAKTURA_DETAILS2TableAdapter.GetDataIdFaktury(idFaktury))); reportViewer1.LocalReport.DataSources.Add(new ReportDataSource("tlumaczenia", ds.Tables[0])); + + int invoiceProviderId = (int)invoiceProviderTableAdapter.GetDataByIdFaktury(idFaktury).Rows[0]["Id"]; + + reportViewer1.LocalReport.DataSources.Add(new ReportDataSource("Baza_Reklam_InvoiceProvider", + InvoiceProviderFactory.GetInvoiceProvidersById(invoiceProviderId))); reportViewer1.RefreshReport(); Index: trunk/BazaReklam/Properties/AssemblyInfo.cs =================================================================== --- trunk/BazaReklam/Properties/AssemblyInfo.cs (revision 544) +++ trunk/BazaReklam/Properties/AssemblyInfo.cs (revision 547) @@ -30,3 +30,3 @@ // [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.94")] +[assembly: AssemblyFileVersion("1.0.0.95")] Index: trunk/BazaReklamSetup/BazaReklamSetup.vdproj =================================================================== --- trunk/BazaReklamSetup/BazaReklamSetup.vdproj (revision 544) +++ trunk/BazaReklamSetup/BazaReklamSetup.vdproj (revision 547) @@ -762,6 +762,6 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Baza Reklam" - "ProductCode" = "8:{E8685C45-5B09-490C-B081-81869F44669B}" - "PackageCode" = "8:{7A1A4F17-9718-4BE5-B852-32E9B9488196}" + "ProductCode" = "8:{0EA5B346-9933-4F62-9DBF-A76A4566B742}" + "PackageCode" = "8:{68CFBF25-9833-4E63-9952-8D94459FBD5C}" "UpgradeCode" = "8:{4E2DBBA4-3139-4790-8DDB-7AADFC963A7D}" "RestartWWWService" = "11:FALSE" @@ -769,5 +769,5 @@ "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:1.0.94" + "ProductVersion" = "8:1.0.95" "Manufacturer" = "8:AACT" "ARPHELPTELEPHONE" = "8:"