diff --git a/C2P/StdCostList.aspx b/C2P/StdCostList.aspx index 3c15d9a..ac813c4 100644 --- a/C2P/StdCostList.aspx +++ b/C2P/StdCostList.aspx @@ -1,7 +1,7 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="StdCostList.aspx.cs" Inherits="C2P.StdCostList" %> -<%@ Register src="~/WebUserControls/mod_createNewStdCost.ascx" tagname="mod_createNewStdCost" tagprefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_createNewStdCost.ascx" TagName="mod_createNewStdCost" TagPrefix="uc1" %> @@ -17,7 +17,7 @@
-
+
<%: traduci("AvailStdCostList") %>   @@ -28,6 +28,11 @@
+
+
+ <%: traduci("StdCostListExplSteps") %> +
+
diff --git a/C2P/StdCostList.aspx.cs b/C2P/StdCostList.aspx.cs index 1457d7a..b0d90fe 100644 --- a/C2P/StdCostList.aspx.cs +++ b/C2P/StdCostList.aspx.cs @@ -23,10 +23,12 @@ namespace C2P // imposto iframe! con tutti i possibili valori di URL repView.Src = string.Format(@"{0}/StdCostList.aspx?DataRif={1}&lingua={2}", memLayer.ML.confReadString("reportsUrl"), ddlData.SelectedValue, user_std.UtSn.lingua); repView.Visible = true; + divStepExpl.Visible = false; } else { repView.Visible = false; + divStepExpl.Visible = true; } } /// diff --git a/C2P/StdCostList.aspx.designer.cs b/C2P/StdCostList.aspx.designer.cs index 449815b..4c53dde 100644 --- a/C2P/StdCostList.aspx.designer.cs +++ b/C2P/StdCostList.aspx.designer.cs @@ -39,6 +39,15 @@ namespace C2P { /// protected global::C2P.WebUserControls.mod_createNewStdCost mod_createNewStdCost1; + /// + /// divStepExpl control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divStepExpl; + /// /// repView control. /// diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 787334c..74daa06 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 38378fb..a0516ea 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P_Data/DS_Quotes.xsd b/C2P_Data/DS_Quotes.xsd index 514a423..7d71d45 100644 --- a/C2P_Data/DS_Quotes.xsd +++ b/C2P_Data/DS_Quotes.xsd @@ -1874,7 +1874,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -1958,7 +1958,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -1994,7 +1994,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2019,7 +2019,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2099,7 +2099,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2136,7 +2136,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2206,7 +2206,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2461,7 +2461,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2699,7 +2699,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2720,7 +2720,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - + @@ -2855,11 +2855,11 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer - - - - - + + + + + \ No newline at end of file diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll index 38378fb..a0516ea 100644 Binary files a/C2P_Data/bin/Release/C2P_Data.dll and b/C2P_Data/bin/Release/C2P_Data.dll differ diff --git a/C2P_Report/C2P_Report.csproj b/C2P_Report/C2P_Report.csproj index 84fde21..73468ad 100644 --- a/C2P_Report/C2P_Report.csproj +++ b/C2P_Report/C2P_Report.csproj @@ -140,7 +140,9 @@ - + + Designer + diff --git a/C2P_Report/Reports/ReportOffers_Q.rdl b/C2P_Report/Reports/ReportOffers_Q.rdl index 0c86be5..e7f3479 100644 --- a/C2P_Report/Reports/ReportOffers_Q.rdl +++ b/C2P_Report/Reports/ReportOffers_Q.rdl @@ -379,7 +379,7 @@ System.Decimal - ="http://10.74.82.218/C2P_Drawings/" & Fields!CodItem.Value & ".png" + ="http://c2p.steamware.net/C2P_Drawings/" & Fields!CodItem.Value & ".png" diff --git a/C2P_Report/Reports/ReportOffers_Q.rdlc b/C2P_Report/Reports/ReportOffers_Q.rdlc index f5c1b60..aacecab 100644 --- a/C2P_Report/Reports/ReportOffers_Q.rdlc +++ b/C2P_Report/Reports/ReportOffers_Q.rdlc @@ -378,7 +378,7 @@ System.Decimal - ="http://10.74.82.218/C2P_Drawings/" & Fields!CodItem.Value & ".png" + ="http://c2p.steamware.net/C2P_Drawings/" & Fields!CodItem.Value & ".png" diff --git a/C2P_Report/Reports/ReportOffers_S.rdl b/C2P_Report/Reports/ReportOffers_S.rdl index 0c86be5..e7f3479 100644 --- a/C2P_Report/Reports/ReportOffers_S.rdl +++ b/C2P_Report/Reports/ReportOffers_S.rdl @@ -379,7 +379,7 @@ System.Decimal - ="http://10.74.82.218/C2P_Drawings/" & Fields!CodItem.Value & ".png" + ="http://c2p.steamware.net/C2P_Drawings/" & Fields!CodItem.Value & ".png" diff --git a/C2P_Report/Reports/ReportOffers_S.rdlc b/C2P_Report/Reports/ReportOffers_S.rdlc index f5c1b60..aacecab 100644 --- a/C2P_Report/Reports/ReportOffers_S.rdlc +++ b/C2P_Report/Reports/ReportOffers_S.rdlc @@ -378,7 +378,7 @@ System.Decimal - ="http://10.74.82.218/C2P_Drawings/" & Fields!CodItem.Value & ".png" + ="http://c2p.steamware.net/C2P_Drawings/" & Fields!CodItem.Value & ".png" diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index 38378fb..a0516ea 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 23ab70e..1ff9dbb 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index c6867be..fbb91ee 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.9.124.281")] -[assembly: AssemblyFileVersion("0.9.124.281")] +[assembly: AssemblyVersion("0.9.125.281")] +[assembly: AssemblyFileVersion("0.9.125.281")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index f4163ce..354c05a 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.9.124.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.9.124.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.9.125.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.9.125.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+