diff --git a/Jenkinsfile b/Jenkinsfile index 472a496e..caaa30b6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=932']) { + withEnv(['NEXT_BUILD_NUMBER=933']) { // 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' diff --git a/MP-Admin/GestKIT.aspx.cs b/MP-Admin/GestKIT.aspx.cs index eaa34663..1769beb1 100644 --- a/MP-Admin/GestKIT.aspx.cs +++ b/MP-Admin/GestKIT.aspx.cs @@ -26,11 +26,6 @@ namespace MoonProAdmin // se è un ORDINE... procedo! if (BCodeVal.IndexOf("OPR") == 0) { - mod_gestKIT.codOrd = mod_barcode.codOrd; - mod_gestKIT.codArt = mod_barcode.codArt; - mod_gestKIT.kitCode = mod_barcode.kitCode; - mod_gestKIT.qta = mod_barcode.qta; - mod_gestKIT.descArt = mod_barcode.descArt; // aggiungo ordine... mod_gestKIT.addOrdArt(mod_barcode.codOrd, mod_barcode.codArt, mod_barcode.descArt, mod_barcode.qta); mod_gestKIT.lastInput = ""; diff --git a/MP-Admin/WebUserControls/mod_gestKIT.ascx b/MP-Admin/WebUserControls/mod_gestKIT.ascx index 7e85462d..64e1393c 100644 --- a/MP-Admin/WebUserControls/mod_gestKIT.ascx +++ b/MP-Admin/WebUserControls/mod_gestKIT.ascx @@ -108,7 +108,6 @@ -