diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll index 8720d545..563702d4 100644 Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ diff --git a/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs b/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs index dc1837d3..6919cf22 100644 --- a/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs +++ b/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs @@ -606,10 +606,15 @@ namespace GMW.WebUserControls try { dtxInUdcDest = DataMatrix.mgr.taDtx2UDC.getByDtx(barcodeIn).Select(string.Format("UDC = '{0}'", NewUDC)).Length > 0; - // se old UDC != "" posso ricaricare + // ricalcolo vecchio UDC + OldUDC = ((DS_DataMatrix.Dtx2UDCRow)DataMatrix.mgr.taDtx2UDC.getByDtx(barcodeIn).Select(string.Format("CodStato = '{0}'", statoUdcIn))[0]).UDC.Replace(flussoAnc, flussoTemp); + // verifico SE sia in carico ad AL... if (OldUDC != "") { - udcSourceOk = true; + if (MagClass.magazzino.taAL2UDC.getByAL(sourceAL).Select(string.Format("UDC = '{0}'", OldUDC)).Length > 0) + { + udcSourceOk = true; + } } } catch diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index b0a4367d..dc18d319 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll index 3c227d52..fc0b62d1 100644 Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs index 4f4e7467..cf94779b 100644 --- a/VersGen/GMW.cs +++ b/VersGen/GMW.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.5.703.1623")] -[assembly: AssemblyFileVersion("2.5.703.1623")] +[assembly: AssemblyVersion("2.5.705.1624")] +[assembly: AssemblyFileVersion("2.5.705.1624")] [assembly: AssemblyCopyright("Steamware © 2007-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt index 4a5d2968..55ebc87a 100644 --- a/VersGen/GMW.tt +++ b/VersGen/GMW.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.5.703.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.5.703.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.5.705.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.5.705.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+