diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx.cs b/C2P/WebUserControls/mod_QuoteDet.ascx.cs index 1a3829e..478aa60 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx.cs +++ b/C2P/WebUserControls/mod_QuoteDet.ascx.cs @@ -246,10 +246,12 @@ namespace C2P.WebUserControls mod_Q_ExtrPar1.Visible = false; mod_Q_Header1.Visible = true; mod_Q_PackPar1.Visible = false; + lbConvQ2S.Visible = false; } else // altrimenti gestione ordinaria di editing { + lbConvQ2S.Visible = true; switch (req) { case "Costs": @@ -397,14 +399,12 @@ namespace C2P.WebUserControls protected void lbConvQ2S_Click(object sender, EventArgs e) { // update da Q ad S del tipo offerta - - // redirect a simulazione -#if false - // cambio stato offerta da draft! - DtProxy.man.taQFQ.updateQState(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), 1); - // aggiorno! - updateBaseData(); -#endif + DS_Quotes.QuoteListDataTable tab = DtProxy.man.taQL.makeSim(Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev)); + if (tab.Rows.Count > 0) + { + // seleziona l'offerta duplicata! + Response.Redirect(string.Format("Quote?QuoteType={0}&CodQuote={1}&QuoteRev={2}", tab[0].QuoteType, tab[0].CodQuote, tab[0].QuoteRev)); + } } diff --git a/C2P/WebUserControls/mod_S_Header.ascx b/C2P/WebUserControls/mod_S_Header.ascx index 4d9416e..3a0b1f0 100644 --- a/C2P/WebUserControls/mod_S_Header.ascx +++ b/C2P/WebUserControls/mod_S_Header.ascx @@ -185,7 +185,7 @@ - + diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 96c96fa..3e2ae56 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 54b6092..2b134c1 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 909a312..7920b2d 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index 54b6092..2b134c1 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index 94d0be6..b0f42d6 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index 909a312..7920b2d 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index 2c57a4a..5fe50b7 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.7.78.172")] -[assembly: AssemblyFileVersion("0.7.78.172")] +[assembly: AssemblyVersion("0.7.79.172")] +[assembly: AssemblyFileVersion("0.7.79.172")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index d59e88c..6396222 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.7.78.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.7.78.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.7.79.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.7.79.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+