diff --git a/Jenkinsfile b/Jenkinsfile index 0c782084..c4d08d63 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=790']) { + withEnv(['NEXT_BUILD_NUMBER=791']) { // env.versionNumber = VersionNumber(versionNumberString : '5.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '5.3.${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/DettaglioMacchina.aspx b/MP-TAB/DettaglioMacchina.aspx index 9f760dbe..00529321 100644 --- a/MP-TAB/DettaglioMacchina.aspx +++ b/MP-TAB/DettaglioMacchina.aspx @@ -30,10 +30,10 @@
- Reg. SCARTI + Reg. SCARTI
- Reg. CONTROLLI + Reg.CONTROLLI
<%-- diff --git a/MP-TAB/IOB-info.aspx b/MP-TAB/IOB-info.aspx index bf3fd756..8490ac53 100644 --- a/MP-TAB/IOB-info.aspx +++ b/MP-TAB/IOB-info.aspx @@ -28,9 +28,6 @@
  • CNC Absolute counter: <%: IobFeeder.CNC_Counter %>
  • -
    diff --git a/MP-TAB/IOB-info.aspx.designer.cs b/MP-TAB/IOB-info.aspx.designer.cs index 404fb071..43b3844d 100644 --- a/MP-TAB/IOB-info.aspx.designer.cs +++ b/MP-TAB/IOB-info.aspx.designer.cs @@ -21,15 +21,6 @@ namespace MoonProTablet { /// protected global::MoonProTablet.WebUserControls.mod_dettMacchina mod_dettMacchina1; - /// - /// Controllo hlAbout. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.HyperLink hlAbout; - /// /// Controllo mod_directLinks. ///