diff --git a/GMW_Term/WebUserControls/mod_delibLog.ascx b/GMW_Term/WebUserControls/mod_delibLog.ascx index a12baa0f..386e8dbd 100644 --- a/GMW_Term/WebUserControls/mod_delibLog.ascx +++ b/GMW_Term/WebUserControls/mod_delibLog.ascx @@ -7,21 +7,14 @@
-

DELIBERA LOGISTICA

+
+ DELIBERA LOGISTICA +
- - - - -
-
- - - - -
-
-
+ +
+ +
diff --git a/GMW_Term/WebUserControls/mod_delibLog.ascx.cs b/GMW_Term/WebUserControls/mod_delibLog.ascx.cs index f74ecb3c..3dfb459a 100644 --- a/GMW_Term/WebUserControls/mod_delibLog.ascx.cs +++ b/GMW_Term/WebUserControls/mod_delibLog.ascx.cs @@ -65,7 +65,7 @@ namespace GMW_Term.WebUserControls catch { } // se ho da deliberare mostro pannello - if (showNC || showNC) + if (showNC || showDL) { // verifico se ho da deliberare PM o NC divDetailDelib.Visible = true; diff --git a/GMW_Term/WebUserControls/mod_detail_DL.ascx b/GMW_Term/WebUserControls/mod_detail_DL.ascx index 86544c31..47bbf3d2 100644 --- a/GMW_Term/WebUserControls/mod_detail_DL.ascx +++ b/GMW_Term/WebUserControls/mod_detail_DL.ascx @@ -1,4 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_detail_DL.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_detail_DL" %>
- MANCA PM + DELIB. LOGIST. NECESSARIA
diff --git a/GMW_Term/WebUserControls/mod_detail_NC.ascx b/GMW_Term/WebUserControls/mod_detail_NC.ascx index c006b6c3..30fd3a7c 100644 --- a/GMW_Term/WebUserControls/mod_detail_NC.ascx +++ b/GMW_Term/WebUserControls/mod_detail_NC.ascx @@ -1,8 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_detail_NC.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_detail_NC" %>
- - <%-- diff --git a/GMW_Term/WebUserControls/mod_menuTop.ascx b/GMW_Term/WebUserControls/mod_menuTop.ascx index 847f41ac..9684e010 100644 --- a/GMW_Term/WebUserControls/mod_menuTop.ascx +++ b/GMW_Term/WebUserControls/mod_menuTop.ascx @@ -1,4 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menuTop.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_menuTop" %>
- +
\ No newline at end of file diff --git a/GMW_Term/WebUserControls/mod_menuTop.ascx.designer.cs b/GMW_Term/WebUserControls/mod_menuTop.ascx.designer.cs index 48647ded..e6b92a76 100644 --- a/GMW_Term/WebUserControls/mod_menuTop.ascx.designer.cs +++ b/GMW_Term/WebUserControls/mod_menuTop.ascx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/GMW_Term/bin/GMW_Term.dll b/GMW_Term/bin/GMW_Term.dll index d08d18ed..0d6e3be2 100644 Binary files a/GMW_Term/bin/GMW_Term.dll and b/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW_Term/bin/GMW_data.dll b/GMW_Term/bin/GMW_data.dll index ef495338..f2331e14 100644 Binary files a/GMW_Term/bin/GMW_data.dll and b/GMW_Term/bin/GMW_data.dll differ diff --git a/ReleaseClienti/TK_prod/TK_GMW_Term.zip b/ReleaseClienti/TK_prod/TK_GMW_Term.zip index 86738268..542b3825 100644 Binary files a/ReleaseClienti/TK_prod/TK_GMW_Term.zip and b/ReleaseClienti/TK_prod/TK_GMW_Term.zip differ diff --git a/ReleaseClienti/TK_test/TK_GMW_TestTerm.zip b/ReleaseClienti/TK_test/TK_GMW_TestTerm.zip index bd7c0152..f1fe13f4 100644 Binary files a/ReleaseClienti/TK_test/TK_GMW_TestTerm.zip and b/ReleaseClienti/TK_test/TK_GMW_TestTerm.zip differ