From 47eab5237a0834b64e512b6162418c1efaa695a7 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 30 Jan 2006 11:36:17 +0000
Subject: [PATCH] Patch level         : 2.2 330 Files correlati     : in0.exe
 in0700a.msk Ricompilazione Demo : [ ] Commento            : Corretta modifica
 e caricamento  rettifiche con anni aventi diverse frequenze di versamento

git-svn-id: svn://10.65.10.50/trunk@13736 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 in/in0200.cpp  |  4 ++--
 in/in0700.cpp  |  3 +--
 in/in0700a.uml |  8 ++++++--
 in/inlib01.cpp | 11 +++++------
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/in/in0200.cpp b/in/in0200.cpp
index cc7266f76..7b2a0a6d5 100755
--- a/in/in0200.cpp
+++ b/in/in0200.cpp
@@ -370,8 +370,8 @@ bool TDischetto_mask::on_field_event(TOperable_field& o, TField_event e, long jo
       const char fc = frequenza(anno, 'C');
       TList_field& list = (TList_field&)field(type_field());
       TToken_string codes = "A|C";
-      TToken_string descr = TR("Acquisti");
-				
+      TToken_string descr;
+      descr.add(TR("Acquisti"));
 			descr.add(TR("Cessioni"));
       if (fa == fc)
       {
diff --git a/in/in0700.cpp b/in/in0700.cpp
index b0a3234fd..eb0389b9a 100755
--- a/in/in0700.cpp
+++ b/in/in0700.cpp
@@ -172,8 +172,7 @@ public:
 
 bool TRettifiche_intra::user_create()
 {
-  open_files(LF_TABCOM, LF_TAB, LF_CLIFO, 
-             LF_RIEPRETT, 0);
+  open_files(LF_TABCOM, LF_TAB, LF_CLIFO, LF_RIEPRETT, 0);
   _rel = new TRelation(LF_RIEPRETT);
   _msk = new TRettifiche_mask;
   return TRUE;
diff --git a/in/in0700a.uml b/in/in0700a.uml
index 05c3bf93e..d2d6cae08 100755
--- a/in/in0700a.uml
+++ b/in/in0700a.uml
@@ -47,10 +47,10 @@ END
 NUMBER O_ANNO 4
 BEGIN
   PROMPT 21 4 "Anno "
-  FLAGS "AUG"
+  FLAGS "UG"
   FIELD ANNORETT
   CHECKTYPE REQUIRED
-  NUM_EXPR #O_ANNO<=#O_ANNO
+  NUM_EXPR #O_ANNO<=#F_ANNO
   WARNING "Si possono rettificare solo gli anni precedenti o uguali"
 END
 
@@ -247,12 +247,15 @@ BEGIN
   ITEM "03|Luglio-Settembre"
   ITEM "04|Ottobre-Dicembre"
   FIELD PERIODO
+  KEY 1
 END
 
 LIST F_PERIODO_A 2 16
 BEGIN
   PROMPT 33 12 "Periodo "
   ITEM "01|Annuale"
+  FIELD PERIODO
+  KEY 1
 END
 
 NUBER F_NUM_RIG 7
@@ -271,6 +274,7 @@ BEGIN
   DISPLAY "Periodo rett." PERETT
   DISPLAY "Numero rett." NUMRETT
   OUTPUT F_PERIODO_M PERIODO
+  OUTPUT F_PERIODO_T PERIODO
   OUTPUT F_NUM_RIG NUMRIG
   CHECKTYPE REQUIRED
   FIELD NUMRIG
diff --git a/in/inlib01.cpp b/in/inlib01.cpp
index 7d71fc84e..3343749c1 100755
--- a/in/inlib01.cpp
+++ b/in/inlib01.cpp
@@ -17,10 +17,6 @@
 
 char TIntra_frequency::frequenza(int a, char t) const
 {
-  const TDate d(TODAY);
-  if (a <= 0)
-    a = d.year(); 
-
   switch (t)
   {
   case 'A': break;
@@ -30,17 +26,20 @@ char TIntra_frequency::frequenza(int a, char t) const
   default : break;
   }
   
+  const TDate d(TODAY);
+  if (a <= 0)
+    a = d.year(); 
   if (a < d.year())
   {
     TLocalisamfile riep(LF_RIEPRETT);  
-    riep.put("TIPO", (char)t);
+    riep.put("TIPO", t);
     riep.put("ANNO", a);
     if (riep.read(_isgteq) == NOERR)
     {                     
       if (riep.get_char("TIPO") == t && riep.get_int("ANNO") == a)
       {
         const char freq = riep.get_char("FREQUENZA");
-        if (freq != '\0')
+        if (freq > ' ')
           return freq;
       }
     }