Merge pull request #2 from ruialexrib/master

Teste Update

src/Globals.cs

@@ -308,10 +308,10 @@ public static List<TaxTableEntryTotal> LoadTaxEntryTotals(List<InvoiceLine> invo
                     TaxPercentage = cl.First().TaxPercentage,
                     CreditAmount = cl.Sum(c => c.CreditAmount),
                     DebitAmount = cl.Sum(d => d.DebitAmount),
-                    BalanceAmount = cl.Sum(c => c.CreditAmount) - cl.Sum(d => d.DebitAmount),
+                    TotalCredit = cl.Sum(c => c.CreditAmount) + cl.Sum(c => c.CreditTaxPayable),
                     CreditTaxPayable = cl.Sum(c => c.CreditTaxPayable),
                     DebitTaxPayable = cl.Sum(d => d.DebitTaxPayable),
-                    BalanceTaxPayable = cl.Sum(c => c.CreditTaxPayable) - cl.Sum(d => d.DebitTaxPayable)
+                    TotalDebit = cl.Sum(d => d.DebitAmount) + cl.Sum(d => d.DebitTaxPayable),
                 }).ToList();
 
             return totals;

src/Models/InvoiceLine.cs

@@ -45,20 +45,20 @@ public class InvoiceLine
         [Display(Name = "% Imposto")]
         public float TaxPercentage { get; set; }
 
-        [Display(Name = "Crédito")]
+         [Display(Name = "Débito")]
         [DataType(DataType.Currency)]
-        public float CreditAmount { get; set; }
+        public float DebitAmount { get; set; }
 
-        [Display(Name = "Débito")]
+        [Display(Name = "Imp. Deb.")]
         [DataType(DataType.Currency)]
-        public float DebitAmount { get; set; }
+        public float DebitTaxPayable { get; set; }
 
-        [Display(Name = "Imp. Créd.")]
+        [Display(Name = "Crédito")]
         [DataType(DataType.Currency)]
-        public float CreditTaxPayable { get; set; }
+        public float CreditAmount { get; set; }
 
-        [Display(Name = "Imp. Deb.")]
+        [Display(Name = "Imp. Créd.")]
         [DataType(DataType.Currency)]
-        public float DebitTaxPayable { get; set; }
+        public float CreditTaxPayable { get; set; }
     }
 }

src/Models/TaxTableEntryTotal.cs

@@ -13,28 +13,30 @@ public class TaxTableEntryTotal
         [Display(Name = "% Imposto")]
         public float TaxPercentage { get; set; }
 
-        [Display(Name = "Base Créd.")]
+        [Display(Name = "Base")]
         [DataType(DataType.Currency)]
-        public float CreditAmount { get; set; }
+        public float DebitAmount { get; set; }
 
-        [Display(Name = "Base Déb.")]
+        [Display(Name = "Imp.")]
         [DataType(DataType.Currency)]
-        public float DebitAmount { get; set; }
+        public float DebitTaxPayable { get; set; }
+
+        [Display(Name = "Total")]
+        [DataType(DataType.Currency)]
+        public float TotalDebit { get; set; }
+
 
-        [Display(Name = "Base Total")]
+        [Display(Name = "Base")]
         [DataType(DataType.Currency)]
-        public float BalanceAmount { get; set; }
+        public float CreditAmount { get; set; }
 
-        [Display(Name = "Imp. Créd.")]
+        [Display(Name = "Imp.")]
         [DataType(DataType.Currency)]
         public float CreditTaxPayable { get; set; }
 
-        [Display(Name = "Imp. Déb.")]
+        [Display(Name = "Total")]
         [DataType(DataType.Currency)]
-        public float DebitTaxPayable { get; set; }
+        public float TotalCredit { get; set; }
 
-        [Display(Name = "Imp. Total")]
-        [DataType(DataType.Currency)]
-        public float BalanceTaxPayable { get; set; }
     }
 }

src/SAFT_Reader.csproj

@@ -30,7 +30,7 @@
     <PublisherName>Rui Ribeiro</PublisherName>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>51</ApplicationRevision>
