diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx b/C2P/WebUserControls/mod_OffersArchive.ascx
index 2042562..e570279 100644
--- a/C2P/WebUserControls/mod_OffersArchive.ascx
+++ b/C2P/WebUserControls/mod_OffersArchive.ascx
@@ -91,7 +91,7 @@
                 <asp:LinkButton runat="server" Width="100%" ID="lbOpen" CssClass="btn btn-success" OnClick="lbOpen_Click"><i class="fa fa-search"></i> <%:traduci("Open") %></asp:LinkButton>
             </div>
             <div class="col-sm-2" style="padding: 0px 4px;">
-                <asp:LinkButton runat="server" Width="100%" ID="lbDelete" CssClass="btn btn-danger" OnClick="lbDelete_Click"><i class="fa fa-trash-o"></i> <%:traduci("Delete") %></asp:LinkButton>
+                <asp:LinkButton runat="server" Width="100%" ID="lbDelete" CssClass="btn btn-danger" OnClick="lbDelete_Click" OnClientClick="return confirm('Confirm Delete?')"><i class="fa fa-trash-o"></i> <%:traduci("Delete") %></asp:LinkButton>
             </div>
             <div class="col-sm-2" style="padding: 0px 4px;">
                 <asp:LinkButton runat="server" Width="100%" ID="lbDuplicate" CssClass="btn btn-primary" OnClick="lbDuplicate_Click"><i class="fa fa-code-fork"></i> <%:traduci("Duplicate") %></asp:LinkButton>
diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx.cs b/C2P/WebUserControls/mod_OffersArchive.ascx.cs
index 6aff653..268037f 100644
--- a/C2P/WebUserControls/mod_OffersArchive.ascx.cs
+++ b/C2P/WebUserControls/mod_OffersArchive.ascx.cs
@@ -406,11 +406,24 @@ namespace C2P.WebUserControls
         /// <param name="e"></param>
         protected void lbDelete_Click(object sender, EventArgs e)
         {
-            // elimino SINGOLA offerta selezionata
-            DtProxy.man.taQFQ.DeleteQuery(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev));
-            numSel = 0;
-            doUpdate();
-            setBtnVisib();
+            bool isDraft = false;
+            int IdxQS = 0;
+            try
+            {
+                IdxQS = DtProxy.man.taQFQ.getByKey(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), "N")[0].IdxQState;
+                isDraft = (IdxQS == 0);
+            }
+            catch
+            { }
+            // SOLO se è in stato draft...
+            if (isDraft)
+            {
+                // elimino SINGOLA offerta selezionata
+                DtProxy.man.taQFQ.DeleteQuery(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev));
+                numSel = 0;
+                doUpdate();
+                setBtnVisib();
+            }
         }
         /// <summary>
         /// duplica offerta selezionata
diff --git a/C2P/WebUserControls/mod_Q_ExtrPar.ascx b/C2P/WebUserControls/mod_Q_ExtrPar.ascx
index a79918c..e2d90c2 100644
--- a/C2P/WebUserControls/mod_Q_ExtrPar.ascx
+++ b/C2P/WebUserControls/mod_Q_ExtrPar.ascx
@@ -23,7 +23,7 @@
             <div class="col-xs-4 text-right">
                 <uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("CodDiesGroup") %>' valore='<%# Eval("CodDiesGroup") %>' />
             </div>
-        </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:N0}") %>' />
@@ -37,7 +37,7 @@
             <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>
         <div class="row bottomLine">
             <div class="col-xs-2 text-left">
                 <uc1:mod_display ID="mod_display9" runat="server" etichetta='<%# traduci("CodPlant") %>' valore='<%# Eval("CodPlant") %>' />
@@ -47,13 +47,14 @@
             </div>
             <div class="col-xs-2 text-left">
                 <uc1:mod_display ID="mod_display12" runat="server" etichetta='<%# traduci("NumSMED") %>' valore='<%# Eval("NumSMED", "{0:N0}") %>' />
