poprawki dodatkowe pola

JPK_VDEK/AddDec.xaml

@@ -0,0 +1,33 @@
+<UserControl x:Class="JPK_VDEK.AddDec"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:JPK_VDEK"
+             mc:Ignorable="d" d:DesignWidth="800" Height="254">
+    <Grid>
+        <Label Content="Uzasadnienie korekty" HorizontalAlignment="Left" Margin="34,149,0,0" VerticalAlignment="Top" Height="25" Width="123" RenderTransformOrigin="0.37,0.48">
+            <Label.RenderTransform>
+                <TransformGroup>
+                    <ScaleTransform/>
+                    <SkewTransform/>
+                    <RotateTransform/>
+                    <TranslateTransform X="0.001"/>
+                </TransformGroup>
+            </Label.RenderTransform>
+        </Label>
+        <TextBox x:Name="tkor" HorizontalAlignment="Left" Height="67" Margin="162,149,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="536"/>
+        <Label Content="Nadwyżka(P_39)" HorizontalAlignment="Left" Margin="25,10,0,0" VerticalAlignment="Top"/>
+        <TextBox x:Name="nadwyzka" HorizontalAlignment="Left" Height="23" Margin="200,10,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="120"  Text="{Binding P39}"/>
+        <Label Content="Wysokość zwrotu do zaliczenia na poczet przyszłych zobowiązań" HorizontalAlignment="Left" Margin="33,87,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.451,1.781"/>
+        <Label Content="Wysokosc zaliczki do przeniesienia na następny miesiąc" HorizontalAlignment="Left" Margin="33,118,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.451,1.781"/>
+        <RadioButton Content="Zwrot na rachunek VAT" HorizontalAlignment="Left" Margin="33,47,0,0" VerticalAlignment="Top"/>
+        <RadioButton Content="Zwrot w terminie 25" HorizontalAlignment="Left" Margin="200,47,0,0" VerticalAlignment="Top"/>
+        <RadioButton Content="Zwrot w terminie 60" HorizontalAlignment="Left" Margin="351,47,0,0" VerticalAlignment="Top"/>
+        <RadioButton Content="Zwrot w terminie 180" HorizontalAlignment="Left" Margin="500,47,0,0" VerticalAlignment="Top"/>
+        <RadioButton Content="Zaliczka na poczet przyszłych zobowiązań" HorizontalAlignment="Left" Margin="33,67,0,0" VerticalAlignment="Top"/>
+        <TextBox HorizontalAlignment="Left" Height="23" Margin="382,90,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="120"/>
+        <TextBox HorizontalAlignment="Left" Height="23" Margin="382,121,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="120"/>
+
+    </Grid>
+</UserControl>

JPK_VDEK/AddDec.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace JPK_VDEK
+{
+    /// <summary>
+    /// Logika interakcji dla klasy AddDec.xaml
+    /// </summary>
+    public partial class AddDec : UserControl
+    {
+        public AddDec()
+        {
+            InitializeComponent();
+        }
+    }
+}

JPK_VDEK/Core/JG.cs

@@ -68,9 +68,9 @@ namespace JPK_VDEK.Core
             s.Kraj = "PL";
             s.MiastoPoczta = "Wrocław";
             s.Miejscowosc = "Wrocław";
-            s.Poczta = "53-413";
+            s.Poczta = "53-611";
             s.Powiat = "wrocławski";
-            s.Ulica = "Gwiaździsta";
+            s.Ulica = "Strzegomska";
             s.Wojewodztwo = "dolnośląskie";
             s.Dom = "";
             s.Budynek = "66";

JPK_VDEK/Core/JpkData.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -56,7 +57,7 @@ namespace JPK_VDEK
             aJpk.ZakupWiersz = new List<JPKZakupWiersz>();
 
             aJpk.ZakupCtrl = new JPKZakupCtrl();
-            aJpk.ViewSP = new ObservableCollection<JPKSprzedazWiersz>();
+            aJpk.ViewSP = new ObservableCollection<JPKSprzedazWierszExt>();
             aJpk.ViewZA = new ObservableCollection<JPKZakupWiersz>();
 
             aJpk.Sumy = new JPKSumyKontrola();
@@ -65,12 +66,127 @@ namespace JPK_VDEK
             aJpk.Urz = new US();
         }
     }
