installers x SP vers 3.0.781

GMW/GMW.csproj.user

@@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <ProjectView>ShowAllFiles</ProjectView>
-    <NameOfLastUsedPublishProfile>SP_test</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>SP_prod</NameOfLastUsedPublishProfile>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>

GMW/WebUserControls/mod_PostRX_DT.ascx.cs

@@ -308,7 +308,7 @@ namespace GMW.WebUserControls
                 switch (MagClass.tipoBCode(barcodeIn))
                 {
                     case tipoCodiceBarcode.DateTime:
-                        okDTL = getDateTimeLine();
+                        okDTL = getDateTimeLine(false);
                         if (okDTL)
                         {
                             Postazione.messaggiText = traduci("SetDataFus");
@@ -323,7 +323,7 @@ namespace GMW.WebUserControls
                         }
                         break;
                     case tipoCodiceBarcode.DateTimeLine:
-                        okDTL = getDateTimeLine();
+                        okDTL = getDateTimeLine(true);
                         if (okDTL)
                         {
                             Postazione.messaggiText = traduci("SetDataFus");
@@ -513,7 +513,9 @@ namespace GMW.WebUserControls
         /// <summary>
         /// recupera da barcode dataOra e linea fusione (SE presenti)
         /// </summary>
-        private bool getDateTimeLine()
+        /// <param name="readline"></param>
+        /// <returns></returns>
+        private bool getDateTimeLine(bool readline)
         {
             bool okData = false;
             bool okLinea = false;
@@ -535,31 +537,38 @@ namespace GMW.WebUserControls
             {
                 dataFus = oldDataFus;
             }
-            if (okData)
+            if (readline)
             {
-                try
+                if (okData)
                 {
-                    newLinea = barcodeIn.Replace(memLayer.ML.confReadString("prefDateTime"), "").Substring(10, barcodeIn.Length - 10 - memLayer.ML.confReadString("prefDateTime").Length);
-                    if ((newLinea != "") && (DataProxy.obj.taElPost.getByCod(newLinea).Rows.Count > 0))
+                    try
                     {
-                        lineaFus = newLinea;
-                        okLinea = true;
+                        newLinea = barcodeIn.Replace(memLayer.ML.confReadString("prefDateTime"), "").Substring(10, barcodeIn.Length - 10 - memLayer.ML.confReadString("prefDateTime").Length);
+                        if ((newLinea != "") && (DataProxy.obj.taElPost.getByCod(newLinea).Rows.Count > 0))
+                        {
+                            lineaFus = newLinea;
+                            okLinea = true;
+                        }
+                        else
+                        {
+                            lineaFus = "";
+                            dataFus = oldDataFus;
+                        }
                     }
-                    else
+                    catch
                     {
                         lineaFus = "";
                         dataFus = oldDataFus;
                     }
                 }
-                catch
+                else
                 {
                     lineaFus = "";
-                    dataFus = oldDataFus;
                 }
             }
             else
             {
-                lineaFus = "";
+                okLinea = true;
             }
             return okData && okLinea;
         }
@@ -806,7 +815,7 @@ namespace GMW.WebUserControls
             }
             else
             {
-                // 2014.10.02 TOLTO eprché ripoerta a 1 la qty prima dell'update... inutile! tanto poi ricalcola...
+                // 2014.10.02 TOLTO perché ripoerta a 1 la qty prima dell'update... inutile! tanto poi ricalcola...
 #if false
                 // aggiorno quantità!
                 MagClass.magazzino.taCartellini.updateQty(newUdcChild, MagClass.magazzino.CodSoggCurrUser, "U", codEventoUdc, qta); 

GMW/WebUserControls/mod_PostRX_NT.ascx.cs

@@ -254,7 +254,7 @@ namespace GMW.WebUserControls
                 {
                     case tipoCodiceBarcode.DateTime:
                         // imposto NUOVA dataora fusione...   
-                        okDTL = getDateTimeLine();
+                        okDTL = getDateTimeLine(false);
                         if (okDTL)
                         {
                             Postazione.messaggiText = traduci("SetDataFus");
@@ -269,7 +269,7 @@ namespace GMW.WebUserControls
                         }
                         break;
                     case tipoCodiceBarcode.DateTimeLine:
-                        okDTL = getDateTimeLine();
+                        okDTL = getDateTimeLine(true);
                         if (okDTL)
                         {
                             Postazione.messaggiText = traduci("SetDataFus");
@@ -326,7 +326,9 @@ namespace GMW.WebUserControls
         /// <summary>
         /// recupera da barcode dataOra e linea fusione (SE presenti)
         /// </summary>
-        private bool getDateTimeLine()
+        /// <param name="readline"></param>
+        /// <returns></returns>
+        private bool getDateTimeLine(bool readline)
         {
             bool okData = false;
             bool okLinea = false;
@@ -348,31 +350,38 @@ namespace GMW.WebUserControls
             {
                 dataFus = oldDataFus;
             }
-            if (okData)
+            if (readline)
             {
-                try
+                if (okData)
                 {
-                    newLinea = barcodeIn.Replace(memLayer.ML.confReadString("prefDateTime"), "").Substring(10, barcodeIn.Length - 10 - memLayer.ML.confReadString("prefDateTime").Length);
-                    if ((newLinea != "") && (DataProxy.obj.taElPost.getByCod(newLinea).Rows.Count > 0))
+                    try
                     {
-                        lineaFus = newLinea;
-                        okLinea = true;
+                        newLinea = barcodeIn.Replace(memLayer.ML.confReadString("prefDateTime"), "").Substring(10, barcodeIn.Length - 10 - memLayer.ML.confReadString("prefDateTime").Length);
+                        if ((newLinea != "") && (DataProxy.obj.taElPost.getByCod(newLinea).Rows.Count > 0))
+                        {
+                            lineaFus = newLinea;
+                            okLinea = true;
+                        }
+                        else
+                        {
+                            lineaFus = "";
+                            dataFus = oldDataFus;
+                        }
                     }
-                    else
+                    catch
                     {
                         lineaFus = "";
                         dataFus = oldDataFus;
                     }
                 }
-                catch
+                else
                 {
                     lineaFus = "";
-                    dataFus = oldDataFus;
                 }
             }
             else
             {
-                lineaFus = "";
+                okLinea = true;
             }
             return okData && okLinea;
         }