diff --git a/C2P/C2P.csproj.user b/C2P/C2P.csproj.user
index cd5a0b1..d496d3a 100644
--- a/C2P/C2P.csproj.user
+++ b/C2P/C2P.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ShowAllFiles</ProjectView>
-    <NameOfLastUsedPublishProfile>costimateZip</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>IIS02</NameOfLastUsedPublishProfile>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
diff --git a/C2P/CsvExcelExporter.aspx.cs b/C2P/CsvExcelExporter.aspx.cs
index d8fa791..e02c9af 100644
--- a/C2P/CsvExcelExporter.aspx.cs
+++ b/C2P/CsvExcelExporter.aspx.cs
@@ -78,12 +78,15 @@ namespace C2P
             List<string> columnNames = new List<string>();
             List<string> rows = new List<string>();
 
+            string FIELDTERMINATOR = memLayer.ML.confReadString("FIELDTERMINATOR");
+            string ROWTERMINATOR = memLayer.ML.confReadString("ROWTERMINATOR");
+
             foreach (DataColumn column in dataTable.Columns)
             {
                 columnNames.Add(column.ColumnName);
             }
 
-            builder.Append(string.Join(memLayer.ML.confReadString("FIELDTERMINATOR"), columnNames.ToArray())).Append("\n");
+            builder.Append(string.Join(FIELDTERMINATOR, columnNames.ToArray())).Append(ROWTERMINATOR);
 
             foreach (DataRow row in dataTable.Rows)
             {
@@ -96,10 +99,10 @@ namespace C2P
                     currentRow.Add(item.ToString().Replace("\n", " ").Replace("\r", ""));
                 }
 
-                rows.Add(string.Join(memLayer.ML.confReadString("FIELDTERMINATOR"), currentRow.ToArray()));
+                rows.Add(string.Join(FIELDTERMINATOR, currentRow.ToArray()));
             }
 
-            builder.Append(string.Join("\n", rows.ToArray()));
+            builder.Append(string.Join(ROWTERMINATOR, rows.ToArray()));
 
             Response.Clear();
             Response.AddHeader("content-disposition", string.Format("attachment; filename={0}.csv", tableReq));
diff --git a/C2P/Web.config b/C2P/Web.config
index cc58cbb..f1ae8b3 100644
--- a/C2P/Web.config
+++ b/C2P/Web.config
@@ -50,7 +50,7 @@
     <add key="uplDir" value="\\10.74.82.217\ImportData\" />
     <add key="archDir" value="\\10.74.82.217\Archive\" />
     <add key="FIELDTERMINATOR" value=";" />
-    <add key="ROWTERMINATOR" value="\n" />
+    <add key="ROWTERMINATOR" value="\r\n" />
     <add key="FIRSTROW" value="2" />
     <add key="CODEPAGE" value="ACP" />
     <add key="flgUpdate" value="true" />
diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll
index 17b7dfa..dd3a6c1 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 68d0bdd..3581935 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 a9e4680..e83fdfc 100644
Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ
diff --git a/C2P/obj/deploy/C2P.dll b/C2P/obj/deploy/C2P.dll
index 17b7dfa..0388dd5 100644
Binary files a/C2P/obj/deploy/C2P.dll and b/C2P/obj/deploy/C2P.dll differ
diff --git a/C2P_CronJob/bin/Release/C2P_CronJob.application b/C2P_CronJob/bin/Release/C2P_CronJob.application
index d610fdf..1ffb5a4 100644
--- a/C2P_CronJob/bin/Release/C2P_CronJob.application
+++ b/C2P_CronJob/bin/Release/C2P_CronJob.application
@@ -11,7 +11,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>bxI03TxkMUmsyqt77ro7c/SCD/Q=</dsig:DigestValue>
+        <dsig:DigestValue>Jn9n4StcoR+bV4ftDViHkfXtreM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest b/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest
index a6463b9..61a3996 100644
--- a/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest
+++ b/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest
@@ -84,7 +84,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>VoRF4oUGkLXkXEC//iA3h3inZIY=</dsig:DigestValue>
+        <dsig:DigestValue>CZIj/16Vm2ojSlW/e40eylxL904=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -96,7 +96,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>PY0yG0KPjn2Sj44zoAh5QqZJpW0=</dsig:DigestValue>
+        <dsig:DigestValue>8PjtSZ9O2yiyFyao03PgxbP8W/4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -252,7 +252,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>WCZux0S90xinA+bU2R63Gov7x8U=</dsig:DigestValue>
+        <dsig:DigestValue>MaWRMQFzEXXhOZsqKdN70rMiPrg=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/C2P_CronJob/bin/Release/C2P_Data.dll b/C2P_CronJob/bin/Release/C2P_Data.dll
index 68d0bdd..3581935 100644
Binary files a/C2P_CronJob/bin/Release/C2P_Data.dll and b/C2P_CronJob/bin/Release/C2P_Data.dll differ
diff --git a/C2P_CronJob/bin/Release/SteamWare.dll b/C2P_CronJob/bin/Release/SteamWare.dll
index a9e4680..e83fdfc 100644
Binary files a/C2P_CronJob/bin/Release/SteamWare.dll and b/C2P_CronJob/bin/Release/SteamWare.dll differ
diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll
index 68d0bdd..3581935 100644
Binary files a/C2P_Data/bin/Release/C2P_Data.dll and b/C2P_Data/bin/Release/C2P_Data.dll differ
diff --git a/C2P_Data/bin/Release/SteamWare.dll b/C2P_Data/bin/Release/SteamWare.dll
index a9e4680..e83fdfc 100644
Binary files a/C2P_Data/bin/Release/SteamWare.dll and b/C2P_Data/bin/Release/SteamWare.dll differ
diff --git a/C2P_Project/bin/Output/C2P_DB.dacpac b/C2P_Project/bin/Output/C2P_DB.dacpac
index 594ddb1..ad9de8c 100644
Binary files a/C2P_Project/bin/Output/C2P_DB.dacpac and b/C2P_Project/bin/Output/C2P_DB.dacpac differ
diff --git a/C2P_Project/bin/Output/C2P_Project.dll b/C2P_Project/bin/Output/C2P_Project.dll
index c89db13..a6998d5 100644
Binary files a/C2P_Project/bin/Output/C2P_Project.dll and b/C2P_Project/bin/Output/C2P_Project.dll differ
diff --git a/C2P_Report/Reports/OffertDOC.rdlc b/C2P_Report/Reports/OffertDOC.rdlc
index 76ad427..6086a73 100644
--- a/C2P_Report/Reports/OffertDOC.rdlc
+++ b/C2P_Report/Reports/OffertDOC.rdlc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Report xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner" xmlns:cl="http://schemas.microsoft.com/sqlserver/reporting/2010/01/componentdefinition" xmlns="http://schemas.microsoft.com/sqlserver/reporting/2010/01/reportdefinition">
-  <Author>Steamware SRL - Vers. 1.2.1</Author>
+  <Author>Steamware SRL - Vers. 1.1.1</Author>
   <AutoRefresh>0</AutoRefresh>
   <DataSources>
     <DataSource Name="DB_C2P">
@@ -18,11 +18,7 @@
             <Value>=Parameters!Ticket.Value</Value>
             <rd:UserDefined>true</rd:UserDefined>
           </QueryParameter>
-          <QueryParameter Name="@Chiave">
-            <Value>=Parameters!Chiave.Value</Value>
-          </QueryParameter>
         </QueryParameters>
-        <CommandType>StoredProcedure</CommandType>
         <CommandText>stp_prt_dsQuoteFull_Q_Data</CommandText>
         <rd:UseGenericDesigner>true</rd:UseGenericDesigner>
       </Query>
@@ -920,7 +916,7 @@
                                                     <Style>
                                                       <FontFamily>Tahoma</FontFamily>
                                                       <FontSize>9pt</FontSize>
-                                                      <Format>#,0.000 '€';(#,0.000 '€')</Format>
+                                                      <Format>#,0.00 '€';(#,0.00 '€')</Format>
                                                     </Style>
                                                   </TextRun>
                                                 </TextRuns>
@@ -940,7 +936,6 @@
                                               <rd:FormatSymbolCulture>it-IT</rd:FormatSymbolCulture>
                                             </Style>
                                           </Textbox>
-                                          <rd:Selected>true</rd:Selected>
                                         </CellContents>
                                       </TablixCell>
                                       <TablixCell>
@@ -986,7 +981,7 @@
                                               <Paragraph>
                                                 <TextRuns>
                                                   <TextRun>
-                                                    <Value>=Fields!P_PriceOff.Value * Fields!BatchQty.Value</Value>
+                                                    <Value>=Fields!P_PriceOff.Value * Fields!KgTeo.Value</Value>
                                                     <Style>
                                                       <FontFamily>Tahoma</FontFamily>
                                                       <FontSize>9pt</FontSize>
@@ -1661,15 +1656,6 @@
         </ParameterValues>
       </ValidValues>
     </ReportParameter>
-    <ReportParameter Name="Chiave">
-      <DataType>String</DataType>
-      <DefaultValue>
-        <Values>
-          <Value>QuoteType=Q&amp;CodQuote=1505200011&amp;QuoteRev=0</Value>
-        </Values>
-      </DefaultValue>
-      <Hidden>true</Hidden>
-    </ReportParameter>
   </ReportParameters>
   <EmbeddedImages>
     <EmbeddedImage Name="SoloProxima_285x72px">