+                <%--<asp:Label runat="server" ID="txt2del" Text='<%# 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">
-             <div class="col-xs-2 text-left">
+            <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">
diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll
index b0b9a6f..b26181c 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 691567f..43185e7 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 51b6720..48b0bec 100644
Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ
diff --git a/C2P_Data/C2P_Data.csproj b/C2P_Data/C2P_Data.csproj
index f45df1e..f4a573a 100644
--- a/C2P_Data/C2P_Data.csproj
+++ b/C2P_Data/C2P_Data.csproj
@@ -47,6 +47,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DS_Quotes.cs">
+      <DependentUpon>DS_Quotes.xsd</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="DS_Quotes.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
diff --git a/C2P_Data/DS_Quotes.Designer.cs b/C2P_Data/DS_Quotes.Designer.cs
index 639fb06..5c58b6b 100644
--- a/C2P_Data/DS_Quotes.Designer.cs
+++ b/C2P_Data/DS_Quotes.Designer.cs
@@ -3727,8 +3727,6 @@ namespace C2P_Data {
             
             private global::System.Data.DataColumn columnP_MinPrice_sim;
             
-            private global::System.Data.DataColumn columnNumSMED1;
-            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public QuoteFull_QDataTable() {
@@ -4594,14 +4592,6 @@ namespace C2P_Data {
                 }
             }
             
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public global::System.Data.DataColumn NumSMED1Column {
-                get {
-                    return this.columnNumSMED1;
-                }
-            }
-            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -4743,8 +4733,7 @@ namespace C2P_Data {
                         decimal NetMar_sim, 
                         decimal FCShield_sim, 
                         decimal MinPrice_sim, 
-                        decimal P_MinPrice_sim, 
-                        int NumSMED1) {
+                        decimal P_MinPrice_sim) {
                 QuoteFull_QRow rowQuoteFull_QRow = ((QuoteFull_QRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         Vers,
@@ -4850,8 +4839,7 @@ namespace C2P_Data {
                         NetMar_sim,
                         FCShield_sim,
                         MinPrice_sim,
-                        P_MinPrice_sim,
-                        NumSMED1};
+                        P_MinPrice_sim};
                 rowQuoteFull_QRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowQuoteFull_QRow);
                 return rowQuoteFull_QRow;
@@ -4987,7 +4975,6 @@ namespace C2P_Data {
                 this.columnFCShield_sim = base.Columns["FCShield_sim"];
                 this.columnMinPrice_sim = base.Columns["MinPrice_sim"];
                 this.columnP_MinPrice_sim = base.Columns["P_MinPrice_sim"];
-                this.columnNumSMED1 = base.Columns["NumSMED1"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -5201,8 +5188,6 @@ namespace C2P_Data {
                 base.Columns.Add(this.columnMinPrice_sim);
                 this.columnP_MinPrice_sim = new global::System.Data.DataColumn("P_MinPrice_sim", typeof(decimal), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnP_MinPrice_sim);
-                this.columnNumSMED1 = new global::System.Data.DataColumn("NumSMED1", typeof(int), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnNumSMED1);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnQuoteType,
                                 this.columnCodQuote,
@@ -5306,7 +5291,6 @@ namespace C2P_Data {
                 this.columnMSR01_sim.AllowDBNull = false;
                 this.columnNetProd01_sim.AllowDBNull = false;
                 this.columnDSR_sim.AllowDBNull = false;
-                this.columnNumSMED1.Caption = "NumSMED";
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -10588,22 +10572,6 @@ namespace C2P_Data {
                 }
             }
             
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public int NumSMED1 {
-                get {
-                    try {
-                        return ((int)(this[this.tableQuoteFull_Q.NumSMED1Column]));
-                    }
-                    catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("The value for column \'NumSMED1\' in table \'QuoteFull_Q\' is DBNull.", e);
-                    }
-                }
-                set {
-                    this[this.tableQuoteFull_Q.NumSMED1Column] = value;
-                }
-            }
-            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public bool IsCodClientAssocNull() {
@@ -11095,18 +11063,6 @@ namespace C2P_Data {
             public void SetP_MinPrice_simNull() {
                 this[this.tableQuoteFull_Q.P_MinPrice_simColumn] = global::System.Convert.DBNull;
             }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public bool IsNumSMED1Null() {
-                return this.IsNull(this.tableQuoteFull_Q.NumSMED1Column);
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public void SetNumSMED1Null() {
-                this[this.tableQuoteFull_Q.NumSMED1Column] = global::System.Convert.DBNull;
-            }
         }
         
         /// <summary>
@@ -17601,7 +17557,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
             tableMapping.ColumnMappings.Add("FCShield_sim", "FCShield_sim");
             tableMapping.ColumnMappings.Add("MinPrice_sim", "MinPrice_sim");
             tableMapping.ColumnMappings.Add("P_MinPrice_sim", "P_MinPrice_sim");
-            tableMapping.ColumnMappings.Add("NumSMED", "NumSMED1");
+            tableMapping.ColumnMappings.Add("NumSMED", "NumSMED");
             this._adapter.TableMappings.Add(tableMapping);
         }
         
diff --git a/C2P_Data/DS_Quotes.cs b/C2P_Data/DS_Quotes.cs
new file mode 100644
index 0000000..a964100
--- /dev/null
+++ b/C2P_Data/DS_Quotes.cs
@@ -0,0 +1,13 @@
+namespace C2P_Data {
+    
+    
+    public partial class DS_Quotes {
+    }
+}
+
+namespace C2P_Data.DS_QuotesTableAdapters {
+    
+    
+    public partial class QuoteFull_QTableAdapter {
+    }
+}
diff --git a/C2P_Data/DS_Quotes.xsd b/C2P_Data/DS_Quotes.xsd
index 72f6b5a..1533148 100644
--- a/C2P_Data/DS_Quotes.xsd
+++ b/C2P_Data/DS_Quotes.xsd
@@ -882,10 +882,10 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
               <Mapping SourceColumn="FCShield_sim" DataSetColumn="FCShield_sim" />
               <Mapping SourceColumn="MinPrice_sim" DataSetColumn="MinPrice_sim" />
               <Mapping SourceColumn="P_MinPrice_sim" DataSetColumn="P_MinPrice_sim" />
-              <Mapping SourceColumn="NumSMED" DataSetColumn="NumSMED1" />
+              <Mapping SourceColumn="NumSMED" DataSetColumn="NumSMED" />
             </Mappings>
             <Sources>
-              <DbSource ConnectionRef="Proxima_C2PConnectionString (Settings)" DbObjectName="Proxima_C2P.dbo.stp_QLF_Delete" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="DeleteQuery" Modifier="Public" Name="DeleteQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="DeleteQuery">
+              <DbSource ConnectionRef="Proxima_C2PConnectionString (Settings)" DbObjectName="Proxima_C2P.dbo.stp_QLF_Delete" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="DeleteQuery" Modifier="Public" Name="DeleteQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="DeleteQuery">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_QLF_Delete</CommandText>
@@ -898,7 +898,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="Proxima_C2PConnectionString (Settings)" DbObjectName="Proxima_C2P.dbo.stp_QL_fullDataCount" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="fullDataCount" Modifier="Public" Name="fullDataCount" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="fullDataCount">
+              <DbSource ConnectionRef="Proxima_C2PConnectionString (Settings)" DbObjectName="Proxima_C2P.dbo.stp_QL_fullDataCount" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="fullDataCount" Modifier="Public" Name="fullDataCount" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="fullDataCount">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_QL_fullDataCount</CommandText>
@@ -1003,7 +1003,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas
                   </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="GetDataBy1" UserSourceName="QuoteFull_Q_update">
+              <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="GetDataBy2" UserSourceName="QuoteFull_Q_update">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_QuoteFull_Q_update</CommandText>
@@ -1870,7 +1870,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer
   <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">
@@ -1954,7 +1954,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer
             </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">
@@ -1990,7 +1990,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer
             </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">
@@ -2015,7 +2015,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer
             </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">
@@ -2095,7 +2095,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer
             </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">
@@ -2132,7 +2132,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer
             </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">
@@ -2202,7 +2202,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer
             </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">
@@ -2453,11 +2453,10 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer
               <xs:element name="FCShield_sim" msprop:Generator_ColumnVarNameInTable="columnFCShield_sim" msprop:Generator_ColumnPropNameInRow="FCShield_sim" msprop:Generator_ColumnPropNameInTable="FCShield_simColumn" msprop:Generator_UserColumnName="FCShield_sim" type="xs:decimal" minOccurs="0" />
               <xs:element name="MinPrice_sim" msprop:Generator_ColumnVarNameInTable="columnMinPrice_sim" msprop:Generator_ColumnPropNameInRow="MinPrice_sim" msprop:Generator_ColumnPropNameInTable="MinPrice_simColumn" msprop:Generator_UserColumnName="MinPrice_sim" type="xs:decimal" minOccurs="0" />
               <xs:element name="P_MinPrice_sim" msprop:Generator_ColumnVarNameInTable="columnP_MinPrice_sim" msprop:Generator_ColumnPropNameInRow="P_MinPrice_sim" msprop:Generator_ColumnPropNameInTable="P_MinPrice_simColumn" msprop:Generator_UserColumnName="P_MinPrice_sim" type="xs:decimal" minOccurs="0" />
-              <xs:element name="NumSMED1" msdata:Caption="NumSMED" msprop:Generator_ColumnVarNameInTable="columnNumSMED1" msprop:Generator_ColumnPropNameInRow="NumSMED1" msprop:Generator_ColumnPropNameInTable="NumSMED1Column" msprop:Generator_UserColumnName="NumSMED1" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="QuoteFull_S" msprop:Generator_TableClassName="QuoteFull_SDataTable" msprop:Generator_TableVarName="tableQuoteFull_S" msprop:Generator_TablePropName="QuoteFull_S" msprop:Generator_RowDeletingName="QuoteFull_SRowDeleting" msprop:Generator_RowChangingName="QuoteFull_SRowChanging" msprop:Generator_RowEvHandlerName="QuoteFull_SRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteFull_SRowDeleted" msprop:Generator_UserTableName="QuoteFull_S" msprop:Generator_RowChangedName="QuoteFull_SRowChanged" msprop:Generator_RowEvArgName="QuoteFull_SRowChangeEvent" msprop:Generator_RowClassName="QuoteFull_SRow">
+        <xs:element name="QuoteFull_S" msprop:Generator_TableClassName="QuoteFull_SDataTable" msprop:Generator_TableVarName="tableQuoteFull_S" msprop:Generator_RowChangedName="QuoteFull_SRowChanged" msprop:Generator_TablePropName="QuoteFull_S" msprop:Generator_RowDeletingName="QuoteFull_SRowDeleting" msprop:Generator_RowChangingName="QuoteFull_SRowChanging" msprop:Generator_RowEvHandlerName="QuoteFull_SRowChangeEventHandler" msprop:Generator_RowDeletedName="QuoteFull_SRowDeleted" msprop:Generator_RowClassName="QuoteFull_SRow" msprop:Generator_UserTableName="QuoteFull_S" msprop:Generator_RowEvArgName="QuoteFull_SRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Vers" msprop:Generator_ColumnVarNameInTable="columnVers" msprop:Generator_ColumnPropNameInRow="Vers" msprop:Generator_ColumnPropNameInTable="VersColumn" msprop:Generator_UserColumnName="Vers">
@@ -2695,7 +2694,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="RawMatDet" msprop:Generator_TableClassName="RawMatDetDataTable" msprop:Generator_TableVarName="tableRawMatDet" msprop:Generator_RowChangedName="RawMatDetRowChanged" msprop:Generator_TablePropName="RawMatDet" msprop:Generator_RowDeletingName="RawMatDetRowDeleting" msprop:Generator_RowChangingName="RawMatDetRowChanging" msprop:Generator_RowEvHandlerName="RawMatDetRowChangeEventHandler" msprop:Generator_RowDeletedName="RawMatDetRowDeleted" msprop:Generator_RowClassName="RawMatDetRow" msprop:Generator_UserTableName="RawMatDet" msprop:Generator_RowEvArgName="RawMatDetRowChangeEvent">
+        <xs:element name="RawMatDet" msprop:Generator_TableClassName="RawMatDetDataTable" msprop:Generator_TableVarName="tableRawMatDet" msprop:Generator_TablePropName="RawMatDet" msprop:Generator_RowDeletingName="RawMatDetRowDeleting" msprop:Generator_RowChangingName="RawMatDetRowChanging" msprop:Generator_RowEvHandlerName="RawMatDetRowChangeEventHandler" msprop:Generator_RowDeletedName="RawMatDetRowDeleted" msprop:Generator_UserTableName="RawMatDet" msprop:Generator_RowChangedName="RawMatDetRowChanged" msprop:Generator_RowEvArgName="RawMatDetRowChangeEvent" msprop:Generator_RowClassName="RawMatDetRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="RawMat" msprop:Generator_ColumnVarNameInTable="columnRawMat" msprop:Generator_ColumnPropNameInRow="RawMat" msprop:Generator_ColumnPropNameInTable="RawMatColumn" msprop:Generator_UserColumnName="RawMat">
@@ -2716,7 +2715,7 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="StdCostList" msprop:Generator_TableClassName="StdCostListDataTable" msprop:Generator_TableVarName="tableStdCostList" msprop:Generator_TablePropName="StdCostList" msprop:Generator_RowDeletingName="StdCostListRowDeleting" msprop:Generator_RowChangingName="StdCostListRowChanging" msprop:Generator_RowEvHandlerName="StdCostListRowChangeEventHandler" msprop:Generator_RowDeletedName="StdCostListRowDeleted" msprop:Generator_UserTableName="StdCostList" msprop:Generator_RowChangedName="StdCostListRowChanged" msprop:Generator_RowEvArgName="StdCostListRowChangeEvent" msprop:Generator_RowClassName="StdCostListRow">
+        <xs:element name="StdCostList" msprop:Generator_TableClassName="StdCostListDataTable" msprop:Generator_TableVarName="tableStdCostList" msprop:Generator_RowChangedName="StdCostListRowChanged" msprop:Generator_TablePropName="StdCostList" msprop:Generator_RowDeletingName="StdCostListRowDeleting" msprop:Generator_RowChangingName="StdCostListRowChanging" msprop:Generator_RowEvHandlerName="StdCostListRowChangeEventHandler" msprop:Generator_RowDeletedName="StdCostListRowDeleted" msprop:Generator_RowClassName="StdCostListRow" msprop:Generator_UserTableName="StdCostList" msprop:Generator_RowEvArgName="StdCostListRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="DataRif" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnDataRif" msprop:Generator_ColumnPropNameInRow="DataRif" msprop:Generator_ColumnPropNameInTable="DataRifColumn" msprop:Generator_UserColumnName="DataRif" minOccurs="0">
@@ -2851,11 +2850,11 @@ SELECT RawMat, ProcCost, ProcYield, CSR, SSR, SSVA, SSVR, ExtraMatCost, ExtraSer
   </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/DS_Quotes.xss b/C2P_Data/DS_Quotes.xss
index 3edc65b..d106d29 100644
--- a/C2P_Data/DS_Quotes.xss
+++ b/C2P_Data/DS_Quotes.xss
@@ -12,7 +12,7 @@
     <Shape ID="DesignTable:QuoteWorkInt" ZOrder="12" X="882" Y="11" Height="305" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:QuoteParam" ZOrder="10" X="486" Y="720" Height="210" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
     <Shape ID="DesignTable:QuoteOC" ZOrder="8" X="889" Y="418" Height="305" Width="197" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <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_Q" ZOrder="1" X="40" Y="606" Height="381" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:QuoteFull_S" ZOrder="5" X="854" Y="760" Height="230" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:RawMatDet" ZOrder="3" X="496" Y="971" Height="267" Width="213" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:StdCostList" ZOrder="2" X="920" Y="1091" Height="343" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll
index 691567f..43185e7 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 8343942..e90bc99 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 51b6720..48b0bec 100644
Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ
diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs
index 256870d..991f08e 100644
--- a/VersGen/C2P.cs
+++ b/VersGen/C2P.cs
@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.8.109.240")]
-[assembly: AssemblyFileVersion("0.8.109.240")]
+[assembly: AssemblyVersion("0.8.110.241")]
+[assembly: AssemblyFileVersion("0.8.110.241")]
 [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")]
 [assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt
index 8ba99d5..acf16af 100644
--- a/VersGen/C2P.tt
+++ b/VersGen/C2P.tt
@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.8.109.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("0.8.109.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("0.8.110.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("0.8.110.<#= this.RevisionNumber #>")]
 [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
 [assembly: AssemblyCompany("Steamware")]
 <#+