From 2ab8b8d9f3c0f555cbe8650177516b7f64747beb Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 2 May 2018 22:16:37 +0200
Subject: [PATCH] vers 740 con correzione scarti

---
 Jenkinsfile                                    |  2 +-
 MP-Tablet/WebUserControls/mod_confProd.ascx    | 11 +++++------
 .../mod_confProd.ascx.designer.cs              | 18 +++++++++---------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ddc06a79..e1d1c320 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=739']) {
+        withEnv(['NEXT_BUILD_NUMBER=740']) {
           // env.versionNumber = VersionNumber(versionNumberString : '5.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '5.1.${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-Tablet/WebUserControls/mod_confProd.ascx b/MP-Tablet/WebUserControls/mod_confProd.ascx
index 79cd7353..ffaedf36 100644
--- a/MP-Tablet/WebUserControls/mod_confProd.ascx
+++ b/MP-Tablet/WebUserControls/mod_confProd.ascx
@@ -29,12 +29,10 @@
   <div class="col-6 col-sm-3 pr-1 px-sm-1 py-0 text-right">
     <div class="alert alert-danger py-1">
       <div class="text-truncate">
-        [B] Scarti VERS + PEND
+        [B] Scarti VERS.
       </div>
       <div style="font-size: 2em; font-weight: bold;" class="my-0">
-        <asp:Label runat="server" ID="lblPzConfScarto">[B1]</asp:Label>
-        +
-        <asp:Label runat="server" ID="lblPz2RecScarto">[B2]</asp:Label>
+        <asp:Label runat="server" ID="lblPzConfScarto">[B]</asp:Label>
       </div>
     </div>
   </div>
@@ -89,10 +87,11 @@
           <div class="col-5 pr-1">
             <asp:Label runat="server" ID="lblNumScarti" AssociatedControlID="txtNumScarti" Text="Pz Scarto" />
             <asp:TextBox runat="server" ID="txtNumScarti" Font-Size="XX-Large" TextMode="Number" CssClass="form-control text-right bg-dark text-danger py-0" Enabled="false" />
+            <asp:Label runat="server" ID="lblPz2RecScarto">[B2]</asp:Label>
           </div>
           <div class="col-1 px-1">
-            <asp:Label runat="server" ID="Label2" AssociatedControlID="lblPlus" />
-            <asp:label runat="server" ID="lblPlus" Font-Size="XX-Large" TextMode="Number"  Enabled="false">+</asp:label>
+            <asp:Label runat="server" ID="Label2" AssociatedControlID="lblPlus">&nbsp;</asp:Label>
+            <asp:Label runat="server" ID="lblPlus" Font-Size="XX-Large" TextMode="Number" Enabled="false">+</asp:Label>
           </div>
           <div class="col-6 pl-1">
             <asp:Label runat="server" ID="lblPzBuoni" AssociatedControlID="txtPzBuoni" Text="Pz Buoni" />
diff --git a/MP-Tablet/WebUserControls/mod_confProd.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_confProd.ascx.designer.cs
index c648b7b6..2775a151 100644
--- a/MP-Tablet/WebUserControls/mod_confProd.ascx.designer.cs
+++ b/MP-Tablet/WebUserControls/mod_confProd.ascx.designer.cs
@@ -39,15 +39,6 @@ namespace MoonProTablet.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPzConfScarto;
         
-        /// <summary>
-        /// Controllo lblPz2RecScarto.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblPz2RecScarto;
-        
         /// <summary>
         /// Controllo lblPzConfBuoni.
         /// </summary>
@@ -165,6 +156,15 @@ namespace MoonProTablet.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtNumScarti;
         
+        /// <summary>
+        /// Controllo lblPz2RecScarto.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPz2RecScarto;
+        
         /// <summary>
         /// Controllo Label2.
         /// </summary>