+    public class JJPKZakupWierszExt: JPKZakupWiersz
+    {
+        public string TypDokumentuExt { get; set; }
+        public JJPKZakupWierszExt()
+        {
+            TypDokumentuExt = "";
+        }
+        public void CopyFromBase(JPKZakupWiersz a)
+        {
+            LpZakupu = a.LpZakupu;
+            DowodZakupu = a.DowodZakupu;
+            NazwaDostawcy = a.NazwaDostawcy;
+            NrDostawcy = a.NrDostawcy;
+            DataWplywu = a.DataWplywu;
+            DataZakupu = a.DataZakupu;
+            K_40 = a.K_40;
+            K_41 = a.K_41;
+            K_42 = a.K_42;
+            K_43 = a.K_43;
+            K_44 = a.K_44;
+            K_45 = a.K_45;
+            K_46 = a.K_46;
+            K_47 = a.K_47;
+            KodKrajuNadaniaTIN = a.KodKrajuNadaniaTIN;
+            DokumentZakupu = a.DokumentZakupu;
+            MPP = a.MPP;
+            IMP = a.IMP;
+            ZakupVAT_Marza = a.ZakupVAT_Marza;
+         
+        }
 
-    public class JpkExt : JPK
+    }
+    public class JPKSprzedazWierszExt : JPKSprzedazWiersz
     {
+        public string TypDokumentuExt { get; set; }
+
+        public JPKSprzedazWierszExt()
+        {
+            TypDokumentuExt = "";
+        }
+        public void CopyFromBase(JPKSprzedazWiersz a)
+        {
+            LpSprzedazy = a.LpSprzedazy;
+            DataSprzedazy = a.DataSprzedazy;
+            DataWystawienia = a.DataWystawienia;
+            DowodSprzedazy = a.DowodSprzedazy;
+            NazwaKontrahenta = a.NazwaKontrahenta;
+            K_10 = a.K_10;
+            K_11 = a.K_11;
+            K_12 = a.K_12;
+            K_13 = a.K_13;
+            K_14 = a.K_14;
+            K_15 = a.K_15;
+            K_16 = a.K_16;
+            K_17 = a.K_17;
+            K_18 = a.K_18;
+            K_19 = a.K_19;
+            K_20 = a.K_20;
+            K_21 = a.K_21;
+            K_22 = a.K_22;
+            K_23 = a.K_23;
+            K_24 = a.K_24;
+            K_25 = a.K_25;
+            K_26 = a.K_26;
+            K_27 = a.K_27;
+            K_28 = a.K_28;
+            K_29 = a.K_29;
+            K_30 = a.K_30;
+            K_31 = a.K_31;
+            K_32 = a.K_32;
+            K_33 = a.K_33;
+            K_34 = a.K_34;
+            K_35 = a.K_35;
+            K_36 = a.K_36;
+            SprzedazVAT_Marza = a.SprzedazVAT_Marza;
+            NrKontrahenta = a.NrKontrahenta;
+            KodKrajuNadaniaTIN = a.KodKrajuNadaniaTIN;
+            TypDokumentu = a.TypDokumentu;
+            GTU_01 = a.GTU_01;
+            GTU_02 = a.GTU_02;
+            GTU_03 = a.GTU_03;
+            GTU_04 = a.GTU_04;
+            GTU_05 = a.GTU_05;
+            GTU_06 = a.GTU_06;
+            GTU_07 = a.GTU_07;
+            GTU_08 = a.GTU_08;
+            GTU_09 = a.GTU_09;
+            GTU_10 = a.GTU_10;
+            GTU_11 = a.GTU_11;
+            GTU_12 = a.GTU_12;
+            GTU_13 = a.GTU_13;
+            SW = a.SW;
+            EE = a.EE;
+            TP = a.TP;
+            TT_WNT = a.TT_WNT;
+            TT_D = a.TT_D;
+            MR_T = a.MR_T;
+            MR_UZ = a.MR_UZ;
+            I_42 = a.I_42;
+            I_63 = a.I_63;
+            B_SPV = a.B_SPV;
+            B_SPV_DOSTAWA = a.B_SPV_DOSTAWA;
+            B_MPV_PROWIZJA = a.B_MPV_PROWIZJA;
+            MPP = a.MPP;
+            KorektaPodstawyOpodt = a.KorektaPodstawyOpodt;
+
+        }
+
+    }
+    public class JpkExt : JPK , INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private void NotifyPropertyChanged( String propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
         public void setCel(int poz)
         {
             this.Naglowek.CelZlozenia.Value = Convert.ToSByte(this.Cel.Cel[poz].Key);
+            NotifyPropertyChanged();
         }
         public void setUrzad(int poz)
         {
@@ -78,13 +194,29 @@ namespace JPK_VDEK
             if(kod.Equals("0271"))
             {
                 this.Naglowek.KodUrzedu = TKodUS.Item0271;
+                this.UsNazwa = this.Urz.Lista[poz].Describe;
             }
             if (kod.Equals("0225"))
             {
-                this.Naglowek.KodUrzedu = TKodUS.Item0271;
+                this.Naglowek.KodUrzedu = TKodUS.Item0225;
+                this.UsNazwa = this.Urz.Lista[poz].Describe;
             }
+            NotifyPropertyChanged();
         }
-        public ObservableCollection<JPKSprzedazWiersz> ViewSP { get; set; }
+        private Decimal p39;
+        public Decimal P39 {
+            get 
+            {
+                return p39;
+            }
+            set
+                {
+                p39 = value;
+                this.Deklaracja.PozycjeSzczegolowe.P_39 = P39.ToString();
+                    NotifyPropertyChanged();
+                }
+             }
+        public ObservableCollection<JPKSprzedazWierszExt> ViewSP { get; set; }
         public ObservableCollection<JPKZakupWiersz> ViewZA { get; set; }
 
         public JPKSumyKontrola Sumy { get; set; }

JPK_VDEK/Deklaracja.xaml

@@ -119,7 +119,7 @@
         <Label Content="P_69" HorizontalAlignment="Left" Margin="574,426,0,0" VerticalAlignment="Top"/>
         <TextBox x:Name="tp18_Copy6" HorizontalAlignment="Left" Height="23" Margin="609,420,0,0" TextWrapping="Wrap" Text="{Binding Deklaracja.PozycjeSzczegolowe.P_69}" VerticalAlignment="Top" Width="120" ToolTip="Wysokość podatku należnego z tytułu dostawy towarów oraz świadczenia usług na terytorium kraju, opodatkowanych stawką 7% albo 8%, oraz korekty dokonanej zgodnie z art. 89a ust. 1 i 4 ustawy" IsReadOnly="True"/>
         <Label Content="P_ORDZU" HorizontalAlignment="Left" Margin="548,455,0,0" VerticalAlignment="Top"/>
-        <TextBox x:Name="tp18_Copy7" HorizontalAlignment="Left" Height="23" Margin="609,450,0,0" TextWrapping="Wrap" Text="{Binding Deklaracja.PozycjeSzczegolowe.P_ORDZU}" VerticalAlignment="Top" Width="191" ToolTip="Wysokość podatku należnego z tytułu dostawy towarów oraz świadczenia usług na terytorium kraju, opodatkowanych stawką 7% albo 8%, oraz korekty dokonanej zgodnie z art. 89a ust. 1 i 4 ustawy" IsReadOnly="True"/>
+        <TextBox x:Name="tp18_Copy7" HorizontalAlignment="Left" Height="74" Margin="609,450,0,0" TextWrapping="Wrap" Text="{Binding Deklaracja.PozycjeSzczegolowe.P_ORDZU}" VerticalAlignment="Top" Width="237" ToolTip="Wysokość podatku należnego z tytułu dostawy towarów oraz świadczenia usług na terytorium kraju, opodatkowanych stawką 7% albo 8%, oraz korekty dokonanej zgodnie z art. 89a ust. 1 i 4 ustawy" IsReadOnly="True"/>
         <CheckBox Content="P55" IsChecked="{Binding P55}" HorizontalAlignment="Left" Margin="609,57,0,0" VerticalAlignment="Top"/>
         <CheckBox Content="P56" IsChecked="{Binding P56}" HorizontalAlignment="Left" Margin="609,78,0,0" VerticalAlignment="Top"/>
         <CheckBox Content="P57" IsChecked="{Binding P57}" HorizontalAlignment="Left" Margin="609,100,0,0" VerticalAlignment="Top"/>

JPK_VDEK/Header.xaml

@@ -3,7 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:JPK_VDEK"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>

JPK_VDEK/JPK_VDEK.csproj

@@ -55,6 +55,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="AddDec.xaml.cs">
+      <DependentUpon>AddDec.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ConfigPopup.xaml.cs">
       <DependentUpon>ConfigPopup.xaml</DependentUpon>
     </Compile>
@@ -103,6 +106,10 @@
     <Compile Include="ZaWie.xaml.cs">
       <DependentUpon>ZaWie.xaml</DependentUpon>
     </Compile>
+    <Page Include="AddDec.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ConfigPopup.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

JPK_VDEK/JpkSap.xaml

@@ -10,8 +10,8 @@
         <Label Content="Cel złożenia" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top"/>
         <Label Content="Urząd" HorizontalAlignment="Left" Margin="10,41,0,0" VerticalAlignment="Top"/>
         <Button Content="5. Wygeneruj" HorizontalAlignment="Left" Margin="363,80,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click"/>
-        <ComboBox HorizontalAlignment="Left" Name="cCel" Margin="114,13,0,0" VerticalAlignment="Top" Width="324"/>
-        <ComboBox HorizontalAlignment="Left"  Name="cUrz" Margin="114,44,0,0" VerticalAlignment="Top" Width="324"/>
+        <ComboBox HorizontalAlignment="Left" Name="cCel" Margin="114,13,0,0" VerticalAlignment="Top" Width="324" SelectionChanged="cCel_SelectionChanged"/>
+        <ComboBox HorizontalAlignment="Left"  Name="cUrz" Margin="114,44,0,0" VerticalAlignment="Top" Width="324" SelectionChanged="cUrz_SelectionChanged"/>
 
     </Grid>
 </UserControl>

JPK_VDEK/JpkSap.xaml.cs

@@ -20,6 +20,7 @@ namespace JPK_VDEK
     /// </summary>
     public partial class JpkSap : UserControl
     {
+ 
         public JpkSap()
         {
             InitializeComponent();
@@ -38,14 +39,30 @@ namespace JPK_VDEK
         {
             if (JpkData.getJpk().wczytalemGL == true)
             {
+                Mouse.OverrideCursor = System.Windows.Input.Cursors.Wait;
                 string s = JpkData.getJpk().outScalony;
                 int scel = cCel.SelectedIndex;
                 int urz = cUrz.SelectedIndex;
                 JpkData.getJpk().setCel(scel);
                 JpkData.getJpk().setUrzad(urz);
                 JPK jpk = JpkData.getBaseJpk();
+                Mouse.OverrideCursor = null;
                 jpk.SaveToFile(s);
+                MessageBox.Show("Wygenerowano plik JPK", "JPK_VDEK");
             }
         }
+
+        private void cCel_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            int scel = cCel.SelectedIndex;
+            JpkData.getJpk().setCel(scel);
+
+        }
+
+        private void cUrz_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            int urz = cUrz.SelectedIndex;
+            JpkData.getJpk().setUrzad(urz);
+        }
     }
 }

