fix errore delete

git-svn-id: https://keyhammer.ath.cx/svn/XPS/trunk@127 43c8e981-f90d-406c-a89a-24a2c4268d51

project/XPS/Web.config

@@ -153,7 +153,7 @@
     <add key="welcomeApp" value="XPS_welcomeApp" />
     <add key="appName" value="XPS" />
     <add key="mainRev" value="1.2" />
-    <add key="minRev" value="130" />
+    <add key="minRev" value="131" />
     <add key="copyRight" value="SteamWare © 2008-2012" />
     <add key="defaultApp" value="XPS_Appl" />
     <add key="defaultTitle" value="XPS_ShortWelcome" />
@@ -185,10 +185,10 @@
     <add key="PageWidthSchedaIdentificazione" value="26.5cm" />
     <add key="PageHeightSchedaIdentificazione" value="18.6cm" />
     <add key="MarginSchedaIdentificazione" value="0.3cm" />
-    <!--<add key="printerBarcode" value="\\10.74.82.10\Brother QL-500" />-->
+    <add key="printerBarcode" value="\\10.74.82.72\Brother QL-560" />
     <!--<add key="printerBarcode" value="\\10.74.82.10\ql500" />-->
     <!--<add key="printerBarcode" value="Brother HL-4050CDN" />-->
-    <add key="printerBarcode" value="\\Vostro410\PDFCreator" />
+    <!--<add key="printerBarcode" value="\\Vostro410\PDFCreator" />-->
     <add key="PageWidthBarcode" value="5.4cm" />
     <add key="PageHeightBarcode" value="1.7cm" />
     <add key="MarginBarcode" value="0.1cm" />

project/XPS/WebUserControls/mod_ULP.ascx.cs

@@ -308,7 +308,8 @@ namespace XPS.WebUserControls
         /// <returns></returns>
         public bool userCanDel(object codStato, object IdxObjMamma, object posizione)
         {
-            return (isAccettVisible(codStato) && otherRemains(IdxObjMamma) && lastSister(IdxObjMamma, posizione));
+            return (isAccettVisible(codStato) && lastSister(IdxObjMamma, posizione));
+            //return (isAccettVisible(codStato) && otherRemains(IdxObjMamma) && lastSister(IdxObjMamma, posizione));
         }
         /// <summary>
         /// determina se l'utente possa editare o duplicare la riga

project/XPS/WebUserControls/mod_dettComm.ascx.cs

@@ -370,7 +370,8 @@ namespace XPS.WebUserControls
         /// <returns></returns>
         public bool userCanDel(object codStato, object IdxObjMamma, object posizione)
         {
-            return (isAccettVisible(codStato) && otherRemains(IdxObjMamma) && lastSister(IdxObjMamma, posizione));
+            return (isAccettVisible(codStato) && lastSister(IdxObjMamma, posizione));
+            //return (isAccettVisible(codStato) && otherRemains(IdxObjMamma) && lastSister(IdxObjMamma, posizione));
         }
         /// <summary>
         /// imposta il modo d'uso del controllo tra i vari magazzino/segreteria/produzione/direzione

project/XPS/WebUserControls/mod_elencoComm.ascx.cs

@@ -475,7 +475,12 @@ namespace XPS.WebUserControls
         public bool isSemaforoVisibile(object minCodStato, object maxCodStato)
         {
             bool answ = false;
-            if ((Convert.ToInt32(maxCodStato) > 4) && (Convert.ToInt32(minCodStato) < 6)) answ = true; // se il max è superiore a 4 qualcosa è spedibile... o spedito, ergo mostro semaforo...
+            try
+            {
+                if ((Convert.ToInt32(maxCodStato) > 4) && (Convert.ToInt32(minCodStato) < 6)) answ = true; // se il max è superiore a 4 qualcosa è spedibile... o spedito, ergo mostro semaforo...
+            }
+            catch
+            { }
             return answ;
         }
         /// <summary>
