diff --git a/C2P/Web.config b/C2P/Web.config
index c4a5785..27bd005 100644
--- a/C2P/Web.config
+++ b/C2P/Web.config
@@ -16,6 +16,8 @@
     <!--nome sw e versioni-->
     <add key="CodModulo" value="C2P" />
     <add key="appName" value="C2P" />
+    <add key="money" value="€" />
+    <add key="weight" value="kg" />
     <!--area logger-->
     <add key="_logDir" value="~/logs/" />
     <add key="doShrinkFolder" value="true" />
@@ -56,6 +58,7 @@
       </buildProviders>-->
     </compilation>
     <httpRuntime targetFramework="4.5" />
+    <!--<globalization culture="en-US" enableClientBasedCulture="false" uiCulture="en-US" />-->
     <pages>
       <namespaces>
         <add namespace="System.Web.Optimization" />
diff --git a/C2P/WebUserControls/mod_S_Costs.ascx b/C2P/WebUserControls/mod_S_Costs.ascx
index 96ca2ef..03a47e6 100644
--- a/C2P/WebUserControls/mod_S_Costs.ascx
+++ b/C2P/WebUserControls/mod_S_Costs.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_S_Costs.ascx.cs" Inherits="C2P.WebUserControls.mod_S_Costs" %>
-<%@ Register src="~/WebUserControls/mod_Q_Costs.ascx" tagname="mod_Q_Costs" tagprefix="uc1" %>
+<%@ Register Src="~/WebUserControls/mod_Q_Costs.ascx" TagName="mod_Q_Costs" TagPrefix="uc1" %>
 
 <uc1:mod_Q_Costs ID="mod_Q_Costs1" runat="server" />
-
diff --git a/C2P/WebUserControls/mod_S_Dies.ascx b/C2P/WebUserControls/mod_S_Dies.ascx
index bc614bb..f1a07c5 100644
--- a/C2P/WebUserControls/mod_S_Dies.ascx
+++ b/C2P/WebUserControls/mod_S_Dies.ascx
@@ -1,2 +1,4 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_S_Dies.ascx.cs" Inherits="C2P.WebUserControls.mod_S_Dies" %>
-2 be done...
\ No newline at end of file
+
+
+2 be done...
diff --git a/C2P/WebUserControls/mod_S_ExtrPar.ascx b/C2P/WebUserControls/mod_S_ExtrPar.ascx
index 5d2617b..91db77a 100644
--- a/C2P/WebUserControls/mod_S_ExtrPar.ascx
+++ b/C2P/WebUserControls/mod_S_ExtrPar.ascx
@@ -1,11 +1,11 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_S_ExtrPar.ascx.cs" Inherits="C2P.WebUserControls.mod_S_ExtrPar" %>
-
 <%if (false)
   { %>
 <webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
 <webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
 <%} %>
 <%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %>
+
 <asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%">
     <ItemTemplate>
         <div class="row bottomLine">
@@ -84,13 +84,118 @@
             </div>
         </div>
     </ItemTemplate>