JPK_VDEK/MainWindow.xaml

@@ -5,17 +5,17 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:JPK_VDEK"
         mc:Ignorable="d"
-        Title="JPK_VDEK" Height="703.584" Width="907.168" Icon="trash_empty_ico.ico">
+        Title="JPK_VDEK" Height="766.251" Width="907.168" Icon="trash_empty_ico.ico">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="157*"/>
             <ColumnDefinition Width="239*"/>
         </Grid.ColumnDefinitions>
 
-        <TabControl HorizontalAlignment="Left" Height="647" Margin="10,27,-0.2,-0.4" VerticalAlignment="Top" Width="891" Grid.ColumnSpan="2" RenderTransformOrigin="0.482,-0.112">
+        <TabControl HorizontalAlignment="Left" Height="745" Margin="10,27,0,-35" VerticalAlignment="Top" Width="891" Grid.ColumnSpan="2" RenderTransformOrigin="0.482,-0.112">
             <TabItem Header="Ogólne">
                 <Grid Background="#FFE5E5E5" Margin="0,0,0.4,9.2">
-                    <local:Ogolne x:Name="ogolne" Margin="0,10,9.2,-40"/>
+                    <local:Ogolne x:Name="ogolne" Margin="0,10,8.6,-44.2"/>
                 </Grid>
             </TabItem>
             <TabItem Header="Nagłówek">

JPK_VDEK/MainWindow.xaml.cs

@@ -26,6 +26,7 @@ namespace JPK_VDEK
         {
             InitializeComponent();
             this.ogolne.win = this;
+ 
         }
 
         private void MenuItem_Click(object sender, RoutedEventArgs e)

JPK_VDEK/Ogolne.xaml

@@ -4,41 +4,55 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:JPK_VDEK"
-             mc:Ignorable="d" d:DesignWidth="750" Height="639.797">
-    <Grid Margin="0,0,0.4,-57.4">
-        <Label Content="Podaj plik jpk IGL" HorizontalAlignment="Left" Margin="20,10,0,0" VerticalAlignment="Top" Width="123"/>
-        <Label Content="Podaj plik jpk SAP" HorizontalAlignment="Left" Margin="20,41,0,0" VerticalAlignment="Top" Width="123"/>
-        <TextBox x:Name="tigl" HorizontalAlignment="Left" Height="23" Margin="164,13,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="411" Grid.ColumnSpan="2"/>
-        <TextBox x:Name="tgl" HorizontalAlignment="Left" Height="23" Margin="164,44,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="411" Grid.ColumnSpan="2"/>
-        <Label Content="Podaj plik jpk scalony" HorizontalAlignment="Left" Margin="20,67,0,0" VerticalAlignment="Top" Width="123"/>
-        <TextBox x:Name="tscal" HorizontalAlignment="Left" Height="23" Margin="164,72,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="411" Grid.ColumnSpan="2"/>
-        <Button HorizontalAlignment="Left" Margin="580,13,0,0" VerticalAlignment="Top" Width="26" Click="Button_Click">
+             mc:Ignorable="d" d:DesignWidth="750" Height="788.997">
+    <Grid Margin="0,0,0,127">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="47*"/>
+        </Grid.ColumnDefinitions>
+        <Label Content="Podaj plik jpk IGL" HorizontalAlignment="Left" Margin="20,10,0,0" VerticalAlignment="Top" Width="123" Grid.ColumnSpan="2"/>
+        <Label Content="Podaj plik jpk SAP" HorizontalAlignment="Left" Margin="20,41,0,0" VerticalAlignment="Top" Width="123" Grid.ColumnSpan="2"/>
+        <TextBox x:Name="tigl" HorizontalAlignment="Left" Height="23" Margin="119,13,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="411" Grid.Column="1"/>
+        <TextBox x:Name="tgl" HorizontalAlignment="Left" Height="23" Margin="119,44,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="411" Grid.Column="1"/>
+        <Label Content="Podaj plik jpk scalony" HorizontalAlignment="Left" Margin="20,67,0,0" VerticalAlignment="Top" Width="123" Grid.ColumnSpan="2"/>
+        <TextBox x:Name="tscal" HorizontalAlignment="Left" Height="23" Margin="119,72,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="411" Grid.Column="1"/>
+        <Button HorizontalAlignment="Left" Margin="535,13,0,0" VerticalAlignment="Top" Width="26" Click="Button_Click" Grid.Column="1">
             <DockPanel>
                 <Image Source="icons8-browse-folder-32.png"/>
             </DockPanel>
         </Button>
-        <Button  HorizontalAlignment="Left" Margin="580,44,0,0" VerticalAlignment="Top" Width="26" RenderTransformOrigin="0.577,2.55" Click="Button_Click_1">
+        <Button  HorizontalAlignment="Left" Margin="535,44,0,0" VerticalAlignment="Top" Width="26" RenderTransformOrigin="0.577,2.55" Click="Button_Click_1" Grid.Column="1">
             <DockPanel>
                 <Image Source="icons8-browse-folder-32.png"/>
             </DockPanel>
         </Button>
-        <Button  HorizontalAlignment="Left" Margin="580,75,0,0" VerticalAlignment="Top" Width="26" Click="Button_Click_2">
+        <Button  HorizontalAlignment="Left" Margin="535,75,0,0" VerticalAlignment="Top" Width="26" Click="Button_Click_2" Grid.Column="1">
             <DockPanel>
                 <Image Source="icons8-browse-folder-32.png"/>
             </DockPanel>
         </Button>
