SUmy kontrolne plus zakup

JPK_VDEK/Core/JPKSumyKontrola.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JPK_VDEK.Core
+{
+    public class JPKSumyKontrola
+    {
+        public Decimal K_10 { get; set; }
+        public Decimal K_11 { get; set; }
+        public Decimal K_12 { get; set; }
+        public Decimal K_13 { get; set; }
+        public Decimal K_14 { get; set; }
+        public Decimal K_15 { get; set; }
+        public Decimal K_16 { get; set; }
+        public Decimal K_17 { get; set; }
+        public Decimal K_18 { get; set; }
+        public Decimal K_19 { get; set; }
+        public Decimal K_20 { get; set; }
+        public Decimal K_21 { get; set; }
+        public Decimal K_22 { get; set; }
+        public Decimal K_23 { get; set; }
+        public Decimal K_24{ get; set; }
+        public Decimal K_25 { get; set; }
+        public Decimal K_26 { get; set; }
+        public Decimal K_27{ get; set; }
+        public Decimal K_28 { get; set; }
+        public Decimal K_29 { get; set; }
+        public Decimal K_30 { get; set; }
+        public Decimal K_31 { get; set; }
+        public Decimal K_32 { get; set; }
+        public Decimal K_33 { get; set; }
+        public Decimal K_34 { get; set; }
+        public Decimal K_35 { get; set; }
+        public Decimal K_36 { get; set; }
+        public Decimal SprzedazVAT_Marza { get; set; }
+        public Decimal K_40 { get; set; }
+        public Decimal K_41 { get; set; }
+        public Decimal K_42{ get; set; }
+        public Decimal K_43 { get; set; }
+        public Decimal K_44 { get; set; }
+        public Decimal K_45 { get; set; }
+        public Decimal K_46 { get; set; }
+        public Decimal K_47 { get; set; }
+        public Decimal ZakupVAT_Marza { get; set; }
+    }
+}

JPK_VDEK/Core/JpkData.cs

