diff --git a/C2P/Quote.aspx b/C2P/Quote.aspx
index 8b41f16..98f9643 100644
--- a/C2P/Quote.aspx
+++ b/C2P/Quote.aspx
@@ -1,9 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.Master" AutoEventWireup="true" CodeBehind="Quote.aspx.cs" Inherits="C2P.Quote" %>
-
-
 <%@ Register Src="~/WebUserControls/mod_QuoteDet.ascx" TagName="mod_QuoteDet" TagPrefix="uc1" %>
-
-
 <asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
diff --git a/C2P/WebUserControls/mod_Q_Header.ascx b/C2P/WebUserControls/mod_Q_Header.ascx
index e1aa001..567f647 100644
--- a/C2P/WebUserControls/mod_Q_Header.ascx
+++ b/C2P/WebUserControls/mod_Q_Header.ascx
@@ -104,8 +104,79 @@
             </div>
         </div>
     </EditItemTemplate>
+    <InsertItemTemplate>
+        <div class="row bottomLine">
+            <div class="col-xs-6 text-left">
+                <uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("ProductCode") %>' />
+                <asp:DropDownList ID="DropDownList2" runat="server" DataSourceID="odsProducts" DataValueField="value" DataTextField="value" SelectedValue='<%# Bind("CodItem") %>' />
+                <%--<asp:TextBox Font-Bold="true" ID="TextBox1" runat="server" Text='<%# Bind("CodItem") %>' />--%>
+            </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" />
+                <%--<asp:TextBox Font-Bold="true" ID="TextBox2" runat="server" Text='<%# Bind("CodClient") %>' CssClass="text-right" />--%>
+            </div>
+        </div>
+        <div class="row bottomLine">
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("Alloy") %>' />
+                <asp:DropDownList ID="DropDownList4" runat="server" DataSourceID="odsRawMat" DataValueField="value" DataTextField="label" SelectedValue='<%# Bind("RawMat") %>' />
+                <%--<asp:TextBox Font-Bold="true" ID="TextBox3" runat="server" Text='<%# Bind("RawMat") %>' />--%>
+            </div>
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("Base6060") %>' />
+                <asp:TextBox Font-Bold="true" ID="TextBox5" runat="server" Text='<%# Bind("RawMatCost","{0:N4}") %>' />
+            </div>
+            <div class="col-xs-2 text-left">
+                <uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("ExtraAlloy") %>' />
+                <asp:TextBox Font-Bold="true" ID="TextBox7" runat="server" Text='<%# Bind("RawMatExtraCost","{0:N4}") %>' />
+            </div>
+            <div class="col-xs-6 text-right">
+                <uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("OrderBatch") %>' />
+                <asp:TextBox Font-Bold="true" ID="TextBox4" runat="server" Text='<%# Bind("BatchQty") %>' CssClass="text-right" />
+            </div>
+        </div>
+        <div class="row bottomLine">
+            <div class="col-xs-6 text-left">
+                <uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("Incoterms") %>' />
+                <asp:DropDownList ID="DropDownList1" runat="server" DataSourceID="odsIncoterms" DataValueField="value" DataTextField="label" SelectedValue='<%# Bind("CodInco") %>' CssClass="text-right" />
+                <%--<asp:TextBox Font-Bold="true" ID="TextBox6" runat="server" Text='<%# Bind("CodInco") %>' CssClass="text-right" />--%>
+            </div>
+            <div class="col-xs-6 text-right">
+                <uc1:mod_display ID="mod_display8" runat="server" etichetta='<%# traduci("Agency") %>' />
+                <asp:Label Font-Bold="true" ID="TextBox8" runat="server" Text='<%# Eval("ProvvCost","{0:N4}") %>' CssClass="text-right" />
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-xs-12">
+                <uc1:mod_display ID="mod_display9" runat="server" etichetta='<%# traduci("Note") %>' />
+                <asp:TextBox Font-Bold="true" ID="TextBox1" runat="server" Text='<%# Bind("Note") %>' TextMode="MultiLine" Width="100%" Height="4em" />
+            </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="Insert"><i class="fa fa-plus-square"></i>&nbsp;<%: traduci("Insert") %></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>
+    </InsertItemTemplate>
 </asp:FormView>
-<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter" UpdateMethod="updateHeaders" OnUpdated="odsQuotes_Updated">
+<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByKey" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter" UpdateMethod="updateHeaders" OnUpdated="odsQuotes_Updated" InsertMethod="insertNew">
+    <InsertParameters>
+        <asp:Parameter Name="QuoteType" Type="String" DefaultValue="Q" />
+        <asp:Parameter Name="CodClient" Type="String" />
+        <asp:Parameter Name="CodItem" Type="String" />
+        <asp:Parameter Name="RawMat" Type="String" />
+        <asp:Parameter Name="RawMatCost" Type="Decimal" />
+        <asp:Parameter Name="RawMatExtraCost" Type="Decimal" />
+        <asp:Parameter Name="BatchQty" Type="Int32" />
+        <asp:Parameter Name="CodInco" Type="String" />
+        <asp:Parameter Name="Note" Type="String" />
+    </InsertParameters>
     <SelectParameters>
         <asp:QueryStringParameter Name="QuoteType" QueryStringField="QuoteType" Type="String" />
         <asp:QueryStringParameter Name="CodQuote" QueryStringField="CodQuote" Type="Int64" />