-        <Button Content="1. Scal JPK" HorizontalAlignment="Left" Margin="152,273,0,0" VerticalAlignment="Top" Width="89" Click="Button_Click_4"/>
-        <Button Content="2. Zapisz JPK" HorizontalAlignment="Left" Margin="246,273,0,0" VerticalAlignment="Top" Width="89" Click="Button_Click_5"/>
-        <Button Content="3. Zapisz DB" HorizontalAlignment="Left" Margin="340,273,0,0" VerticalAlignment="Top" Width="89" RenderTransformOrigin="1.382,0.6" Click="Button_Click_6"/>
-        <Button Content="0. Wczytaj" HorizontalAlignment="Left" Margin="636,78,0,0" VerticalAlignment="Top" Width="89" Click="Button_Click_3"/>
-        <GroupBox Header="Pliki OUT" HorizontalAlignment="Left" Height="123" Margin="10,145,0,0" VerticalAlignment="Top" Width="730">
+        <Button Content="1. Scal JPK" HorizontalAlignment="Left" Margin="107,273,0,0" VerticalAlignment="Top" Width="89" Click="Button_Click_4" Grid.Column="1"/>
+        <Button Content="2. Zapisz JPK" HorizontalAlignment="Left" Margin="201,273,0,0" VerticalAlignment="Top" Width="89" Click="Button_Click_5" Grid.Column="1"/>
+        <Button Content="3. Zapisz DB" HorizontalAlignment="Left" Margin="295,273,0,0" VerticalAlignment="Top" Width="89" RenderTransformOrigin="1.382,0.6" Click="Button_Click_6" Grid.Column="1"/>
+        <Button Content="0. Wczytaj" HorizontalAlignment="Left" Margin="591,78,0,0" VerticalAlignment="Top" Width="89" Click="Button_Click_3" Grid.Column="1"/>
+        <GroupBox Header="Pliki OUT" HorizontalAlignment="Left" Height="123" Margin="10,145,0,0" VerticalAlignment="Top" Width="730" Grid.ColumnSpan="2">
             <local:OutFile HorizontalAlignment="Left" Height="100" Margin="10,0,0,0" VerticalAlignment="Top" Width="696"/>
         </GroupBox>
-        <Label Content="Numer JPK 0 - pierwszy 1,2... korekty " HorizontalAlignment="Left" Margin="20,114,0,0" VerticalAlignment="Top" RenderTransformOrigin="-4.789,-0.154"/>
-        <TextBox x:Name="tkor" HorizontalAlignment="Left" Height="23" Margin="232,114,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="120"/>
-        <Button x:Name="bgen" Content="4. Wczytaj" HorizontalAlignment="Left" Margin="636,47,0,0" VerticalAlignment="Top" Width="89" Click="bgen_Click"/>
-        <GroupBox Header="Sap" HorizontalAlignment="Left" Height="154" Margin="10,297,0,0" VerticalAlignment="Top" Width="730">
-            <local:JpkSap HorizontalAlignment="Left" Height="127" Margin="10,0,0,0" VerticalAlignment="Top" Width="684"/>
+        <Label Content="Numer JPK 0 - pierwszy 1,2... korekty " HorizontalAlignment="Left" Margin="20,114,0,0" VerticalAlignment="Top" RenderTransformOrigin="-4.789,-0.154" Grid.ColumnSpan="2"/>
+        <TextBox x:Name="tkor" HorizontalAlignment="Left" Height="23" Margin="187,114,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="120" Grid.Column="1"/>
+        <Button x:Name="bgen" Content="4. Wczytaj" HorizontalAlignment="Left" Margin="591,47,0,0" VerticalAlignment="Top" Width="89" Click="bgen_Click" Grid.Column="1"/>
+        <GroupBox Header="Sap" HorizontalAlignment="Left" Height="120" Margin="10,527,0,0" VerticalAlignment="Top" Width="730" Grid.ColumnSpan="2">
+            <local:JpkSap x:Name="jpksap" HorizontalAlignment="Left" Height="127" Margin="16,-6,0,0" VerticalAlignment="Top" Width="684" RenderTransformOrigin="0.5,0.5">
+                <local:JpkSap.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform/>
+                        <SkewTransform AngleX="-0.355"/>
+                        <RotateTransform/>
+                        <TranslateTransform X="0.394"/>
+                    </TransformGroup>
+                </local:JpkSap.RenderTransform>
+            </local:JpkSap>
         </GroupBox>
+        <local:AddDec HorizontalAlignment="Left" Height="229" Margin="10,298,0,0" VerticalAlignment="Top" Width="715" Grid.ColumnSpan="2"/>
     </Grid>
 </UserControl>

JPK_VDEK/Ogolne.xaml.cs

@@ -25,9 +25,11 @@ namespace JPK_VDEK
     public partial class Ogolne : UserControl
     {
         public MainWindow win { get; set; }
+        
         public Ogolne()
         {
             InitializeComponent();
+           
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)
@@ -45,6 +47,7 @@ namespace JPK_VDEK
 
         private void Button_Click_1(object sender, RoutedEventArgs e)
         {
+
             OpenFileDialog openFileDialog = new OpenFileDialog();
             openFileDialog.Multiselect = false;
             openFileDialog.Title = "Podaj plik do przetworzenia GL";
@@ -106,18 +109,19 @@ namespace JPK_VDEK
             }
             try
             {
-                using (StreamReader sr = new StreamReader(path))
+                Mouse.OverrideCursor = System.Windows.Input.Cursors.Wait;
+                using (StreamReader sr = new StreamReader(path, Encoding.Default))
                 {
                     string line = sr.ReadLine();
                     atr = line.Split('|');
 
+
                     JpkData.getJpk().Naglowek.KodUrzedu = TKodUS.Item0271;
                     JpkData.getJpk().UsNazwa = "DOLNOŚLĄSKI URZĄD SKARBOWY WE WROCŁAWJU";
 
                     JpkData.getJpk().Naglowek.Rok = atr[1].Substring(0, 4);
                     JpkData.getJpk().Naglowek.Miesiac = Convert.ToSByte(atr[1].Substring(4, 2));
                     JpkData.getJpk().Naglowek.DataWytworzeniaJPK = new DateTime(Convert.ToInt16(atr[3].Substring(0, 4)), Convert.ToInt16(atr[3].Substring(4, 2)), Convert.ToInt16(atr[3].Substring(6, 2)));
-                    JpkData.getJpk().Naglowek.CelZlozenia.Value = 1;
 
                     TPodmiotDowolnyBezAdresuOsobaNiefizyczna fir = new TPodmiotDowolnyBezAdresuOsobaNiefizyczna();
                     JG jgos = new JG();
@@ -140,6 +144,7 @@ namespace JPK_VDEK
                         {
                             JpkData.getJpk().Deklaracja.PozycjeSzczegolowe = new PozycjeSzczegolowe();
                             PozycjeSzczegolowe d1 = JpkData.getJpk().Deklaracja.PozycjeSzczegolowe;
+                           
                             d1.P_10 = atr[2] ;
                             d1.P_11 = atr[3];
                             d1.P_12 = atr[4];
@@ -274,7 +279,7 @@ namespace JPK_VDEK
                             }
                             d1.P_68 = atr[60];
                             d1.P_69 = atr[61];
-                            d1.P_ORDZU = atr[62];
+                            d1.P_ORDZU = "";
                             JpkData.getJpk().Deklaracja.Pouczenia = Convert.ToDecimal(atr[63].Replace('.', ',')); 
                         }
                        
@@ -282,6 +287,7 @@ namespace JPK_VDEK
                         {
                             liczbaWSp++;
                             JPKSprzedazWiersz spw = new JPKSprzedazWiersz();
+                            JPKSprzedazWierszExt spwext = new JPKSprzedazWierszExt();
                             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)));
