Index: branches/Abonament/BazaReklam/ZamowieniaForm.cs =================================================================== --- branches/Abonament/BazaReklam/ZamowieniaForm.cs (revision 705) +++ branches/Abonament/BazaReklam/ZamowieniaForm.cs (revision 706) @@ -21,5 +21,5 @@ private AgentRepository agentRepository; private Agent agent; - + private REKLAMADataSet.KLIENCIRow klient; private int idZamowienia; @@ -49,5 +49,5 @@ new SLOWNIKDataSetTableAdapters.Kursy_WalutTableAdapter(); - + public ZamowieniaForm(REKLAMADataSet.KLIENCIRow klient) { @@ -113,5 +113,5 @@ { BindProductsWithoutOrders(); - + usunFaktureButton.Enabled = User.Instance().IsKierownik; dtpZmianaDaty.Enabled = User.Instance().IsKierownik; @@ -135,5 +135,5 @@ if (klient == null) return; - + KlientLabel.Text = klient.IskodKlientaNull() ? "BRAK KODU KLIENTA" @@ -183,9 +183,9 @@ if (zamowieniaBindingSource.Current == null || rEKLAMADataGridView1.SelectedRows.Count <= 0) return; - DataRowView z = (DataRowView) zamowieniaBindingSource.Current; - REKLAMADataSet.zamowieniaRow zamowienie = (REKLAMADataSet.zamowieniaRow) z.Row; - - IProduct product = (IProduct) rEKLAMADataGridView1.SelectedRows[0].DataBoundItem; - + DataRowView z = (DataRowView)zamowieniaBindingSource.Current; + REKLAMADataSet.zamowieniaRow zamowienie = (REKLAMADataSet.zamowieniaRow)z.Row; + + IProduct product = (IProduct)rEKLAMADataGridView1.SelectedRows[0].DataBoundItem; + string s = string.Empty; if (!CanAddProductToOrder(product, productsWithOrder, zamowienie, out s)) @@ -227,5 +227,5 @@ StringBuilder sb = new StringBuilder(); bool canAddProduct = true; - + if (order.zafakturowanoWszystko || order.zafakturowano) { @@ -233,5 +233,5 @@ canAddProduct = false; } - + if (products.FindAll(delegate(IProduct p) { return p.Currency != product.Currency && p.OrderId == order.idZamowienia; }).Count > 0) { @@ -245,5 +245,5 @@ } - if(canAddProduct && product.ProductType == ProductType.Advertisment) + if (canAddProduct && product.ProductType == ProductType.Advertisment) { if (datyWydanTableAdapter.GetDataByPierwszaEmisjaWReklamie(product.Id).Rows.Count <= 0) @@ -262,9 +262,9 @@ if (zamowieniaBindingSource.Current == null || rEKLAMADataGridView.SelectedRows.Count == 0) return; - IProduct product = (IProduct) rEKLAMADataGridView.SelectedRows[0].DataBoundItem; + IProduct product = (IProduct)rEKLAMADataGridView.SelectedRows[0].DataBoundItem; if (product.HasInvoice) { - MessageBox.Show("Wybrany produkt posiada ju¿ zafakturowane elementy. Nie mo¿na go usun¹æ.", + MessageBox.Show("Wybrany produkt posiada ju¿ zafakturowane elementy. Nie mo¿na go usun¹æ.", "Baza Reklam - Zamówienia i faktury"); return; @@ -272,10 +272,10 @@ customerRepository.RemoveProductFromOrder(product); - + productsWithOrder.Remove(product); int orderId = product.OrderId.Value; product.OrderId = null; productsWithoutOrder.Add(product); - + BindProductsWithOrders(orderId); BindProductsWithoutOrders(); @@ -290,6 +290,6 @@ Cursor = Cursors.WaitCursor; - DataRowView z = (DataRowView) zamowieniaBindingSource.Current; - REKLAMADataSet.zamowieniaRow zamowienie = (REKLAMADataSet.zamowieniaRow) z.Row; + DataRowView z = (DataRowView)zamowieniaBindingSource.Current; + REKLAMADataSet.zamowieniaRow zamowienie = (REKLAMADataSet.zamowieniaRow)z.Row; InitIssueTables(zamowienie); @@ -363,5 +363,5 @@ wplatyTableAdapter.Update(rEKLAMADataSet.Wplaty); - int il = (int) emisjeTableAdapter.iloscNiezafakturowanychEmisjiWZamowieniu(zamowienie.idZamowienia); + int il = (int)emisjeTableAdapter.iloscNiezafakturowanychEmisjiWZamowieniu(zamowienie.idZamowienia); if (il == 0 && !proforma) { @@ -458,5 +458,5 @@ fakturaDetailsRow.BRUTTO = Convert.ToDecimal((1 + vat) * netto); } - else if(naglowekFaktury.Iswaluta_mianoNull() && klientRow.Country.ToUpper() != "POLSKA") + else if (naglowekFaktury.Iswaluta_mianoNull() && klientRow.Country.ToUpper() != "POLSKA") { decimal vat = Convert.ToDecimal(reklama.VAT); @@ -467,5 +467,5 @@ fakturaDetailsRow.S_VAT = reklama.VAT; fakturaDetailsRow.BRUTTO = Convert.ToDecimal((1 + vat) * netto); - + decimal brutto = fakturaDetailsRow.BRUTTO; @@ -474,5 +474,5 @@ fakturaDetailsRow.UPUST_PR = reklama.RABAT; if (fakturaDetailsRow.UPUST_PR != 0) - fakturaDetailsRow.UPUST_NETTO = Math.Round(netto/(Convert.ToDecimal(reklama.RABAT) - netto), 2); + fakturaDetailsRow.UPUST_NETTO = Math.Round(netto / (Convert.ToDecimal(reklama.RABAT) - netto), 2); else fakturaDetailsRow.UPUST_NETTO = 0; @@ -511,5 +511,4 @@ foreach (IProduct subscription in subscriptionsToInvoice) { - foreach (IProductDetail subscriptionDetail in subscription.ProductDetails) { @@ -519,7 +518,6 @@ fakturaDetailsRow.MIESIAC = (short)subscriptionDetail.Month; //TODO: Add Title to Subscription schema - //fakturaDetailsRow.TYTUL = subscriptionDetail; - //TODO: Nazwa uslugi dla reklamy i abonamentu - fakturaDetailsRow.NAZWA_USLUGI = subscriptionDetail.ProductId + " | " + subscriptionDetail.Id; + fakturaDetailsRow.TYTUL = (short)subscription.TitleId; + fakturaDetailsRow.NAZWA_USLUGI = subscription.ShortName + " | " + subscriptionDetail.Id; fakturaDetailsRow.reklamaId = subscription.Id; fakturaDetailsRow.CENA_JEDN = subscription.Price; @@ -545,6 +543,4 @@ bruttoWaluta += subscriptionDetail.Price; } - - } @@ -552,5 +548,5 @@ if (bruttoWaluta != 0) { - naglowekFaktury.waluta_brutto = Math.Round(Convert.ToDouble(bruttoWaluta),2); + naglowekFaktury.waluta_brutto = Math.Round(Convert.ToDouble(bruttoWaluta), 2); naglowekFaktury.EndEdit(); } @@ -629,5 +625,5 @@ if (reklama.wyroznienie) { - emisja.netto = Math.Round(Convert.ToDecimal(1 + reklama.wyroznienie_procent) * emisja.netto,2); + emisja.netto = Math.Round(Convert.ToDecimal(1 + reklama.wyroznienie_procent) * emisja.netto, 2); } } @@ -635,6 +631,6 @@ { decimal temp = Math.Round( - Convert.ToDecimal(reklama.Brutto_Euro * naglowekFaktury.waluta_kurs / naglowekFaktury.waluta_przelicznik),2); - emisja.netto = Convert.ToDecimal(temp /reklama.KROTNOŒÆ); + Convert.ToDecimal(reklama.Brutto_Euro * naglowekFaktury.waluta_kurs / naglowekFaktury.waluta_przelicznik), 2); + emisja.netto = Convert.ToDecimal(temp / reklama.KROTNOŒÆ); } @@ -677,5 +673,5 @@ SLOWNIKDataSet.AGENCJERow agencja = (SLOWNIKDataSet.AGENCJERow)agencjeTableAdapter.GetDataByKodAgenta(zamowienie.kodAgenta).Rows[0]; naglowekFaktury.ID_SPRZEDAWCY = agencja.Id_agencji; - + //Set EKSPORT to true to avoid to export this invoice to SoftLab FK accounting system if (naglowekFaktury.ID_SPRZEDAWCY == 4 || naglowekFaktury.ID_SPRZEDAWCY == 6) @@ -693,8 +689,8 @@ naglowekFaktury.NABYWCA_ADRES = klientRow.Adres_Fkatura; naglowekFaktury.NABYWCA_NIP = klientRow.Nip; - naglowekFaktury.opis = "Faktura za reklamy zgodnie z zamówieniem: " - + klientRow.kodKlienta + - "/" + zamowienie.nrZamowienia + - "/" + zamowienie.kodAgenta + + naglowekFaktury.opis = "Faktura za reklamy zgodnie z zamówieniem: " + + klientRow.kodKlienta + + "/" + zamowienie.nrZamowienia + + "/" + zamowienie.kodAgenta + "/" + zamowienie.rokZamowienia; @@ -841,5 +837,5 @@ DataRowView row = (DataRowView)fAKTURYBindingSource.Current; REKLAMADataSet.FAKTURYRow faktura = (REKLAMADataSet.FAKTURYRow)row.Row; - + if (Convert.ToBoolean(faktura.KOREKTA)) { @@ -853,5 +849,5 @@ { MessageBox.Show("Istnieje ju¿ faktura korekta"); - // return; + // return; } @@ -866,5 +862,5 @@ naglowekKorekty.idFakturyKorekta = faktura.ID_FK_KOR; } - + SqlConnection conn = new SqlConnection(ConnString.getConnString().Value); @@ -1009,5 +1005,5 @@ REKLAMADataSet.REKLAMARow reklama = (REKLAMADataSet.REKLAMARow)em.GetParentRow("REKLAMA_UKAZE_SIE_W_NR"); - + fakturaDetailsRow.ROK = Convert.ToInt16(dataWydania.rok); fakturaDetailsRow.MIESIAC = Convert.ToInt16(dataWydania.ms); @@ -1072,5 +1068,5 @@ if (brutto_waluta != 0) { - naglowekFaktury.waluta_brutto = Math.Round(Convert.ToDouble(brutto_waluta),2); + naglowekFaktury.waluta_brutto = Math.Round(Convert.ToDouble(brutto_waluta), 2); naglowekFaktury.EndEdit(); } @@ -1131,5 +1127,5 @@ if (rEKLAMADataGridView.SelectedRows.Count <= 0) return; - IProduct product = (IProduct) rEKLAMADataGridView.SelectedRows[0].DataBoundItem; + IProduct product = (IProduct)rEKLAMADataGridView.SelectedRows[0].DataBoundItem; if (product.ProductType != ProductType.Advertisment) return; @@ -1170,6 +1166,6 @@ if (zamowieniaBindingSource.Current == null) return; - DataRowView z = (DataRowView) zamowieniaBindingSource.Current; - REKLAMADataSet.zamowieniaRow zamowienie = (REKLAMADataSet.zamowieniaRow) z.Row; + DataRowView z = (DataRowView)zamowieniaBindingSource.Current; + REKLAMADataSet.zamowieniaRow zamowienie = (REKLAMADataSet.zamowieniaRow)z.Row; BindProductsWithOrders(zamowienie.idZamowienia); @@ -1242,23 +1238,23 @@ int idZam = korekta.idZamowienia; - int i = fAKTURYBindingSource.Find("ID_FK_KOR",idKorekty); - + int i = fAKTURYBindingSource.Find("ID_FK_KOR", idKorekty); + REKLAMADataSet.FAKTURYRow korygowanaFaktura = (REKLAMADataSet.FAKTURYRow) ((DataRowView)fAKTURYBindingSource.List[i]).Row; - int j = fAKTURYBindingSource.Find("ID_FAKTURY",idKorygowanejFaktury); - - if (j > -1 && i!= j) - { - REKLAMADataSet.FAKTURYRow poprzedniaKorekta = (REKLAMADataSet.FAKTURYRow) - ((DataRowView)fAKTURYBindingSource.List[j]).Row; - - korygowanaFaktura.ID_FK_KOR = poprzedniaKorekta.ID_FAKTURY; - } - else - { - korygowanaFaktura.SetID_FK_KORNull(); - } - + int j = fAKTURYBindingSource.Find("ID_FAKTURY", idKorygowanejFaktury); + + if (j > -1 && i != j) + { + REKLAMADataSet.FAKTURYRow poprzedniaKorekta = (REKLAMADataSet.FAKTURYRow) + ((DataRowView)fAKTURYBindingSource.List[j]).Row; + + korygowanaFaktura.ID_FK_KOR = poprzedniaKorekta.ID_FAKTURY; + } + else + { + korygowanaFaktura.SetID_FK_KORNull(); + } + fAKTURYBindingSource.EndEdit(); @@ -1321,5 +1317,5 @@ REKLAMADataSet.zamowieniaRow zamowienie = (REKLAMADataSet.zamowieniaRow)zam.Row; - + if (zmienReklamyOrazZamowienie) { @@ -1336,5 +1332,5 @@ zamowienie.SetdataOstatniejZafakturowanejEmisjiNull(); zamowienie.EndEdit(); - + SqlConnection conn = new SqlConnection(ConnString.getConnString().Value); @@ -1386,6 +1382,6 @@ Cursor = Cursors.WaitCursor; - DataRowView z = (DataRowView) zamowieniaBindingSource.Current; - REKLAMADataSet.zamowieniaRow zamowienie = (REKLAMADataSet.zamowieniaRow) z.Row; + DataRowView z = (DataRowView)zamowieniaBindingSource.Current; + REKLAMADataSet.zamowieniaRow zamowienie = (REKLAMADataSet.zamowieniaRow)z.Row; InitIssueTables(zamowienie); @@ -1434,9 +1430,11 @@ ProductRepository productRepository = new ProductRepository(ConnString.getConnString().Value); List subscriptions = products.FindAll(delegate(IProduct p) { return p.ProductType == ProductType.Subscription; }); + + if (subscriptions.Count == 0) return new List(); + DateTime date = productRepository.FindFirstDateForInvoice(subscriptions); List subscriptionsToInvoice = productRepository.FindProductsToInvoice(subscriptions, InvoicingType.ThreeMonths, date); return subscriptionsToInvoice; } - } } Index: branches/Abonament/BazaReklam/raporty.xsd =================================================================== --- branches/Abonament/BazaReklam/raporty.xsd (revision 648) +++ branches/Abonament/BazaReklam/raporty.xsd (revision 706) @@ -290,9 +290,9 @@ SELECT FAKTURA_DETAILS.JM, SUM(FAKTURA_DETAILS.ILOSC) AS ILOSC, SUM(FAKTURA_DETAILS.NETTO) AS NETTO, FAKTURA_DETAILS.S_VAT, SUM(FAKTURA_DETAILS.BRUTTO) AS BRUTTO, SUM(FAKTURA_DETAILS.VAT) AS VAT, [LISTA TYTUŁÓW].SYMB, FAKTURA_DETAILS.NR_WYDANIA, - FAKTURA_DETAILS.NAZWA_USLUGI, FAKTURA_DETAILS.MIESIAC, FAKTURA_DETAILS.ROK, FAKTURA_DETAILS.ReklamaId + FAKTURA_DETAILS.NAZWA_USLUGI, FAKTURA_DETAILS.MIESIAC, FAKTURA_DETAILS.ROK, FAKTURA_DETAILS.ReklamaId, FAKTURA_DETAILS.Typ FROM FAKTURA_DETAILS LEFT OUTER JOIN [LISTA TYTUŁÓW] ON FAKTURA_DETAILS.TYTUL = [LISTA TYTUŁÓW ].id GROUP BY FAKTURA_DETAILS.JM, FAKTURA_DETAILS.S_VAT, FAKTURA_DETAILS.ID_FAKTURY, [LISTA TYTUŁÓW].SYMB, FAKTURA_DETAILS.NR_WYDANIA, - FAKTURA_DETAILS.NAZWA_USLUGI, FAKTURA_DETAILS.MIESIAC, FAKTURA_DETAILS.ROK, FAKTURA_DETAILS.ReklamaId + FAKTURA_DETAILS.NAZWA_USLUGI, FAKTURA_DETAILS.MIESIAC, FAKTURA_DETAILS.ROK, FAKTURA_DETAILS.ReklamaId, FAKTURA_DETAILS.Typ HAVING (FAKTURA_DETAILS.ID_FAKTURY = @idFaktury) @@ -317,4 +317,5 @@ + @@ -443,4 +444,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -532,4 +746,5 @@ + @@ -581,5 +796,5 @@ - + @@ -588,219 +803,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -813,4 +814,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -889,4 +1108,11 @@ + + + + + + + @@ -925,4 +1151,6 @@ + + @@ -932,4 +1160,14 @@ + + + + + + + + + + @@ -939,6 +1177,13 @@ - - + + + + + + + + + @@ -947,26 +1192,7 @@ - - - - - - - - - - - - - - - - - - - - - - + + + @@ -975,229 +1201,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1206,5 +1208,5 @@ - + @@ -1213,5 +1215,5 @@ - + @@ -1220,13 +1222,13 @@ - - - - - - - - - + + + + + + + + + @@ -1235,47 +1237,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1284,5 +1286,5 @@ - + Index: branches/Abonament/BazaReklam/raporty.xss =================================================================== --- branches/Abonament/BazaReklam/raporty.xss (revision 648) +++ branches/Abonament/BazaReklam/raporty.xss (revision 706) @@ -11,8 +11,8 @@ - + - + Index: branches/Abonament/BazaReklam/Classes/Interfaces/IProduct.cs =================================================================== --- branches/Abonament/BazaReklam/Classes/Interfaces/IProduct.cs (revision 705) +++ branches/Abonament/BazaReklam/Classes/Interfaces/IProduct.cs (revision 706) @@ -8,4 +8,5 @@ { int Id { get; set; } + int TitleId { get; set; } ProductType ProductType { get; set; } string Type { get; set; } Index: branches/Abonament/BazaReklam/Classes/Repositories/CustomerRepository.cs =================================================================== --- branches/Abonament/BazaReklam/Classes/Repositories/CustomerRepository.cs (revision 705) +++ branches/Abonament/BazaReklam/Classes/Repositories/CustomerRepository.cs (revision 706) @@ -41,6 +41,6 @@ public override void Save(Customer customer) { - const string insertSubscriptionQuery = "INSERT INTO Subscription(Guid, CustomerId, SubscriptionTypeId, SubscriptionItems, BasePrice, TotalPrice, Discount, Currency, OrderId, CreatedOn, CreatedBy, UpdatedOn, UpdatedBy, StartDate) " - + "VALUES(@guid, @customerId, @subscriptionTypeId, @subscriptionItems, @basePrice, @totalPrice, @discount, @currency, @orderId, @createdOn, @createdBy, @updatedOn, @updatedBy, @startDate) " + const string insertSubscriptionQuery = "INSERT INTO Subscription(Guid, CustomerId, SubscriptionTypeId, SubscriptionItems, BasePrice, TotalPrice, Discount, Vat, Currency, OrderId, CreatedOn, CreatedBy, UpdatedOn, UpdatedBy, StartDate) " + + "VALUES(@guid, @customerId, @subscriptionTypeId, @subscriptionItems, @basePrice, @totalPrice, @discount, @vat, @currency, @orderId, @createdOn, @createdBy, @updatedOn, @updatedBy, @startDate) " + "SELECT SCOPE_IDENTITY();"; @@ -67,4 +67,5 @@ _command.Parameters.AddWithValue("@totalPrice", subscription.TotalPrice); _command.Parameters.AddWithValue("@discount", subscription.Discount); + _command.Parameters.AddWithValue("@vat", subscription.Vat); _command.Parameters.AddWithValue("@currency", subscription.Currency); if (subscription.OrderId > 0) @@ -113,5 +114,5 @@ public List FindSubscriptions(int customerId) { - string query = "SELECT Id, Guid, CustomerId, SubscriptionTypeId, SubscriptionItems, BasePrice, Discount, TotalPrice, Currency, OrderId, CreatedOn, CreatedBy, UpdatedOn, UpdatedBy, StartDate FROM Subscription WHERE CustomerId={0} ORDER BY UpdatedOn DESC"; + string query = "SELECT Id, Guid, CustomerId, SubscriptionTypeId, SubscriptionItems, BasePrice, Discount, Vat, TotalPrice, Currency, OrderId, CreatedOn, CreatedBy, UpdatedOn, UpdatedBy, StartDate FROM Subscription WHERE CustomerId={0} ORDER BY UpdatedOn DESC"; query = string.Format(query, customerId); @@ -135,13 +136,14 @@ subscription.BasePrice = _reader.GetDecimal(5); subscription.Discount = _reader.GetDecimal(6); - subscription.TotalPrice = _reader.GetDecimal(7); - subscription.Currency = _reader.GetString(8); - if (_reader[9] != DBNull.Value) - subscription.OrderId = _reader.GetInt32(9); - subscription.CreatedOn = _reader.GetDateTime(10); - subscription.CreatedBy = _reader.GetInt32(11); - subscription.UpdatedOn = _reader.GetDateTime(12); - subscription.UpdatedBy = _reader.GetInt32(13); - subscription.StartDate = _reader.GetDateTime(14); + subscription.Vat = _reader.GetDecimal(7); + subscription.TotalPrice = _reader.GetDecimal(8); + subscription.Currency = _reader.GetString(9); + if (_reader[10] != DBNull.Value) + subscription.OrderId = _reader.GetInt32(10); + subscription.CreatedOn = _reader.GetDateTime(11); + subscription.CreatedBy = _reader.GetInt32(12); + subscription.UpdatedOn = _reader.GetDateTime(13); + subscription.UpdatedBy = _reader.GetInt32(14); + subscription.StartDate = _reader.GetDateTime(15); subscriptions.Add(subscription); @@ -178,17 +180,16 @@ Product product = new Product(); product.Id = _reader.GetInt32(0); - product.Type = _reader.GetString(1); - product.ProductType = (ProductType)_reader.GetInt32(2); - product.ShortName = _reader.GetString(3); - if (_reader[4] != DBNull.Value) - product.StartDate = _reader.GetDateTime(4); - else - Debug.WriteLine(product.ShortName); - product.Price = _reader.GetDecimal(5); - product.TotalPrice = _reader.GetDecimal(6); - product.Vat = _reader.GetDecimal(7); - product.Currency = _reader.GetString(8); - product.IsActivated = _reader.GetBoolean(9); - product.HasInvoice = _reader.GetBoolean(10); + product.TitleId = _reader.GetInt32(1); + product.Type = _reader.GetString(2); + product.ProductType = (ProductType)_reader.GetInt32(3); + product.ShortName = _reader.GetString(4); + if (_reader[5] != DBNull.Value) + product.StartDate = _reader.GetDateTime(5); + product.Price = _reader.GetDecimal(6); + product.TotalPrice = _reader.GetDecimal(7); + product.Vat = _reader.GetDecimal(8); + product.Currency = _reader.GetString(9); + product.IsActivated = _reader.GetBoolean(10); + product.HasInvoice = _reader.GetBoolean(11); products.Add(product); @@ -225,16 +226,17 @@ Product product = new Product(); product.Id = _reader.GetInt32(0); - product.Type = _reader.GetString(1); - product.ProductType = (ProductType) _reader.GetInt32(2); - product.ShortName = _reader.GetString(3); - product.StartDate = _reader.GetDateTime(4); - product.Price = _reader.GetDecimal(5); - product.TotalPrice = _reader.GetDecimal(6); - product.Vat = _reader.GetDecimal(7); - product.Currency = _reader.GetString(8); - product.IsActivated = _reader.GetBoolean(9); - if (_reader[10] != DBNull.Value) - product.OrderId = _reader.GetInt32(10); - product.HasInvoice = _reader.GetBoolean(11); + product.TitleId = _reader.GetInt32(1); + product.Type = _reader.GetString(2); + product.ProductType = (ProductType) _reader.GetInt32(3); + product.ShortName = _reader.GetString(4); + product.StartDate = _reader.GetDateTime(5); + product.Price = _reader.GetDecimal(6); + product.TotalPrice = _reader.GetDecimal(7); + product.Vat = _reader.GetDecimal(8); + product.Currency = _reader.GetString(9); + product.IsActivated = _reader.GetBoolean(10); + if (_reader[11] != DBNull.Value) + product.OrderId = _reader.GetInt32(11); + product.HasInvoice = _reader.GetBoolean(12); products.Add(product); Index: branches/Abonament/BazaReklam/Classes/Repositories/SubscriptionTypeRepository.cs =================================================================== --- branches/Abonament/BazaReklam/Classes/Repositories/SubscriptionTypeRepository.cs (revision 703) +++ branches/Abonament/BazaReklam/Classes/Repositories/SubscriptionTypeRepository.cs (revision 706) @@ -14,5 +14,5 @@ public override List FindAll() { - const string query = "SELECT Id, Name, PricePln, PriceEur FROM dbo.SubscriptionType"; + const string query = "SELECT Id, TitleId, Name, PricePln, PriceEur FROM dbo.SubscriptionType"; List subscriptionTypes = new List(); @@ -29,7 +29,8 @@ { subscriptionTypes.Add(new SubscriptionType(_reader.GetInt32(0), - _reader.GetString(1), - _reader.GetDecimal(2), - _reader.GetDecimal(3))); + _reader.GetInt32(1), + _reader.GetString(2), + _reader.GetDecimal(3), + _reader.GetDecimal(4))); } } Index: branches/Abonament/BazaReklam/Classes/Model/Product.cs =================================================================== --- branches/Abonament/BazaReklam/Classes/Model/Product.cs (revision 705) +++ branches/Abonament/BazaReklam/Classes/Model/Product.cs (revision 706) @@ -9,4 +9,5 @@ { private int _id; + private int _titleId; private ProductType _productType; private string _type; @@ -26,4 +27,10 @@ get { return _id; } set { _id = value; } + } + + public int TitleId + { + get { return _titleId; } + set { _titleId = value; } } Index: branches/Abonament/BazaReklam/Classes/Model/Subscription.cs =================================================================== --- branches/Abonament/BazaReklam/Classes/Model/Subscription.cs (revision 703) +++ branches/Abonament/BazaReklam/Classes/Model/Subscription.cs (revision 706) @@ -9,4 +9,5 @@ private Guid _guid; private int _customerId; + private int _titleId; private int _subscriptionTypeId; private int _subscriptionItems; @@ -14,4 +15,5 @@ private decimal _totalPrice; private decimal _discount; + private decimal _vat; private string _currency; private DateTime _startDate; @@ -33,7 +35,8 @@ } - public Subscription(int id, Guid guid, int customerId, int subscriptionTypeId, int subscriptionItems, decimal basePrice, decimal totalPrice, decimal discount, string currency, int orderId, DateTime createdOn, int createdBy, DateTime updatedOn, int updatedBy, DateTime startDate) + public Subscription(int id, Guid guid, int customerId, int titleId, int subscriptionTypeId, int subscriptionItems, decimal basePrice, decimal totalPrice, decimal discount, decimal vat, string currency, int orderId, DateTime createdOn, int createdBy, DateTime updatedOn, int updatedBy, DateTime startDate) { _id = id; + _titleId = titleId; _startDate = startDate; _updatedBy = updatedBy; @@ -45,4 +48,5 @@ _basePrice = basePrice; _totalPrice = totalPrice; + _vat = vat; _discount = discount; _subscriptionItems = subscriptionItems; @@ -56,4 +60,10 @@ get { return _id; } //set { _id = value; } + } + + public int TitleId + { + get { return _titleId; } + set { _titleId = value; } } @@ -92,4 +102,10 @@ get { return _discount; } set { _discount = value; } + } + + public decimal Vat + { + get { return _vat; } + set { _vat = value; } } Index: branches/Abonament/BazaReklam/Classes/Model/SubscriptionType.cs =================================================================== --- branches/Abonament/BazaReklam/Classes/Model/SubscriptionType.cs (revision 703) +++ branches/Abonament/BazaReklam/Classes/Model/SubscriptionType.cs (revision 706) @@ -4,11 +4,13 @@ { private readonly int _id; + private int _titleId; private string _name; private decimal _pricePln; private decimal _priceEur; - public SubscriptionType(int id, string name, decimal pricePln, decimal priceEur) + public SubscriptionType(int id, int titleId, string name, decimal pricePln, decimal priceEur) { _id = id; + _titleId = titleId; _priceEur = priceEur; _pricePln = pricePln; @@ -38,4 +40,10 @@ get { return _id; } } + + public int TitleId + { + get { return _titleId; } + set { _titleId = value; } + } } } Index: branches/Abonament/BazaReklam/raporty.Designer.cs =================================================================== --- branches/Abonament/BazaReklam/raporty.Designer.cs (revision 648) +++ branches/Abonament/BazaReklam/raporty.Designer.cs (revision 706) @@ -3661,4 +3661,6 @@ private global::System.Data.DataColumn columnReklamaId; + private global::System.Data.DataColumn columnTyp; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public FAKTURA_DETAILS2DataTable() { @@ -3776,4 +3778,11 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn TypColumn { + get { + return this.columnTyp; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Browsable(false)] public int Count { @@ -3804,5 +3813,5 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public FAKTURA_DETAILS2Row AddFAKTURA_DETAILS2Row(string JM, int ILOSC, decimal NETTO, double S_VAT, decimal BRUTTO, decimal VAT, string SYMB, short NR_WYDANIA, string NAZWA_USLUGI, short MIESIAC, int ROK, int ReklamaId) { + public FAKTURA_DETAILS2Row AddFAKTURA_DETAILS2Row(string JM, int ILOSC, decimal NETTO, double S_VAT, decimal BRUTTO, decimal VAT, string SYMB, short NR_WYDANIA, string NAZWA_USLUGI, short MIESIAC, int ROK, int ReklamaId, short Typ) { FAKTURA_DETAILS2Row rowFAKTURA_DETAILS2Row = ((FAKTURA_DETAILS2Row)(this.NewRow())); object[] columnValuesArray = new object[] { @@ -3818,5 +3827,6 @@ MIESIAC, ROK, - ReklamaId}; + ReklamaId, + Typ}; rowFAKTURA_DETAILS2Row.ItemArray = columnValuesArray; this.Rows.Add(rowFAKTURA_DETAILS2Row); @@ -3855,4 +3865,5 @@ this.columnROK = base.Columns["ROK"]; this.columnReklamaId = base.Columns["ReklamaId"]; + this.columnTyp = base.Columns["Typ"]; } @@ -3883,4 +3894,6 @@ this.columnReklamaId = new global::System.Data.DataColumn("ReklamaId", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnReklamaId); + this.columnTyp = new global::System.Data.DataColumn("Typ", typeof(short), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTyp); this.columnJM.MaxLength = 5; this.columnILOSC.ReadOnly = true; @@ -9479,4 +9492,19 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public short Typ { + get { + try { + return ((short)(this[this.tableFAKTURA_DETAILS2.TypColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'Typ\' in table \'FAKTURA_DETAILS2\' is DBNull.", e); + } + } + set { + this[this.tableFAKTURA_DETAILS2.TypColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public bool IsJMNull() { return this.IsNull(this.tableFAKTURA_DETAILS2.JMColumn); @@ -9596,4 +9624,14 @@ public void SetReklamaIdNull() { this[this.tableFAKTURA_DETAILS2.ReklamaIdColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsTypNull() { + return this.IsNull(this.tableFAKTURA_DETAILS2.TypColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetTypNull() { + this[this.tableFAKTURA_DETAILS2.TypColumn] = global::System.Convert.DBNull; } } @@ -12085,4 +12123,5 @@ tableMapping.ColumnMappings.Add("ROK", "ROK"); tableMapping.ColumnMappings.Add("ReklamaId", "ReklamaId"); + tableMapping.ColumnMappings.Add("Typ", "Typ"); this._adapter.TableMappings.Add(tableMapping); } @@ -12101,9 +12140,9 @@ this._commandCollection[0].CommandText = @"SELECT FAKTURA_DETAILS.JM, SUM(FAKTURA_DETAILS.ILOSC) AS ILOSC, SUM(FAKTURA_DETAILS.NETTO) AS NETTO, FAKTURA_DETAILS.S_VAT, SUM(FAKTURA_DETAILS.BRUTTO) AS BRUTTO, SUM(FAKTURA_DETAILS.VAT) AS VAT, [LISTA TYTUŁÓW].SYMB, FAKTURA_DETAILS.NR_WYDANIA, - FAKTURA_DETAILS.NAZWA_USLUGI, FAKTURA_DETAILS.MIESIAC, FAKTURA_DETAILS.ROK, FAKTURA_DETAILS.ReklamaId + FAKTURA_DETAILS.NAZWA_USLUGI, FAKTURA_DETAILS.MIESIAC, FAKTURA_DETAILS.ROK, FAKTURA_DETAILS.ReklamaId, FAKTURA_DETAILS.Typ FROM FAKTURA_DETAILS LEFT OUTER JOIN [LISTA TYTUŁÓW] ON FAKTURA_DETAILS.TYTUL = [LISTA TYTUŁÓW ].id GROUP BY FAKTURA_DETAILS.JM, FAKTURA_DETAILS.S_VAT, FAKTURA_DETAILS.ID_FAKTURY, [LISTA TYTUŁÓW].SYMB, FAKTURA_DETAILS.NR_WYDANIA, - FAKTURA_DETAILS.NAZWA_USLUGI, FAKTURA_DETAILS.MIESIAC, FAKTURA_DETAILS.ROK, FAKTURA_DETAILS.ReklamaId + FAKTURA_DETAILS.NAZWA_USLUGI, FAKTURA_DETAILS.MIESIAC, FAKTURA_DETAILS.ROK, FAKTURA_DETAILS.ReklamaId, FAKTURA_DETAILS.Typ HAVING (FAKTURA_DETAILS.ID_FAKTURY = @idFaktury)"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; Index: branches/Abonament/BazaReklam/SubscriptionForm.cs =================================================================== --- branches/Abonament/BazaReklam/SubscriptionForm.cs (revision 703) +++ branches/Abonament/BazaReklam/SubscriptionForm.cs (revision 706) @@ -41,5 +41,5 @@ - [Obsolete("This is a deprecated method - use ComboBoxHelper after merge from ReklamaReorganizacja branch")] + [Obsolete("Use ComboBoxHelper after merge from ReklamaReorganizacja branch")] static void BindComboBox(IEnumerable list, ComboBox comboBox) { @@ -59,5 +59,5 @@ cbSubscriptionType.ValueMember = "Id"; - cbSubscriptionType.Items.Insert(0, new SubscriptionType(0, "-- proszê wybraæ --", 0, 0)); + cbSubscriptionType.Items.Insert(0, new SubscriptionType(0, 0, "-- proszê wybraæ --", 0, 0)); cbSubscriptionType.SelectedIndex = 0; @@ -133,11 +133,16 @@ subscription.Guid = Guid.NewGuid(); subscription.SubscriptionTypeId = CurrentSubscriptionType.Id; + subscription.TitleId = CurrentSubscriptionType.TitleId; subscription.SubscriptionItems = (int)numSubscriptionCount.Value; subscription.BasePrice = cbCurrency.SelectedItem.ToString() == "PLN" - ? Decimal.Parse(txtPricePln.Text) - : Decimal.Parse(txtPriceEur.Text); + ? Decimal.Parse(txtPricePln.Text) + : Decimal.Parse(txtPriceEur.Text); subscription.Discount = numDiscount.Value / 100; + + subscription.Vat = subscription.Currency == "PLN" + ? (decimal) VatHelper.PL22 + : (decimal) VatHelper.EU00; subscription.TotalPrice = cbCurrency.SelectedItem.ToString() == "PLN" @@ -160,14 +165,6 @@ subscriptionDetail.PricePln = Decimal.Parse(txtPricePln.Text) * (1 - subscription.Discount); - if (subscription.Currency == "PLN") - { - subscriptionDetail.Vat = (decimal)VatHelper.PL22; - } - else - { - subscriptionDetail.Vat = (decimal)VatHelper.EU00; - } - - + subscriptionDetail.Vat = subscription.Vat; + subscription.AddSubscriptionDetail(subscriptionDetail); } Index: branches/Abonament/BazaReklam/Raporty/fakturaReversed2.rdlc =================================================================== --- branches/Abonament/BazaReklam/Raporty/fakturaReversed2.rdlc (revision 626) +++ branches/Abonament/BazaReklam/Raporty/fakturaReversed2.rdlc (revision 706) @@ -23,4 +23,11 @@ b25f001f-b804-47d3-a2d8-ca8b4ba825f1 + + SQL + + + + + d3e5e4aa-8578-4f3e-bf07-918b6c4eec29 SQL @@ -1047,4 +1054,8 @@ System.Int16 + + TYP + System.Int32 + @@ -1511,4 +1522,403 @@ 1cm + + 5 + FakturaDetails2 + + =CountDistinct(Fields!Typ.Value=1)<=0 + + true + + + =CStr(Fields!Typ.Value) + Equal + + 1 + + + + 21.5873cm + + + + + =Split(Fields!NAZWA_USLUGI.Value,"|").GetValue(0) + + +
+ + + + + 3 + + + + 9 + true + =Split(Fields!NAZWA_USLUGI.Value,"|").GetValue(0) + + + + + + + + 8 + true + =First(Fields!FAKTURY_DRUK_DETAILS_INTERNATIONALlabel_miesiac.Value, "tlumaczenia") + + + + + 0.50794cm + + + + + + + + 7 + true + =iif(Fields!S_VAT.Value<>0,"Netto (PLN)","Netto (" + First(Fields!waluta_miano.Value, "Faktura") + ")") + + + + + + + + 6 + true + =iif(Fields!S_VAT.Value<>0,"VAT (PLN)","VAT (" + First(Fields!waluta_miano.Value, "Faktura") + ")") + + + + + + + + 5 + true + =iif(Fields!S_VAT.Value<>0,"Brutto (PLN)","Brutto (" + First(Fields!waluta_miano.Value, "Faktura") + ")") + + + + + + + + 4 + true + + + + + + 0.63492cm + + +
+ + + 7.25cm +
+ + + + + + + + 3 + true + =IIf(Fields!S_VAT.Value>0,Fields!NETTO.Value,Fields!NETTO.Value/Parameters!kursWaluty.Value) + + + + + + + + 2 + true + =Fields!S_VAT.Value * Fields!NETTO.Value + + + + + + + + 1 + true + =iif(Fields!S_VAT.Value<>0,Fields!NETTO.Value * (1 + Fields!S_VAT.Value),Fields!NETTO.Value/Parameters!kursWaluty.Value) + + + + + + + + true + =Fields!MIESIAC.Value &"/" & Fields!ROK.Value + + + + + 0.50794cm + + +
+
+ + + + + 4 + + + + 10 + true + ="Specyfikacja abonamentów do faktury" & " " & First(Fields!NUMER.Value, "Faktura") & "/" & First(Fields!NUMER_ROZ.Value, "Faktura") & "/" & First(Fields!NUMER_ROK.Value, "Faktura") + + + + + 0.63492cm + + +
+ + + 2cm + + + 1.75cm + + + 2cm + + + 1.5cm + + + 11.55556cm +
0.12698cm @@ -1724,4 +2134,5 @@ =Fields!SYMB.Value + =Fields!Typ.Value @@ -1753,5 +2164,5 @@ 7 true - =RunningValue(Fields!SYMB.Value, CountDistinct, nothing) + =RunningValue(CStr(Fields!Typ.Value) + "_" + Fields!SYMB.Value, CountDistinct, nothing) @@ -1780,5 +2191,5 @@ 6 true - ="Reklama w" & " " & Fields!SYMB.Value + =IIf(Fields!Typ.Value=1, "Abonament w ", "Reklama w ") + Fields!SYMB.Value @@ -4705,4 +5116,13 @@ true true + + + =CStr(Fields!Typ.Value) + Equal + + 2 + + + 21.5873cm