diff --git a/EgtBEAMWALL.Core/Constants/ConstIni.vb b/EgtBEAMWALL.Core/Constants/ConstIni.vb
index 3327d23f..c004720c 100644
--- a/EgtBEAMWALL.Core/Constants/ConstIni.vb
+++ b/EgtBEAMWALL.Core/Constants/ConstIni.vb
@@ -44,6 +44,7 @@ Public Module ConstIni
    Public Const K_DATADIR As String = "DataDir"
    Public Const K_ENABLEEDIT As String = "EnableEdit"
    Public Const K_FASTPRODUCE As String = "FastProduce"
+   Public Const K_ADDPROJ As String = "AddProj"
 
    'Public Const S_LANGUAGES As String = "Languages"
    'Public Const K_LANGUAGE As String = "Language"
diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
index 02b4b39c..a3301e31 100644
--- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
@@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.4.1")>
-<Assembly: AssemblyFileVersion("2.5.4.1")>
+<Assembly: AssemblyVersion("2.5.4.2")>
+<Assembly: AssemblyFileVersion("2.5.4.2")>
diff --git a/EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb b/EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb
index c11a78ab..3678af03 100644
--- a/EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb
+++ b/EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb
@@ -10,6 +10,9 @@ Public Class ProdFileM
          Return m_nProjIdList
       End Get
    End Property
+   Public Sub SetProjIdList(value As List(Of Integer))
+      m_nProjIdList = value
+   End Sub
 
    Protected m_sName As String
    Public ReadOnly Property sName As String
diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
index c430bbc2..de28bb6a 100644
--- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.4.1")]
-[assembly: AssemblyFileVersion("2.5.4.1")]
+[assembly: AssemblyVersion("2.5.4.2")]
+[assembly: AssemblyFileVersion("2.5.4.2")]
diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
index 0b5b4b73..19bf4274 100644
--- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.4.1")>
-<Assembly: AssemblyFileVersion("2.5.4.1")>
+<Assembly: AssemblyVersion("2.5.4.2")>
+<Assembly: AssemblyFileVersion("2.5.4.2")>
diff --git a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
index 336d446a..60c47b36 100644
--- a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
+++ b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
@@ -955,6 +955,9 @@
   <ItemGroup>
     <Resource Include="Resources\TopPanel\RemoveAllRawPart.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ProjectManager\AddProj.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR32.exe
diff --git a/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb b/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb
index 728b8b3d..0d22043d 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb
@@ -373,6 +373,12 @@ Public Class MainMenuVM
                Map.refProdManagerVM.CurrProd.SetReloadProject(True)
             End If
             'DbControllers.m_ProdController.ResetController()
+            ' se Warehouse di tipo Medium e piu' di un progetto collegato
+            Dim nDefault As Integer = 2
+            If GetMainPrivateProfileInt(S_WAREHOUSE, EgtBEAMWALL.Core.ConstIni.K_TYPE, nDefault) = WarehouseType.MEDIUM AndAlso Map.refProdManagerVM.CurrProd.nProjIdList.Count > 1 Then
+               ' confronto le Sezioni del BTL importato con quelle in Warehouse
+               WarehouseWndVM.UpdateSectionXMaterial()
+            End If
             ' aggiorno titolo
             Map.refMainWindowVM.UpdateTitle()
             DbControllers.m_ProdController.LockByProdId(Map.refProdManagerVM.CurrProd.nProdId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber())
diff --git a/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb
index 88a74138..154987e1 100644
--- a/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.4.1")>
-<Assembly: AssemblyFileVersion("2.5.4.1")>
+<Assembly: AssemblyVersion("2.5.4.2")>
+<Assembly: AssemblyFileVersion("2.5.4.2")>
diff --git a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
index 96a59177..bf2baa74 100644
--- a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
@@ -126,28 +126,40 @@ Public Class OpenProjectFileDialogVM
          If nTempCtx <> 0 Then
             ' inizializzo gestore lavorazioni
             EgtInitMachMgr(Map.refMainWindowVM.MainWindowM.sMachinesRoot, Map.refMainWindowVM.MainWindowM.sToolMakersDir)