+    <ApplicationRevision>52</ApplicationRevision>
     <ApplicationVersion>1.1.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>

src/UI/MainForm.cs

@@ -87,10 +87,17 @@ private void LoadGrids()
             // format gridTotals
             SetWaitingMsg("A acabar apresentação dos dados...");
             gridTotals.Columns["TaxCode"].CellStyle.Font.Bold = true;
-            gridTotals.Columns["BalanceAmount"].CellStyle.BackColor = ColorTranslator.FromHtml(Globals.LightColumnColor);
-            gridTotals.Columns["BalanceAmount"].CellStyle.Font.Bold = true;
-            gridTotals.Columns["BalanceTaxPayable"].CellStyle.BackColor = ColorTranslator.FromHtml(Globals.DarkColumnColor);
-            gridTotals.Columns["BalanceTaxPayable"].CellStyle.Font.Bold = true;
+            gridTotals.Columns["TotalCredit"].CellStyle.BackColor = ColorTranslator.FromHtml(Globals.LightColumnColor);
+            gridTotals.Columns["TotalCredit"].CellStyle.Font.Bold = true;
+            gridTotals.Columns["TotalDebit"].CellStyle.BackColor = ColorTranslator.FromHtml(Globals.LightColumnColor);
+            gridTotals.Columns["TotalDebit"].CellStyle.Font.Bold = true;
+
+            // stacked headers
+            var stackedHeaderRow1 = new StackedHeaderRow();
+            stackedHeaderRow1.StackedColumns.Add(new StackedColumn() { ChildColumns = "TaxCode,TaxDescription,TaxPercentage", HeaderText = "Tipo de Imposto" });
+            stackedHeaderRow1.StackedColumns.Add(new StackedColumn() { ChildColumns = "DebitAmount,DebitTaxPayable,TotalDebit", HeaderText = "Débito" });
+            stackedHeaderRow1.StackedColumns.Add(new StackedColumn() { ChildColumns = "CreditAmount,CreditTaxPayable,TotalCredit", HeaderText = "Crédito" });
+            gridTotals.StackedHeaderRows.Add(stackedHeaderRow1);
 
             // format gridLines
             gridLines.Columns["TaxCode"].CellStyle.Font.Bold = true;
@@ -200,14 +207,6 @@ private void SetGridTotalsSummaries()
                 SummaryType = SummaryType.DoubleAggregate
             };
 
-            GridSummaryColumn ba = new GridSummaryColumn
-            {
-                Name = "BalanceAmount",
-                Format = "{Sum:c}",
-                MappingName = "BalanceAmount",
-                SummaryType = SummaryType.DoubleAggregate
-            };
-
             GridSummaryColumn ctp = new GridSummaryColumn
             {
                 Name = "CreditTaxPayable",
@@ -224,20 +223,30 @@ private void SetGridTotalsSummaries()
                 SummaryType = SummaryType.DoubleAggregate
             };
 
-            GridSummaryColumn btp = new GridSummaryColumn
+            GridSummaryColumn tc = new GridSummaryColumn
             {
-                Name = "BalanceTaxPayable",
+                Name = "TotalCredit",
                 Format = "{Sum:c}",
-                MappingName = "BalanceTaxPayable",
+                MappingName = "TotalCredit",
                 SummaryType = SummaryType.DoubleAggregate
             };
 
+            GridSummaryColumn td = new GridSummaryColumn
+            {
+                Name = "TotalDebit",
+                Format = "{Sum:c}",
+                MappingName = "TotalDebit",
+                SummaryType = SummaryType.DoubleAggregate
+            };
+
+
             sum.SummaryColumns.Add(ca);
             sum.SummaryColumns.Add(da);
-            sum.SummaryColumns.Add(ba);
+            sum.SummaryColumns.Add(td);
+            sum.SummaryColumns.Add(tc);
             sum.SummaryColumns.Add(ctp);
             sum.SummaryColumns.Add(dtp);
-            sum.SummaryColumns.Add(btp);
+
 
             this.gridTotals.TableSummaryRows.Add(sum);
         }