@@ -1,4 +1,5 @@
-using System;
+using JPK_VDEK.Core;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -15,34 +16,45 @@ namespace JPK_VDEK
         {
             if(aJpk==null)
             {
-                aJpk = new JpkExt();
-                aJpk.Naglowek = new JPKNaglowek();
-                aJpk.Naglowek.KodFormularza = new TNaglowekKodFormularza();
-                aJpk.Naglowek.CelZlozenia = new TNaglowekCelZlozenia();
-                aJpk.Naglowek.KodFormularzaDekl = new TNaglowekKodFormularzaDekl();
-                aJpk.Naglowek.WariantFormularzaDekl = 21;
-                aJpk.Naglowek.WariantFormularza = 1;
+                JpkData.initJpk();
+            }
+            return aJpk;
+        }
+        public static void initJpk()
+        {
+            aJpk = new JpkExt();
+            aJpk.Naglowek = new JPKNaglowek();
+            aJpk.Naglowek.KodFormularza = new TNaglowekKodFormularza();
+            aJpk.Naglowek.CelZlozenia = new TNaglowekCelZlozenia();
+            aJpk.Naglowek.KodFormularzaDekl = new TNaglowekKodFormularzaDekl();
+            aJpk.Naglowek.WariantFormularzaDekl = 21;
+            aJpk.Naglowek.WariantFormularza = 1;
 
-                aJpk.Podmiot1 = new JPKPodmiot1();
+            aJpk.Podmiot1 = new JPKPodmiot1();
 
-                aJpk.Deklaracja = new JPKDeklaracja();
+            aJpk.Deklaracja = new JPKDeklaracja();
 
-                aJpk.SprzedazWiersz = new List<JPKSprzedazWiersz>();
+            aJpk.SprzedazWiersz = new List<JPKSprzedazWiersz>();
 
-                aJpk.SprzedazCtrl = new JPKSprzedazCtrl();
+            aJpk.SprzedazCtrl = new JPKSprzedazCtrl();
 
-                aJpk.ZakupWiersz = new List<JPKZakupWiersz>();
+            aJpk.ZakupWiersz = new List<JPKZakupWiersz>();
 
-                aJpk.ZakupCtrl = new JPKZakupCtrl();
-                aJpk.ViewSP = new ObservableCollection<JPKSprzedazWiersz>();
-            }
-            return aJpk;
+            aJpk.ZakupCtrl = new JPKZakupCtrl();
+            aJpk.ViewSP = new ObservableCollection<JPKSprzedazWiersz>();
+            aJpk.ViewZA = new ObservableCollection<JPKZakupWiersz>();
+
+            aJpk.Sumy = new JPKSumyKontrola();
         }
     }
 
     public class JpkExt : JPK
     {
         public ObservableCollection<JPKSprzedazWiersz> ViewSP { get; set; }
+        public ObservableCollection<JPKZakupWiersz> ViewZA { get; set; }
+
+        public JPKSumyKontrola Sumy { get; set; }
+
         public string  UsNazwa { get; set; }
         public bool P55 { get; set; }
         public bool P56 { get; set; }

JPK_VDEK/JPK_VDEK.csproj

@@ -59,6 +59,7 @@
       <DependentUpon>ConfigPopup.xaml</DependentUpon>
     </Compile>
     <Compile Include="Core\JG.cs" />
+    <Compile Include="Core\JPKSumyKontrola.cs" />
     <Compile Include="Deklaracja.xaml.cs">
       <DependentUpon>Deklaracja.xaml</DependentUpon>
     </Compile>

JPK_VDEK/Ogolne.xaml.cs

@@ -88,6 +88,7 @@ namespace JPK_VDEK
 
         private void bgen_Click(object sender, RoutedEventArgs e)
         {
+            JpkData.initJpk();
             // wczytywanie pliku csv i wypełnianie struktur 
             string path = tgl.Text;
             string[] atr;
@@ -119,7 +120,10 @@ namespace JPK_VDEK
                     fir.Email = sp.email;
                     JpkData.getJpk().Podmiot1.Item = fir;
 
-                   
+                    int liczbaWSp = 0;
+                    Decimal podNal = 0;
+                    int liczbaWZp = 0;
+                    Decimal podNali = 0;
                     while (!sr.EndOfStream)
                     {
                         line = sr.ReadLine();
@@ -265,17 +269,334 @@ namespace JPK_VDEK
                             d1.P_ORDZU = atr[62];
                             JpkData.getJpk().Deklaracja.Pouczenia = Convert.ToDecimal(atr[63].Replace('.', ',')); 
                         }
+                       
                         if (atr[1].Equals("S"))
                         {
+                            liczbaWSp++;
                             JPKSprzedazWiersz spw = new JPKSprzedazWiersz();
                             spw.LpSprzedazy = atr[0];
+                            spw.DataSprzedazy = new DateTime(Convert.ToInt16(atr[3].Substring(0, 4)), Convert.ToInt16(atr[3].Substring(4, 2)), Convert.ToInt16(atr[3].Substring(6, 2)));
+                            spw.DataWystawienia = new DateTime(Convert.ToInt16(atr[4].Substring(0, 4)), Convert.ToInt16(atr[4].Substring(4, 2)), Convert.ToInt16(atr[4].Substring(6, 2)));
+                            spw.DowodSprzedazy = atr[5];
+                            spw.NazwaKontrahenta = atr[6];
+                            
+                            spw.K_10 = Convert.ToDecimal(atr[8].Replace('.', ','));
+                            spw.K_11 = Convert.ToDecimal(atr[9].Replace('.', ','));
+                            spw.K_12 = Convert.ToDecimal(atr[10].Replace('.', ','));
+                            spw.K_13 = Convert.ToDecimal(atr[11].Replace('.', ','));
+                            spw.K_14 = Convert.ToDecimal(atr[12].Replace('.', ','));
+                            spw.K_15 = Convert.ToDecimal(atr[13].Replace('.', ','));
+                            spw.K_16 = Convert.ToDecimal(atr[14].Replace('.', ','));
+                            spw.K_17 = Convert.ToDecimal(atr[15].Replace('.', ','));
+                            spw.K_18 = Convert.ToDecimal(atr[16].Replace('.', ','));
+                            spw.K_19 = Convert.ToDecimal(atr[17].Replace('.', ','));
+                            spw.K_20 = Convert.ToDecimal(atr[18].Replace('.', ','));
+                            spw.K_21 = Convert.ToDecimal(atr[19].Replace('.', ','));
+                            spw.K_22 = Convert.ToDecimal(atr[20].Replace('.', ','));
+                            spw.K_23 = Convert.ToDecimal(atr[21].Replace('.', ','));
+                            spw.K_24 = Convert.ToDecimal(atr[22].Replace('.', ','));
+                            spw.K_25 = Convert.ToDecimal(atr[23].Replace('.', ','));
+                            spw.K_26 = Convert.ToDecimal(atr[24].Replace('.', ','));
+                            spw.K_27 = Convert.ToDecimal(atr[25].Replace('.', ','));
+                            spw.K_28 = Convert.ToDecimal(atr[26].Replace('.', ','));
+                            spw.K_29 = Convert.ToDecimal(atr[27].Replace('.', ','));
+                            spw.K_30 = Convert.ToDecimal(atr[28].Replace('.', ','));
+                            spw.K_31 = Convert.ToDecimal(atr[29].Replace('.', ','));
+                            spw.K_32 = Convert.ToDecimal(atr[30].Replace('.', ','));
+                            spw.K_33 = Convert.ToDecimal(atr[31].Replace('.', ','));
+                            spw.K_34 = Convert.ToDecimal(atr[32].Replace('.', ','));
+                            spw.K_35 = Convert.ToDecimal(atr[33].Replace('.', ','));
+                            spw.K_36 = Convert.ToDecimal(atr[34].Replace('.', ','));
+
+                            podNal = podNal + spw.K_16 + spw.K_18 + spw.K_20 + spw.K_24 + spw.K_26 + spw.K_28 + spw.K_30 + spw.K_32 + spw.K_33 + spw.K_34 - spw.K_35 - spw.K_36;
+
+                            spw.SprzedazVAT_Marza = Convert.ToDecimal(atr[35].Replace('.', ','));
+
+                            JpkData.getJpk().Sumy.K_10 += spw.K_10;
+                            JpkData.getJpk().Sumy.K_11 += spw.K_11;
+                            JpkData.getJpk().Sumy.K_12 += spw.K_12;
+                            JpkData.getJpk().Sumy.K_13 += spw.K_13;
+                            JpkData.getJpk().Sumy.K_14 += spw.K_14;
+                            JpkData.getJpk().Sumy.K_15 += spw.K_15;
+                            JpkData.getJpk().Sumy.K_16 += spw.K_16;
+                            JpkData.getJpk().Sumy.K_17 += spw.K_17;
+                            JpkData.getJpk().Sumy.K_18 += spw.K_18;
+                            JpkData.getJpk().Sumy.K_19 += spw.K_19;
+                            JpkData.getJpk().Sumy.K_20 += spw.K_20;
+                            JpkData.getJpk().Sumy.K_21 += spw.K_21;
+                            JpkData.getJpk().Sumy.K_22 += spw.K_22;
+                            JpkData.getJpk().Sumy.K_23 += spw.K_23;
+                            JpkData.getJpk().Sumy.K_24 += spw.K_24;
+                            JpkData.getJpk().Sumy.K_25 += spw.K_25;
+                            JpkData.getJpk().Sumy.K_26 += spw.K_26;
+                            JpkData.getJpk().Sumy.K_27 += spw.K_27;
+                            JpkData.getJpk().Sumy.K_28 += spw.K_28;
+                            JpkData.getJpk().Sumy.K_29 += spw.K_29;
+                            JpkData.getJpk().Sumy.K_30 += spw.K_30;
+                            JpkData.getJpk().Sumy.K_31 += spw.K_31;
+                            JpkData.getJpk().Sumy.K_32 += spw.K_32;
+                            JpkData.getJpk().Sumy.K_33 += spw.K_33;
+                            JpkData.getJpk().Sumy.K_34 += spw.K_34;
+                            JpkData.getJpk().Sumy.K_35 += spw.K_35;
+                            JpkData.getJpk().Sumy.K_36 += spw.K_36;
+                            JpkData.getJpk().Sumy.SprzedazVAT_Marza += spw.SprzedazVAT_Marza;
+
+
+                            spw.NrKontrahenta = atr[46];
+
+                            spw.KodKrajuNadaniaTIN = atr[48];
+                            if (atr[49].Equals("WEW"))
+                            {
+                                spw.TypDokumentu = TDowoduSprzedazy.WEW;
+                            }
+                            if (atr[49].Equals("RO"))
+                            {
+                                spw.TypDokumentu = TDowoduSprzedazy.RO;
+                            }
+                            if (atr[49].Equals("FP"))
+                            {
+                                spw.TypDokumentu = TDowoduSprzedazy.FP;
+                            }
+
+                            spw.GTU_01 = 0;
+                            spw.GTU_02 = 0;
+                            if (atr[50].Equals("X"))
+                            {
+                                spw.GTU_03 = 1;
+                            }
+                            else
+                            {
+                                spw.GTU_03 = 0;
+                            }
+                            spw.GTU_04 = 0;
+                            if (atr[51].Equals("X"))
+                            {
+                                spw.GTU_05 = 1;
+                            }
+                            else
+                            {
+                                spw.GTU_05 = 0;
+                            }
+                            if (atr[52].Equals("X"))
+                            {
+                                spw.GTU_06 = 1;
+                            }
+                            else
+                            {
+                                spw.GTU_06 = 0;
+                            }
+                            if (atr[53].Equals("X"))
+                            {
+                                spw.GTU_07 = 1;
+                            }
+                            else
+                            {
+                                spw.GTU_07 = 0;
+                            }
+                            spw.GTU_08 = 0;
+                            spw.GTU_09 = 0;
+                            if (atr[54].Equals("X"))
+                            {
+                                spw.GTU_10 = 1;
+                            }
+                            else
+                            {
+                                spw.GTU_10 = 0;
+                            }
+                            spw.GTU_11 = 0;
+                            if (atr[55].Equals("X"))
+                            {
+                                spw.GTU_12 = 1;
+                            }
+                            else
+                            {
+                                spw.GTU_12 = 0;
+                            }
+                            if (atr[56].Equals("X"))
+                            {
+                                spw.GTU_13 = 1;
+                            }
+                            else
+                            {
+                                spw.GTU_13 = 0;
+                            }
+                            if (atr[57].Equals("X"))
+                            {
+                                spw.SW = 1;
+                            }
+                            else
+                            {
+                                spw.SW = 0;
+                            }
+                            if (atr[58].Equals("X"))
+                            {
+                                spw.EE = 1;
+                            }
+                            else
+                            {
+                                spw.EE = 0;
+                            }
+                            if (atr[59].Equals("X"))
+                            {
+                                spw.TP = 1;
+                            }
+                            else
+                            {
+                                spw.TP = 0;
+                            }
+                            if (atr[60].Equals("X"))
+                            {
+                                spw.TT_WNT = 1;
+                            }
+                            else
+                            {
+                                spw.TT_WNT = 0;
+                            }
+                            if (atr[61].Equals("X"))
+                            {
+                                spw.TT_D = 1;
+                            }
+                            else
+                            {
+                                spw.TT_D = 0;
+                            }
+                            if (atr[62].Equals("X"))
+                            {
+                                spw.MR_T = 1;
+                            }
+                            else
+                            {
+                                spw.MR_T = 0;
+                            }
+                            if (atr[63].Equals("X"))
+                            {
+                                spw.MR_UZ = 1;
+                            }
+                            else
+                            {
+                                spw.MR_UZ = 0;
+                            }
+                            if (atr[64].Equals("X"))
+                            {
+                                spw.I_42 = 1;
+                            }
+                            else
+                            {
+                                spw.I_42 = 0;
+                            }
+                            if (atr[65].Equals("X"))
+                            {
+                                spw.I_63 = 1;
+                            }
+                            else
+                            {
+                                spw.I_63 = 0;
+                            }
+                            if (atr[65].Equals("X"))
+                            {
+                                spw.B_SPV = 1;
+                            }
+                            else
+                            {
+                                spw.B_SPV = 0;
+                            }
+                            if (atr[66].Equals("X"))
+                            {
+                                spw.B_SPV_DOSTAWA = 1;
+                            }
+                            else
+                            {
+                                spw.B_SPV_DOSTAWA = 0;
+                            }
+                            if (atr[67].Equals("X"))
+                            {
+                                spw.B_MPV_PROWIZJA = 1;
+                            }
+                            else
+                            {
+                                spw.B_MPV_PROWIZJA = 0;
+                            }
+                            if (atr[68].Equals("X"))
+                            {
+                                spw.MPP = 1;
+                            }
+                            else
+                            {
+                                spw.MPP = 0;
+                            }
+                            if (atr[69].Equals("X"))
+                            {
+                                spw.KorektaPodstawyOpodt = 1;
+                            }
+                            else
+                            {
+                                spw.KorektaPodstawyOpodt = 0;
+                            }
                             JpkData.getJpk().SprzedazWiersz.Add(spw);
                             JpkData.getJpk().ViewSP.Add(spw);
                         }
                         if (atr[1].Equals("Z"))
                         {
+                            liczbaWZp++;
+                            JPKZakupWiersz zaw = new JPKZakupWiersz();
+                            zaw.LpZakupu = atr[0];
+
+                            zaw.DowodZakupu = atr[5];
+                            zaw.NazwaDostawcy = atr[6];
+                            zaw.NrDostawcy = atr[46];
+                            zaw.DataWplywu = new DateTime(Convert.ToInt16(atr[3].Substring(0, 4)), Convert.ToInt16(atr[3].Substring(4, 2)), Convert.ToInt16(atr[3].Substring(6, 2)));
+                            zaw.DataZakupu = new DateTime(Convert.ToInt16(atr[4].Substring(0, 4)), Convert.ToInt16(atr[4].Substring(4, 2)), Convert.ToInt16(atr[4].Substring(6, 2)));
+
+                            zaw.K_40 = Convert.ToDecimal(atr[38].Replace('.', ','));
+                            zaw.K_41 = Convert.ToDecimal(atr[39].Replace('.', ','));
+                            zaw.K_42 = Convert.ToDecimal(atr[40].Replace('.', ','));
+                            zaw.K_43 = Convert.ToDecimal(atr[41].Replace('.', ','));
+
+                            zaw.K_44 = Convert.ToDecimal(atr[42].Replace('.', ','));
+                            zaw.K_45 = Convert.ToDecimal(atr[43].Replace('.', ','));
+                            zaw.K_46 = Convert.ToDecimal(atr[44].Replace('.', ','));
+                            zaw.K_47 = Convert.ToDecimal(atr[45].Replace('.', ','));
+
+                            zaw.KodKrajuNadaniaTIN = atr[48];
+
+                            if (atr[49].Equals("MK"))
+                            {
+                                zaw.DokumentZakupu = TDowoduZakupu.MK;
+                            }
+                            if (atr[49].Equals("VAT_RR"))
+                            {
+                                zaw.DokumentZakupu = TDowoduZakupu.VAT_RR;
+                            }
+                            if (atr[49].Equals("WEW"))
+                            {
+                                zaw.DokumentZakupu = TDowoduZakupu.WEW;
+                            }
+                            if (atr[68].Equals("X"))
+                            {
+                                zaw.MPP = 1;
+                            }
+                            else
+                            {
+                                zaw.MPP = 0;
+                            }
+                            if (atr[70].Equals("X"))
+                            {
+                                zaw.IMP = 1;
+                            }
+                            else
+                            {
+                                zaw.IMP = 0;
+                            }
+                            zaw.ZakupVAT_Marza = Convert.ToDecimal(atr[71].Replace('.', ','));
+                            podNali = podNali + zaw.K_41 + zaw.K_43 + zaw.K_44 + zaw.K_45 + zaw.K_46 + zaw.K_47;
+                            JpkData.getJpk().ZakupWiersz.Add(zaw);
+                            JpkData.getJpk().ViewZA.Add(zaw);
                         }
                     }
+                    JpkData.getJpk().SprzedazCtrl.LiczbaWierszySprzedazy = liczbaWSp.ToString();
+                    JpkData.getJpk().SprzedazCtrl.PodatekNalezny = podNal;
+                    JpkData.getJpk().ZakupCtrl.LiczbaWierszyZakupow = liczbaWZp.ToString();
+                    JpkData.getJpk().ZakupCtrl.PodatekNaliczony = podNali;
                 }
                 win.DataContext = JpkData.getJpk();
             }