+    <EditItemTemplate>
+        <div class="row bottomLine">
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("TipoDies") %>' valore='<%# Eval("TipoDies") %>' />
+            </div>
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display10" runat="server" etichetta='<%# traduci("DiamDies") %>' valore='<%# Eval("DiamDies", "{0:N2}") %>' />
+            </div>
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display11" runat="server" etichetta='<%# traduci("HoleNumDies") %>' valore='<%# Eval("HoleNumDies") %>' />
+            </div>
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("NumDiesInList") %>' valore='<%# Eval("NumDiesInList", "{0:N0}") %>' />
+            </div>
+            <div class="col-xs-4 text-right">
+                <uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("CodDiesGroup") %>' />
+                <asp:TextBox Font-Bold="true" ID="TextBox6" runat="server" Text='<%# Bind("CodDiesGroup") %>' />
+            </div>
+        </div>
+        <div class="row bottomLine">
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("DiesEOLife") %>' valore='<%# Eval("DiesEOLife", "{0:N2}") %>' />
+            </div>
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("DiesExpLife") %>' valore='<%# Eval("DiesExpLife", "{0:N2}") %>' />
+            </div>
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("NumDiesExaust") %>' valore='<%# Eval("NumDiesExaust", "{0:N0}") %>' />
+            </div>
+            <div class="col-xs-6 text-right">
+                <uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("DiesPrice") %>' valore='<%# Eval("DiesPrice", "{0:C3}") %>' />
+            </div>
+        </div>
+        <div class="row bottomLine bg-danger">
+            <div class="col-xs-6 text-left">
+                <uc1:mod_display ID="mod_display16" runat="server" etichetta='<%# traduci("DiesTecLife") %>' />
+                <asp:TextBox Font-Bold="true" ID="TextBox2" runat="server" Text='<%# Bind("DiesTecLife", "{0:N2}") %>' />
+            </div>
+            <div class="col-xs-6 text-right">
+                <uc1:mod_display ID="mod_display18" runat="server" etichetta='<%# traduci("DiesPrice_sim") %>' />
+                <asp:TextBox Font-Bold="true" ID="TextBox1" runat="server" Text='<%# Bind("DiesPrice_sim", "{0:N2}") %>' />
+            </div>
+        </div>
+        <div class="row bottomLine">
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display9" runat="server" etichetta='<%# traduci("CodPlant") %>' />
+                <asp:TextBox Font-Bold="true" ID="TextBox7" runat="server" Text='<%# Bind("CodPlant") %>' />
+            </div>
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display8" runat="server" etichetta='<%# traduci("KgTeo") %>' valore='<%# Eval("KgTeo", "{0:N2}") %>' />
+            </div>
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display12" runat="server" etichetta='<%# traduci("NumSMED") %>' valore='<%# Eval("NumSMED", "{0:N0}") %>' />
+            </div>
+            <div class="col-xs-6 text-right">
+                <uc1:mod_display ID="mod_display13" runat="server" etichetta='<%# traduci("KeyAMIL") %>' valore='<%# Eval("KeyAMIL") %>' />
+            </div>
+        </div>
+        <div class="row bottomLine">
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display14" runat="server" etichetta='<%# traduci("WSR01") %>' valore='<%# Eval("WSR01", "{0:P2}") %>' />
+            </div>
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display15" runat="server" etichetta='<%# traduci("MSR01") %>' valore='<%# Eval("MSR01", "{0:P2}") %>' />
+            </div>
+            <div class="col-xs-8 text-right">
+                <uc1:mod_display ID="mod_display17" runat="server" etichetta='<%# traduci("NetProd01") %>' valore='<%# Eval("NetProd01", "{0:N2} kg/h") %>' />
+            </div>
+        </div>
+        <div class="row bottomLine bg-danger">
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display19" runat="server" etichetta='<%# traduci("WSR01_sim") %>' />
+                <asp:TextBox Font-Bold="true" ID="TextBox3" runat="server" Text='<%# Bind("WSR01_sim", "{0:N4}") %>' />
+            </div>
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display20" runat="server" etichetta='<%# traduci("MSR01_sim") %>' />
+                <asp:TextBox Font-Bold="true" ID="TextBox4" runat="server" Text='<%# Bind("MSR01_sim", "{0:N4}") %>' />
+            </div>
+            <div class="col-xs-8 text-right">
+                <uc1:mod_display ID="mod_display21" runat="server" etichetta='<%# traduci("NetProd01_sim") %>' />
+                <asp:TextBox Font-Bold="true" ID="TextBox5" runat="server" Text='<%# Bind("NetProd01_sim", "{0:N2}") %>' />
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-xs-offset-3">
+                <div class="col-xs-6">
+                    <asp:LinkButton runat="server" ID="LinkButton1" class="btn btn-success" Width="100%" CausesValidation="true" CommandName="Update"><i class="fa fa-check"></i>&nbsp;<%: traduci("Update") %></asp:LinkButton>
+                </div>
+                <div class="col-xs-6">
+                    <asp:LinkButton runat="server" ID="LinkButton2" class="btn btn-danger" Width="100%" CausesValidation="false" CommandName="Cancel"><i class="fa fa-undo"></i>&nbsp;<%: traduci("Cancel") %></asp:LinkButton>
+                </div>
+            </div>
+        </div>
+    </EditItemTemplate>
 </asp:FormView>