-            EgtOpenFile(SelProject.sProdPath)
-            ' cancello tutti i gruppi di lavorazione
-            Dim nMachGroupId As Integer = EgtGetFirstMachGroup()
-            While nMachGroupId <> GDB_ID.NULL
-               EgtSetCurrMachGroup(nMachGroupId)
-               Dim nRawPartId As Integer = EgtGetFirstRawPart()
-               While nRawPartId <> GDB_ID.NULL
-                  Dim nPartId As Integer = EgtGetFirstPartInRawPart(nRawPartId)
-                  While nPartId <> GDB_ID.NULL
-                     EgtRemovePartFromRawPart(nPartId)
-                     ' elimino pezzo copia
-                     EgtErase(nPartId)
-                     nPartId = EgtGetFirstPartInRawPart(nRawPartId)
-                  End While
-                  nRawPartId = EgtGetNextRawPart(nRawPartId)
-               End While
-               EgtRemoveMachGroup(nMachGroupId)
-               nMachGroupId = EgtGetFirstMachGroup()
-            End While
-            ' lo salvo in tutti i proj correlati
+            ' apro, ripulisco e salvo il progetto in tutti i proj correlati
             Dim ProdFile As ProdFileVM = DirectCast(SelProject, ProdFileVM)
             For Each nProjId In ProdFile.nProjIdList
+               EgtOpenFile(SelProject.sProdPath)
+               ' cancello tutti i gruppi di lavorazione
+               Dim nMachGroupId As Integer = EgtGetFirstMachGroup()
+               While nMachGroupId <> GDB_ID.NULL
+                  EgtSetCurrMachGroup(nMachGroupId)
+                  Dim nRawPartId As Integer = EgtGetFirstRawPart()
+                  While nRawPartId <> GDB_ID.NULL
+                     Dim nPartId As Integer = EgtGetFirstPartInRawPart(nRawPartId)
+                     While nPartId <> GDB_ID.NULL
+                        EgtRemovePartFromRawPart(nPartId)
+                        ' elimino pezzo copia
+                        EgtErase(nPartId)
+                        nPartId = EgtGetFirstPartInRawPart(nRawPartId)
+                     End While
+                     nRawPartId = EgtGetNextRawPart(nRawPartId)
+                  End While
+                  EgtRemoveMachGroup(nMachGroupId)
+                  nMachGroupId = EgtGetFirstMachGroup()
+               End While
+               ' cancello tutti i gruppi che sono di un progetto diverso da questo
+               Dim nGroupId As Integer = EgtGetFirstInGroup(GDB_ID.ROOT)
+               While nGroupId <> GDB_ID.NULL
+                  Dim nGroupProjId As Integer = GDB_ID.NULL
+                  Dim nNextGroupId As Integer = EgtGetNext(nGroupId)
+                  If EgtGetInfo(nGroupId, BTL_PRT_PROJ, nGroupProjId) Then
+                     If nGroupProjId <> nProjId Then
+                        EgtErase(nGroupId)
+                     End If
+                  End If
+                  nGroupId = nNextGroupId
+               End While
                EgtSaveFile(ProdFile.GetProjPath(nProjId), NGE.CMPTEXT)
             Next
             ' torno sul contesto corrente
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerV.xaml b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerV.xaml
index efbe4867..7c4ae8d4 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerV.xaml
@@ -39,9 +39,9 @@
    </Button>-->
    <Button Command="{Binding AddProj_Command}"
            ToolTip="{Binding AddProj_ToolTip}"
-           Visibility="Collapsed"
+           Visibility="{Binding AddProj_Visibility}"
            Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ProjectManager/AddProj.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding GoToProj_Command}"
            ToolTip="{Binding GoToProj_ToolTip}"
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
index 3f3f79a2..f77692bf 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
@@ -84,10 +84,18 @@ Public Class ProdManagerVM
       End Get
    End Property
 
+   Private m_AddProj_Visibility As Visibility
+   Public ReadOnly Property AddProj_Visibility As Visibility
+      Get
+         Return m_AddProj_Visibility
+      End Get
+   End Property
+
    ' Definizione comandi
    Private m_cmdOpen As ICommand
    Private m_cmdOpenMruFile As ICommand
    Private m_cmdSave As ICommand