JPK_VDEK/PodsumowanieSP.xaml

@@ -8,7 +8,7 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <Label Content="K10" HorizontalAlignment="Left" Margin="9,2,0,0" VerticalAlignment="Top" Width="30"/>
-        <TextBox x:Name="tk10" HorizontalAlignment="Left" Height="23" Margin="44,1,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="120"/>
+        <TextBox x:Name="tk10" HorizontalAlignment="Left" Height="23" Margin="44,1,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="120" IsReadOnly="True"/>
         <Label Content="K11" HorizontalAlignment="Left" Margin="9,30,0,0" VerticalAlignment="Top" Width="30"/>
         <TextBox x:Name="tk11" HorizontalAlignment="Left" Height="23" Margin="44,30,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="120"/>
         <Label Content="K12" HorizontalAlignment="Left" Margin="9,60,0,0" VerticalAlignment="Top" Width="30"/>

JPK_VDEK/SPwiersz.xaml

@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:JPK_VDEK"
              mc:Ignorable="d" Height="512.903" Width="871.939">
     <Grid>
-        <DataGrid x:Name="spwiersz" ItemsSource="{Binding ViewSP}" HorizontalAlignment="Left" Height="461" Margin="0,42,0,0" VerticalAlignment="Top" Width="856" HorizontalScrollBarVisibility="Visible" IsEnabled="False">
+        <DataGrid x:Name="spwiersz" ItemsSource="{Binding ViewSP}" HorizontalAlignment="Left" Height="461" Margin="0,42,0,0" AutoGenerateColumns="False" VerticalAlignment="Top" Width="856"  IsEnabled="True" IsReadOnly="True">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="" Binding="{Binding LpSprzedazy}" >
                     <DataGridTextColumn.HeaderTemplate>
