version 1.1.16

Mip/Mip.csproj

@@ -88,11 +88,6 @@
     <Reference Include="GMap.NET.WindowsForms">
       <HintPath>DLL\GMap.NET.WindowsForms.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>C:\Windows\assembly\GAC\Microsoft.Office.Interop.Excel\12.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Excel.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="Microsoft.VisualBasic.Compatibility" />
     <Reference Include="MonthCalendar">
@@ -469,17 +464,6 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="Microsoft.Office.Core">
-      <Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
-      <VersionMajor>2</VersionMajor>
-      <VersionMinor>4</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5">
       <Visible>False</Visible>
@@ -543,7 +527,35 @@
     <None Include="Použité obrázky\arrow-up-double-2.png" />
     <None Include="Použité obrázky\arrow-down-double-2.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <COMReference Include="Microsoft.Office.Core">
+      <Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
+      <VersionMajor>2</VersionMajor>
+      <VersionMinor>4</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="Microsoft.Office.Interop.Excel">
+      <Guid>{00020813-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>6</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="VBIDE">
+      <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>5</VersionMajor>
+      <VersionMinor>3</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Mip/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.15.0")]
+[assembly: AssemblyVersion("1.1.16.0")]
-[assembly: AssemblyFileVersion("1.1.15.0")]
+[assembly: AssemblyFileVersion("1.1.16.0")]

Mip/classGlobal.cs

@@ -508,7 +508,7 @@ namespace Mip
                 {
 
                     //IPaddress = "127.0.0.1";
-                    IPaddress = "192.168.1.18";
+                    IPaddress = "192.168.1.68";
                     pingReply = pingIP.Send(IPaddress);
                     if (pingReply.Status.ToString() == "Success")
                     {

Mip/frmEditDopyt.Designer.cs

@@ -41,6 +41,8 @@
             this.checkBox1 = new System.Windows.Forms.CheckBox();
             this.label11 = new System.Windows.Forms.Label();
             this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();
+            this.label25 = new System.Windows.Forms.Label();
             this.label10 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
@@ -86,8 +88,6 @@
             this.button2 = new System.Windows.Forms.Button();
             this.comboBox3 = new System.Windows.Forms.ComboBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();
-            this.label25 = new System.Windows.Forms.Label();
             this.groupBox3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
             this.groupBox4.SuspendLayout();
@@ -258,6 +258,22 @@
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "Informácie o zázname";
             // 
+            // dateTimePicker2
+            // 
+            this.dateTimePicker2.CustomFormat = "YYYY-mm-DD";
+            this.dateTimePicker2.Location = new System.Drawing.Point(158, 109);
+            this.dateTimePicker2.Name = "dateTimePicker2";
+            this.dateTimePicker2.Size = new System.Drawing.Size(174, 20);
+            this.dateTimePicker2.TabIndex = 40;
+            // 
+            // label25
+            // 
+            this.label25.Location = new System.Drawing.Point(3, 111);
+            this.label25.Name = "label25";
+            this.label25.Size = new System.Drawing.Size(149, 18);
+            this.label25.TabIndex = 39;
+            this.label25.Text = "Dátum potvrdený zákazníkovi";
+            // 
             // label10
             // 
             this.label10.AutoSize = true;
@@ -695,22 +711,6 @@
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "Zákazník a výkres";
             // 
-            // dateTimePicker2
-            // 
-            this.dateTimePicker2.CustomFormat = "YYYY-mm-DD";
-            this.dateTimePicker2.Location = new System.Drawing.Point(158, 109);
-            this.dateTimePicker2.Name = "dateTimePicker2";
-            this.dateTimePicker2.Size = new System.Drawing.Size(174, 20);
-            this.dateTimePicker2.TabIndex = 40;
-            // 
-            // label25
-            // 
-            this.label25.Location = new System.Drawing.Point(3, 111);
-            this.label25.Name = "label25";
-            this.label25.Size = new System.Drawing.Size(149, 18);
-            this.label25.TabIndex = 39;
-            this.label25.Text = "Dátum potvrdený zákazníkovi";
-            // 
             // frmEditDopyt
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

Mip/frmEditDopyt.cs

@@ -134,7 +134,14 @@ namespace Mip
             comboBox5.Text = DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["Material"].Ordinal].ToString();
             comboBox4.Text = DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["UpravaMaterialu"].Ordinal].ToString();
             dateTimePicker1.Value = Convert.ToDateTime(DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["DatumPotvrdeny"].Ordinal]);
+            if (DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["DatumPotvrdenyZakaznikovi"].Ordinal].ToString() == "")
+            {
+                dateTimePicker2.Value = dateTimePicker1.Value;
+            }
+            else
+            {
                 dateTimePicker2.Value = Convert.ToDateTime(DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["DatumPotvrdenyZakaznikovi"].Ordinal]);
+            }
             textBox6.Text = DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["PocetKusov"].Ordinal].ToString();
             //numericUpDown1.Minimum = 0;
             //numericUpDown1.Maximum = Convert.ToInt32(DTEditDopyt.Rows[0].ItemArray[DTEditDopyt.Columns["PocetZoSkladu"].Ordinal].ToString());

Mip/frmMain.Designer.cs

@@ -11935,8 +11935,8 @@
             this.lblVerzia.Name = "lblVerzia";
             this.lblVerzia.Size = new System.Drawing.Size(37, 13);
             this.lblVerzia.TabIndex = 13;
-            this.lblVerzia.Tag = "1,115";
+            this.lblVerzia.Tag = "1,116";
-            this.lblVerzia.Text = "1.1.15";
+            this.lblVerzia.Text = "1.1.16";
             this.lblVerzia.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // label50

Mip/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs

@@ -1,4 +1,4 @@
 // <autogenerated />
 using System;
 using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")]
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = "")]

MipInstaller/MipInstaller.vdproj

@@ -630,15 +630,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Mip1.1"
-        "ProductCode" = "8:{CEA7D3C2-1155-4451-8864-74556EC36D03}"
+        "ProductCode" = "8:{53D6FB1C-BE22-4D9F-89A1-D20FD066D9EB}"
-        "PackageCode" = "8:{1F79D53A-9B5A-4A70-8994-9C39FD5AB51C}"
+        "PackageCode" = "8:{F9303335-D82B-49D8-A4DA-AF43DDFB8865}"
         "UpgradeCode" = "8:{96C5136E-DF0B-48C4-9031-F8CA75E3E3E6}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.1.14"
+        "ProductVersion" = "8:1.1.16"
         "Manufacturer" = "8:Kompozitum"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"