From 731e117c47a44e41324f401e4e7ec57e085d50ca Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 7 May 2014 17:06:02 +0200
Subject: [PATCH] vers 679: - completata e caricata in test sterrTaglioIN...

---
 GMW/WebUserControls/mod_SterrTagIN.ascx |  24 +++++++++++++-----------
 GMW/bin/GMW.dll                         | Bin 725504 -> 725504 bytes
 GMW/bin/VersGen.dll                     | Bin 4096 -> 4096 bytes
 VersGen/GMW.cs                          |   4 ++--
 VersGen/GMW.tt                          |   4 ++--
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/GMW/WebUserControls/mod_SterrTagIN.ascx b/GMW/WebUserControls/mod_SterrTagIN.ascx
index ea4ceb55..2c66a2c1 100644
--- a/GMW/WebUserControls/mod_SterrTagIN.ascx
+++ b/GMW/WebUserControls/mod_SterrTagIN.ascx
@@ -21,10 +21,10 @@
                 <asp:Label runat="server" ID="lblDisegno" Font-Size="28pt" Text="" ForeColor="#FFFFFF" Font-Bold="true" ToolTip="disegno" />
         </div>
         <div>
-                    <asp:Label runat="server" ID="lblBarcode" Text="Barcode" />
-                    <br />
-                    <asp:TextBox runat="server" ID="txtBarcode" Height="56px" Width="100%" Font-Size="32pt" AutoPostBack="True" Style="text-align: center" TabIndex="1" />
-                </div>
+            <asp:Label runat="server" ID="lblBarcode" Text="Barcode" />
+            <br />
+            <asp:TextBox runat="server" ID="txtBarcode" Height="56px" Width="100%" Font-Size="32pt" AutoPostBack="True" Style="text-align: center" TabIndex="1" />
+        </div>
     </div>
     <div class="col-sm-4 col-lg-3">
         <div class="panel panel-primary panel-sm">
@@ -32,14 +32,15 @@
                 <b><%: traduci("UDC") %></b>
             </div>
             <div class="panel-body">
-                    <div class="boxRicerca">
-                        <div style="float: left;">
-                            <asp:TextBox ID="txtCerca" runat="server" OnTextChanged="txtCerca_TextChanged" Width="160px" AutoPostBack="True" />
-                        </div>
-                        <div style="float: right;">
-                            <asp:Button ID="btnCerca" runat="server" OnClick="btnCerca_Click" Text='<%# traduci("lblCerca") %>' />
-                        </div>
+                <div class="boxRicerca">
+                    <div style="float: left;">
+                        <asp:TextBox ID="txtCerca" runat="server" OnTextChanged="txtCerca_TextChanged" Width="160px" AutoPostBack="True" />
                     </div>
+                    <div style="float: right;">
+                        <asp:Button ID="btnCerca" runat="server" OnClick="btnCerca_Click" Text='<%# traduci("lblCerca") %>' />
+                    </div>
+                </div>
+                <div>
                     <asp:GridView ID="grView" runat="server" AllowPaging="false" AllowSorting="True" AutoGenerateColumns="False"
                         OnDataBound="grView_DataBound"
                         DataKeyNames="UDC" DataSourceID="ods" OnPageIndexChanged="grView_PageIndexChanged"
@@ -100,6 +101,7 @@
                         </FilterParameters>
                     </asp:ObjectDataSource>
                     <asp:Label ID="lblNumRec" runat="server" CssClass="didascalia" />
+                </div>
             </div>
         </div>
     </div>
diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll
index d391eafb9f1302b95d3255e24d18ece04bccc3d2..f32fba07ee57e002a7d6d04e3a9b070768dc7539 100644
GIT binary patch
delta 180
zcmZozqSLTMXF><#p2p7BPR7<wrq)j8)=rkKovfF87?*F4?PaZ<pyFa+Y2oT>>Y{6I
zVPT?c;%wrm>u6vO<eFN#xL8=4yEz#fZ2u?AcCSky_T7vNEfroq3u;T}-kAQ|VEdaD
zY;}^1meaEjv1KyunSS*Un>HiUcE-bOcUd@>GqEx-F&MKg-~RkKTPY)><@VT<Z1O;Q
ddhIDTXGY8RgQwVlm>q~YfS7ap!BbrJ?f`f+L$Ck<

delta 180
zcmZozqSLTMXF>;KN@HhhCu3_TQ)?%4YbVRrPS(pkjLWvi_OjMaP;oUkadmPuHq^B+
zG&a{Yu{3efwKOtz)-^LQb2K$@b}_VcblLt-mhE1bfZ;B`=jM&Ro|9}6vI5RZuHF7-
z1zVjYqs8>>Lu{FhDbueWV$)`1+|GEI?Jf)FGA33ACI(}+W!s-0XDel7wAdbdl1&~+
ePp>`2=FDi(e()3<5VHd@2M}{^KX{7E-W>o)GeD&P

diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll
index b855fd54c2bb57916cc32c85e2d4ff6bd3abc91a..fc60cd5cdb0eea45659f201e5cd0bfb3df5d83d6 100644
GIT binary patch
delta 96
zcmZorXi%8Y!L-|ZW7h&^#^sx}SsIxH-m81PyYBqJt+PT$ssHZmC6o8Cl`~pSHetU2
yR5+Q9LyOUMvmr+;6X$X!Rt6>pW47g+r*lnZWVGC@%VQ3tCa3Z`134>s!<hi6u^&qS

delta 96
zcmZorXi%8Y!SqLGW7h&^#$}teSsIxHcE5T5{?JW(uSGf>b9bHXnJ{?|TREe}WE1ua
zK!uapIJ6jDHXCxpGI1_rVr5`rFlJk}c{<lrMn;Rxx;*AUYH}*CGmx{AH=GFo69yo@

diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs
index 238da4ce..6a52bbd0 100644
--- a/VersGen/GMW.cs
+++ b/VersGen/GMW.cs
@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.5.678.1587")]
-[assembly: AssemblyFileVersion("2.5.678.1587")]
+[assembly: AssemblyVersion("2.5.679.1587")]
+[assembly: AssemblyFileVersion("2.5.679.1587")]
 [assembly: AssemblyCopyright("Steamware © 2007-2014")]
 [assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt
index bb78252a..7c92e264 100644
--- a/VersGen/GMW.tt
+++ b/VersGen/GMW.tt
@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.5.678.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.5.678.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.5.679.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.5.679.<#= this.RevisionNumber #>")]
 [assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")]
 [assembly: AssemblyCompany("Steamware")]
 <#+