-<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter">
+<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter" UpdateMethod="updateExtrParSim">
     <SelectParameters>
         <asp:QueryStringParameter Name="QuoteType" QueryStringField="QuoteType" Type="String" />
         <asp:QueryStringParameter Name="CodQuote" QueryStringField="CodQuote" Type="Int64" />
         <asp:QueryStringParameter Name="QuoteRev" QueryStringField="QuoteRev" Type="Int32" />
         <asp:Parameter DefaultValue="Y" Name="DoUpdate" Type="String" />
     </SelectParameters>
+    <UpdateParameters>
+        <asp:Parameter Name="Original_QuoteType" Type="String" />
+        <asp:Parameter Name="Original_CodQuote" Type="Int64" />
+        <asp:Parameter Name="Original_QuoteRev" Type="Int32" />
+        <asp:Parameter Name="CodDiesGroup" Type="String" />
+        <asp:Parameter Name="CodPlant" Type="String" />
+        <asp:Parameter Name="DiesPrice_sim" Type="Decimal" />
+        <asp:Parameter Name="DiesTecLife" Type="Decimal" />
+        <asp:Parameter Name="WSR01_sim" Type="Decimal" />
+        <asp:Parameter Name="MSR01_sim" Type="Decimal" />
+        <asp:Parameter Name="NetProd01_sim" Type="Decimal" />
+    </UpdateParameters>
 </asp:ObjectDataSource>
-
diff --git a/C2P/WebUserControls/mod_S_Header.ascx b/C2P/WebUserControls/mod_S_Header.ascx
index 5bebdb1..0ff6b27 100644
--- a/C2P/WebUserControls/mod_S_Header.ascx
+++ b/C2P/WebUserControls/mod_S_Header.ascx
@@ -6,6 +6,7 @@
 <%} %>
 <%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %>
 
+
 <asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%">
     <ItemTemplate>
         <div class="row bottomLine">
@@ -64,7 +65,7 @@
                 <uc1:mod_display ID="mod_display11" runat="server" etichetta='<%# traduci("UnitWeight") %>' />
                 <asp:TextBox Font-Bold="true" ID="TextBox3" runat="server" Text='<%# Bind("UnitWeight","{0:N3}") %>' />
             </div>
-            
+
             <div class="col-xs-6 text-right">
                 <uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("Customer") %>' />
                 <asp:DropDownList ID="DropDownList3" runat="server" DataSourceID="odsCustomers" DataValueField="value" DataTextField="label" SelectedValue='<%# Bind("CodClient") %>' CssClass="text-right" />
@@ -221,4 +222,4 @@
 <asp:ObjectDataSource ID="odsCustomers" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selClientTableAdapter"></asp:ObjectDataSource>
 <asp:ObjectDataSource ID="odsRawMat" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selRawMatTableAdapter"></asp:ObjectDataSource>
 <asp:ObjectDataSource ID="odsIncoterms" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selIncotermsTableAdapter"></asp:ObjectDataSource>
-<asp:Label runat="server" ID="lblError" CssClass="text-danger" Visible="false" />
\ No newline at end of file
+<asp:Label runat="server" ID="lblError" CssClass="text-danger" Visible="false" />
diff --git a/C2P/WebUserControls/mod_S_PackPar.ascx b/C2P/WebUserControls/mod_S_PackPar.ascx
index 433f2ed..ae77477 100644
--- a/C2P/WebUserControls/mod_S_PackPar.ascx
+++ b/C2P/WebUserControls/mod_S_PackPar.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_S_PackPar.ascx.cs" Inherits="C2P.WebUserControls.mod_S_PackPar" %>
-<%@ Register src="~/WebUserControls/mod_Q_PackPar.ascx" tagname="mod_Q_PackPar" tagprefix="uc1" %>
+<%@ Register Src="~/WebUserControls/mod_Q_PackPar.ascx" TagName="mod_Q_PackPar" TagPrefix="uc1" %>
 
 <uc1:mod_Q_PackPar ID="mod_Q_PackPar1" runat="server" />
