diff --git a/Jenkinsfile b/Jenkinsfile index f75d4cc5..4f82ebc8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1170']) { + withEnv(['NEXT_BUILD_NUMBER=1171']) { // env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.6.${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/cmp_dettODL.ascx b/MP-TAB/WebUserControls/cmp_dettODL.ascx index 641e5b9b..f522c419 100644 --- a/MP-TAB/WebUserControls/cmp_dettODL.ascx +++ b/MP-TAB/WebUserControls/cmp_dettODL.ascx @@ -23,17 +23,17 @@
- CodArt: + Cod:
-
+
Articolo:
-
+
@@ -50,32 +50,29 @@
-
+
Pz/pallet:
-
+