From 28ab6dd190a762d9df97a4f86936cfe845893adc Mon Sep 17 00:00:00 2001
From: bonazzi <bonazzi@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 30 Dec 2016 08:15:49 +0000
Subject: [PATCH] Patch level         : 12.0 322 Files correlati     :

Sistemato menu per gv
Corrette ablitazioni campi nella visualizzazione liquidazione

git-svn-id: svn://10.65.10.50/branches/R_10_00@23484 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 src/cg/cg5500.cpp | 35 +++++++++++++++++++++--------------
 src/cg/cgmenu.men | 12 +++++++++++-
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/cg/cg5500.cpp b/src/cg/cg5500.cpp
index bfa2770b8..1eadb6cef 100755
--- a/src/cg/cg5500.cpp
+++ b/src/cg/cg5500.cpp
@@ -390,13 +390,18 @@ bool Visliq_app::sel_mese_sh1 (TMask_field& f, KEY k)
   int sel   = sh.selected();
   int month = sh.selected()+1;
   TToken_string& tt = sh.row(sh.selected());
-  if (sh.items() == 4) 
+  TMask& sm = sh.sheet_mask();
+
+	if (sh.items() == 4) 
     month *= 3;  
   
-  bool ok = false;
+   if (sm.is_running() && !sm.stop_run(K_ENTER))
+		return true;
+	
+	 bool ok = true;
   
   //if (m.dirty() || sh.sheet_mask().dirty())
-  if (m.field(F_CREDPREC).dirty() || app()._sh_dirty || app()._sv_dirty)
+  if (m.field(F_CREDPREC).dirty() || app()._sh_dirty || app()._sv_dirty || sm.dirty())
   {             
     KEY k = yesnocancel_box(TR("Registrare le modifiche effettuate?"));
     if (k ==  K_YES)
@@ -405,16 +410,12 @@ bool Visliq_app::sel_mese_sh1 (TMask_field& f, KEY k)
       app().read_general(m);  
     ok = (k == K_YES || k == K_NO);  
   } 
-  else 
-    ok = true;   
 
 
-  TMask& sm = sh.sheet_mask();
   if (ok) 
   {
-    if (sm.is_running()) sm.stop_run(K_ENTER);
-    app().vis_one(month); 
-    app().read_general(m);  
+		app().vis_one(month); 
+		app().read_general(m);  
   }
   
   app().set_liq_rows(sh);
@@ -485,13 +486,19 @@ bool Visliq_app::sel_mese_sh2 (TMask_field& f, KEY k)
   int month = sh.selected()+1;
   if (sh.items() < 12) 
     month *= 3;      
+
+	TMask& sv = sh.sheet_mask();
   
   // click su acconto
   if (month  > 12) return true;
 
-  bool ok = false;  
+  if (sv.is_running() && !sv.stop_run(K_ENTER))
+		return true;
+
+  bool ok = true;
+
   //if (m.dirty())         
-  if (m.field(F_CREDPREC).dirty() || app()._sh_dirty || app()._sv_dirty)
+  if (m.field(F_CREDPREC).dirty() || app()._sh_dirty || app()._sv_dirty || sv.dirty())
   {             
     KEY k = yesnocancel_box(TR("Registrazione modifiche effettuate?"));
     if (k ==  K_YES)
@@ -500,12 +507,9 @@ bool Visliq_app::sel_mese_sh2 (TMask_field& f, KEY k)
       app().read_general(m);  
     ok = k == K_YES || k == K_NO;  
   } 
-  else ok = true;   
   
-  TMask& sv = sh.sheet_mask();
   if (ok)
   {
-    if (sv.is_running()) sv.stop_run(K_ENTER);
     app().vis_one(month);
     const bool compensabile = app()._lia->get("S9") == "CM";
     if ((app()._year >= 2000) && compensabile)
@@ -613,6 +617,9 @@ bool Visliq_app::vis_all()
 				sh.enable_column(id, true);
 	  }
 	}
+	else
+		sh.enable_column(110);
+
   // fill the mask in
   read_general(*_mask);
 
diff --git a/src/cg/cgmenu.men b/src/cg/cgmenu.men
index 64e7ab604..ffc7fa166 100755
--- a/src/cg/cgmenu.men
+++ b/src/cg/cgmenu.men
@@ -109,7 +109,8 @@ Item_05 = "Stampa registri", "cg4 -3", "F"
 Item_06 = "Stampa pro-rata", "cg5 -9", "F"
 Item_07 = "Liste fatture", [CGMENU_026]
 Item_08 = "Gestione acconti IVA", [CGMENU_027]
-Item_09 = "Gestione versamenti IVA", <gvmenu.men>
+Item_09 = "Gestione versamenti IVA", [CGMENU_022]
+Item_09 = "Gestione F24", <gvmenu.men>
 Item_10 = "Operazioni annuali", [CGMENU_029]
 Item_11 = "IVA per cassa / differita", <icmenu.men>
 Item_12 = "Gestione autotrasportatori", "cg4 -9", "F"
@@ -212,6 +213,15 @@ Item_02 = "Apertura nuovo esercizio IVA", "cg4 -4 I", "F"
 Item_03 = "Chiusura/Apertura conti", "cg4 -5", "F"
 Item_04 = "Chiusura/Apertura conti Contabilità sep.", "np0 -1", "F"
 
+[CGMENU_022]
+Caption = "Gestione versamenti IVA"
+Picture = <cg01>
+Module  = 0
+Flags   = ""
+Item_01 = "Estrazione versamenti", "cg4 -2 -D", "F"
+Item_02 = "Gestione versamenti", "ba3 -0 %del", ""
+Item_03 = "Stampa versamenti", "cg1 -3", "F"
+
 [CGMENU_023]
 Caption = "Stampe di contabilità"
 Picture = <cg01>