@@ -350,25 +356,28 @@ namespace JPK_VDEK
                             JpkData.getJpk().Sumy.SprzedazVAT_Marza += spw.SprzedazVAT_Marza;
 
 
-                            spw.NrKontrahenta = atr[46];
+                            spw.NrKontrahenta = atr[48];
+
+                            spw.KodKrajuNadaniaTIN = atr[50];
 
-                            spw.KodKrajuNadaniaTIN = atr[48];
-                            if (atr[49].Equals("WEW"))
+                            if (atr[51].Equals("WEW"))
                             {
                                 spw.TypDokumentu = TDowoduSprzedazy.WEW;
+                                spwext.TypDokumentuExt = "WEW";
                             }
-                            if (atr[49].Equals("RO"))
+                            if (atr[51].Equals("RO"))
                             {
                                 spw.TypDokumentu = TDowoduSprzedazy.RO;
+                                spwext.TypDokumentuExt = "RO";
                             }
-                            if (atr[49].Equals("FP"))
+                            if (atr[51].Equals("FP"))
                             {
                                 spw.TypDokumentu = TDowoduSprzedazy.FP;
+                                spwext.TypDokumentuExt = "FP";
                             }
-
                             spw.GTU_01 = 0;
                             spw.GTU_02 = 0;
-                            if (atr[50].Equals("X"))
+                            if (atr[52].Equals("X"))
                             {
                                 spw.GTU_03 = 1;
                             }
@@ -377,7 +386,7 @@ namespace JPK_VDEK
                                 spw.GTU_03 = 0;
                             }
                             spw.GTU_04 = 0;
-                            if (atr[51].Equals("X"))
+                            if (atr[53].Equals("X"))
                             {
                                 spw.GTU_05 = 1;
                             }
@@ -385,7 +394,7 @@ namespace JPK_VDEK
                             {
                                 spw.GTU_05 = 0;
                             }
-                            if (atr[52].Equals("X"))
+                            if (atr[54].Equals("X"))
                             {
                                 spw.GTU_06 = 1;
                             }
@@ -393,7 +402,7 @@ namespace JPK_VDEK
                             {
                                 spw.GTU_06 = 0;
                             }
-                            if (atr[53].Equals("X"))
+                            if (atr[55].Equals("X"))
                             {
                                 spw.GTU_07 = 1;
                             }
@@ -403,7 +412,7 @@ namespace JPK_VDEK
                             }
                             spw.GTU_08 = 0;
                             spw.GTU_09 = 0;
-                            if (atr[54].Equals("X"))
+                            if (atr[56].Equals("X"))
                             {
                                 spw.GTU_10 = 1;
                             }
@@ -412,7 +421,7 @@ namespace JPK_VDEK
                                 spw.GTU_10 = 0;
                             }
                             spw.GTU_11 = 0;
-                            if (atr[55].Equals("X"))
+                            if (atr[57].Equals("X"))
                             {
                                 spw.GTU_12 = 1;
                             }
@@ -420,7 +429,7 @@ namespace JPK_VDEK
                             {
                                 spw.GTU_12 = 0;
                             }
-                            if (atr[56].Equals("X"))
+                            if (atr[58].Equals("X"))
                             {
                                 spw.GTU_13 = 1;
                             }
@@ -428,7 +437,7 @@ namespace JPK_VDEK
                             {
                                 spw.GTU_13 = 0;
                             }
-                            if (atr[57].Equals("X"))
+                            if (atr[59].Equals("X"))
                             {
                                 spw.SW = 1;
                             }
@@ -436,7 +445,7 @@ namespace JPK_VDEK
                             {
                                 spw.SW = 0;
                             }
-                            if (atr[58].Equals("X"))
+                            if (atr[60].Equals("X"))
                             {
                                 spw.EE = 1;
                             }
@@ -444,7 +453,7 @@ namespace JPK_VDEK
                             {
                                 spw.EE = 0;
                             }
-                            if (atr[59].Equals("X"))
+                            if (atr[61].Equals("X"))
                             {
                                 spw.TP = 1;
                             }
@@ -452,7 +461,7 @@ namespace JPK_VDEK
                             {
                                 spw.TP = 0;
                             }
-                            if (atr[60].Equals("X"))
+                            if (atr[62].Equals("X"))
                             {
                                 spw.TT_WNT = 1;
                             }
@@ -460,7 +469,7 @@ namespace JPK_VDEK
                             {
                                 spw.TT_WNT = 0;
                             }
-                            if (atr[61].Equals("X"))
+                            if (atr[63].Equals("X"))
                             {
                                 spw.TT_D = 1;
                             }
@@ -468,7 +477,7 @@ namespace JPK_VDEK
                             {
                                 spw.TT_D = 0;
                             }
-                            if (atr[62].Equals("X"))
+                            if (atr[64].Equals("X"))
                             {
                                 spw.MR_T = 1;
                             }
@@ -476,7 +485,7 @@ namespace JPK_VDEK
                             {
                                 spw.MR_T = 0;
                             }
-                            if (atr[63].Equals("X"))
+                            if (atr[65].Equals("X"))
                             {
                                 spw.MR_UZ = 1;
                             }
@@ -484,7 +493,7 @@ namespace JPK_VDEK
                             {
                                 spw.MR_UZ = 0;
                             }
-                            if (atr[64].Equals("X"))
+                            if (atr[66].Equals("X"))
                             {
                                 spw.I_42 = 1;
                             }
@@ -492,7 +501,7 @@ namespace JPK_VDEK
                             {
                                 spw.I_42 = 0;
                             }
-                            if (atr[65].Equals("X"))
+                            if (atr[67].Equals("X"))
                             {
                                 spw.I_63 = 1;
                             }
@@ -500,7 +509,7 @@ namespace JPK_VDEK
                             {
                                 spw.I_63 = 0;
                             }
-                            if (atr[65].Equals("X"))
+                            if (atr[68].Equals("X"))
                             {
                                 spw.B_SPV = 1;
                             }
