diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx.cs b/C2P/WebUserControls/mod_OffersArchive.ascx.cs index 436ff42..e8a1f76 100644 --- a/C2P/WebUserControls/mod_OffersArchive.ascx.cs +++ b/C2P/WebUserControls/mod_OffersArchive.ascx.cs @@ -97,8 +97,8 @@ namespace C2P.WebUserControls { lbOpen.CssClass = baseCss + "success"; lbDuplicate.CssClass = baseCss + "warning"; - lbSimulate.CssClass = baseCss + "danger"; lbPrint.CssClass = baseCss + "info"; + lbSimulate.CssClass = baseCss + "danger"; // cerco riga selezionata... CheckBox chkBox; @@ -112,6 +112,11 @@ namespace C2P.WebUserControls CodQuote = grView.SelectedDataKey["CodQuote"].ToString(); QuoteRev = grView.SelectedDataKey["QuoteRev"].ToString(); } + // solo se riga corrente è tipo "Q" + if (QuoteType != "Q") + { + lbSimulate.CssClass = lbSimulate.CssClass + " disabled"; + } } } else diff --git a/C2P/WebUserControls/mod_S_Header.ascx.cs b/C2P/WebUserControls/mod_S_Header.ascx.cs index 3b5bf84..d54a776 100644 --- a/C2P/WebUserControls/mod_S_Header.ascx.cs +++ b/C2P/WebUserControls/mod_S_Header.ascx.cs @@ -65,8 +65,8 @@ namespace C2P.WebUserControls // intercetto ed annullo l'insert e.Cancel = true; - // cultura... - CultureInfo cultura = new CultureInfo("en-US"); + //// cultura... + //CultureInfo cultura = new CultureInfo("en-US"); // recupero ultima riga pre-update... DS_Quotes.QuoteFull_QRow rigaPre = DtProxy.man.taQFQ.getLast()[0]; @@ -76,9 +76,12 @@ namespace C2P.WebUserControls string CodClient = e.InputParameters["CodClient"].ToString(); string CodItem = e.InputParameters["CodItem"].ToString(); string RawMat = e.InputParameters["RawMat"].ToString(); - decimal RawMatCost = Convert.ToDecimal(e.InputParameters["RawMatCost"], cultura); - decimal RawMatExtraCost = Convert.ToDecimal(e.InputParameters["RawMatExtraCost"], cultura); - int BatchQty = Convert.ToInt32(e.InputParameters["BatchQty"], cultura); + decimal RawMatCost = Convert.ToDecimal(e.InputParameters["RawMatCost"]); + decimal RawMatExtraCost = Convert.ToDecimal(e.InputParameters["RawMatExtraCost"]); + int BatchQty = Convert.ToInt32(e.InputParameters["BatchQty"]); + //decimal RawMatCost = Convert.ToDecimal(e.InputParameters["RawMatCost"], cultura); + //decimal RawMatExtraCost = Convert.ToDecimal(e.InputParameters["RawMatExtraCost"], cultura); + //int BatchQty = Convert.ToInt32(e.InputParameters["BatchQty"], cultura); string CodInco = e.InputParameters["CodInco"].ToString(); string Note = e.InputParameters["Note"].ToString(); diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index b331ed4..23e4148 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 b540ec1..8ab85b9 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 ef5f279..942a7b5 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 b540ec1..8ab85b9 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 8b06613..f53c5fb 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 ef5f279..942a7b5 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 43256d8..2f4e28c 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.8.80.173")] -[assembly: AssemblyFileVersion("0.8.80.173")] +[assembly: AssemblyVersion("0.8.83.176")] +[assembly: AssemblyFileVersion("0.8.83.176")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index e707433..92747ce 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.8.80.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.8.80.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.8.83.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.8.83.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+