-
diff --git a/C2P/WebUserControls/mod_S_Quot.ascx b/C2P/WebUserControls/mod_S_Quot.ascx
index ceef8d0..81e59e1 100644
--- a/C2P/WebUserControls/mod_S_Quot.ascx
+++ b/C2P/WebUserControls/mod_S_Quot.ascx
@@ -1,5 +1,5 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_S_Quot.ascx.cs" Inherits="C2P.WebUserControls.mod_S_Quot" %>
-<%@ Register src="~/WebUserControls/mod_Q_Quot.ascx" tagname="mod_Q_Quot" tagprefix="uc1" %>
+<%@ Register Src="~/WebUserControls/mod_Q_Quot.ascx" TagName="mod_Q_Quot" TagPrefix="uc1" %>
+
 
 <uc1:mod_Q_Quot ID="mod_Q_Quot1" runat="server" />
-
diff --git a/C2P/WebUserControls/mod_newProduct.ascx b/C2P/WebUserControls/mod_newProduct.ascx
index 36f316a..545b607 100644
--- a/C2P/WebUserControls/mod_newProduct.ascx
+++ b/C2P/WebUserControls/mod_newProduct.ascx
@@ -5,7 +5,7 @@
 <%@ Register Src="~/WebUserControls/mod_S_Header.ascx" TagName="mod_S_Header" TagPrefix="uc3" %>
 <%@ Register Src="~/WebUserControls/mod_S_PackPar.ascx" TagName="mod_S_PackPar" TagPrefix="uc4" %>
 <%@ Register Src="~/WebUserControls/mod_S_Quot.ascx" TagName="mod_S_Quot" TagPrefix="uc5" %>