@@ -508,7 +517,7 @@ namespace JPK_VDEK
                             {
                                 spw.B_SPV = 0;
                             }
-                            if (atr[66].Equals("X"))
+                            if (atr[69].Equals("X"))
                             {
                                 spw.B_SPV_DOSTAWA = 1;
                             }
@@ -516,7 +525,7 @@ namespace JPK_VDEK
                             {
                                 spw.B_SPV_DOSTAWA = 0;
                             }
-                            if (atr[67].Equals("X"))
+                            if (atr[70].Equals("X"))
                             {
                                 spw.B_MPV_PROWIZJA = 1;
                             }
@@ -524,7 +533,7 @@ namespace JPK_VDEK
                             {
                                 spw.B_MPV_PROWIZJA = 0;
                             }
-                            if (atr[68].Equals("X"))
+                            if (atr[71].Equals("X"))
                             {
                                 spw.MPP = 1;
                             }
@@ -532,7 +541,7 @@ namespace JPK_VDEK
                             {
                                 spw.MPP = 0;
                             }
-                            if (atr[69].Equals("X"))
+                            if (atr[72].Equals("X"))
                             {
                                 spw.KorektaPodstawyOpodt = 1;
                             }
@@ -540,46 +549,51 @@ namespace JPK_VDEK
                             {
                                 spw.KorektaPodstawyOpodt = 0;
                             }
+                            spwext.CopyFromBase(spw);
                             JpkData.getJpk().SprzedazWiersz.Add(spw);
-                            JpkData.getJpk().ViewSP.Add(spw);
+                            JpkData.getJpk().ViewSP.Add(spwext);
                         }
                         if (atr[1].Equals("Z"))
                         {
                             liczbaWZp++;
                             JPKZakupWiersz zaw = new JPKZakupWiersz();
+                            JJPKZakupWierszExt zawext = new JJPKZakupWierszExt();
                             zaw.LpZakupu = atr[0];
 
                             zaw.DowodZakupu = atr[5];
                             zaw.NazwaDostawcy = atr[6];
-                            zaw.NrDostawcy = atr[46];
+                            zaw.NrDostawcy = atr[48];
                             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_42 = Convert.ToDecimal(atr[42].Replace('.', ','));
+                            zaw.K_43 = Convert.ToDecimal(atr[43].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.K_44 = Convert.ToDecimal(atr[44].Replace('.', ','));
+                            zaw.K_45 = Convert.ToDecimal(atr[45].Replace('.', ','));
+                            zaw.K_46 = Convert.ToDecimal(atr[46].Replace('.', ','));
+                            zaw.K_47 = Convert.ToDecimal(atr[47].Replace('.', ','));
 
-                            zaw.KodKrajuNadaniaTIN = atr[48];
+                            zaw.KodKrajuNadaniaTIN = atr[50];
 
-                            if (atr[49].Equals("MK"))
+                            if (atr[51].Equals("MK"))
                             {
                                 zaw.DokumentZakupu = TDowoduZakupu.MK;
+                                zawext.TypDokumentuExt = "MK";
                             }
-                            if (atr[49].Equals("VAT_RR"))
+                            if (atr[51].Equals("VAT_RR"))
                             {
                                 zaw.DokumentZakupu = TDowoduZakupu.VAT_RR;
+                                zawext.TypDokumentuExt = "VAT_RR";
                             }
-                            if (atr[49].Equals("WEW"))
+                            if (atr[51].Equals("WEW"))
                             {
                                 zaw.DokumentZakupu = TDowoduZakupu.WEW;
+                                zawext.TypDokumentuExt = "WEW";
                             }
-                            if (atr[68].Equals("X"))
+                            if (atr[70].Equals("X"))
                             {
                                 zaw.MPP = 1;
                             }
@@ -587,7 +601,7 @@ namespace JPK_VDEK
                             {
                                 zaw.MPP = 0;
                             }
-                            if (atr[70].Equals("X"))
+                            if (atr[72].Equals("X"))
                             {
                                 zaw.IMP = 1;
                             }
@@ -595,8 +609,10 @@ namespace JPK_VDEK
                             {
                                 zaw.IMP = 0;
                             }
-                            zaw.ZakupVAT_Marza = Convert.ToDecimal(atr[71].Replace('.', ','));
-
+                            if (!atr[73].Equals(""))
+                            {
+                                zaw.ZakupVAT_Marza = Convert.ToDecimal(atr[73].Replace('.', ','));
+                            }
                             JpkData.getJpk().Sumy.K_40 += zaw.K_40;
                             JpkData.getJpk().Sumy.K_41 += zaw.K_41;
                             JpkData.getJpk().Sumy.K_42 += zaw.K_42;
@@ -609,16 +625,21 @@ namespace JPK_VDEK
 
                             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().ZakupWiersz.Add(zaw);
+                            zawext.CopyFromBase(zaw);
+                            JpkData.getJpk().ViewZA.Add(zawext);
                         }
                     }
                     JpkData.getJpk().SprzedazCtrl.LiczbaWierszySprzedazy = liczbaWSp.ToString();
                     JpkData.getJpk().SprzedazCtrl.PodatekNalezny = podNal;
                     JpkData.getJpk().ZakupCtrl.LiczbaWierszyZakupow = liczbaWZp.ToString();
                     JpkData.getJpk().ZakupCtrl.PodatekNaliczony = podNali;
+
                 }
                 JpkData.getJpk().wczytalemGL = true;
                 win.DataContext = JpkData.getJpk();
