From 1280876ec05d543d6760d76a3389bdc8876a2736 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 3 Oct 2018 22:39:37 +0200
Subject: [PATCH] Test Barcode Colcom: OK. Cambio Traduzione CognomeNome da
 matrOPR in TAB

---
 Jenkinsfile                              |  2 +-
 MP-TAB/WebUserControls/mod_title.ascx.cs | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 519af732..c65e0911 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=838']) {
+        withEnv(['NEXT_BUILD_NUMBER=839']) {
           // env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '6.0.${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_title.ascx.cs b/MP-TAB/WebUserControls/mod_title.ascx.cs
index d5bca4ca..18a6a5f7 100644
--- a/MP-TAB/WebUserControls/mod_title.ascx.cs
+++ b/MP-TAB/WebUserControls/mod_title.ascx.cs
@@ -200,14 +200,14 @@ namespace MoonProTablet.WebUserControls
         {
           logger.lg.scriviLog(string.Format("Eccezione in User.aspx - page_load: {0}", exc), tipoLog.EXCEPTION);
         }
-        if (cognomeNome != "")
-        {
-          swData = cognomeNome;
-        }
-        else if (DataLayer.MatrOpr > 0)
+        if (DataLayer.MatrOpr > 0)
         {
           swData = DataLayer.CognomeNomeOpr;
         }
+        else if (cognomeNome != "")
+        {
+          swData = cognomeNome;
+        }
         else
         {
           swData = "MoonProTablet";