Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test Barcode Colcom: OK. Cambio Traduzione CognomeNome da matrOPR in TAB

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-10-03 22:39:37 +02:00
parent e771990d65
commit 1280876ec0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'
MP-TAB/WebUserControls/mod_title.ascx.cs
+5 -5
View File
@@ -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";