diff --git a/Jenkinsfile b/Jenkinsfile index cdce12b..552f92c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=340']) { + withEnv(['NEXT_BUILD_NUMBER=341']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${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_OOIL_drawings.ascx b/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx index 9885983..e696e6b 100644 --- a/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx +++ b/NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx @@ -3,7 +3,7 @@
-
<%: traduci("Drawings") %>
+

<%: traduci("Drawings") %>

diff --git a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx index 5a73325..7cdcaf3 100644 --- a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx +++ b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx @@ -14,11 +14,11 @@ <%-- --%>
-
+
-
+