@@ -490,8 +495,15 @@ namespace XPS.WebUserControls
         public string immagineDaStato(object minCodStato, object maxCodStato)
         {
             string answ = imgPath(SteamWare.tipoImg.semaforoGiallo, SteamWare.dimImg.medium, tipoFileImg.gif);
-            int codMin = Convert.ToInt32(minCodStato);
-            int codMax = Convert.ToInt32(maxCodStato);
+            int codMin = 0;
+            int codMax = 0;
+            try
+            {
+                codMin = Convert.ToInt32(minCodStato);
+                codMax = Convert.ToInt32(maxCodStato);
+            }
+            catch
+            { }            
             // in base ai 2 valori relativi decido semafori...
             if (codMax < 5) answ = imgPath(SteamWare.tipoImg.semaforoRosso, SteamWare.dimImg.medium, tipoFileImg.gif);
             if (codMin > 4) answ = imgPath(SteamWare.tipoImg.semaforoVerde, SteamWare.dimImg.medium, tipoFileImg.gif);
@@ -506,8 +518,15 @@ namespace XPS.WebUserControls
         public string toolTipDaStato(object minCodStato, object maxCodStato)
         {
             string answ = traduci("commParzProntaSpedire");
-            int codMin = Convert.ToInt32(minCodStato);
-            int codMax = Convert.ToInt32(maxCodStato);
+            int codMin = 0;
+            int codMax = 0;
+            try
+            {
+                codMin = Convert.ToInt32(minCodStato);
+                codMax = Convert.ToInt32(maxCodStato);
+            }
+            catch
+            { }     
             // in base ai 2 valori relativi decido semafori...
             if (codMax < 5) answ = traduci("commNonProntaSpedire");
             if (codMin > 4) answ = traduci("commProntaSpedire");
@@ -673,6 +692,5 @@ namespace XPS.WebUserControls
         }
         
         #endregion
-
     }
 }

project/XPS/equaAppSettings.config

@@ -19,7 +19,7 @@
     <add key="welcomeApp" value="XPS_welcomeApp"/>
     <add key="appName" value="XPS"/>
     <add key="mainRev" value="1.2"/>
-    <add key="minRev" value="130"/>
+    <add key="minRev" value="131"/>
     <add key="copyRight" value="SteamWare © 2008-2012"/>
     <add key="defaultApp" value="XPS_Appl"/>
     <add key="defaultTitle" value="XPS_ShortWelcome"/>

project/XPST/Web.config

@@ -153,7 +153,7 @@
     <add key="welcomeApp" value="XPS_welcomeApp"/>
     <add key="appName" value="XPS"/>
     <add key="mainRev" value="1.2"/>
-    <add key="minRev" value="130"/>
+    <add key="minRev" value="131"/>
     <add key="copyRight" value="SteamWare © 2008-2012"/>
     <add key="defaultApp" value="XPS_Appl"/>
     <add key="defaultTitle" value="XPS_ShortWelcome"/>

project/XPST/equaAppSettings.config

@@ -19,7 +19,7 @@
     <add key="welcomeApp" value="XPS_welcomeApp"/>
     <add key="appName" value="XPS"/>
     <add key="mainRev" value="1.2"/>
-    <add key="minRev" value="130"/>
+    <add key="minRev" value="131"/>
     <add key="copyRight" value="SteamWare © 2008-2012"/>
     <add key="defaultApp" value="XPS_Appl"/>
     <add key="defaultTitle" value="XPS_ShortWelcome"/>

project/XPST_deploy/Release/equaAppSettings.config

@@ -19,7 +19,7 @@
     <add key="welcomeApp" value="XPS_welcomeApp"/>
     <add key="appName" value="XPS"/>
     <add key="mainRev" value="1.2"/>
-    <add key="minRev" value="130"/>
+    <add key="minRev" value="131"/>
     <add key="copyRight" value="SteamWare © 2008-2012"/>
     <add key="defaultApp" value="XPS_Appl"/>
     <add key="defaultTitle" value="XPS_ShortWelcome"/>

project/XPST_deploy/Release/web.config

@@ -152,7 +152,7 @@
     <add key="welcomeApp" value="XPS_welcomeApp" />
     <add key="appName" value="XPS" />
     <add key="mainRev" value="1.2" />
-    <add key="minRev" value="130" />
+    <add key="minRev" value="131" />
     <add key="copyRight" value="SteamWare © 2008-2012" />
     <add key="defaultApp" value="XPS_Appl" />
     <add key="defaultTitle" value="XPS_ShortWelcome" />

project/XPST_deploy/Source/Web.config

@@ -153,7 +153,7 @@
     <add key="welcomeApp" value="XPS_welcomeApp"/>
     <add key="appName" value="XPS"/>
     <add key="mainRev" value="1.2"/>
-    <add key="minRev" value="130"/>
+    <add key="minRev" value="131"/>
     <add key="copyRight" value="SteamWare © 2008-2012"/>
     <add key="defaultApp" value="XPS_Appl"/>
     <add key="defaultTitle" value="XPS_ShortWelcome"/>

project/XPST_deploy/Source/equaAppSettings.config

@@ -19,7 +19,7 @@
     <add key="welcomeApp" value="XPS_welcomeApp"/>
     <add key="appName" value="XPS"/>
     <add key="mainRev" value="1.2"/>
