diff --git a/C2P/RepOffers.aspx.cs b/C2P/RepOffers.aspx.cs index 39aaf36..059e428 100644 --- a/C2P/RepOffers.aspx.cs +++ b/C2P/RepOffers.aspx.cs @@ -18,7 +18,7 @@ namespace C2P if (!Page.IsPostBack) { // imposto iframe! - repView.Src = string.Format(@"{0}/ReportViewer.aspx?ticket={1}", memLayer.ML.confReadString("reportsUrl"), Request.QueryString["ticket"]); + repView.Src = string.Format(@"{0}/ReportViewer.aspx?ticket={1}&lingua={2}", memLayer.ML.confReadString("reportsUrl"), Request.QueryString["ticket"], user_std.UtSn.lingua); #if false if (memLayer.ML.confReadBool("ReportRemoteRender")) { diff --git a/C2P/WebUserControls/mod_Q_Costs.ascx b/C2P/WebUserControls/mod_Q_Costs.ascx index 22f6405..015dfe0 100644 --- a/C2P/WebUserControls/mod_Q_Costs.ascx +++ b/C2P/WebUserControls/mod_Q_Costs.ascx @@ -15,7 +15,8 @@
- Indicare con variabile se Ref / Sell + <%: traduci("costByRefusion") %> + <%: traduci("costBySell") %>
@@ -41,7 +42,8 @@
- Note su selezione articolo/classe x DIES (da variabile) + <%: traduci("DiesCostByItem") %> + <%: traduci("DiesCostByClass") %>
@@ -53,7 +55,8 @@
- Indicare con variabile se Ref / Sell + <%: traduci("costByRefusion") %> + <%: traduci("costBySell") %>
@@ -79,7 +82,8 @@
- Indicazione Incoterms + dest da variabile + - +
diff --git a/C2P/WebUserControls/mod_Q_Costs.ascx.cs b/C2P/WebUserControls/mod_Q_Costs.ascx.cs index 32ad217..b221605 100644 --- a/C2P/WebUserControls/mod_Q_Costs.ascx.cs +++ b/C2P/WebUserControls/mod_Q_Costs.ascx.cs @@ -46,6 +46,20 @@ namespace C2P.WebUserControls { } return answ; } - + /// + /// calcola se il primo valore sia superiore al secondo + /// + /// + /// + /// + public bool firstIsGrt(object val1, object val2) + { + bool answ = false; + if (Convert.ToDecimal(val1) >= Convert.ToDecimal(val2)) + { + answ = true; + } + return answ; + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx b/C2P/WebUserControls/mod_QuoteDet.ascx index d649a7d..668c676 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx +++ b/C2P/WebUserControls/mod_QuoteDet.ascx @@ -26,16 +26,30 @@ . -
-
+ +
+
+ + +
+
<%--
--%>
-  <%: traduci("HEADER") %>
-  <%: traduci("COSTS") %>
-  <%: traduci("EXTRUS-PARAM") %>
-  <%: traduci("PACK-PARAM") %>
<%--
--%>
+  <%: traduci("HEADER") %> +
+
+  <%: traduci("COSTS") %> +
+
+  <%: traduci("EXTRUS-PARAM") %> +
+
+  <%: traduci("PACK-PARAM") %> +
+
+ <%--
--%>
@@ -46,21 +60,39 @@
- <%--
--%>
-  <%: traduci("QUOTATION") %>
<%--
--%>
+  <%: traduci("QUOTATION") %> +
+
+
-
-
-  <%: traduci("nextIdxQState-01") %>
-
-  <%: traduci("nextIdxQState-00") %>
-  <%: traduci("nextIdxQState-02") %>
-
-  <%: traduci("nextIdxQState-03") %>
-
-  <%: traduci("createNewRev") %>
\ No newline at end of file +
+
+
+  <%: traduci("nextIdxQState-01") %> +
+
+
+
+  <%: traduci("nextIdxQState-00") %> +
+
+  <%: traduci("nextIdxQState-02") %> +
+
+
+
+  <%: traduci("nextIdxQState-03") %> +
+
+
+
+  <%: traduci("createNewRev") %> +
+
+
+ diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 12dc4bf..a8bd6fc 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 0bae309..2347d6f 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/NLog.dll b/C2P/bin/NLog.dll index 11a5469..5a2f145 100644 Binary files a/C2P/bin/NLog.dll and b/C2P/bin/NLog.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 4e2ef13..048732e 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Data/DS_Quotes.Designer.cs b/C2P_Data/DS_Quotes.Designer.cs index 9da9c78..0bf18c2 100644 --- a/C2P_Data/DS_Quotes.Designer.cs +++ b/C2P_Data/DS_Quotes.Designer.cs @@ -3576,6 +3576,14 @@ namespace C2P_Data { private global::System.Data.DataColumn columnIdxQState; + private global::System.Data.DataColumn columnDiesByClass; + + private global::System.Data.DataColumn columnvalid; + + private global::System.Data.DataColumn columnerrorScore; + + private global::System.Data.DataColumn columnTranspZone; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public QuoteFull_QDataTable() { @@ -4257,6 +4265,38 @@ namespace C2P_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn DiesByClassColumn { + get { + return this.columnDiesByClass; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn validColumn { + get { + return this.columnvalid; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn errorScoreColumn { + get { + return this.columnerrorScore; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn TranspZoneColumn { + get { + return this.columnTranspZone; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -4375,7 +4415,11 @@ namespace C2P_Data { decimal NetMar, decimal FCShield, decimal PckSur, - int IdxQState) { + int IdxQState, + bool DiesByClass, + bool valid, + int errorScore, + string TranspZone) { QuoteFull_QRow rowQuoteFull_QRow = ((QuoteFull_QRow)(this.NewRow())); object[] columnValuesArray = new object[] { Vers, @@ -4458,7 +4502,11 @@ namespace C2P_Data { NetMar, FCShield, PckSur, - IdxQState}; + IdxQState, + DiesByClass, + valid, + errorScore, + TranspZone}; rowQuoteFull_QRow.ItemArray = columnValuesArray; this.Rows.Add(rowQuoteFull_QRow); return rowQuoteFull_QRow; @@ -4571,6 +4619,10 @@ namespace C2P_Data { this.columnFCShield = base.Columns["FCShield"]; this.columnPckSur = base.Columns["PckSur"]; this.columnIdxQState = base.Columns["IdxQState"]; + this.columnDiesByClass = base.Columns["DiesByClass"]; + this.columnvalid = base.Columns["valid"]; + this.columnerrorScore = base.Columns["errorScore"]; + this.columnTranspZone = base.Columns["TranspZone"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4738,6 +4790,14 @@ namespace C2P_Data { base.Columns.Add(this.columnPckSur); this.columnIdxQState = new global::System.Data.DataColumn("IdxQState", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnIdxQState); + this.columnDiesByClass = new global::System.Data.DataColumn("DiesByClass", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDiesByClass); + this.columnvalid = new global::System.Data.DataColumn("valid", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnvalid); + this.columnerrorScore = new global::System.Data.DataColumn("errorScore", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnerrorScore); + this.columnTranspZone = new global::System.Data.DataColumn("TranspZone", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTranspZone); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnQuoteType, this.columnCodQuote, @@ -4817,6 +4877,10 @@ namespace C2P_Data { this.columnFCShield.ReadOnly = true; this.columnPckSur.ReadOnly = true; this.columnIdxQState.AllowDBNull = false; + this.columnvalid.AllowDBNull = false; + this.columnerrorScore.AllowDBNull = false; + this.columnTranspZone.AllowDBNull = false; + this.columnTranspZone.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7386,6 +7450,55 @@ namespace C2P_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool DiesByClass { + get { + try { + return ((bool)(this[this.tableQuoteFull_Q.DiesByClassColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'DiesByClass\' in table \'QuoteFull_Q\' is DBNull.", e); + } + } + set { + this[this.tableQuoteFull_Q.DiesByClassColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool valid { + get { + return ((bool)(this[this.tableQuoteFull_Q.validColumn])); + } + set { + this[this.tableQuoteFull_Q.validColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int errorScore { + get { + return ((int)(this[this.tableQuoteFull_Q.errorScoreColumn])); + } + set { + this[this.tableQuoteFull_Q.errorScoreColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string TranspZone { + get { + return ((string)(this[this.tableQuoteFull_Q.TranspZoneColumn])); + } + set { + this[this.tableQuoteFull_Q.TranspZoneColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsCodClientAssocNull() { @@ -7877,6 +7990,18 @@ namespace C2P_Data { public void SetPckSurNull() { this[this.tableQuoteFull_Q.PckSurColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsDiesByClassNull() { + return this.IsNull(this.tableQuoteFull_Q.DiesByClassColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetDiesByClassNull() { + this[this.tableQuoteFull_Q.DiesByClassColumn] = global::System.Convert.DBNull; + } } /// @@ -12258,6 +12383,10 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas tableMapping.ColumnMappings.Add("FCShield", "FCShield"); tableMapping.ColumnMappings.Add("PckSur", "PckSur"); tableMapping.ColumnMappings.Add("IdxQState", "IdxQState"); + tableMapping.ColumnMappings.Add("DiesByClass", "DiesByClass"); + tableMapping.ColumnMappings.Add("valid", "valid"); + tableMapping.ColumnMappings.Add("errorScore", "errorScore"); + tableMapping.ColumnMappings.Add("TranspZone", "TranspZone"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/C2P_Data/DS_Quotes.xsd b/C2P_Data/DS_Quotes.xsd index 1d5cc92..abb4d4d 100644 --- a/C2P_Data/DS_Quotes.xsd +++ b/C2P_Data/DS_Quotes.xsd @@ -847,6 +847,10 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas + + + + @@ -1571,6 +1575,16 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas + + + + + + + + + + diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index 0bae309..2347d6f 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 a3b5a22..eb1ff8f 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 4e2ef13..048732e 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 1302fda..20fbb1f 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.6.60.150")] -[assembly: AssemblyFileVersion("0.6.60.150")] +[assembly: AssemblyVersion("0.6.61.162")] +[assembly: AssemblyFileVersion("0.6.61.162")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index e6c4f8f..dca15f5 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.6.60.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.6.60.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.6.61.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.6.61.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+