-<%@ Register src="~/WebUserControls/mod_S_Dies.ascx" tagname="mod_S_Dies" tagprefix="uc6" %>
+<%@ Register Src="~/WebUserControls/mod_S_Dies.ascx" TagName="mod_S_Dies" TagPrefix="uc6" %>
 <%if (false)
   { %>
 <webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
@@ -28,28 +28,48 @@
                 <asp:HyperLink runat="server" ID="hlRevHist" Target="_blank">
                     <asp:Label runat="server" ID="lblQuoteType" />
                     <asp:Label runat="server" ID="lblCodQuote" /><span style="color: #dedede; font-size: 0.8em;">.<asp:Label runat="server" ID="lblQuoteRev" /></span>
-                </asp:HyperLink></div></div></div></div><div class="container">
+                </asp:HyperLink>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="container">
     <div class="row" style="min-height: 322px;">
         <div class="panel panel-warning">
             <div class="btn-group btn-group-justified">
                 <div class="btn-group">
-                    <asp:LinkButton runat="server" ID="lbHeader" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="Header"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("HEADER") %></asp:LinkButton></div><div class="btn-group">
-                    <asp:LinkButton runat="server" ID="lbExtrPar" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="ExtrPar"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("EXTRUS-PARAM") %></asp:LinkButton></div><div class="btn-group">
-                    <asp:LinkButton runat="server" ID="lbPackPar" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="PackPar"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("PACK-PARAM") %></asp:LinkButton></div><div class="btn-group">
-                    <asp:LinkButton runat="server" ID="lbDiesPar" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="DiesPar"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("DIES-PARAM") %></asp:LinkButton></div><div class="btn-group">
-                    <asp:LinkButton runat="server" ID="lbCosts" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="Costs"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("COSTS") %></asp:LinkButton></div></div><div class="panel-body bg-warning">
+                    <asp:LinkButton runat="server" ID="lbHeader" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="Header"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("HEADER") %></asp:LinkButton>
+                </div>
+                <div class="btn-group">
+                    <asp:LinkButton runat="server" ID="lbExtrPar" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="ExtrPar"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("EXTRUS-PARAM") %></asp:LinkButton>
+                </div>
+                <div class="btn-group">
+                    <asp:LinkButton runat="server" ID="lbPackPar" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="PackPar"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("PACK-PARAM") %></asp:LinkButton>
+                </div>
+                <div class="btn-group">
+                    <asp:LinkButton runat="server" ID="lbDiesPar" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="DiesPar"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("DIES-PARAM") %></asp:LinkButton>
+                </div>
+                <div class="btn-group">
+                    <asp:LinkButton runat="server" ID="lbCosts" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="Costs"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("COSTS") %></asp:LinkButton>
+                </div>
+            </div>
+            <div class="panel-body bg-warning">
                 <uc1:mod_S_Costs ID="mod_S_Costs1" runat="server" />
                 <uc2:mod_S_ExtrPar ID="mod_S_ExtrPar1" runat="server" />
                 <uc3:mod_S_Header ID="mod_S_Header1" runat="server" />
                 <uc4:mod_S_PackPar ID="mod_S_PackPar1" runat="server" />
-            <uc6:mod_S_Dies ID="mod_S_Dies1" runat="server" /></div>
+                <uc6:mod_S_Dies ID="mod_S_Dies1" runat="server" />
+            </div>
         </div>
     </div>
     <div class="row">
         <div class="panel panel-warning">
             <div class="btn-group btn-group-justified">
                 <div class="btn-group">
-                    <asp:LinkButton runat="server" ID="lbQuotation" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="Quote"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("QUOTATION") %></asp:LinkButton></div></div><div class="panel-body bg-warning">
+                    <asp:LinkButton runat="server" ID="lbQuotation" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="Quote"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("QUOTATION") %></asp:LinkButton>
+                </div>
+            </div>
+            <div class="panel-body bg-warning">
                 <uc5:mod_S_Quot ID="mod_S_Quot1" runat="server" />
             </div>
         </div>
@@ -57,11 +77,26 @@
     <div style="margin-bottom: 30px;">
         <div id="divStato0" runat="server" class="row">
             <div class="col-xs-4 col-xs-offset-4">
-                <asp:LinkButton runat="server" ID="lbCreateOffer" class="btn btn-success" Width="100%" OnClick="lnkCreateOffer_Click"><i class="fa fa-check"></i>&nbsp;<%: traduci("nextIdxQState-01") %></asp:LinkButton></div></div><div id="divStato1" runat="server" class="row">
+                <asp:LinkButton runat="server" ID="lbCreateOffer" class="btn btn-success" Width="100%" OnClick="lnkCreateOffer_Click"><i class="fa fa-check"></i>&nbsp;<%: traduci("nextIdxQState-01") %></asp:LinkButton>
+            </div>
+        </div>
+        <div id="divStato1" runat="server" class="row">
             <div class="col-xs-4 col-xs-offset-2">
-                <asp:LinkButton runat="server" ID="lbReject" class="btn btn-danger" Width="100%" OnClick="lbReject_Click"><i class="fa fa-thumbs-o-down"></i>&nbsp;<%: traduci("nextIdxQState-00") %></asp:LinkButton></div><div class="col-xs-4">
-                <asp:LinkButton runat="server" ID="lbApprove" class="btn btn-success" Width="100%" OnClick="lbApprove_Click"><i class="fa fa-thumbs-o-up"></i>&nbsp;<%: traduci("nextIdxQState-02") %></asp:LinkButton></div></div><div id="divStato2" runat="server" class="row">
+                <asp:LinkButton runat="server" ID="lbReject" class="btn btn-danger" Width="100%" OnClick="lbReject_Click"><i class="fa fa-thumbs-o-down"></i>&nbsp;<%: traduci("nextIdxQState-00") %></asp:LinkButton>
+            </div>
+            <div class="col-xs-4">
+                <asp:LinkButton runat="server" ID="lbApprove" class="btn btn-success" Width="100%" OnClick="lbApprove_Click"><i class="fa fa-thumbs-o-up"></i>&nbsp;<%: traduci("nextIdxQState-02") %></asp:LinkButton>
+            </div>
+        </div>
+        <div id="divStato2" runat="server" class="row">
             <div class="col-xs-4 col-xs-offset-4">
-                <asp:LinkButton runat="server" ID="lbRelease" class="btn btn-success" Width="100%" OnClick="lbRelease_Click"><i class="fa fa-upload"></i>&nbsp;<%: traduci("nextIdxQState-03") %></asp:LinkButton></div></div><div id="divStato3" runat="server" class="row">
+                <asp:LinkButton runat="server" ID="lbRelease" class="btn btn-success" Width="100%" OnClick="lbRelease_Click"><i class="fa fa-upload"></i>&nbsp;<%: traduci("nextIdxQState-03") %></asp:LinkButton>
+            </div>
+        </div>
+        <div id="divStato3" runat="server" class="row">
             <div class="col-xs-4 col-xs-offset-4">
-                <asp:LinkButton runat="server" ID="lbNewRev" class="btn btn-success" Width="100%" OnClick="lbNewRev_Click"><i class="fa fa-upload"></i>&nbsp;<%: traduci("createNewRev") %></asp:LinkButton></div></div></div></div>
\ No newline at end of file
+                <asp:LinkButton runat="server" ID="lbNewRev" class="btn btn-success" Width="100%" OnClick="lbNewRev_Click"><i class="fa fa-upload"></i>&nbsp;<%: traduci("createNewRev") %></asp:LinkButton>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/C2P/WebUserControls/mod_newProduct.ascx.cs b/C2P/WebUserControls/mod_newProduct.ascx.cs
index c3187c4..cde103d 100644
--- a/C2P/WebUserControls/mod_newProduct.ascx.cs
+++ b/C2P/WebUserControls/mod_newProduct.ascx.cs
@@ -235,6 +235,7 @@ namespace C2P.WebUserControls
                         mod_S_Dies1.Visible = false;
                         break;
                     case "ExtrPar":
+                        if (prevReq == req) mod_S_ExtrPar1.toggleMode();
                         mod_S_Costs1.Visible = false;
                         mod_S_ExtrPar1.Visible = true;
                         mod_S_Header1.Visible = false;
diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll
index a4fd969..bc9f09c 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 3b8bc36..8de4bae 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 4e2ef13..5dd0304 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 2edc05e..9a5e899 100644
--- a/C2P_Data/DS_Quotes.Designer.cs
+++ b/C2P_Data/DS_Quotes.Designer.cs
@@ -15702,7 +15702,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[13];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[14];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = "dbo.stp_QL_fullDataAll";
@@ -15788,23 +15788,22 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
             this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PriceOff", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[10] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[10].Connection = this.Connection;
-            this._commandCollection[10].CommandText = "dbo.stp_QLF_UpdHead";
+            this._commandCollection[10].CommandText = "dbo.stp_QLS_UpdExtrPar";
             this._commandCollection[10].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodQuote", global::System.Data.SqlDbType.BigInt, 8, global::System.Data.ParameterDirection.Input, 19, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteRev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodClient", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodItem", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMat", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatExtraCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchQty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodInco", global::System.Data.SqlDbType.NVarChar, 5, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodDiesGroup", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodPlant", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DiesPrice_sim", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DiesTecLife", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@WSR01_sim", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 8, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MSR01_sim", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 8, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NetProd01_sim", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 8, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[11] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[11].Connection = this.Connection;
-            this._commandCollection[11].CommandText = "dbo.stp_QLS_UpdHead";
+            this._commandCollection[11].CommandText = "dbo.stp_QLF_UpdHead";
             this._commandCollection[11].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -15812,8 +15811,6 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
             this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteRev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodClient", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodItem", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UnitWeight", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodItemGroup", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMat", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatExtraCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -15822,13 +15819,31 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
             this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[12] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[12].Connection = this.Connection;
-            this._commandCollection[12].CommandText = "dbo.stp_QLF_UpdQState";
+            this._commandCollection[12].CommandText = "dbo.stp_QLS_UpdHead";
             this._commandCollection[12].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodQuote", global::System.Data.SqlDbType.BigInt, 8, global::System.Data.ParameterDirection.Input, 19, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteRev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxQState", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodClient", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodItem", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UnitWeight", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodItemGroup", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMat", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatExtraCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchQty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodInco", global::System.Data.SqlDbType.NVarChar, 5, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[13] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[13].Connection = this.Connection;
+            this._commandCollection[13].CommandText = "dbo.stp_QLF_UpdQState";
+            this._commandCollection[13].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodQuote", global::System.Data.SqlDbType.BigInt, 8, global::System.Data.ParameterDirection.Input, 19, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteRev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxQState", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -16121,7 +16136,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
-        public virtual DS_Quotes.QuoteFull_QDataTable updateHeaders(string Original_QuoteType, global::System.Nullable<long> Original_CodQuote, global::System.Nullable<int> Original_QuoteRev, string CodClient, string CodItem, string RawMat, global::System.Nullable<decimal> RawMatCost, global::System.Nullable<decimal> RawMatExtraCost, global::System.Nullable<int> BatchQty, string CodInco, string Note) {
+        public virtual DS_Quotes.QuoteFull_QDataTable updateExtrParSim(string Original_QuoteType, global::System.Nullable<long> Original_CodQuote, global::System.Nullable<int> Original_QuoteRev, string CodDiesGroup, string CodPlant, global::System.Nullable<decimal> DiesPrice_sim, global::System.Nullable<decimal> DiesTecLife, global::System.Nullable<decimal> WSR01_sim, global::System.Nullable<decimal> MSR01_sim, global::System.Nullable<decimal> NetProd01_sim) {
             this.Adapter.SelectCommand = this.CommandCollection[10];
             if ((Original_QuoteType == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
@@ -16141,6 +16156,77 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
             else {
                 this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
             }
+            if ((CodDiesGroup == null)) {
+                this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[4].Value = ((string)(CodDiesGroup));
+            }
+            if ((CodPlant == null)) {
+                this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[5].Value = ((string)(CodPlant));
+            }
+            if ((DiesPrice_sim.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[6].Value = ((decimal)(DiesPrice_sim.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value;
+            }
+            if ((DiesTecLife.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[7].Value = ((decimal)(DiesTecLife.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[7].Value = global::System.DBNull.Value;
+            }
+            if ((WSR01_sim.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[8].Value = ((decimal)(WSR01_sim.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[8].Value = global::System.DBNull.Value;
+            }
+            if ((MSR01_sim.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[9].Value = ((decimal)(MSR01_sim.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[9].Value = global::System.DBNull.Value;
+            }
+            if ((NetProd01_sim.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[10].Value = ((decimal)(NetProd01_sim.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[10].Value = global::System.DBNull.Value;
+            }
+            DS_Quotes.QuoteFull_QDataTable dataTable = new DS_Quotes.QuoteFull_QDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual DS_Quotes.QuoteFull_QDataTable updateHeaders(string Original_QuoteType, global::System.Nullable<long> Original_CodQuote, global::System.Nullable<int> Original_QuoteRev, string CodClient, string CodItem, string RawMat, global::System.Nullable<decimal> RawMatCost, global::System.Nullable<decimal> RawMatExtraCost, global::System.Nullable<int> BatchQty, string CodInco, string Note) {
+            this.Adapter.SelectCommand = this.CommandCollection[11];
+            if ((Original_QuoteType == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(Original_QuoteType));
+            }
+            if ((Original_CodQuote.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((long)(Original_CodQuote.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            if ((Original_QuoteRev.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[3].Value = ((int)(Original_QuoteRev.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
+            }
             if ((CodClient == null)) {
                 this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
             }
@@ -16199,7 +16285,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
         public virtual DS_Quotes.QuoteFull_QDataTable updateHeadSim(string Original_QuoteType, global::System.Nullable<long> Original_CodQuote, global::System.Nullable<int> Original_QuoteRev, string CodClient, string CodItem, global::System.Nullable<decimal> UnitWeight, string CodItemGroup, string RawMat, global::System.Nullable<decimal> RawMatCost, global::System.Nullable<decimal> RawMatExtraCost, global::System.Nullable<int> BatchQty, string CodInco, string Note) {
-            this.Adapter.SelectCommand = this.CommandCollection[11];
+            this.Adapter.SelectCommand = this.CommandCollection[12];
             if ((Original_QuoteType == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -16288,7 +16374,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
         public virtual DS_Quotes.QuoteFull_QDataTable updateQState(string Original_QuoteType, global::System.Nullable<long> Original_CodQuote, global::System.Nullable<int> Original_QuoteRev, global::System.Nullable<int> IdxQState) {
-            this.Adapter.SelectCommand = this.CommandCollection[12];
+            this.Adapter.SelectCommand = this.CommandCollection[13];
             if ((Original_QuoteType == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
diff --git a/C2P_Data/DS_Quotes.xsd b/C2P_Data/DS_Quotes.xsd
index ae41edf..6766477 100644
--- a/C2P_Data/DS_Quotes.xsd
+++ b/C2P_Data/DS_Quotes.xsd
@@ -977,6 +977,26 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="Proxima_C2PConnectionString (Settings)" DbObjectName="Proxima_C2P.dbo.stp_QLS_UpdExtrPar" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="updateExtrParSim" GetMethodModifier="Public" GetMethodName="updateExtrParSim" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="updateExtrParSim" UserSourceName="updateExtrParSim">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_QLS_UpdExtrPar</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="char" DbType="AnsiStringFixedLength" Direction="Input" ParameterName="@Original_QuoteType" Precision="0" ProviderType="Char" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bigint" DbType="Int64" Direction="Input" ParameterName="@Original_CodQuote" Precision="19" ProviderType="BigInt" Scale="0" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_QuoteRev" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodDiesGroup" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodPlant" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="decimal" DbType="Decimal" Direction="Input" ParameterName="@DiesPrice_sim" Precision="18" ProviderType="Decimal" Scale="6" Size="9" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="decimal" DbType="Decimal" Direction="Input" ParameterName="@DiesTecLife" Precision="18" ProviderType="Decimal" Scale="6" Size="9" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="decimal" DbType="Decimal" Direction="Input" ParameterName="@WSR01_sim" Precision="9" ProviderType="Decimal" Scale="8" Size="5" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="decimal" DbType="Decimal" Direction="Input" ParameterName="@MSR01_sim" Precision="9" ProviderType="Decimal" Scale="8" Size="5" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="decimal" DbType="Decimal" Direction="Input" ParameterName="@NetProd01_sim" Precision="9" ProviderType="Decimal" Scale="8" Size="5" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="Proxima_C2PConnectionString (Settings)" DbObjectName="Proxima_C2P.dbo.stp_QLF_UpdHead" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="updateHeaders" GetMethodModifier="Public" GetMethodName="updateHeaders" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="updateHeaders" UserSourceName="updateHeaders">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
diff --git a/C2P_Data/DS_Quotes.xss b/C2P_Data/DS_Quotes.xss
index 6a4b114..3e5c434 100644
--- a/C2P_Data/DS_Quotes.xss
+++ b/C2P_Data/DS_Quotes.xss
@@ -6,14 +6,14 @@
 </autogenerated>-->
 <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="1" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:QuoteList" ZOrder="1" X="462" Y="129" Height="476" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="349" />
+    <Shape ID="DesignTable:QuoteList" ZOrder="2" X="462" Y="129" Height="476" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="349" />
     <Shape ID="DesignTable:QuoteRM" ZOrder="11" X="122" Y="271" Height="324" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:QuoteWorkExt" ZOrder="12" X="102" Y="35" Height="210" Width="230" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
     <Shape ID="DesignTable:QuoteWorkInt" ZOrder="10" X="882" Y="11" Height="305" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:QuoteParam" ZOrder="8" X="497" Y="665" Height="210" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
     <Shape ID="DesignTable:QuoteOC" ZOrder="6" X="889" Y="418" Height="305" Width="197" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:QuoteFull_Q" ZOrder="3" X="40" Y="606" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:QuoteFull_S" ZOrder="2" X="854" Y="760" Height="230" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:QuoteFull_Q" ZOrder="1" X="40" Y="606" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:QuoteFull_S" ZOrder="3" X="854" Y="760" Height="230" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
   </Shapes>
   <Connectors>
     <Connector ID="DesignRelation:FK_QuoteRM_QuoteList" ZOrder="13" LineWidth="11">
diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll
index 3b8bc36..8de4bae 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 70bf036..5c958b3 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..5dd0304 100644
Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