diff --git a/C2P/WebUserControls/mod_Q_Header.ascx.cs b/C2P/WebUserControls/mod_Q_Header.ascx.cs
index 1a8a6b1..760d32f 100644
--- a/C2P/WebUserControls/mod_Q_Header.ascx.cs
+++ b/C2P/WebUserControls/mod_Q_Header.ascx.cs
@@ -28,6 +28,13 @@ namespace C2P.WebUserControls
                 frmView.ChangeMode(FormViewMode.ReadOnly);
             }
         }
+        /// <summary>
+        /// imposta modalità insert...
+        /// </summary>
+        public void setInsertMode()
+        {
+            frmView.ChangeMode(FormViewMode.Insert);
+        }
 
         protected void odsQuotes_Updated(object sender, ObjectDataSourceStatusEventArgs e)
         {
diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx b/C2P/WebUserControls/mod_QuoteDet.ascx
index b78a209..fbdbb3a 100644
--- a/C2P/WebUserControls/mod_QuoteDet.ascx
+++ b/C2P/WebUserControls/mod_QuoteDet.ascx
@@ -8,8 +8,6 @@
   { %>
 <webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
 <%} %>
-
-
 <div class="container-fluid" style="background-color: #969696;">
     <div class="container">
         <div class="row" style="font-size: 2em; padding: 4px;">
diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx.cs b/C2P/WebUserControls/mod_QuoteDet.ascx.cs
index ac8b4cf..80cd4b7 100644
--- a/C2P/WebUserControls/mod_QuoteDet.ascx.cs
+++ b/C2P/WebUserControls/mod_QuoteDet.ascx.cs
@@ -95,6 +95,11 @@ namespace C2P.WebUserControls
                 memLayer.ML.setSessionVal("prevReqQD", value);
             }
         }
+        /// <summary>
+        /// procedura caricamento apgina...
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void Page_Load(object sender, EventArgs e)
         {
             // recupero valori della chaive della quote da URL...
@@ -207,58 +212,85 @@ namespace C2P.WebUserControls
         /// </summary>
         private void setModVisibility(string req)
         {
-            switch (req)
-            {
-                case "Costs":
-                    mod_Q_Costs1.Visible = true;
-                    mod_Q_ExtrPar1.Visible = false;
-                    mod_Q_Header1.Visible = false;
-                    mod_Q_PackPar1.Visible = false;
-                    break;
-                case "ExtrPar":
-                    mod_Q_Costs1.Visible = false;
-                    mod_Q_ExtrPar1.Visible = true;
-                    mod_Q_Header1.Visible = false;
-                    mod_Q_PackPar1.Visible = false;
-                    break;
-                case "Header":
-                    if (prevReq == req) mod_Q_Header1.toggleMode();
-                    mod_Q_Costs1.Visible = false;
-                    mod_Q_ExtrPar1.Visible = false;
-                    mod_Q_Header1.Visible = true;
-                    mod_Q_PackPar1.Visible = false;
-                    break;
-                case "PackPar":
-                    mod_Q_Costs1.Visible = false;
-                    mod_Q_ExtrPar1.Visible = false;
-                    mod_Q_Header1.Visible = false;
-                    mod_Q_PackPar1.Visible = true;
-                    break;
-                case "Quote":
-                    if (prevReq == req) mod_Q_Quot1.toggleMode();
-                    break;
-                default:
-                    mod_Q_Costs1.Visible = false;
-                    mod_Q_ExtrPar1.Visible = false;
-                    mod_Q_Header1.Visible = true;
-                    mod_Q_PackPar1.Visible = false;
-                    break;
-            }
-            prevReq = req;
-            // controllo SE sia visibile il pulsante crea offerta (netMargin > 0... DA VERIFICARE)
             bool okCreate = false;
-            DS_Quotes.QuoteFull_QRow riga;
-            try
+            bool showEdit = false;
+            if (QuoteType == "" || CodQuote == "" || QuoteRev == "")
+            // se NON HO dati x una richiesta specifica vado in modalità INSERT..
             {
-                riga = DtProxy.man.taQFQ.getByKey(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), "N")[0];
-                if (riga.NetMar > 0 || riga.PriceOff > 0)
-                {
-                    okCreate = true;
-                }
+                // mostro solo controllo header in modalità INSERT
+                mod_Q_Header1.setInsertMode();
+                mod_Q_Costs1.Visible = false;
+                mod_Q_ExtrPar1.Visible = false;
+                mod_Q_Header1.Visible = true;
+                mod_Q_PackPar1.Visible = false;
             }
-            catch
-            { }
+            else
+            // altrimenti gestione ordinaria di editing
+            {
+                switch (req)
+                {
+                    case "Costs":
+                        mod_Q_Costs1.Visible = true;
+                        mod_Q_ExtrPar1.Visible = false;
+                        mod_Q_Header1.Visible = false;
+                        mod_Q_PackPar1.Visible = false;
+                        break;
+                    case "ExtrPar":
+                        mod_Q_Costs1.Visible = false;
+                        mod_Q_ExtrPar1.Visible = true;
+                        mod_Q_Header1.Visible = false;
+                        mod_Q_PackPar1.Visible = false;
+                        break;
+                    case "Header":
+                        if (prevReq == req) mod_Q_Header1.toggleMode();
+                        mod_Q_Costs1.Visible = false;
+                        mod_Q_ExtrPar1.Visible = false;
+                        mod_Q_Header1.Visible = true;
+                        mod_Q_PackPar1.Visible = false;
+                        break;
+                    case "PackPar":
+                        mod_Q_Costs1.Visible = false;
+                        mod_Q_ExtrPar1.Visible = false;
+                        mod_Q_Header1.Visible = false;
+                        mod_Q_PackPar1.Visible = true;
+                        break;
+                    case "Quote":
+                        if (prevReq == req) mod_Q_Quot1.toggleMode();
+                        break;
+                    default:
+                        mod_Q_Costs1.Visible = false;
+                        mod_Q_ExtrPar1.Visible = false;
+                        mod_Q_Header1.Visible = true;
+                        mod_Q_PackPar1.Visible = false;
+                        break;
+                }
+                prevReq = req;
+                // controllo SE sia visibile il pulsante crea offerta (netMargin > 0... DA VERIFICARE)
+                DS_Quotes.QuoteFull_QRow riga;
+                try
+                {
+                    riga = DtProxy.man.taQFQ.getByKey(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), "N")[0];
+                    if (riga.NetMar > 0 || riga.PriceOff > 0)
+                    {
+                        okCreate = true;
+                    }
+                }
+                catch
+                { }
+                showEdit = true;
+            }
+            // fix visibilità button creazione offerta
             lbCreateOffer.Visible = okCreate;