+                Mouse.OverrideCursor = null;
+                MessageBox.Show("Wczytano plik","JPK_VDEK");
             }
             catch (FileNotFoundException ex)
             {

JPK_VDEK/SPwiersz.xaml

@@ -27,7 +27,7 @@
                 <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="TypDokumentu"  Binding="{Binding TypDokumentuExt}" />
                 <DataGridTextColumn Header="GTU_01"  Binding="{Binding GTU_01}" />
                 <DataGridTextColumn Header="GTU_02"  Binding="{Binding GTU_02}" />
                 <DataGridTextColumn Header="GTU_03"  Binding="{Binding GTU_03}"/>

JPK_VDEK/Schemat_JPK_V7M(1)_v1-0.Designer.cs

@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
 //    Generated by Xsd2Code++. Version 5.0.0.47. www.xsd2code.com
-//    <NameSpace>JPK_VDEK</NameSpace><Collection>List</Collection><codeType>CSharp</codeType><EnableDataBinding>False</EnableDataBinding><GenerateCloneMethod>False</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><DataMemberNameArg>OnlyIfDifferent</DataMemberNameArg><DataMemberOnXmlIgnore>False</DataMemberOnXmlIgnore><CodeBaseTag>Net20</CodeBaseTag><InitializeFields>None</InitializeFields><GenerateUnusedComplexTypes>False</GenerateUnusedComplexTypes><GenerateUnusedSimpleTypes>True</GenerateUnusedSimpleTypes><GenerateXMLAttributes>True</GenerateXMLAttributes><OrderXMLAttrib>False</OrderXMLAttrib><EnableLazyLoading>False</EnableLazyLoading><VirtualProp>False</VirtualProp><PascalCase>False</PascalCase><AutomaticProperties>True</AutomaticProperties><PropNameSpecified>None</PropNameSpecified><PrivateFieldName>StartWithUnderscore</PrivateFieldName><PrivateFieldNamePrefix></PrivateFieldNamePrefix><EnableRestriction>False</EnableRestriction><RestrictionMaxLenght>False</RestrictionMaxLenght><RestrictionRegEx>False</RestrictionRegEx><RestrictionRange>False</RestrictionRange><ValidateProperty>False</ValidateProperty><ClassNamePrefix></ClassNamePrefix><ClassLevel>Public</ClassLevel><PartialClass>True</PartialClass><ClassesInSeparateFiles>False</ClassesInSeparateFiles><ClassesInSeparateFilesDir></ClassesInSeparateFilesDir><TrackingChangesEnable>False</TrackingChangesEnable><GenTrackingClasses>False</GenTrackingClasses><HidePrivateFieldInIDE>False</HidePrivateFieldInIDE><EnableSummaryComment>False</EnableSummaryComment><EnableAppInfoSettings>False</EnableAppInfoSettings><EnableExternalSchemasCache>False</EnableExternalSchemasCache><EnableDebug>False</EnableDebug><EnableWarn>False</EnableWarn><ExcludeImportedTypes>False</ExcludeImportedTypes><ExpandNesteadAttributeGroup>False</ExpandNesteadAttributeGroup><CleanupCode>False</CleanupCode><EnableXmlSerialization>True</EnableXmlSerialization><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><EnableEncoding>False</EnableEncoding><EnableXMLIndent>False</EnableXMLIndent><IndentChar>Indent2Space</IndentChar><NewLineAttr>False</NewLineAttr><OmitXML>False</OmitXML><Encoder>UTF8</Encoder><Serializer>XmlSerializer</Serializer><sspNullable>False</sspNullable><sspString>False</sspString><sspCollection>False</sspCollection><sspComplexType>False</sspComplexType><sspSimpleType>False</sspSimpleType><sspEnumType>False</sspEnumType><XmlSerializerEvent>False</XmlSerializerEvent><BaseClassName>EntityBase</BaseClassName><UseBaseClass>False</UseBaseClass><GenBaseClass>False</GenBaseClass><CustomUsings></CustomUsings><AttributesToExlude></AttributesToExlude>
+//    <NameSpace>JPK_VDEK</NameSpace><Collection>List</Collection><codeType>CSharp</codeType><EnableDataBinding>False</EnableDataBinding><GenerateCloneMethod>False</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><DataMemberNameArg>OnlyIfDifferent</DataMemberNameArg><DataMemberOnXmlIgnore>False</DataMemberOnXmlIgnore><CodeBaseTag>Net20</CodeBaseTag><InitializeFields>None</InitializeFields><GenerateUnusedComplexTypes>False</GenerateUnusedComplexTypes><GenerateUnusedSimpleTypes>True</GenerateUnusedSimpleTypes><GenerateXMLAttributes>True</GenerateXMLAttributes><OrderXMLAttrib>False</OrderXMLAttrib><EnableLazyLoading>False</EnableLazyLoading><VirtualProp>False</VirtualProp><PascalCase>False</PascalCase><AutomaticProperties>True</AutomaticProperties><PropNameSpecified>None</PropNameSpecified><PrivateFieldName>StartWithUnderscore</PrivateFieldName><PrivateFieldNamePrefix></PrivateFieldNamePrefix><EnableRestriction>False</EnableRestriction><RestrictionMaxLenght>False</RestrictionMaxLenght><RestrictionRegEx>False</RestrictionRegEx><RestrictionRange>False</RestrictionRange><ValidateProperty>False</ValidateProperty><ClassNamePrefix></ClassNamePrefix><ClassLevel>Public</ClassLevel><PartialClass>True</PartialClass><ClassesInSeparateFiles>False</ClassesInSeparateFiles><ClassesInSeparateFilesDir></ClassesInSeparateFilesDir><TrackingChangesEnable>False</TrackingChangesEnable><GenTrackingClasses>False</GenTrackingClasses><HidePrivateFieldInIDE>False</HidePrivateFieldInIDE><EnableSummaryComment>False</EnableSummaryComment><EnableAppInfoSettings>False</EnableAppInfoSettings><EnableExternalSchemasCache>False</EnableExternalSchemasCache><EnableDebug>False</EnableDebug><EnableWarn>False</EnableWarn><ExcludeImportedTypes>False</ExcludeImportedTypes><ExpandNesteadAttributeGroup>False</ExpandNesteadAttributeGroup><CleanupCode>False</CleanupCode><EnableXmlSerialization>True</EnableXmlSerialization><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><EnableEncoding>False</EnableEncoding><EnableXMLIndent>False</EnableXMLIndent><IndentChar>Indent2Space</IndentChar><NewLineAttr>False</NewLineAttr><OmitXML>False</OmitXML><Encoder>UTF8</Encoder><Serializer>XmlSerializer</Serializer><sspNullable>True</sspNullable><sspString>False</sspString><sspCollection>False</sspCollection><sspComplexType>False</sspComplexType><sspSimpleType>False</sspSimpleType><sspEnumType>True</sspEnumType><XmlSerializerEvent>False</XmlSerializerEvent><BaseClassName>EntityBase</BaseClassName><UseBaseClass>False</UseBaseClass><GenBaseClass>False</GenBaseClass><CustomUsings></CustomUsings><AttributesToExlude></AttributesToExlude>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 #pragma warning disable
@@ -19,7 +19,7 @@ namespace JPK_VDEK
     using System.Collections.Generic;
 
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -28,6 +28,8 @@ namespace JPK_VDEK
     public partial class PozycjeSzczegolowe
     {
 
+        private bool _shouldSerializeItemElementName;
+
         private string _p_10;
 
         private string _p_11;
@@ -760,6 +762,7 @@ namespace JPK_VDEK
             set
             {
                 this._itemElementName = value;
+                _shouldSerializeItemElementName = true;
             }
         }
 
@@ -925,6 +928,18 @@ namespace JPK_VDEK
             }
         }
 
+        /// <summary>
+        /// Test whether ItemElementName should be serialized
+        /// </summary>
+        public virtual bool ShouldSerializeItemElementName()
+        {
+            if (_shouldSerializeItemElementName)
+            {
+                return true;
+            }
+            return (ItemElementName != default(ItemChoiceType));
+        }
+
         #region Serialize/Deserialize
         /// <summary>
         /// Serializes current PozycjeSzczegolowe object into an XML string
@@ -1106,7 +1121,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://jpk.mf.gov.pl/wzor/2019/11/06/11061/", IncludeInSchema = false)]
     public enum ItemChoiceType
