diff --git a/Jenkinsfile b/Jenkinsfile index 000b3eca..766acfc3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1419']) { + withEnv(['NEXT_BUILD_NUMBER=1420']) { // env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.13.${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-MAG/Controllers/PrintQueueController.cs b/MP-MAG/Controllers/PrintQueueController.cs index e7a8ed85..358337b2 100644 --- a/MP-MAG/Controllers/PrintQueueController.cs +++ b/MP-MAG/Controllers/PrintQueueController.cs @@ -81,7 +81,6 @@ namespace MP_MAG.Controllers break; case MagData.reportRichiesto.ReportPackListFull: - // FIXME TODO fare davvero!!! tab = MagDataLayerObj.taRepPLFull.GetData(keyParam, false); answ.Add("stp_prt_ReportPackListFull", tab); break; diff --git a/MP-MAG/WebUserControls/cmp_OrderList.ascx b/MP-MAG/WebUserControls/cmp_OrderList.ascx index 049383ec..c700928b 100644 --- a/MP-MAG/WebUserControls/cmp_OrderList.ascx +++ b/MP-MAG/WebUserControls/cmp_OrderList.ascx @@ -9,7 +9,7 @@