Merge branch 'develop'

GMW/GMW.csproj

@@ -1016,7 +1016,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Reports\CartellinoFinito.rdlc" />
-    <Content Include="Reports\CartellinoFus.rdlc" />
     <Content Include="Reports\CartellinoMP.rdlc" />
     <Content Include="Reports\CartellinoOdette.rdlc" />
     <Content Include="Reports\CartellinoTara.rdlc" />
@@ -1349,6 +1348,9 @@
     <Folder Include="Reports\SP\" />
     <Folder Include="Reports\TK\" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Reports\CartellinoFusi.rdlc" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

GMW/WebUserControls/mod_gestPrinterPost.ascx

@@ -68,7 +68,7 @@
             </FooterTemplate>
             <ItemTemplate>
                 <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandArgument='<%# Eval("codPostazione") %>' CommandName="Delete" ImageUrl="~/images/elimina_m.png" 
-                    ToolTip='<%# traduci("Delete") %>' Visible='<%# delEnabled(Eval("codPostazione")) %>' />
+                    ToolTip='<%# traduci("Delete") %>'  />
                 <asp:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="imgDelete">
                 </asp:ConfirmButtonExtender>
             </ItemTemplate>

GMW_Term/WebUserControls/mod_searchRes.ascx

@@ -4,20 +4,16 @@
 <link href="../Style.css" rel="stylesheet" type="text/css" />
 <% } %>
 <div class="clearAll" style="text-align: center; margin: auto; height: 28px; vertical-align: top;">
-    <asp:ImageButton ID="btnLeft" runat="server" ImageUrl="../Images/ArrowLeft.png" OnClick="btnLeft_Click" Width="22px"
-        Height="22px" />
+    <asp:ImageButton ID="btnLeft" runat="server" ImageUrl="../Images/ArrowLeft.png" OnClick="btnLeft_Click" Width="22px" Height="22px" />
     <asp:ImageButton ID="btnUp" runat="server" ImageUrl="../Images/ArrowUp.png" OnClick="btnUp_Click" Width="22px" Height="22px" />
-    <asp:Button ID="btnButtonsHome" runat="server" OnClick="btnButtonsHome_Click" CssClass="btnHome" Text="Ricerca [6]" AccessKey="6"
-        Height="22px" />
-    <asp:ImageButton ID="btnDown" runat="server" ImageUrl="../Images/ArrowDown.png" OnClick="btnDown_Click" Width="22px"
-        Height="22px" />
-     <asp:ImageButton ID="btnRight" runat="server" ImageUrl="../Images/ArrowRight.png" OnClick="btnRight_Click" Width="22px"
-        Height="22px" />
+    <asp:Button ID="btnButtonsHome" runat="server" OnClick="btnButtonsHome_Click" CssClass="btnHome" Text="Ricerca [6]" AccessKey="6" Height="22px" />
+    <asp:ImageButton ID="btnDown" runat="server" ImageUrl="../Images/ArrowDown.png" OnClick="btnDown_Click" Width="22px" Height="22px" />
+    <asp:ImageButton ID="btnRight" runat="server" ImageUrl="../Images/ArrowRight.png" OnClick="btnRight_Click" Width="22px" Height="22px" />
 </div>
 <asp:Panel runat="server" ID="pnlBlocchi" CssClass="clearAll">
     <div style="padding: 2px; font-size: 8pt;">
-        <asp:GridView ID="grViewMag" runat="server" DataSourceID="ods" EnableModelValidation="True" DataKeyNames="IdxBlocco" AutoGenerateColumns="False"
-            PageSize="3" AllowPaging="True" OnSelectedIndexChanged="grViewMag_SelectedIndexChanged" Width="100%">
+        <asp:GridView ID="grViewMag" runat="server" DataSourceID="ods" EnableModelValidation="True" DataKeyNames="IdxBlocco" AutoGenerateColumns="False" PageSize="3" AllowPaging="True" OnSelectedIndexChanged="grViewMag_SelectedIndexChanged"
+            Width="100%">
             <RowStyle CssClass="btnGrigioHalf" />
             <SelectedRowStyle CssClass="btnAzzurroHalf" />
             <Columns>
@@ -46,8 +42,7 @@
 </asp:Panel>
 <asp:Panel runat="server" ID="pnlUdc" CssClass="clearAll">
     <div style="padding: 2px; font-size: 8pt;">
-        <asp:GridView ID="grViewUdc" runat="server" DataSourceID="odsUdc" EnableModelValidation="True" DataKeyNames="UDC" AutoGenerateColumns="False"
-            PageSize="3" AllowPaging="True" Width="100%">
+        <asp:GridView ID="grViewUdc" runat="server" DataSourceID="odsUdc" EnableModelValidation="True" DataKeyNames="UDC" AutoGenerateColumns="False" PageSize="3" AllowPaging="True" Width="100%">
             <RowStyle CssClass="btnGrigioHalf" />
             <SelectedRowStyle CssClass="btnAzzurroHalf" />
             <Columns>
@@ -57,9 +52,9 @@
                     <ItemTemplate>
                         <asp:LinkButton runat="server" ID="lbBlocco" CommandArgument='<%# Eval("UDC") %>' CommandName="Select">
                             <div class="divSx">
-                                <asp:Label runat="server" ID="lblUDC" Font-Bold="true" Text='<%# Eval("UDC") %>' />
+                                <asp:Label runat="server" ID="lblUDC" Text='<%# Eval("UDC") %>' />
                                 &nbsp;
-                                <asp:Label runat="server" ID="lblPos" Text='<%# Eval("CodCella") %>' />
+                                <asp:Label runat="server" ID="lblPos" Font-Bold="true" Text='<%# Eval("CodCella") %>' />
                             </div>
                             <div class="divDx">
                                 <asp:Label runat="server" ID="Label3" Text='<%# Eval("Qta","({0:0}p.)") %>' />

GMW_data/reportPrinter.cs

@@ -196,7 +196,7 @@ public class reportPrinter
                 report.DataSources.Add(new ReportDataSource(memLayer.ML.confReadString("ReportDatasource"), caricaDati(tipoReport, UDC)));
                 break;
             case reportRichiesto.CartellinoFusi:
-                report.ReportPath = @".\Reports\CartellinoFus.rdlc";
+                report.ReportPath = @".\Reports\CartellinoFusi.rdlc";
                 report.DataSources.Add(new ReportDataSource(memLayer.ML.confReadString("ReportDatasource"), caricaDati(tipoReport, UDC)));
                 break;
             case reportRichiesto.CartellinoMP: