Zbiór zmian 262

Data:

2009-01-28 17:28:37 (17 years ago)

Autor:

marek

Opis:

fixes #67 - wywalono zaokraglanie na poziomie tworzenia wierszy w tabeli Faktura_Details

Lokalizacja:

trunk

Pliki:

• BazaReklam/FacturesForm.Designer.cs (zmodyfikowane) (9 diffs)
• BazaReklam/FacturesFormNEW.cs (zmodyfikowane) (4 diffs)
• BazaReklam/ZamowieniaForm.cs (zmodyfikowane) (3 diffs)
• SQL/Views/VIEW_ZESTAWIENIE_FAKTUR_NOWE.txt (zmodyfikowane) (3 diffs)

trunk/BazaReklam/FacturesForm.Designer.cs

@@ -49 +49 @@
             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();
             this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components);
             this.zestawienieFakturBindingSource = new System.Windows.Forms.BindingSource(this.components);
@@ -111 +112 @@
             this.vATDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.bRUTTODataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.sumazaplatDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataWplaty = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -567 +569 @@
             this.vATDataGridViewTextBoxColumn,
             this.bRUTTODataGridViewTextBoxColumn,
+            this.dataGridViewTextBoxColumn2,
             this.sumazaplatDataGridViewTextBoxColumn,
             this.dataWplaty,
@@ -722 +725 @@
             this.bRUTTODataGridViewTextBoxColumn.Width = 60;
             // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "waluta_brutto";
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle14.Format = "N2";
+            dataGridViewCellStyle14.NullValue = null;
+            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle14;
+            this.dataGridViewTextBoxColumn2.HeaderText = "Waluta brutto";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.Width = 88;
+            // 
             // sumazaplatDataGridViewTextBoxColumn
             // 
             this.sumazaplatDataGridViewTextBoxColumn.DataPropertyName = "suma_zaplat";
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle14.Format = "C2";
-            this.sumazaplatDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle15.Format = "C2";
+            this.sumazaplatDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle15;
             this.sumazaplatDataGridViewTextBoxColumn.HeaderText = "Zap³ata";
             this.sumazaplatDataGridViewTextBoxColumn.Name = "sumazaplatDataGridViewTextBoxColumn";
@@ -736 +750 @@
             this.dataWplaty.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.dataWplaty.DataPropertyName = "dataWplaty";
-            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle15.Format = "d";
-            dataGridViewCellStyle15.NullValue = null;
-            this.dataWplaty.DefaultCellStyle = dataGridViewCellStyle15;
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle16.Format = "d";
+            dataGridViewCellStyle16.NullValue = null;
+            this.dataWplaty.DefaultCellStyle = dataGridViewCellStyle16;
             this.dataWplaty.HeaderText = "Data wp³aty";
             this.dataWplaty.Name = "dataWplaty";
@@ -747 +761 @@
             this.wplata_brutto.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.wplata_brutto.DataPropertyName = "wplata_brutto";
-            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle16.Format = "C";
-            this.wplata_brutto.DefaultCellStyle = dataGridViewCellStyle16;
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle17.Format = "C";
+            this.wplata_brutto.DefaultCellStyle = dataGridViewCellStyle17;
             this.wplata_brutto.HeaderText = "Wp³ata";
             this.wplata_brutto.Name = "wplata_brutto";
@@ -757 +771 @@
             this.waluta_brutto.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.waluta_brutto.DataPropertyName = "wplata_waluta_brutto";
-            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle17.Format = "N2";
-            dataGridViewCellStyle17.NullValue = null;
-            this.waluta_brutto.DefaultCellStyle = dataGridViewCellStyle17;
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle18.Format = "N2";
+            dataGridViewCellStyle18.NullValue = null;
+            this.waluta_brutto.DefaultCellStyle = dataGridViewCellStyle18;
             this.waluta_brutto.HeaderText = "Wp³ata w walucie";
             this.waluta_brutto.Name = "waluta_brutto";
@@ -768 +782 @@
             this.wplata_waluta_miano.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.wplata_waluta_miano.DataPropertyName = "wplata_waluta_miano";
-            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.wplata_waluta_miano.DefaultCellStyle = dataGridViewCellStyle18;
+            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.wplata_waluta_miano.DefaultCellStyle = dataGridViewCellStyle19;
             this.wplata_waluta_miano.HeaderText = "Waluta";
             this.wplata_waluta_miano.Name = "wplata_waluta_miano";