-    <add key="minRev" value="130"/>
+    <add key="minRev" value="131"/>
     <add key="copyRight" value="SteamWare © 2008-2012"/>
     <add key="defaultApp" value="XPS_Appl"/>
     <add key="defaultTitle" value="XPS_ShortWelcome"/>

project/XPST_installer/XPST_installer.vdproj

@@ -243,14 +243,14 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:XPST"
-        "ProductCode" = "8:{46210ABC-7AAF-4AF7-B7C0-E228355BC843}"
-        "PackageCode" = "8:{802E5502-613F-4031-A6EB-28DFF7DDF985}"
+        "ProductCode" = "8:{8CB36A61-7539-4409-95F4-1733CB89B6E7}"
+        "PackageCode" = "8:{07C54154-2635-4C68-9016-96197A326980}"
         "UpgradeCode" = "8:{1F4D37F4-ED5E-41B7-9D58-560A137B61D4}"
         "RestartWWWService" = "11:TRUE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.2.130"
+        "ProductVersion" = "8:1.2.131"
         "Manufacturer" = "8:SteamWare s.r.l."
         "ARPHELPTELEPHONE" = "8:035-460560"
         "ARPHELPLINK" = "8:www.steamware.net"

project/XPS_data/DS_applicazione.xss

@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="162" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:AnagClienti" ZOrder="19" X="229" Y="-34" Height="115" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:AnagTrattamenti" ZOrder="18" X="1006" Y="43" Height="115" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />

project/XPS_data/SqlScript/V 1.2/sqlUpdate_131.sql

@@ -0,0 +1,72 @@
+set xact_abort on
+go
+
+begin transaction
+go
+
+update LogStatoIstObj set CodStato = N'' where CodStato is null
+go
+
+alter table LogStatoIstObj alter column
+ CodStato nvarchar(50) not null
+go
+
+exec sp_rename 'PK_LogStatoIstObj', 'PK_LogStatoIstObj_1', 'object'
+go
+
+alter table LogStatoIstObj drop
+ constraint FK_LogStatoIstObj_IstObj 
+go
+
+alter table LogStatoIstObj add
+ constraint FK_LogStatoIstObj_IstObj foreign key(IdxObj) references IstObj(IdxObj) on update cascade on delete cascade
+go
+
+commit
+go
+
+
+set xact_abort on
+go
+
+begin transaction
+go
+
+set ANSI_NULLS on
+go
+
+/***********************************
+* STORED PROCEDURE sp_delRow
+*         elimina un set di dati a partire dalla riga di una commessa
+*
+* modif.:        S.E.L.
+* il:                2008.10.23
+**************************************/
+alter PROCEDURE sp_delRow
+(
+       @Original_Cod VARCHAR(50)
+)
+AS
+
+BEGIN TRAN
+
+       -- cancello ULP child
+       DELETE FROM IstObj
+       WHERE     (IdxObjMamma = @Original_Cod) 
+
+       -- cancello riga...
+       DELETE FROM IstObj
+       WHERE     (IdxObj = @Original_Cod) 
+
+COMMIT TRAN
+
+RETURN
+go
+
+commit
+go
+
+
+-- registro versione...
+INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(131, GETDATE())
+GO

project/XPS_data/XPS_data.csproj

@@ -152,6 +152,7 @@
     <Content Include="MDB_Data\si_dt30.mdb">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="SqlScript\V 1.2\sqlUpdate_131.sql" />
     <None Include="SqlScript\V 1.2\Vocabolario_130.sql" />
     <None Include="SqlScript\V 1.2\sqlUpdate_130.sql" />
   </ItemGroup>

project/XPS_installer/XPS_installer.vdproj

@@ -349,14 +349,14 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:XPS"
-        "ProductCode" = "8:{92BF7180-2725-4C26-A532-CCA18042C999}"
-        "PackageCode" = "8:{B9376248-A422-4231-9678-C39E41327FF7}"
+        "ProductCode" = "8:{4E4CB326-A1B0-44CC-94D9-CAC89A2AD218}"
+        "PackageCode" = "8:{507D864B-B8CF-486B-81AD-4F8BDBF778DC}"
         "UpgradeCode" = "8:{71B65361-FEA5-44CA-9B9A-45597433DB20}"
         "RestartWWWService" = "11:TRUE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.2.130"
+        "ProductVersion" = "8:1.2.131"
         "Manufacturer" = "8:SteamWare s.r.l."
         "ARPHELPTELEPHONE" = "8:035-460560"
         "ARPHELPLINK" = "8:www.steamware.net"