@@ -15,76 +15,77 @@
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
                 </DataGridTextColumn>
-                <DataGridTextColumn Header=""  >
+                <DataGridTextColumn Header=""  Binding="{Binding KodKrajuNadaniaTIN}"  >
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
                             <TextBlock Text="Kod Kraju Nadania TIN" Width="40" TextWrapping="Wrap" HorizontalAlignment="Center"/>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
                 </DataGridTextColumn>
-                <DataGridTextColumn Header="NrKontrahenta"  />
-                <DataGridTextColumn Header="NazwaKontrahenta"  />
-                <DataGridTextColumn Header="DowodSprzedazy"  />
-                <DataGridTextColumn Header="DataWystawienia"  />
-                <DataGridTextColumn Header="DataSprzedazy"  />
-                <DataGridTextColumn Header="TypDokumentu"  />
-                <DataGridTextColumn Header="GTU_01"  />
-                <DataGridTextColumn Header="GTU_02"  />
-                <DataGridTextColumn Header="GTU_03"  />
-                <DataGridTextColumn Header="GTU_04"  />
-                <DataGridTextColumn Header="GTU_05"  />
-                <DataGridTextColumn Header="GTU_06"  />
-                <DataGridTextColumn Header="GTU_07"  />
-                <DataGridTextColumn Header="GTU_08"  />
-                <DataGridTextColumn Header="GTU_09"  />
-                <DataGridTextColumn Header="GTU_10"  />
-                <DataGridTextColumn Header="GTU_11"  />
-                <DataGridTextColumn Header="GTU_12"  />
-                <DataGridTextColumn Header="GTU_13"  />
-                <DataGridTextColumn Header="SW"  />
-                <DataGridTextColumn Header="EE"  />
-                <DataGridTextColumn Header="TP"  />
-                <DataGridTextColumn Header="TT_WNT"  />
-                <DataGridTextColumn Header="TT_D"  />
-                <DataGridTextColumn Header="MR_T"  />
-                <DataGridTextColumn Header="MR_UZ"  />
-                <DataGridTextColumn Header="I_42"  />
-                <DataGridTextColumn Header="I_63"  />
-                <DataGridTextColumn Header="B_SPV"  />
-                <DataGridTextColumn Header="B_SPV_DOSTAWA"  />
-                <DataGridTextColumn Header="B_MPV_PROWIZJA"  />
-                <DataGridTextColumn Header="MPP"  />
-                <DataGridTextColumn Header="KorektaPodstawyOpodt"  />
-                <DataGridTextColumn Header="K_10"  />
-                <DataGridTextColumn Header="K_11"  />
-                <DataGridTextColumn Header="K_12"  />
-                <DataGridTextColumn Header="K_13"  />
-                <DataGridTextColumn Header="K_14"  />
-                <DataGridTextColumn Header="K_15"  />
-                <DataGridTextColumn Header="K_16"  />
-                <DataGridTextColumn Header="K_17"  />
-                <DataGridTextColumn Header="K_18"  />
-                <DataGridTextColumn Header="K_19"  />
-                <DataGridTextColumn Header="K_20"  />
-                <DataGridTextColumn Header="K_21"  />
-                <DataGridTextColumn Header="K_22"  />
-                <DataGridTextColumn Header="K_23"  />
-                <DataGridTextColumn Header="K_24"  />
-                <DataGridTextColumn Header="K_25"  />
-                <DataGridTextColumn Header="K_26"  />
-                <DataGridTextColumn Header="K_27"  />
-                <DataGridTextColumn Header="K_28"  />
-                <DataGridTextColumn Header="K_29"  />
-                <DataGridTextColumn Header="K_30"  />
-                <DataGridTextColumn Header="K_31"  />
-                <DataGridTextColumn Header="K_32"  />
-                <DataGridTextColumn Header="K_33"  />
-                <DataGridTextColumn Header="K_34"  />
-                <DataGridTextColumn Header="K_35"  />
-                <DataGridTextColumn Header="K_36"  />
-                <DataGridTextColumn Header="SprzedazVAT_Marza"  />
+                <DataGridTextColumn Header="NrKontrahenta"  Binding="{Binding NrKontrahenta}"  />
+                <DataGridTextColumn Header="NazwaKontrahenta"  Binding="{Binding NazwaKontrahenta}"  />
+                <DataGridTextColumn Header="DowodSprzedazy"   Binding="{Binding DowodSprzedazy}" />
+                <DataGridTextColumn Header="DataWystawienia"  Binding="{Binding DataWystawienia, StringFormat=dd-MM-yyyy}"  />
+                <DataGridTextColumn Header="DataSprzedazy"   Binding="{Binding DataSprzedazy, StringFormat=dd-MM-yyyy}" />
+                <DataGridTextColumn Header="TypDokumentu"  Binding="{Binding TypDokumentu}" />
+                <DataGridTextColumn Header="GTU_01"  Binding="{Binding GTU_01}" />
+                <DataGridTextColumn Header="GTU_02"  Binding="{Binding GTU_02}" />
+                <DataGridTextColumn Header="GTU_03"  Binding="{Binding GTU_03}"/>
+                <DataGridTextColumn Header="GTU_04"  Binding="{Binding GTU_04}"/>
+                <DataGridTextColumn Header="GTU_05"  Binding="{Binding GTU_05}"/>
+                <DataGridTextColumn Header="GTU_06"  Binding="{Binding GTU_06}"/>
+                <DataGridTextColumn Header="GTU_07"  Binding="{Binding GTU_07}"/>
+                <DataGridTextColumn Header="GTU_08"  Binding="{Binding GTU_08}"/>
+                <DataGridTextColumn Header="GTU_09"  Binding="{Binding GTU_09}"/>
+                <DataGridTextColumn Header="GTU_10"  Binding="{Binding GTU_10}"/>
+                <DataGridTextColumn Header="GTU_11"  Binding="{Binding GTU_11}"/>
+                <DataGridTextColumn Header="GTU_12"  Binding="{Binding GTU_12}"/>
+                <DataGridTextColumn Header="GTU_13"  Binding="{Binding GTU_13}"/>
+                <DataGridTextColumn Header="SW"  Binding="{Binding SW}"/>
+                <DataGridTextColumn Header="EE"  Binding="{Binding EE}"/>
+                <DataGridTextColumn Header="TP" Binding="{Binding TP}" />
+                <DataGridTextColumn Header="TT_WNT" Binding="{Binding TT_WNT}" />
+                <DataGridTextColumn Header="TT_D" Binding="{Binding TT_D}" />
+                <DataGridTextColumn Header="MR_T"  Binding="{Binding MR_T}"/>
+                <DataGridTextColumn Header="MR_UZ" Binding="{Binding MR_UZ}" />
+                <DataGridTextColumn Header="I_42" Binding="{Binding I_42}" />
+                <DataGridTextColumn Header="I_63" Binding="{Binding I_63}" />
+                <DataGridTextColumn Header="B_SPV" Binding="{Binding B_SPV}" />
+                <DataGridTextColumn Header="B_SPV_DOSTAWA" Binding="{Binding B_SPV_DOSTAWA}" />
+                <DataGridTextColumn Header="B_MPV_PROWIZJA" Binding="{Binding B_MPV_PROWIZJA}" />
+                <DataGridTextColumn Header="MPP" Binding="{Binding MPP}" />
+                <DataGridTextColumn Header="KorektaPodstawyOpodt" Binding="{Binding KorektaPodstawyOpodt}" />
+                <DataGridTextColumn Header="K_10"  Binding="{Binding K_10}"  />
+                <DataGridTextColumn Header="K_11"  Binding="{Binding K_11}"/>
+                <DataGridTextColumn Header="K_12"  Binding="{Binding K_12}"/>
+                <DataGridTextColumn Header="K_13"  Binding="{Binding K_13}"/>
+                <DataGridTextColumn Header="K_14"  Binding="{Binding K_14}"/>
+                <DataGridTextColumn Header="K_15"  Binding="{Binding K_15}"/>
+                <DataGridTextColumn Header="K_16"  Binding="{Binding K_16}"/>
+                <DataGridTextColumn Header="K_17"  Binding="{Binding K_17}"/>
+                <DataGridTextColumn Header="K_18"  Binding="{Binding K_18}"/>
+                <DataGridTextColumn Header="K_19"  Binding="{Binding K_19}"/>
+                <DataGridTextColumn Header="K_20"  Binding="{Binding K_20}"/>
+                <DataGridTextColumn Header="K_21"  Binding="{Binding K_21}"/>
+                <DataGridTextColumn Header="K_22"  Binding="{Binding K_22}"/>
+                <DataGridTextColumn Header="K_23"  Binding="{Binding K_23}"/>
+                <DataGridTextColumn Header="K_24"  Binding="{Binding K_24}"/>
+                <DataGridTextColumn Header="K_25"  Binding="{Binding K_25}"/>
+                <DataGridTextColumn Header="K_26"  Binding="{Binding K_26}"/>
+                <DataGridTextColumn Header="K_27"  Binding="{Binding K_27}"/>
+                <DataGridTextColumn Header="K_28"  Binding="{Binding K_28}"/>
+                <DataGridTextColumn Header="K_29"  Binding="{Binding K_29}"/>
+                <DataGridTextColumn Header="K_30"  Binding="{Binding K_30}"/>
+                <DataGridTextColumn Header="K_31"  Binding="{Binding K_31}"/>
+                <DataGridTextColumn Header="K_32"  Binding="{Binding K_32}"/>
+                <DataGridTextColumn Header="K_33"  Binding="{Binding K_33}"/>
+                <DataGridTextColumn Header="K_34"  Binding="{Binding K_34}"/>
+                <DataGridTextColumn Header="K_35"  Binding="{Binding K_35}"/>
+                <DataGridTextColumn Header="K_36"  Binding="{Binding K_36}"/>
+                <DataGridTextColumn Header="SprzedazVAT_Marza"  Binding="{Binding SprzedazVAT_Marza}"/>
             </DataGrid.Columns>
         </DataGrid>