@@ -868 +882 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn vATDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn bRUTTODataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
         private System.Windows.Forms.DataGridViewTextBoxColumn sumazaplatDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataWplaty;

trunk/BazaReklam/FacturesFormNEW.cs

@@ -10 +10 @@
     public partial class FacturesFormNEW : Form
     {
-        string query = "SELECT top 2000 * from VIEW_ZESTAWIENIE_FAKTUR_NOWE ";
+        private const string query = "SELECT top 2000 * from VIEW_ZESTAWIENIE_FAKTUR_NOWE ";
 
         private static FacturesFormNEW fakturesForm;
-        private SqlCommand command;
-        private SqlDataAdapter sqlDataAdapter;
+        private readonly SqlCommand command;
+        private readonly SqlDataAdapter sqlDataAdapter;
 
         private bool commandExecuted;
@@ -26 +26 @@
         }
 
-        private FacturesFormNEW(MDIBazaReklam parent)
+        private FacturesFormNEW(Form parent)
         {
             InitializeComponent();
@@ -72 +72 @@
         private void generateNodes()
         {
-            TreeNode node;
-
-            node = new TreeNode("Wp³aty - ksiêgowoœæ");
+            TreeNode node = new TreeNode("Wp³aty - ksiêgowoœæ");
             node.Name = "WplatyKsiegowosc";
             treeView1.Nodes.Add(node);
@@ -555 +553 @@
                 DataRowView row = (DataRowView)VIEW_ZESTAWIENIE_FAKTUR_NOWEBindingSource.Current;
                 REKLAMADataSet.VIEW_ZESTAWIENIE_FAKTUR_NOWERow f = (REKLAMADataSet.VIEW_ZESTAWIENIE_FAKTUR_NOWERow)row.Row;
-                
-                PaymentForm2 pf2;
-
-                if (f.IsidWplatyNull())
-                {
-                    pf2 = new PaymentForm2(0,f.ID_FAKTURY);
-                }
-                else
-                {
-                    pf2 = new PaymentForm2(f.idWplaty, f.ID_FAKTURY);
-                }
+
+                PaymentForm2 pf2 = f.IsidWplatyNull() ? new PaymentForm2(0,f.ID_FAKTURY) : new PaymentForm2(f.idWplaty, f.ID_FAKTURY);
 
                 if (pf2.ShowDialog() == DialogResult.OK)

trunk/BazaReklam/ZamowieniaForm.cs

@@ -453 +453 @@
                 if (naglowekFaktury.Iswaluta_mianoNull() && klient.Country.ToUpper() == "POLSKA")
                 {
-                    fakturaDetailsRow.UPUST_NETTO =
-                        Math.Round(Convert.ToDecimal(reklama.RABAT)*fakturaDetailsRow.CENA_JEDN, 2);
+                    fakturaDetailsRow.UPUST_NETTO = Convert.ToDecimal(reklama.RABAT) * fakturaDetailsRow.CENA_JEDN;
                     fakturaDetailsRow.UPUST_PR = reklama.RABAT;
-                    decimal netto = (1 - Convert.ToDecimal(reklama.RABAT))*fakturaDetailsRow.CENA_JEDN;
+                    decimal netto = (1 - Convert.ToDecimal(reklama.RABAT)) * fakturaDetailsRow.CENA_JEDN;
 
                     if (reklama.wyroznienie)
-                    {
-                        netto = Math.Round(Convert.ToDecimal(1 + reklama.wyroznienie_procent)*netto, 2);
-                    }
-
-                    fakturaDetailsRow.NETTO = Math.Round(netto, 2);
+                        netto = Convert.ToDecimal(1 + reklama.wyroznienie_procent) * netto;
+
+                    fakturaDetailsRow.NETTO = netto;
                     fakturaDetailsRow.S_VAT = reklama.VAT;
                     decimal VAT = Convert.ToDecimal(reklama.VAT);
-                    fakturaDetailsRow.VAT = Convert.ToDecimal(Math.Round(VAT*netto, 2));
-                    fakturaDetailsRow.BRUTTO = Convert.ToDecimal(Math.Round((1 + VAT) * netto, 2));
+                    fakturaDetailsRow.VAT = Convert.ToDecimal(VAT * netto);
+                    fakturaDetailsRow.BRUTTO = Convert.ToDecimal((1 + VAT) * netto);
                 }
                 else if(naglowekFaktury.Iswaluta_mianoNull() && klient.Country.ToUpper() != "POLSKA")
@@ -474 +471 @@
                     decimal netto = (1 - Convert.ToDecimal(reklama.RABAT)) * fakturaDetailsRow.CENA_JEDN;
                     if (reklama.wyroznienie)
-                    {
-                        netto = Math.Round(Convert.ToDecimal(1 + reklama.wyroznienie_procent) * netto, 2);
-                    }
-                    fakturaDetailsRow.NETTO = Math.Round(netto, 2);
+                        netto = Convert.ToDecimal(1 + reklama.wyroznienie_procent) * netto;
+                    fakturaDetailsRow.NETTO = netto;
                     fakturaDetailsRow.S_VAT = reklama.VAT;
-                    fakturaDetailsRow.BRUTTO = Convert.ToDecimal(Math.Round((1 + VAT) * netto, 2));
+                    fakturaDetailsRow.BRUTTO = Convert.ToDecimal((1 + VAT) * netto);
                     
                     decimal brutto = fakturaDetailsRow.BRUTTO;
 
-                    fakturaDetailsRow.VAT = Convert.ToDecimal(Math.Round(VAT * brutto / (1 + VAT), 2));
-
-                    fakturaDetailsRow.UPUST_PR = Math.Round(reklama.RABAT, 2);
+                    fakturaDetailsRow.VAT = Convert.ToDecimal(VAT * brutto / (1 + VAT));
+
+                    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 = netto/(Convert.ToDecimal(reklama.RABAT) - netto);
                     else
-                    {
                         fakturaDetailsRow.UPUST_NETTO = 0;
-                    }
 
                     fakturaDetailsRow.CENA_JEDN = Convert.ToDecimal(netto + fakturaDetailsRow.UPUST_NETTO);
@@ -504 +495 @@
                     decimal VAT = Convert.ToDecimal(reklama.VAT);
                     decimal brutto = fakturaDetailsRow.BRUTTO;
-                    fakturaDetailsRow.VAT = Convert.ToDecimal(Math.Round(VAT * brutto / (1 + VAT), 2));
+                    fakturaDetailsRow.VAT = Convert.ToDecimal(VAT * brutto / (1 + VAT));
                     decimal netto = brutto - fakturaDetailsRow.VAT;
-                    fakturaDetailsRow.NETTO = Math.Round(netto, 2);
-
-                    fakturaDetailsRow.UPUST_PR = Math.Round(reklama.RABAT, 2);
+                    fakturaDetailsRow.NETTO = netto;
+
+                    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 = netto / Convert.ToDecimal(reklama.RABAT) - netto;
                     }
                     else

trunk/SQL/Views/VIEW_ZESTAWIENIE_FAKTUR_NOWE.txt

@@ -20 +20 @@
 -- jesli zostala wystawiona faktura korekta, wyswietl wartosc brutto po korekcie
 BRUTTO = CASE 
-                        WHEN (T.KorektaBrutto IS NULL) THEN T.BRUTTO
-                        ELSE T.KorektaBrutto
+                        WHEN (T.KorektaBrutto IS NULL) THEN T.NETTO * (1 + T.S_VAT)
+                        ELSE T.KorektaNetto * (1 + T.KorektaVat)
                  END,
 T.suma_zaplat, 
@@ -60 +60 @@
                                               dbo.FAKTURY.ID_FK_KOR, Wplaty.brutto as wplata_brutto, Wplaty.waluta_brutto as wplata_waluta_brutto,
                                                                                           dbo.FAKTURY.SPOSOB_ZAPLATY AS SposobZaplaty,
+                                                                                          COALESCE(Korekta.S_VAT, NULL) AS KorektaVat, 
                                                                                           COALESCE(Korekta.Netto, NULL) AS KorektaNetto,
                                                                                           COALESCE(Korekta.Brutto, NULL) AS KorektaBrutto,
@@ -80 +81 @@
                                               dbo.FAKTURY.ID_FK_KOR, Wplaty.brutto, Wplaty.waluta_brutto,
                                                                                           dbo.FAKTURY.SPOSOB_ZAPLATY,
-                                                                                          Korekta.Netto, Korekta.Brutto, Korekta.waluta_brutto
+                                                                                          Korekta.S_VAT, Korekta.Netto, Korekta.Brutto, Korekta.waluta_brutto
                        ) AS T LEFT OUTER JOIN
                           (SELECT     idFaktury, round(SUM(netto),2) AS sumaNettoZEmisji, count(id) as ilEmisji