+   Private m_cmdAddProj As ICommand
    Private m_cmdGoToProj As ICommand
    Private m_cmdGoToSupervisor As ICommand
 
@@ -135,6 +143,12 @@ Public Class ProdManagerVM
       Else
          m_GoToSupervisor_Visibility = Visibility.Collapsed
       End If
+      ' attivo bottone AddProj
+      If GetMainPrivateProfileInt(S_GENERAL, K_ADDPROJ, 0) = 1 Then
+         m_AddProj_Visibility = Visibility.Visible
+      Else
+         m_AddProj_Visibility = Visibility.Collapsed
+      End If
       ' Leggo ultimo indice di progetto
       m_nLastProdId = GetMainPrivateProfileInt(S_GENERAL, K_PRODSINDEX, 1)
       ' Impostazioni MruLists
@@ -372,10 +386,10 @@ Public Class ProdManagerVM
       Save(True)
    End Sub
 
-   Public Sub Save(Optional bShowLoading As Boolean = False)
-      If IsNothing(m_CurrProd) Then Return
+   Public Function Save(Optional bShowLoading As Boolean = False) As Boolean
+      If IsNothing(m_CurrProd) Then Return False
       If bShowLoading Then LoadingWndHelper.OpenLoadingWnd(ActiveIds.SAVEPROD, 2, EgtMsg(63007), EgtMsg(63012), 70)          ' Project saving     ' Saving geometry
-      Map.refSceneHostVM.SaveProject()
+      Dim bOk As Boolean = Map.refSceneHostVM.SaveProject()
       If bShowLoading Then LoadingWndHelper.UpdateLoadingWnd(ActiveIds.SAVEPROD, 2, EgtMsg(63013), 70, 100)          ' Saving data on Db
       Dim MyMachGroupList As New List(Of MyMachGroupM)
       If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
@@ -386,7 +400,7 @@ Public Class ProdManagerVM
       ' aggiorno pezzi su Db
       If Not DbControllers.m_ProdController.UpdateMachGroup(CurrProd.nProdId, MyMachGroupList) And bShowLoading Then
          LoadingWndHelper.CloseLoadingWnd(ActiveIds.SAVEPROD)
-         Return
+         Return False
       End If
       ' verifico se Reset Macchina modificato e nel caso aggiorno DB e CurrProj
       If Map.refCALCPanelVM.IsMachineModified() Then
@@ -411,10 +425,103 @@ Public Class ProdManagerVM
       Map.refMainWindowVM.UpdateTitle()
       NotifyPropertyChanged(NameOf(MruFileNames))
       If bShowLoading Then LoadingWndHelper.CloseLoadingWnd(ActiveIds.SAVEPROD)
-   End Sub
+      Return bOk
+   End Function
 
 #End Region ' SaveCommand
 