+
         <Label Content="Szukaj w pozycjach" HorizontalAlignment="Left" Margin="39,10,0,0" VerticalAlignment="Top"/>
         <TextBox x:Name="tsch" HorizontalAlignment="Left" Height="23" Margin="171,10,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="341"/>
         <Button Content="Szukaj" HorizontalAlignment="Left" Margin="534,10,0,0" VerticalAlignment="Top" Width="75"/>

JPK_VDEK/Sumy.xaml

@@ -9,12 +9,12 @@
     <Grid>
         <Label Content="Liczba wierszy sprzedaży" HorizontalAlignment="Left" Margin="9,10,0,0" VerticalAlignment="Top"/>
         <Label Content="Podatek należny" HorizontalAlignment="Left" Margin="9,36,0,0" VerticalAlignment="Top"/>
-        <TextBox x:Name="tlws" HorizontalAlignment="Left" Height="23" Margin="181,11,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="120"/>
-        <TextBox x:Name="tpn" HorizontalAlignment="Left" Height="23" Margin="181,39,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="120" RenderTransformOrigin="0.5,0.5"/>
+        <TextBox x:Name="tlws" HorizontalAlignment="Left" Height="23" Margin="181,11,0,0" TextWrapping="Wrap" Text="{Binding SprzedazCtrl.LiczbaWierszySprzedazy}" VerticalAlignment="Top" Width="120" IsReadOnly="True"/>
+        <TextBox x:Name="tpn" HorizontalAlignment="Left" Height="23" Margin="181,39,0,0" TextWrapping="Wrap" Text="{Binding SprzedazCtrl.PodatekNalezny}" VerticalAlignment="Top" Width="120" IsReadOnly="True" RenderTransformOrigin="0.5,0.5"/>
         <Label Content="Liczba wierszy zakupu" HorizontalAlignment="Left" Margin="317,10,0,0" VerticalAlignment="Top"/>
         <Label Content="Podatek nalczony" HorizontalAlignment="Left" Margin="317,36,0,0" VerticalAlignment="Top"/>
