diff --git a/Projects/GimDB/bin/Output/GimDB.dacpac b/Projects/GimDB/bin/Output/GimDB.dacpac index fd5c776..f4207cb 100644 Binary files a/Projects/GimDB/bin/Output/GimDB.dacpac and b/Projects/GimDB/bin/Output/GimDB.dacpac differ diff --git a/Projects/GimDB/bin/Output/GimDB.dll b/Projects/GimDB/bin/Output/GimDB.dll index 5991f93..c37cf10 100644 Binary files a/Projects/GimDB/bin/Output/GimDB.dll and b/Projects/GimDB/bin/Output/GimDB.dll differ diff --git a/Projects/GimDB/obj/Debug/GimDB.dll b/Projects/GimDB/obj/Debug/GimDB.dll index 5991f93..c37cf10 100644 Binary files a/Projects/GimDB/obj/Debug/GimDB.dll and b/Projects/GimDB/obj/Debug/GimDB.dll differ diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 65a04d7..a2c4459 100644 Binary files a/Projects/WebGIM/GIM_data/bin/GIM_data.dll and b/Projects/WebGIM/GIM_data/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_data/bin/SteamWare.dll b/Projects/WebGIM/GIM_data/bin/SteamWare.dll index b03388c..40c34f6 100644 Binary files a/Projects/WebGIM/GIM_data/bin/SteamWare.dll and b/Projects/WebGIM/GIM_data/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/ConsumoRic.aspx.cs b/Projects/WebGIM/GIM_site/ConsumoRic.aspx.cs index f68cee3..991dadf 100644 --- a/Projects/WebGIM/GIM_site/ConsumoRic.aspx.cs +++ b/Projects/WebGIM/GIM_site/ConsumoRic.aspx.cs @@ -13,6 +13,18 @@ namespace GIM_site protected void Page_Load(object sender, EventArgs e) { mod_ricercaItem.eh_newrecord += Mod_ricercaItem_eh_newrecord; + if (!Page.IsPostBack) + { + // leggo numInt da sessione ed imposto idxMacchina x ricambi... + int numIntMtz = 0; + try + { + numIntMtz = memLayer.ML.IntSessionObj("numIntMtz_sel"); + mod_ricercaItem.idxMacchina = TA_app.obj.taInterventiMtz.getByIdx(numIntMtz)[0].idxMacchina; + } + catch + { } + } } private void Mod_ricercaItem_eh_newrecord(object sender, EventArgs e) diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 65a04d7..a2c4459 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll index 55b14e2..a636cf7 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/SteamWare.dll b/Projects/WebGIM/GIM_site/bin/SteamWare.dll index b03388c..40c34f6 100644 Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/VersGen.dll b/Projects/WebGIM/GIM_site/bin/VersGen.dll index 0654384..6d63e81 100644 Binary files a/Projects/WebGIM/GIM_site/bin/VersGen.dll and b/Projects/WebGIM/GIM_site/bin/VersGen.dll differ diff --git a/Projects/WebGIM/VersGen/WebGIM.cs b/Projects/WebGIM/VersGen/WebGIM.cs index 35b7366..9c56b8a 100644 --- a/Projects/WebGIM/VersGen/WebGIM.cs +++ b/Projects/WebGIM/VersGen/WebGIM.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.6.282.517")] -[assembly: AssemblyFileVersion("1.6.282.517")] +[assembly: AssemblyVersion("1.6.283.517")] +[assembly: AssemblyFileVersion("1.6.283.517")] [assembly: AssemblyCopyright("Steamware © 2006-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/Projects/WebGIM/VersGen/WebGIM.tt b/Projects/WebGIM/VersGen/WebGIM.tt index 4ca890d..1edd685 100644 --- a/Projects/WebGIM/VersGen/WebGIM.tt +++ b/Projects/WebGIM/VersGen/WebGIM.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.6.282.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.6.282.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.6.283.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.6.283.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll b/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll index 1184e0d..6d63e81 100644 Binary files a/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll and b/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll differ