From b147536cf94cacc42ffd5b10f4c43ac0e595ea89 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 14 Jan 2019 17:45:26 +0100
Subject: [PATCH] fix split ODL...

---
 Jenkinsfile                            |  2 +-
 MP-TAB/WebUserControls/mod_ODL.ascx.cs | 28 +++++++++++++++-----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2a2e3487..4209e1b6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=1143']) {
+        withEnv(['NEXT_BUILD_NUMBER=1144']) {
           // env.versionNumber = VersionNumber(versionNumberString : '6.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '6.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
             env.APP_NAME = 'MAPO'
diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
index 78ed8a9b..3589c1e4 100644
--- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs
+++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs
@@ -105,7 +105,7 @@ namespace MoonProTablet.WebUserControls
           if (emptyOdlMacc)
           {
             // ora verifico SE ALTRA TAVOLA ha ODL...                                                                
-            if (emptyOdlAltraMacc)
+            if (!emptyOdlAltraMacc)
             {
               answ = memLayer.ML.cdvb("showSplitOdlOnTav");
             }
@@ -580,19 +580,23 @@ namespace MoonProTablet.WebUserControls
     protected decimal TCAssegnato(int idxODL)
     {
       decimal answ = 0;
-
-      if (enableRPO)
+      try
       {
-        // leggo info da promessa...
-        var rigaProm = DataLayer.obj.taPODL.getByKey(idxODL)[0];
-        answ = rigaProm.TCAssegnato;
-      }
-      else
-      {
-        // leggo idxOdl da ultimo odl attivo x macchina
-        DS_ProdTempi.ODLRow rigaOdl = DataLayer.obj.taODL.getByIdx(idxODL, false)[0];
-        answ = rigaOdl.TCAssegnato;
+        if (enableRPO)
+        {
+          // leggo info da promessa...
+          var rigaProm = DataLayer.obj.taPODL.getByKey(idxODL)[0];
+          answ = rigaProm.TCAssegnato;
+        }
+        else
+        {
+          // leggo idxOdl da ultimo odl attivo x macchina
+          DS_ProdTempi.ODLRow rigaOdl = DataLayer.obj.taODL.getByIdx(idxODL, false)[0];
+          answ = rigaOdl.TCAssegnato;
+        }
       }
+      catch
+      { }
       return answ;
     }
     /// <summary>