@@ -1125,7 +1140,7 @@ namespace JPK_VDEK
         P_58,
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1429,7 +1444,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1632,7 +1647,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1640,6 +1655,8 @@ namespace JPK_VDEK
     public partial class TNaglowek
     {
 
+        private bool _shouldSerializeKodUrzedu;
+
         private TNaglowekKodFormularza _kodFormularza;
 
         private sbyte _wariantFormularza;
@@ -1732,6 +1749,7 @@ namespace JPK_VDEK
             set
             {
                 this._kodUrzedu = value;
+                _shouldSerializeKodUrzedu = true;
             }
         }
 
@@ -1796,6 +1814,18 @@ namespace JPK_VDEK
             }
         }
 
+        /// <summary>
+        /// Test whether KodUrzedu should be serialized
+        /// </summary>
+        public virtual bool ShouldSerializeKodUrzedu()
+        {
+            if (_shouldSerializeKodUrzedu)
+            {
+                return true;
+            }
+            return (KodUrzedu != default(TKodUS));
+        }
+
         #region Serialize/Deserialize
         /// <summary>
         /// Serializes current TNaglowek object into an XML string
@@ -1977,7 +2007,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1985,6 +2015,8 @@ namespace JPK_VDEK
     public partial class TNaglowekKodFormularza
     {
 
+        private bool _shouldSerializeValue;
+
         private string _kodSystemowy;
 
         private string _wersjaSchemy;
@@ -2035,6 +2067,7 @@ namespace JPK_VDEK
             set
             {
                 this._value = value;
+                _shouldSerializeValue = true;
             }
         }
 
@@ -2050,6 +2083,18 @@ namespace JPK_VDEK
             }
         }
 
+        /// <summary>
+        /// Test whether Value should be serialized
+        /// </summary>
+        public virtual bool ShouldSerializeValue()
+        {
+            if (_shouldSerializeValue)
+            {
+                return true;
+            }
+            return (Value != default(TKodFormularza));
+        }
+
         #region Serialize/Deserialize
         /// <summary>
         /// Serializes current TNaglowekKodFormularza object into an XML string
@@ -2231,7 +2276,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://jpk.mf.gov.pl/wzor/2019/11/06/11061/")]
     public enum TKodFormularza
@@ -2241,7 +2286,7 @@ namespace JPK_VDEK
         JPK_VAT,
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2479,7 +2524,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://crd.gov.pl/xml/schematy/dziedzinowe/mf/2018/08/24/eD/DefinicjeTypy/")]
     public enum TKodUS
@@ -4086,7 +4131,7 @@ namespace JPK_VDEK
         Item3271,
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4094,6 +4139,8 @@ namespace JPK_VDEK
     public partial class TNaglowekKodFormularzaDekl
     {
 
+        private bool _shouldSerializeValue;
+
         private string _kodSystemowy;
 
         private string _kodPodatku;
@@ -4176,6 +4223,7 @@ namespace JPK_VDEK
             set
             {
                 this._value = value;
+                _shouldSerializeValue = true;
             }
         }
 
@@ -4191,6 +4239,18 @@ namespace JPK_VDEK
             }
         }
 
+        /// <summary>
+        /// Test whether Value should be serialized
+        /// </summary>
+        public virtual bool ShouldSerializeValue()
+        {
+            if (_shouldSerializeValue)
+            {
+                return true;
+            }
+            return (Value != default(TKodFormularzaVAT7));
+        }
+
         #region Serialize/Deserialize
         /// <summary>
         /// Serializes current TNaglowekKodFormularzaDekl object into an XML string
@@ -4372,7 +4432,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://jpk.mf.gov.pl/wzor/2019/11/06/11061/")]
     public enum TKodFormularzaVAT7
@@ -4383,7 +4443,7 @@ namespace JPK_VDEK
         VAT7,
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4606,7 +4666,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4825,7 +4885,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5058,7 +5118,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5320,7 +5380,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5553,7 +5613,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5785,7 +5845,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6016,7 +6076,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6024,6 +6084,8 @@ namespace JPK_VDEK
     public partial class JPKSprzedazWiersz
     {
 
+        private bool _shouldSerializeTypDokumentu;
+
         private string _lpSprzedazy;
 
         private string _kodKrajuNadaniaTIN;
@@ -6256,6 +6318,7 @@ namespace JPK_VDEK
             set
             {
                 this._typDokumentu = value;
+                _shouldSerializeTypDokumentu = true;
             }
         }
 
@@ -6931,6 +6994,18 @@ namespace JPK_VDEK
             }
         }
 
+        /// <summary>
+        /// Test whether TypDokumentu should be serialized
+        /// </summary>
+        public virtual bool ShouldSerializeTypDokumentu()
+        {
+            if (_shouldSerializeTypDokumentu)
+            {
+                return true;
+            }
+            return (TypDokumentu != default(TDowoduSprzedazy));
+        }
+
         #region Serialize/Deserialize
         /// <summary>
         /// Serializes current JPKSprzedazWiersz object into an XML string
@@ -7112,7 +7187,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://jpk.mf.gov.pl/wzor/2019/11/06/11061/")]
     public enum TDowoduSprzedazy
@@ -7128,7 +7203,7 @@ namespace JPK_VDEK
         FP,
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7360,7 +7435,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7368,6 +7443,8 @@ namespace JPK_VDEK
     public partial class JPKZakupWiersz
     {
 
+        private bool _shouldSerializeDokumentZakupu;
+
         private string _lpZakupu;
 
         private string _kodKrajuNadaniaTIN;
@@ -7506,6 +7583,7 @@ namespace JPK_VDEK
             set
             {
                 this._dokumentZakupu = value;
+                _shouldSerializeDokumentZakupu = true;
             }
         }
 
@@ -7653,6 +7731,18 @@ namespace JPK_VDEK
             }
         }
 
+        /// <summary>
+        /// Test whether DokumentZakupu should be serialized
+        /// </summary>
+        public virtual bool ShouldSerializeDokumentZakupu()
+        {
+            if (_shouldSerializeDokumentZakupu)
+            {
+                return true;
+            }
+            return (DokumentZakupu != default(TDowoduZakupu));
+        }
+
         #region Serialize/Deserialize
         /// <summary>
         /// Serializes current JPKZakupWiersz object into an XML string
@@ -7834,7 +7924,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://jpk.mf.gov.pl/wzor/2019/11/06/11061/")]
     public enum TDowoduZakupu
@@ -7850,7 +7940,7 @@ namespace JPK_VDEK
         WEW,
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8082,7 +8172,7 @@ namespace JPK_VDEK
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://jpk.mf.gov.pl/wzor/2019/11/06/11061/")]
     [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://jpk.mf.gov.pl/wzor/2019/11/06/11061/", IsNullable = false)]

JPK_VDEK/ZaWie.xaml

@@ -25,7 +25,7 @@
                 <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="DokumentZakupu" Binding="{Binding Path=TypDokumentuExt}"/>
                 <DataGridTextColumn Header="MPP" Binding="{Binding Path=MPP}"/>
                 <DataGridTextColumn Header="IMP" Binding="{Binding Path=IMP}"/>
                 <DataGridTextColumn Header="K_40" Binding="{Binding Path=K_40}"/>