diff --git a/C2P_Report/Reports/StdCostList.rdlc b/C2P_Report/Reports/StdCostList.rdlc
index d62c154..31ae2ec 100644
--- a/C2P_Report/Reports/StdCostList.rdlc
+++ b/C2P_Report/Reports/StdCostList.rdlc
@@ -170,9 +170,7 @@
                                   </Style>
                                 </TextRun>
                               </TextRuns>
-                              <Style>
-                                <TextAlign>Center</TextAlign>
-                              </Style>
+                              <Style />
                             </Paragraph>
                           </Paragraphs>
                           <rd:DefaultName>textbox2</rd:DefaultName>
@@ -208,9 +206,7 @@
                                   </Style>
                                 </TextRun>
                               </TextRuns>
-                              <Style>
-                                <TextAlign>Center</TextAlign>
-                              </Style>
+                              <Style />
                             </Paragraph>
                           </Paragraphs>
                           <rd:DefaultName>textbox3</rd:DefaultName>
@@ -246,9 +242,7 @@
                                   </Style>
                                 </TextRun>
                               </TextRuns>
-                              <Style>
-                                <TextAlign>Center</TextAlign>
-                              </Style>
+                              <Style />
                             </Paragraph>
                           </Paragraphs>
                           <rd:DefaultName>textbox4</rd:DefaultName>
@@ -284,9 +278,7 @@
                                   </Style>
                                 </TextRun>
                               </TextRuns>
-                              <Style>
-                                <TextAlign>Center</TextAlign>
-                              </Style>
+                              <Style />
                             </Paragraph>
                           </Paragraphs>
                           <rd:DefaultName>textbox5</rd:DefaultName>
@@ -322,9 +314,7 @@
                                   </Style>
                                 </TextRun>
                               </TextRuns>
-                              <Style>
-                                <TextAlign>Center</TextAlign>
-                              </Style>
+                              <Style />
                             </Paragraph>
                           </Paragraphs>
                           <rd:DefaultName>textbox6</rd:DefaultName>
@@ -360,9 +350,7 @@
                                   </Style>
                                 </TextRun>
                               </TextRuns>
-                              <Style>
-                                <TextAlign>Center</TextAlign>
-                              </Style>
+                              <Style />
                             </Paragraph>
                           </Paragraphs>
                           <rd:DefaultName>textbox7</rd:DefaultName>
@@ -398,9 +386,7 @@
                                   </Style>
                                 </TextRun>
                               </TextRuns>
-                              <Style>
-                                <TextAlign>Center</TextAlign>
-                              </Style>
+                              <Style />
                             </Paragraph>
                           </Paragraphs>
                           <rd:DefaultName>textbox8</rd:DefaultName>
@@ -436,9 +422,7 @@
                                   </Style>
                                 </TextRun>
                               </TextRuns>
-                              <Style>
-                                <TextAlign>Center</TextAlign>
-                              </Style>
+                              <Style />
                             </Paragraph>
                           </Paragraphs>
                           <rd:DefaultName>textbox9</rd:DefaultName>
@@ -475,7 +459,7 @@
                                 </TextRun>
                               </TextRuns>
                               <Style>
-                                <TextAlign>Center</TextAlign>
+                                <TextAlign>Right</TextAlign>
                               </Style>
                             </Paragraph>
                           </Paragraphs>
@@ -512,9 +496,7 @@
                                   </Style>
                                 </TextRun>
                               </TextRuns>
-                              <Style>
-                                <TextAlign>Center</TextAlign>
-                              </Style>
+                              <Style />
                             </Paragraph>
                           </Paragraphs>
                           <rd:DefaultName>textbox11</rd:DefaultName>
@@ -551,7 +533,7 @@
                                 </TextRun>
                               </TextRuns>
                               <Style>
-                                <TextAlign>Center</TextAlign>
+                                <TextAlign>Right</TextAlign>
                               </Style>
                             </Paragraph>
                           </Paragraphs>
@@ -589,7 +571,7 @@
                                 </TextRun>
                               </TextRuns>
                               <Style>
-                                <TextAlign>Center</TextAlign>
+                                <TextAlign>Right</TextAlign>
                               </Style>
                             </Paragraph>
                           </Paragraphs>
@@ -627,7 +609,7 @@
                                 </TextRun>
                               </TextRuns>
                               <Style>
-                                <TextAlign>Center</TextAlign>
+                                <TextAlign>Right</TextAlign>
                               </Style>
                             </Paragraph>
                           </Paragraphs>
