From 0113a7e6e92e20442377954740b817fbd3c4a35f Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 17 Nov 1994 13:31:02 +0000
Subject: [PATCH] Correzione gestione data 74 ter

git-svn-id: svn://10.65.10.50/trunk@651 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg2100.cpp  | 3 ++-
 cg/cg2100c.uml | 2 +-
 cg/cg2102.cpp  | 7 +------
 cg/cg21iva.uml | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/cg/cg2100.cpp b/cg/cg2100.cpp
index 0fd041372..4d6d82f3f 100755
--- a/cg/cg2100.cpp
+++ b/cg/cg2100.cpp
@@ -54,8 +54,9 @@ TMask* TPrimanota_application::load_mask(int n)
   }  
   break;
  case 2:
-{
+{                                    
   m->set_handler(F_CODREG, reg_handler);
+  m->set_handler(F_DATA74TER, data74ter_handler); 
   m->set_handler(F_PROTIVA, protiva_handler);
   m->set_handler(F_CLIENTE, clifo_handler);
   m->set_handler(F_FORNITORE, clifo_handler);
diff --git a/cg/cg2100c.uml b/cg/cg2100c.uml
index 57ec513f6..88de02bc2 100755
--- a/cg/cg2100c.uml
+++ b/cg/cg2100c.uml
@@ -380,7 +380,7 @@ BOOLEAN F_OCCASIONALE
 BEGIN
   MESSAGE FALSE HIDE,F_OCCASEDIT|ENABLE,F_PIVACLIENTE|ENABLE,F_PIVAFORNITORE|SHOW,F_STATOPAIV
   MESSAGE TRUE  SHOW,F_OCCASEDIT|DISABLE,F_PIVACLIENTE|DISABLE,F_PIVAFORNITORE|HIDE,F_STATOPAIV
-  FLAGS "GHP"                    
+  FLAGS "GH"                    
 END
 
 STRING F_CODPAG 4
diff --git a/cg/cg2102.cpp b/cg/cg2102.cpp
index 529444d86..45f6b8696 100755
--- a/cg/cg2102.cpp
+++ b/cg/cg2102.cpp
@@ -1013,12 +1013,7 @@ bool TPrimanota_application::iva_sottoconto_handler(TMask_field& f, KEY key)
       const TFixed_string td(app().causale().tipo_doc());
       if (td == "FV" || td == "NC") spric = 4;
     }  
-/*    
-    TMask_field& s = f.mask().field(105);
-    if (app().iva() == iva_vendite || s.get().empty())
-      s.set(spric > 0 ? format("%d", spric) : "");
-*/      
-    f.mask().set(105, spric > 0 ? format("%d", spric) : "");
+    f.mask().set(105, spric > 0 ? format("%d", spric) : "", TRUE);
   }
   return TRUE;
 }
diff --git a/cg/cg21iva.uml b/cg/cg21iva.uml
index 3b5d25397..6cf14cb3f 100755
--- a/cg/cg21iva.uml
+++ b/cg/cg21iva.uml
@@ -127,7 +127,7 @@ BEGIN
   DISPLAY "Conto" CONTO
   DISPLAY "Sottoconto" SOTTOCONTO
   DISPLAY "Descrizione@50" DESCR
-  DISPLAY "C/R" TIPOCR
+  DISPLAY "C/R" TIPOSPRIC
   OUTPUT 109 SOTTOCONTO
   OUTPUT 107 GRUPPO
   OUTPUT 108 CONTO