diff --git a/Jenkinsfile b/Jenkinsfile index 198471f..3aedf95 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=367']) { + withEnv(['NEXT_BUILD_NUMBER=368']) { // env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx b/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx index 208b030..af84ef4 100644 --- a/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx +++ b/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx @@ -6,75 +6,82 @@ - - + + - + - - - - - + + + + +