@@ -1174,6 +1156,38 @@
           <PrintOnFirstPage>true</PrintOnFirstPage>
           <PrintOnLastPage>true</PrintOnLastPage>
           <ReportItems>
+            <Textbox Name="Textbox15">
+              <CanGrow>true</CanGrow>
+              <KeepTogether>true</KeepTogether>
+              <Paragraphs>
+                <Paragraph>
+                  <TextRuns>
+                    <TextRun>
+                      <Value>Proxima © 2008-2014</Value>
+                      <Style>
+                        <FontFamily>Tahoma</FontFamily>
+                        <FontSize>9pt</FontSize>
+                        <Color>Gray</Color>
+                      </Style>
+                    </TextRun>
+                  </TextRuns>
+                  <Style />
+                </Paragraph>
+              </Paragraphs>
+              <rd:DefaultName>Textbox15</rd:DefaultName>
+              <Top>0.13417in</Top>
+              <Height>0.175in</Height>
+              <Width>2.25in</Width>
+              <Style>
+                <Border>
+                  <Style>None</Style>
+                </Border>
+                <PaddingLeft>2pt</PaddingLeft>
+                <PaddingRight>2pt</PaddingRight>
+                <PaddingTop>2pt</PaddingTop>
+                <PaddingBottom>2pt</PaddingBottom>
+              </Style>
+            </Textbox>
             <Textbox Name="Textbox16">
               <CanGrow>true</CanGrow>
               <KeepTogether>true</KeepTogether>
@@ -1214,6 +1228,7 @@
               <Left>20.32cm</Left>
               <Height>0.175in</Height>
               <Width>3.1in</Width>
+              <ZIndex>1</ZIndex>
               <Style>
                 <Border>
                   <Style>None</Style>
@@ -1243,7 +1258,7 @@
               <Left>5.25in</Left>
               <Height>0.175in</Height>
               <Width>0.75in</Width>
-              <ZIndex>1</ZIndex>
+              <ZIndex>2</ZIndex>
               <Visibility>
                 <Hidden>true</Hidden>
               </Visibility>
@@ -1257,49 +1272,6 @@
                 <PaddingBottom>2pt</PaddingBottom>
               </Style>
             </Textbox>
-            <Textbox Name="PiePaginaTeam">
-              <CanGrow>true</CanGrow>
-              <KeepTogether>true</KeepTogether>
-              <Paragraphs>
-                <Paragraph>
-                  <TextRuns>
-                    <TextRun>
-                      <Value>Proxima © 2008-</Value>
-                      <Style>
-                        <FontFamily>Tahoma</FontFamily>
-                        <FontSize>9pt</FontSize>
-                        <Color>Gray</Color>
-                      </Style>
-                    </TextRun>
-                    <TextRun>
-                      <Label>Year</Label>
-                      <Value>=Format(Today, "yyyy" )</Value>
-                      <Style>
-                        <FontFamily>Tahoma</FontFamily>
-                        <FontSize>9pt</FontSize>
-                        <Color>Gray</Color>
-                      </Style>
-                    </TextRun>
-                  </TextRuns>
-                  <Style>
-                    <TextAlign>Left</TextAlign>
-                  </Style>
-                </Paragraph>
-              </Paragraphs>
-              <Top>0.13417in</Top>
-              <Height>0.175in</Height>
-              <Width>3.1in</Width>
-              <ZIndex>2</ZIndex>
-              <Style>
-                <Border>
-                  <Style>None</Style>
-                </Border>
-                <PaddingLeft>2pt</PaddingLeft>
-                <PaddingRight>2pt</PaddingRight>
-                <PaddingTop>2pt</PaddingTop>
-                <PaddingBottom>2pt</PaddingBottom>
-              </Style>
-            </Textbox>
           </ReportItems>
           <Style>
             <Border>
diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll
index 68d0bdd..3581935 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 aa61ff0..604a17b 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 a9e4680..e83fdfc 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 b505a8f..7961f97 100644
--- a/VersGen/C2P.cs
+++ b/VersGen/C2P.cs
@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.3.213.572")]
-[assembly: AssemblyFileVersion("2.3.213.572")]
+[assembly: AssemblyVersion("2.3.215.583")]
+[assembly: AssemblyFileVersion("2.3.215.583")]
 [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2015")]
 [assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt
index 3a07b2d..c07eb17 100644
--- a/VersGen/C2P.tt
+++ b/VersGen/C2P.tt
@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.3.213.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.3.213.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.3.215.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.3.215.<#= this.RevisionNumber #>")]
 [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
 [assembly: AssemblyCompany("Steamware")]
 <#+