+            // fix altri button x edit..
+            lbChkStandard.Visible = showEdit;
+            if (!showEdit)
+            {
+                lbCosts.CssClass = "btn btn-default disabled";
+                lbExtrPar.CssClass = "btn btn-default disabled";
+                lbHeader.CssClass = "btn btn-default disabled";
+                lbPackPar.CssClass = "btn btn-default disabled";
+                lbQuotation.CssClass = "btn btn-default disabled";
+            }
         }
         /// <summary>
         /// sistema visibilità buttons x cambio stato
@@ -293,6 +325,10 @@ namespace C2P.WebUserControls
                     btnGetPdf.Visible = true;
                     break;
                 default:
+                    divStato00.Visible = false;
+                    divStato10.Visible = false;
+                    divStato20.Visible = false;
+                    btnGetPdf.Visible = false;
                     break;
             }
         }
@@ -366,5 +402,6 @@ namespace C2P.WebUserControls
                 return answ;
             }
         }
+
     }
 }
\ No newline at end of file
diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll
index 1ba0651..db715a6 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 f668abb..b704a2f 100644
Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ
diff --git a/C2P_Data/DS_Quotes.Designer.cs b/C2P_Data/DS_Quotes.Designer.cs
index 7afad30..365469c 100644
--- a/C2P_Data/DS_Quotes.Designer.cs
+++ b/C2P_Data/DS_Quotes.Designer.cs
@@ -12197,7 +12197,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[7];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = "dbo.stp_QL_fullDataAll";
@@ -12224,47 +12224,61 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataMax", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[3].Connection = this.Connection;
-            this._commandCollection[3].CommandText = "dbo.stp_QuoteFull_Q_update";
+            this._commandCollection[3].CommandText = "dbo.stp_QLF_Insert";
             this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[3].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[3].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[3].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[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PriceOff", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[3].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[3].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[3].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[3].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[3].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[3].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[3].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[3].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[4] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[4].Connection = this.Connection;
-            this._commandCollection[4].CommandText = "dbo.stp_QLF_UpdCosts";
+            this._commandCollection[4].CommandText = "dbo.stp_QuoteFull_Q_update";
             this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[4].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[4].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[4].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[4].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[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PriceOff", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[5].Connection = this.Connection;
-            this._commandCollection[5].CommandText = "dbo.stp_QLF_UpdHead";
+            this._commandCollection[5].CommandText = "dbo.stp_QLF_UpdCosts";
             this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[5].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[5].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[5].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[5].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[5].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[5].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[5].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[5].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[5].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[5].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[5].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[5].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[5].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[6] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[6].Connection = this.Connection;
-            this._commandCollection[6].CommandText = "dbo.stp_QLF_UpdQState";
+            this._commandCollection[6].CommandText = "dbo.stp_QLF_UpdHead";
             this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[6].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[6].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[6].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[6].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[6].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[6].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[6].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[6].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[6].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[6].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[6].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[6].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[6].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[7] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[7].Connection = this.Connection;
+            this._commandCollection[7].CommandText = "dbo.stp_QLF_UpdQState";
+            this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[7].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[7].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[7].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[7].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[7].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()]
@@ -12367,12 +12381,77 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
             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 insertNew(string QuoteType, 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[3];
+            if ((QuoteType == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(QuoteType));
+            }
+            if ((CodClient == null)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((string)(CodClient));
+            }
+            if ((CodItem == null)) {
+                this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[3].Value = ((string)(CodItem));
+            }
+            if ((RawMat == null)) {
+                this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[4].Value = ((string)(RawMat));
+            }
+            if ((RawMatCost.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[5].Value = ((decimal)(RawMatCost.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value;
+            }
+            if ((RawMatExtraCost.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[6].Value = ((decimal)(RawMatExtraCost.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value;
+            }
+            if ((BatchQty.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[7].Value = ((int)(BatchQty.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[7].Value = global::System.DBNull.Value;
+            }
+            if ((CodInco == null)) {
+                this.Adapter.SelectCommand.Parameters[8].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[8].Value = ((string)(CodInco));
+            }
+            if ((Note == null)) {
+                this.Adapter.SelectCommand.Parameters[9].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[9].Value = ((string)(Note));
+            }
+            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 updateCosts(string Original_QuoteType, global::System.Nullable<long> Original_CodQuote, global::System.Nullable<int> Original_QuoteRev, global::System.Nullable<decimal> PriceOff) {
-            this.Adapter.SelectCommand = this.CommandCollection[4];
+            this.Adapter.SelectCommand = this.CommandCollection[5];
             if ((Original_QuoteType == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -12407,7 +12486,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 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[5];
+            this.Adapter.SelectCommand = this.CommandCollection[6];
             if ((Original_QuoteType == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -12484,7 +12563,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[6];
+            this.Adapter.SelectCommand = this.CommandCollection[7];
             if ((Original_QuoteType == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -12518,7 +12597,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")]
         public virtual int QuoteFull_Q_update(string Original_QuoteType, global::System.Nullable<long> Original_CodQuote, global::System.Nullable<int> Original_QuoteRev, global::System.Nullable<decimal> PriceOff) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
             if ((Original_QuoteType == null)) {
                 command.Parameters[1].Value = global::System.DBNull.Value;
             }
diff --git a/C2P_Data/DS_Quotes.xsd b/C2P_Data/DS_Quotes.xsd
index 076a8f5..234959c 100644
--- a/C2P_Data/DS_Quotes.xsd
+++ b/C2P_Data/DS_Quotes.xsd
@@ -852,6 +852,25 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="Proxima_C2PConnectionString (Settings)" DbObjectName="Proxima_C2P.dbo.stp_QLF_Insert" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="insertNew" GetMethodModifier="Public" GetMethodName="insertNew" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="insertNew" UserSourceName="insertNew">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_QLF_Insert</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="@QuoteType" Precision="0" ProviderType="Char" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodClient" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodItem" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@RawMat" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="decimal" DbType="Decimal" Direction="Input" ParameterName="@RawMatCost" Precision="18" ProviderType="Decimal" Scale="6" Size="9" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="decimal" DbType="Decimal" Direction="Input" ParameterName="@RawMatExtraCost" Precision="18" ProviderType="Decimal" Scale="6" Size="9" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@BatchQty" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodInco" Precision="0" ProviderType="NVarChar" Scale="0" Size="5" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Note" Precision="0" ProviderType="NVarChar" Scale="0" Size="2500" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="Proxima_C2PConnectionString (Settings)" DbObjectName="Proxima_C2P.dbo.stp_QuoteFull_Q_update" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="QuoteFull_Q_update" Modifier="Public" Name="QuoteFull_Q_update" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="QuoteFull_Q_update">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
@@ -925,7 +944,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
   <xs:element name="DS_Quotes" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_Quotes" msprop:Generator_UserDSName="DS_Quotes">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="QuoteList" msprop:Generator_TableClassName="QuoteListDataTable" msprop:Generator_TableVarName="tableQuoteList" msprop:Generator_TablePropName="QuoteList" msprop:Generator_RowDeletingName="QuoteListRowDeleting" msprop:Generator_RowChangingName="QuoteListRowChanging" msprop:Generator_RowEvHandlerName="QuoteListRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteListRowDeleted" msprop:Generator_UserTableName="QuoteList" msprop:Generator_RowChangedName="QuoteListRowChanged" msprop:Generator_RowEvArgName="QuoteListRowChangeEvent" msprop:Generator_RowClassName="QuoteListRow">
+        <xs:element name="QuoteList" msprop:Generator_TableClassName="QuoteListDataTable" msprop:Generator_TableVarName="tableQuoteList" msprop:Generator_RowChangedName="QuoteListRowChanged" msprop:Generator_TablePropName="QuoteList" msprop:Generator_RowDeletingName="QuoteListRowDeleting" msprop:Generator_RowChangingName="QuoteListRowChanging" msprop:Generator_RowEvHandlerName="QuoteListRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteListRowDeleted" msprop:Generator_RowClassName="QuoteListRow" msprop:Generator_UserTableName="QuoteList" msprop:Generator_RowEvArgName="QuoteListRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="QuoteType" msprop:Generator_ColumnVarNameInTable="columnQuoteType" msprop:Generator_ColumnPropNameInRow="QuoteType" msprop:Generator_ColumnPropNameInTable="QuoteTypeColumn" msprop:Generator_UserColumnName="QuoteType">
@@ -1009,7 +1028,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="QuoteRM" msprop:Generator_TableClassName="QuoteRMDataTable" msprop:Generator_TableVarName="tableQuoteRM" msprop:Generator_TablePropName="QuoteRM" msprop:Generator_RowDeletingName="QuoteRMRowDeleting" msprop:Generator_RowChangingName="QuoteRMRowChanging" msprop:Generator_RowEvHandlerName="QuoteRMRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteRMRowDeleted" msprop:Generator_UserTableName="QuoteRM" msprop:Generator_RowChangedName="QuoteRMRowChanged" msprop:Generator_RowEvArgName="QuoteRMRowChangeEvent" msprop:Generator_RowClassName="QuoteRMRow">
+        <xs:element name="QuoteRM" msprop:Generator_TableClassName="QuoteRMDataTable" msprop:Generator_TableVarName="tableQuoteRM" msprop:Generator_RowChangedName="QuoteRMRowChanged" msprop:Generator_TablePropName="QuoteRM" msprop:Generator_RowDeletingName="QuoteRMRowDeleting" msprop:Generator_RowChangingName="QuoteRMRowChanging" msprop:Generator_RowEvHandlerName="QuoteRMRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteRMRowDeleted" msprop:Generator_RowClassName="QuoteRMRow" msprop:Generator_UserTableName="QuoteRM" msprop:Generator_RowEvArgName="QuoteRMRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="QuoteType" msprop:Generator_ColumnVarNameInTable="columnQuoteType" msprop:Generator_ColumnPropNameInRow="QuoteType" msprop:Generator_ColumnPropNameInTable="QuoteTypeColumn" msprop:Generator_UserColumnName="QuoteType">
@@ -1045,7 +1064,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="QuoteWorkExt" msprop:Generator_TableClassName="QuoteWorkExtDataTable" msprop:Generator_TableVarName="tableQuoteWorkExt" msprop:Generator_TablePropName="QuoteWorkExt" msprop:Generator_RowDeletingName="QuoteWorkExtRowDeleting" msprop:Generator_RowChangingName="QuoteWorkExtRowChanging" msprop:Generator_RowEvHandlerName="QuoteWorkExtRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteWorkExtRowDeleted" msprop:Generator_UserTableName="QuoteWorkExt" msprop:Generator_RowChangedName="QuoteWorkExtRowChanged" msprop:Generator_RowEvArgName="QuoteWorkExtRowChangeEvent" msprop:Generator_RowClassName="QuoteWorkExtRow">
+        <xs:element name="QuoteWorkExt" msprop:Generator_TableClassName="QuoteWorkExtDataTable" msprop:Generator_TableVarName="tableQuoteWorkExt" msprop:Generator_RowChangedName="QuoteWorkExtRowChanged" msprop:Generator_TablePropName="QuoteWorkExt" msprop:Generator_RowDeletingName="QuoteWorkExtRowDeleting" msprop:Generator_RowChangingName="QuoteWorkExtRowChanging" msprop:Generator_RowEvHandlerName="QuoteWorkExtRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteWorkExtRowDeleted" msprop:Generator_RowClassName="QuoteWorkExtRow" msprop:Generator_UserTableName="QuoteWorkExt" msprop:Generator_RowEvArgName="QuoteWorkExtRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="QuoteType" msprop:Generator_ColumnVarNameInTable="columnQuoteType" msprop:Generator_ColumnPropNameInRow="QuoteType" msprop:Generator_ColumnPropNameInTable="QuoteTypeColumn" msprop:Generator_UserColumnName="QuoteType">
@@ -1070,7 +1089,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="QuoteWorkInt" msprop:Generator_TableClassName="QuoteWorkIntDataTable" msprop:Generator_TableVarName="tableQuoteWorkInt" msprop:Generator_TablePropName="QuoteWorkInt" msprop:Generator_RowDeletingName="QuoteWorkIntRowDeleting" msprop:Generator_RowChangingName="QuoteWorkIntRowChanging" msprop:Generator_RowEvHandlerName="QuoteWorkIntRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteWorkIntRowDeleted" msprop:Generator_UserTableName="QuoteWorkInt" msprop:Generator_RowChangedName="QuoteWorkIntRowChanged" msprop:Generator_RowEvArgName="QuoteWorkIntRowChangeEvent" msprop:Generator_RowClassName="QuoteWorkIntRow">
+        <xs:element name="QuoteWorkInt" msprop:Generator_TableClassName="QuoteWorkIntDataTable" msprop:Generator_TableVarName="tableQuoteWorkInt" msprop:Generator_RowChangedName="QuoteWorkIntRowChanged" msprop:Generator_TablePropName="QuoteWorkInt" msprop:Generator_RowDeletingName="QuoteWorkIntRowDeleting" msprop:Generator_RowChangingName="QuoteWorkIntRowChanging" msprop:Generator_RowEvHandlerName="QuoteWorkIntRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteWorkIntRowDeleted" msprop:Generator_RowClassName="QuoteWorkIntRow" msprop:Generator_UserTableName="QuoteWorkInt" msprop:Generator_RowEvArgName="QuoteWorkIntRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="QuoteType" msprop:Generator_ColumnVarNameInTable="columnQuoteType" msprop:Generator_ColumnPropNameInRow="QuoteType" msprop:Generator_ColumnPropNameInTable="QuoteTypeColumn" msprop:Generator_UserColumnName="QuoteType">
@@ -1150,7 +1169,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="QuoteParam" msprop:Generator_TableClassName="QuoteParamDataTable" msprop:Generator_TableVarName="tableQuoteParam" msprop:Generator_TablePropName="QuoteParam" msprop:Generator_RowDeletingName="QuoteParamRowDeleting" msprop:Generator_RowChangingName="QuoteParamRowChanging" msprop:Generator_RowEvHandlerName="QuoteParamRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteParamRowDeleted" msprop:Generator_UserTableName="QuoteParam" msprop:Generator_RowChangedName="QuoteParamRowChanged" msprop:Generator_RowEvArgName="QuoteParamRowChangeEvent" msprop:Generator_RowClassName="QuoteParamRow">
+        <xs:element name="QuoteParam" msprop:Generator_TableClassName="QuoteParamDataTable" msprop:Generator_TableVarName="tableQuoteParam" msprop:Generator_RowChangedName="QuoteParamRowChanged" msprop:Generator_TablePropName="QuoteParam" msprop:Generator_RowDeletingName="QuoteParamRowDeleting" msprop:Generator_RowChangingName="QuoteParamRowChanging" msprop:Generator_RowEvHandlerName="QuoteParamRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteParamRowDeleted" msprop:Generator_RowClassName="QuoteParamRow" msprop:Generator_UserTableName="QuoteParam" msprop:Generator_RowEvArgName="QuoteParamRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="QuoteType" msprop:Generator_ColumnVarNameInTable="columnQuoteType" msprop:Generator_ColumnPropNameInRow="QuoteType" msprop:Generator_ColumnPropNameInTable="QuoteTypeColumn" msprop:Generator_UserColumnName="QuoteType">
@@ -1187,7 +1206,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="QuoteOC" msprop:Generator_TableClassName="QuoteOCDataTable" msprop:Generator_TableVarName="tableQuoteOC" msprop:Generator_TablePropName="QuoteOC" msprop:Generator_RowDeletingName="QuoteOCRowDeleting" msprop:Generator_RowChangingName="QuoteOCRowChanging" msprop:Generator_RowEvHandlerName="QuoteOCRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteOCRowDeleted" msprop:Generator_UserTableName="QuoteOC" msprop:Generator_RowChangedName="QuoteOCRowChanged" msprop:Generator_RowEvArgName="QuoteOCRowChangeEvent" msprop:Generator_RowClassName="QuoteOCRow">
+        <xs:element name="QuoteOC" msprop:Generator_TableClassName="QuoteOCDataTable" msprop:Generator_TableVarName="tableQuoteOC" msprop:Generator_RowChangedName="QuoteOCRowChanged" msprop:Generator_TablePropName="QuoteOC" msprop:Generator_RowDeletingName="QuoteOCRowDeleting" msprop:Generator_RowChangingName="QuoteOCRowChanging" msprop:Generator_RowEvHandlerName="QuoteOCRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteOCRowDeleted" msprop:Generator_RowClassName="QuoteOCRow" msprop:Generator_UserTableName="QuoteOC" msprop:Generator_RowEvArgName="QuoteOCRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="QuoteType" msprop:Generator_ColumnVarNameInTable="columnQuoteType" msprop:Generator_ColumnPropNameInRow="QuoteType" msprop:Generator_ColumnPropNameInTable="QuoteTypeColumn" msprop:Generator_UserColumnName="QuoteType">
@@ -1257,7 +1276,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="QuoteFull_Q" msprop:Generator_TableClassName="QuoteFull_QDataTable" msprop:Generator_TableVarName="tableQuoteFull_Q" msprop:Generator_RowChangedName="QuoteFull_QRowChanged" msprop:Generator_TablePropName="QuoteFull_Q" msprop:Generator_RowDeletingName="QuoteFull_QRowDeleting" msprop:Generator_RowChangingName="QuoteFull_QRowChanging" msprop:Generator_RowEvHandlerName="QuoteFull_QRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteFull_QRowDeleted" msprop:Generator_RowClassName="QuoteFull_QRow" msprop:Generator_UserTableName="QuoteFull_Q" msprop:Generator_RowEvArgName="QuoteFull_QRowChangeEvent">
+        <xs:element name="QuoteFull_Q" msprop:Generator_TableClassName="QuoteFull_QDataTable" msprop:Generator_TableVarName="tableQuoteFull_Q" msprop:Generator_TablePropName="QuoteFull_Q" msprop:Generator_RowDeletingName="QuoteFull_QRowDeleting" msprop:Generator_RowChangingName="QuoteFull_QRowChanging" msprop:Generator_RowEvHandlerName="QuoteFull_QRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteFull_QRowDeleted" msprop:Generator_UserTableName="QuoteFull_Q" msprop:Generator_RowChangedName="QuoteFull_QRowChanged" msprop:Generator_RowEvArgName="QuoteFull_QRowChangeEvent" msprop:Generator_RowClassName="QuoteFull_QRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Vers" msprop:Generator_ColumnVarNameInTable="columnVers" msprop:Generator_ColumnPropNameInRow="Vers" msprop:Generator_ColumnPropNameInTable="VersColumn" msprop:Generator_UserColumnName="Vers">
@@ -1534,11 +1553,11 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_QuoteRM_QuoteList" msdata:parent="QuoteList" msdata:child="QuoteRM" msdata:parentkey="QuoteType CodQuote QuoteRev" msdata:childkey="QuoteType CodQuote QuoteRev" msprop:Generator_UserChildTable="QuoteRM" msprop:Generator_ChildPropName="GetQuoteRMRows" msprop:Generator_UserRelationName="FK_QuoteRM_QuoteList" msprop:Generator_ParentPropName="QuoteListRowParent" msprop:Generator_RelationVarName="relationFK_QuoteRM_QuoteList" msprop:Generator_UserParentTable="QuoteList" />
-      <msdata:Relationship name="FK_QuoteWorkExt_QuoteList" msdata:parent="QuoteList" msdata:child="QuoteWorkExt" msdata:parentkey="QuoteType CodQuote QuoteRev" msdata:childkey="QuoteType CodQuote QuoteRev" msprop:Generator_UserChildTable="QuoteWorkExt" msprop:Generator_ChildPropName="GetQuoteWorkExtRows" msprop:Generator_UserRelationName="FK_QuoteWorkExt_QuoteList" msprop:Generator_ParentPropName="QuoteListRowParent" msprop:Generator_RelationVarName="relationFK_QuoteWorkExt_QuoteList" msprop:Generator_UserParentTable="QuoteList" />
-      <msdata:Relationship name="FK_QuoteWorkInt_QuoteList" msdata:parent="QuoteList" msdata:child="QuoteWorkInt" msdata:parentkey="QuoteType CodQuote QuoteRev" msdata:childkey="QuoteType CodQuote QuoteRev" msprop:Generator_UserChildTable="QuoteWorkInt" msprop:Generator_ChildPropName="GetQuoteWorkIntRows" msprop:Generator_UserRelationName="FK_QuoteWorkInt_QuoteList" msprop:Generator_ParentPropName="QuoteListRowParent" msprop:Generator_RelationVarName="relationFK_QuoteWorkInt_QuoteList" msprop:Generator_UserParentTable="QuoteList" />
-      <msdata:Relationship name="FK_QuoteParam_QuoteList" msdata:parent="QuoteList" msdata:child="QuoteParam" msdata:parentkey="QuoteType CodQuote QuoteRev" msdata:childkey="QuoteType CodQuote QuoteRev" msprop:Generator_UserChildTable="QuoteParam" msprop:Generator_ChildPropName="GetQuoteParamRows" msprop:Generator_UserRelationName="FK_QuoteParam_QuoteList" msprop:Generator_ParentPropName="QuoteListRowParent" msprop:Generator_RelationVarName="relationFK_QuoteParam_QuoteList" msprop:Generator_UserParentTable="QuoteList" />
-      <msdata:Relationship name="FK_QuoteExtra_QuoteList" msdata:parent="QuoteList" msdata:child="QuoteOC" msdata:parentkey="QuoteType CodQuote QuoteRev" msdata:childkey="QuoteType CodQuote QuoteRev" msprop:Generator_UserChildTable="QuoteOC" msprop:Generator_ChildPropName="GetQuoteOCRows" msprop:Generator_UserRelationName="FK_QuoteExtra_QuoteList" msprop:Generator_ParentPropName="QuoteListRowParent" msprop:Generator_RelationVarName="relationFK_QuoteExtra_QuoteList" msprop:Generator_UserParentTable="QuoteList" />
+      <msdata:Relationship name="FK_QuoteRM_QuoteList" msdata:parent="QuoteList" msdata:child="QuoteRM" msdata:parentkey="QuoteType CodQuote QuoteRev" msdata:childkey="QuoteType CodQuote QuoteRev" msprop:Generator_UserChildTable="QuoteRM" msprop:Generator_ChildPropName="GetQuoteRMRows" msprop:Generator_UserRelationName="FK_QuoteRM_QuoteList" msprop:Generator_RelationVarName="relationFK_QuoteRM_QuoteList" msprop:Generator_UserParentTable="QuoteList" msprop:Generator_ParentPropName="QuoteListRowParent" />
+      <msdata:Relationship name="FK_QuoteWorkExt_QuoteList" msdata:parent="QuoteList" msdata:child="QuoteWorkExt" msdata:parentkey="QuoteType CodQuote QuoteRev" msdata:childkey="QuoteType CodQuote QuoteRev" msprop:Generator_UserChildTable="QuoteWorkExt" msprop:Generator_ChildPropName="GetQuoteWorkExtRows" msprop:Generator_UserRelationName="FK_QuoteWorkExt_QuoteList" msprop:Generator_RelationVarName="relationFK_QuoteWorkExt_QuoteList" msprop:Generator_UserParentTable="QuoteList" msprop:Generator_ParentPropName="QuoteListRowParent" />
+      <msdata:Relationship name="FK_QuoteWorkInt_QuoteList" msdata:parent="QuoteList" msdata:child="QuoteWorkInt" msdata:parentkey="QuoteType CodQuote QuoteRev" msdata:childkey="QuoteType CodQuote QuoteRev" msprop:Generator_UserChildTable="QuoteWorkInt" msprop:Generator_ChildPropName="GetQuoteWorkIntRows" msprop:Generator_UserRelationName="FK_QuoteWorkInt_QuoteList" msprop:Generator_RelationVarName="relationFK_QuoteWorkInt_QuoteList" msprop:Generator_UserParentTable="QuoteList" msprop:Generator_ParentPropName="QuoteListRowParent" />
+      <msdata:Relationship name="FK_QuoteParam_QuoteList" msdata:parent="QuoteList" msdata:child="QuoteParam" msdata:parentkey="QuoteType CodQuote QuoteRev" msdata:childkey="QuoteType CodQuote QuoteRev" msprop:Generator_UserChildTable="QuoteParam" msprop:Generator_ChildPropName="GetQuoteParamRows" msprop:Generator_UserRelationName="FK_QuoteParam_QuoteList" msprop:Generator_RelationVarName="relationFK_QuoteParam_QuoteList" msprop:Generator_UserParentTable="QuoteList" msprop:Generator_ParentPropName="QuoteListRowParent" />
+      <msdata:Relationship name="FK_QuoteExtra_QuoteList" msdata:parent="QuoteList" msdata:child="QuoteOC" msdata:parentkey="QuoteType CodQuote QuoteRev" msdata:childkey="QuoteType CodQuote QuoteRev" msprop:Generator_UserChildTable="QuoteOC" msprop:Generator_ChildPropName="GetQuoteOCRows" msprop:Generator_UserRelationName="FK_QuoteExtra_QuoteList" msprop:Generator_RelationVarName="relationFK_QuoteExtra_QuoteList" msprop:Generator_UserParentTable="QuoteList" msprop:Generator_ParentPropName="QuoteListRowParent" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>
\ 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 f668abb..b704a2f 100644
Binary files a/C2P_Data/bin/Release/C2P_Data.dll and b/C2P_Data/bin/Release/C2P_Data.dll differ
diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs
index 6678f34..b360b59 100644
--- a/VersGen/C2P.cs
+++ b/VersGen/C2P.cs
@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.6.46.136")]
-[assembly: AssemblyFileVersion("0.6.46.136")]
+[assembly: AssemblyVersion("0.6.47.136")]
+[assembly: AssemblyFileVersion("0.6.47.136")]
 [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")]
 [assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt
index 127e823..82dabda 100644
--- a/VersGen/C2P.tt
+++ b/VersGen/C2P.tt
@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.6.46.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("0.6.46.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("0.6.47.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("0.6.47.<#= this.RevisionNumber #>")]
 [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
 [assembly: AssemblyCompany("Steamware")]
 <#+