+#Region "AddProj"
+
+   ''' <summary>
+   ''' Returns a command that do Save.
+   ''' </summary>
+   Public ReadOnly Property AddProj_Command As ICommand
+      Get
+         If m_cmdAddProj Is Nothing Then
+            m_cmdAddProj = New Command(AddressOf AddProj)
+         End If
+         Return m_cmdAddProj
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Save.  This method is invoked by the SaveCommand.
+   ''' </summary>
+   Public Sub AddProj()
+      ' verifico se progetto modificato, e chiedo se salvare
+      If IsNothing(CurrProd) Then Return
+      Dim bNewProject As Boolean = False
+      Dim sProjectDirPath As String = ""
+      sProjectDirPath = CurrProd.sProdDirPath
+      Dim VerifyResult As MessageBoxResult = MessageBoxResult.None
+      ' verifico se progetto modificato, e chiedo se salvare
+      If EgtGetModified() OrElse CurrProd.bIsNew OrElse Map.refCALCPanelVM.IsMachineModified() Then
+         VerifyResult = MessageBox.Show(EgtMsg(61875), "", If(CurrProd.bIsNew, MessageBoxButton.OKCancel, MessageBoxButton.YesNoCancel), MessageBoxImage.Question)
+         Select Case VerifyResult
+            Case MessageBoxResult.Yes, MessageBoxResult.OK
+               ' salvo proj
+               Map.refProdManagerVM.Save()
+            Case MessageBoxResult.Cancel
+               Return
+            Case Else   ' No
+               EgtResetModified()
+               OpenProject(CurrProd)
+         End Select
+      Else
+         EgtResetModified()
+      End If
+      ' faccio scegliere proj da aggiungere
+      Dim OpenProjectFileDialogVM As New OpenProjectFileDialogVM
+      Dim ChooseProdFileDialog As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
+      Dim DialogResult As Boolean? = ChooseProdFileDialog.EgtShowDialog(ProjectType.PROJ, True)
+      If IsNothing(DialogResult) OrElse Not DialogResult Then Return
+      If IsNothing(OpenProjectFileDialogVM.SelProject.nProjId) OrElse OpenProjectFileDialogVM.SelProject.nProjId <= 0 Then Return
+      ' verifico che il proj selezionato non abbia prod
+      If Not IsNothing(OpenProjectFileDialogVM.SelProject.nProdId) AndAlso OpenProjectFileDialogVM.SelProject.nProdId > 0 Then
+         ' verifico che non sia uno di quelli gia' collegati a questo Prod
+         Dim bFound As Boolean = False
+         For Each nProjId As Integer In CurrProd.nProjIdList
+            If nProjId = OpenProjectFileDialogVM.SelProject.nProjId Then
+               bFound = True
+               Exit For
+            End If
+         Next
+         If bFound Then
+            MessageBox.Show("Selezionato progetto che fa gia' parte di questa produzione!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
+         Else
+            MessageBox.Show("Progetto gia' collegato ad una produzione!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
+         End If
+         Return
+      End If
+      ' verifico che sia associato alla stessa macchina
+      If OpenProjectFileDialogVM.SelProject.sMachine <> CurrProd.sMachine Then
+         MessageBox.Show("Progetto per una macchina diversa da quella del progetto corrente!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
+         Return
+      End If
+      ' inserisco proj nel prod corrente
+      Dim bOk As Boolean = EgtInsertFile(OpenProjectFileDialogVM.SelProject.sProjPath)
+      ' lo salvo
+      bOk = bOk AndAlso Save(False)
+      If bOk Then
+         ' riporto aggiunta proj a prod su Db
+         DbControllers.m_ProdController.AddProj(CurrProd.nProdId, OpenProjectFileDialogVM.SelProject.nProjId)
+      End If
+      ' Ricavo il tipo di Warehouse settato nell'INI
+      Dim nDefault As Integer = 2
+      If GetMainPrivateProfileInt(S_WAREHOUSE, EgtBEAMWALL.Core.ConstIni.K_TYPE, nDefault) = WarehouseType.MEDIUM Then
+         ' Se di tipo Medium confronto le Sezioni del BTL importato con quelle in Warehouse
+         WarehouseWndVM.UpdateSectionXMaterial()
+      End If
+      ' aggiorno CurrProd
+      Dim PdFileM = DbControllers.m_ProdController.FindCoreByProdId(CurrProd.nProdId)
+      CurrProd.ProdFileM.SetProjIdList(PdFileM.nProjIdList)
+      ' ricarico BTLPartList
+      OpenProject(CurrProd)
+   End Sub
+
+
+#End Region ' AddProj
+
 #Region "GoToProj"
 
    ''' <summary>
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjectFileVM/ProdFileVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjectFileVM/ProdFileVM.vb
index 377d057e..eff2745e 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjectFileVM/ProdFileVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjectFileVM/ProdFileVM.vb
@@ -139,7 +139,10 @@ Public Class ProdFileVM
                Map.refCALCPanelVM.RevertToOriginalMachine()
                If CurrProject.bIsNew Then
                   ' lo elimino
-                  Directory.Delete(sProjectDirPath, True)
+                  Try
+                     Directory.Delete(sProjectDirPath, True)
+                  Catch ex As Exception
+                  End Try
                   Map.refProdManagerVM.m_MruFiles.Remove(CurrProject.sProdPath)
                   Map.refProdManagerVM.NotifyPropertyChanged(NameOf(Map.refProdManagerVM.MruFileNames))
                   DbControllers.m_ProdController.DeleteProd(CurrProject.nProdId)
diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/AddProj.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/AddProj.png
new file mode 100644
index 00000000..f6a90193
Binary files /dev/null and b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/AddProj.png differ