-        <TextBox x:Name="tlwz" HorizontalAlignment="Left" Height="23" Margin="489,11,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="120"/>
-        <TextBox x:Name="tpna" HorizontalAlignment="Left" Height="23" Margin="489,39,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="120" RenderTransformOrigin="0.5,0.5"/>
+        <TextBox x:Name="tlwz" HorizontalAlignment="Left" Height="23" Margin="489,11,0,0" TextWrapping="Wrap" Text="{Binding ZakupCtrl.LiczbaWierszyZakupow}" VerticalAlignment="Top" Width="120" IsReadOnly="True"/>
+        <TextBox x:Name="tpna" HorizontalAlignment="Left" Height="23" Margin="489,39,0,0" TextWrapping="Wrap" Text="{Binding ZakupCtrl.PodatekNaliczony}" VerticalAlignment="Top" Width="120" RenderTransformOrigin="0.5,0.5" IsReadOnly="True"/>
 
     </Grid>
 </UserControl>

JPK_VDEK/ZaWie.xaml

@@ -10,33 +10,33 @@
         <Label Content="Szukaj w pozycjach" HorizontalAlignment="Left" Margin="39,10,0,0" VerticalAlignment="Top"/>
         <TextBox x:Name="tsch" HorizontalAlignment="Left" Height="23" Margin="171,10,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="341"/>
         <Button Content="Szukaj" HorizontalAlignment="Left" Margin="534,10,0,0" VerticalAlignment="Top" Width="75"/>
