diff --git a/.vs/Mip_v1/v16/.suo b/.vs/Mip_v1/v16/.suo index 45c3a14..329effe 100644 Binary files a/.vs/Mip_v1/v16/.suo and b/.vs/Mip_v1/v16/.suo differ diff --git a/Mip/Properties/AssemblyInfo.cs b/Mip/Properties/AssemblyInfo.cs index 0a7ce9d..2e81f07 100644 --- a/Mip/Properties/AssemblyInfo.cs +++ b/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.10.0")] -[assembly: AssemblyFileVersion("1.1.10.0")] +[assembly: AssemblyVersion("1.1.11.0")] +[assembly: AssemblyFileVersion("1.1.11.0")] diff --git a/Mip/frmMain.Designer.cs b/Mip/frmMain.Designer.cs index 134aa69..2dce2b5 100644 --- a/Mip/frmMain.Designer.cs +++ b/Mip/frmMain.Designer.cs @@ -11935,7 +11935,7 @@ this.lblVerzia.Name = "lblVerzia"; this.lblVerzia.Size = new System.Drawing.Size(34, 13); this.lblVerzia.TabIndex = 13; - this.lblVerzia.Text = "1,010"; + this.lblVerzia.Text = "1,011"; this.lblVerzia.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // label50 diff --git a/Mip/frmMain.cs b/Mip/frmMain.cs index 969ea4f..320fa37 100644 --- a/Mip/frmMain.cs +++ b/Mip/frmMain.cs @@ -1240,7 +1240,7 @@ namespace Mip IF (UpravaMaterialu = '',Material,CONCAT(Material,'-',UpravaMaterialu)) AS Material, UpravaMaterialu, Material, - IF (PocetDoVyroby=0,PocetKusov,CONCAT (PocetKusov,',',PocetDoVyroby,',', PocetKusov-(SELECT IFNULL( SUM(`tabexpedicia`.PocetOdoslanychKusov), 0) FROM `tabexpedicia` WHERE `tabexpedicia`.IDDopyt=`pohladdopyty`.IDCPOBJ ))) AS PocetKusov, + IF (PocetDoVyroby=0,PocetKusov,CONCAT (PocetKusov,', ',PocetDoVyroby,', ', (SELECT IFNULL( SUM(`tabexpedicia`.PocetVyrDobrychKusov), 0) FROM `tabexpedicia` WHERE `tabexpedicia`.IDDopyt=`pohladdopyty`.IDCPOBJ ))) AS PocetKusov, RozlisZnakKonecnaOp, SpojeneRozmery, IF (StatusDopytu='Pozastavená',StatusDopytu,PoznamkaOBJ) AS PoznamkaOBJ diff --git a/MipInstaller/MipInstaller.vdproj b/MipInstaller/MipInstaller.vdproj index 5f6c3fb..a902b04 100644 --- a/MipInstaller/MipInstaller.vdproj +++ b/MipInstaller/MipInstaller.vdproj @@ -630,15 +630,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Mip1.1" - "ProductCode" = "8:{F2D86B63-AD8A-40C4-9E80-2969F8815850}" - "PackageCode" = "8:{7CABACB3-CA4C-4040-A0BE-96F7EA2DACDA}" + "ProductCode" = "8:{9EA6E2CB-8DD7-421E-B854-F73303F79468}" + "PackageCode" = "8:{B68993B5-34AE-4921-B29A-A6968C0E7DCE}" "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.9" + "ProductVersion" = "8:1.1.11" "Manufacturer" = "8:Kompozitum" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -1348,7 +1348,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_DF4DF5614F534F54B59021BDE12D5BB1" { - "SourcePath" = "8:..\\Mip\\obj\\Release\\Mip1.1.exe" + "SourcePath" = "8:..\\Mip\\obj\\Debug\\Mip1.1.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" diff --git a/MipInstaller/Release/MipInstaller.msi b/MipInstaller/Release/MipInstaller.msi index 1d5b447..8173207 100644 Binary files a/MipInstaller/Release/MipInstaller.msi and b/MipInstaller/Release/MipInstaller.msi differ