-        <DataGrid x:Name="zkwie" HorizontalAlignment="Left" Height="381" Margin="10,59,0,0" VerticalAlignment="Top" Width="780">
+        <DataGrid x:Name="zkwie" ItemsSource="{Binding ViewZA}" HorizontalAlignment="Left"  AutoGenerateColumns="False" IsReadOnly="True" Height="381" Margin="10,59,0,0" VerticalAlignment="Top" Width="780">
             <DataGrid.Columns>
-                <DataGridTextColumn Header="" Binding="{Binding Path=ID}" >
+                <DataGridTextColumn Header="" Binding="{Binding Path=LpZakupu}" >
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
                             <TextBlock Text="Lp Sp" Width="25" TextWrapping="Wrap" HorizontalAlignment="Center"/>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
                 </DataGridTextColumn>
-                <DataGridTextColumn Header="KodKrajuNadaniaTIN" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="NrDostawcy" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="NazwaDostawcy" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="DowodZakupu" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="DataZakupu" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="DataWplywu" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="DokumentZakupu" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="MPP" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="IMP" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="K_40" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="K_41" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="K_42" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="K_43" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="K_44" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="K_45" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="K_46" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="K_47" Binding="{Binding Path=Date}"/>
-                <DataGridTextColumn Header="ZakupVAT_Marza" Binding="{Binding Path=Date}"/>
+                <DataGridTextColumn Header="KodKrajuNadaniaTIN" Binding="{Binding Path=KodKrajuNadaniaTIN}"/>
+                <DataGridTextColumn Header="NrDostawcy" Binding="{Binding Path=NrDostawcy}"/>
+                <DataGridTextColumn Header="NazwaDostawcy" Binding="{Binding Path=NazwaDostawcy}"/>
+                <DataGridTextColumn Header="DowodZakupu" Binding="{Binding Path=DowodZakupu}"/>
+                <DataGridTextColumn Header="DataZakupu" Binding="{Binding Path=DataZakupu , StringFormat=dd-MM-yyyy}"/>
+                <DataGridTextColumn Header="DataWplywu" Binding="{Binding Path=DataWplywu , StringFormat=dd-MM-yyyy}"/>
+                <DataGridTextColumn Header="DokumentZakupu" Binding="{Binding Path=DokumentZakupu}"/>
+                <DataGridTextColumn Header="MPP" Binding="{Binding Path=MPP}"/>
+                <DataGridTextColumn Header="IMP" Binding="{Binding Path=IMP}"/>
+                <DataGridTextColumn Header="K_40" Binding="{Binding Path=K_40}"/>
+                <DataGridTextColumn Header="K_41" Binding="{Binding Path=K_41}"/>
+                <DataGridTextColumn Header="K_42" Binding="{Binding Path=K_42}"/>
+                <DataGridTextColumn Header="K_43" Binding="{Binding Path=K_43}"/>
+                <DataGridTextColumn Header="K_44" Binding="{Binding Path=K_44}"/>
+                <DataGridTextColumn Header="K_45" Binding="{Binding Path=K_45}"/>
+                <DataGridTextColumn Header="K_46" Binding="{Binding Path=K_46}"/>
+                <DataGridTextColumn Header="K_47" Binding="{Binding Path=K_47}"/>
+                <DataGridTextColumn Header="ZakupVAT_Marza" Binding="{Binding Path=ZakupVAT_Marza}"/>
             </DataGrid.Columns>
         </DataGrid>