From fdc48dfb0355602820ea8595b0e09ba2071c1fd3 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 2 Jun 1995 13:07:33 +0000
Subject: [PATCH] Aggiornata la stampa delle deleghe aggiungendo i tipi
 richiesti da Vladimiro

git-svn-id: svn://10.65.10.50/trunk@1436 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/Attic/cg1400.cpp  | 17 ++++++++++-------
 cg/Attic/cg1400a.uml |  9 ++++++---
 cg/cg1400.cpp        | 17 ++++++++++-------
 cg/cg1400a.uml       |  9 ++++++---
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/cg/Attic/cg1400.cpp b/cg/Attic/cg1400.cpp
index f667b74a8..5f8f11a8e 100755
--- a/cg/Attic/cg1400.cpp
+++ b/cg/Attic/cg1400.cpp
@@ -154,8 +154,7 @@ int TStampa_deleghe_IVA::select()
   }
   else
   {
-    warning_box("Nessuna ditta ha deleghe %s da stampare", 
-                _contofis ? "per conto fiscale" : "normali");
+    warning_box("Nessuna ditta ha deleghe del tipo specificato");
     res = 2;
   }
   
@@ -215,13 +214,17 @@ void TStampa_deleghe_IVA::print_distinta()
   switch (_tipo)
   {
   case 2: 
-    t << "annuale : "; break;
-  case 7: 
-    t << "acconti IVA : "; break;
+    t << "annuale :"; break;
+  case 3: 
+    t << "articolo 74 : " << itom(_mese); break;
+  case 4: 
+    t << "cessazione attivita' : " << itom(_mese); break;
+  case 5: 
+    t << "integrativa : " << itom(_mese); break;
   default: 
-    t << "periodica : " << itom(_mese) << ' ';  break;
+    t << "periodica : " << itom(_mese);  break;
   }
-  t << _anno;
+  t << ' ' << _anno;
   row.put(t, TAB_SEDE);
   printer().setheaderline(1, row);
 
diff --git a/cg/Attic/cg1400a.uml b/cg/Attic/cg1400a.uml
index 160b31919..abc5fb533 100755
--- a/cg/Attic/cg1400a.uml
+++ b/cg/Attic/cg1400a.uml
@@ -129,9 +129,12 @@ LIST F_TIPO 1 24
 BEGIN
   PROMPT 2 11 "Tipo    "
   HELP "Tipo di delega da stampare"
-  ITEM "1|Periodica" MESSAGE ENABLE,F_MESE
-  ITEM "2|Annuale" MESSAGE "13",F_MESE|DISABLE,F_MESE
-  ITEM "7|Acconti IVA" MESSAGE "12",F_MESE|DISABLE,F_MESE
+  ITEM "1|Periodica"            MESSAGE ENABLE,F_MESE
+  ITEM "2|Annuale"              MESSAGE "13",F_MESE|DISABLE,F_MESE
+  ITEM "3|Articolo 74"          MESSAGE ENABLE,F_MESE
+  ITEM "4|Cessazione attivita'" MESSAGE ENABLE,F_MESE
+  ITEM "5|Integrativa"          MESSAGE ENABLE,F_MESE
+  ITEM "7|Acconti IVA"          MESSAGE "12",F_MESE|DISABLE,F_MESE
 END
 
 DATA F_DATA
diff --git a/cg/cg1400.cpp b/cg/cg1400.cpp
index f667b74a8..5f8f11a8e 100755
--- a/cg/cg1400.cpp
+++ b/cg/cg1400.cpp
@@ -154,8 +154,7 @@ int TStampa_deleghe_IVA::select()
   }
   else
   {
-    warning_box("Nessuna ditta ha deleghe %s da stampare", 
-                _contofis ? "per conto fiscale" : "normali");
+    warning_box("Nessuna ditta ha deleghe del tipo specificato");
     res = 2;
   }
   
@@ -215,13 +214,17 @@ void TStampa_deleghe_IVA::print_distinta()
   switch (_tipo)
   {
   case 2: 
-    t << "annuale : "; break;
-  case 7: 
-    t << "acconti IVA : "; break;
+    t << "annuale :"; break;
+  case 3: 
+    t << "articolo 74 : " << itom(_mese); break;
+  case 4: 
+    t << "cessazione attivita' : " << itom(_mese); break;
+  case 5: 
+    t << "integrativa : " << itom(_mese); break;
   default: 
-    t << "periodica : " << itom(_mese) << ' ';  break;
+    t << "periodica : " << itom(_mese);  break;
   }
-  t << _anno;
+  t << ' ' << _anno;
   row.put(t, TAB_SEDE);
   printer().setheaderline(1, row);
 
diff --git a/cg/cg1400a.uml b/cg/cg1400a.uml
index 160b31919..abc5fb533 100755
--- a/cg/cg1400a.uml
+++ b/cg/cg1400a.uml
@@ -129,9 +129,12 @@ LIST F_TIPO 1 24
 BEGIN
   PROMPT 2 11 "Tipo    "
   HELP "Tipo di delega da stampare"
-  ITEM "1|Periodica" MESSAGE ENABLE,F_MESE
-  ITEM "2|Annuale" MESSAGE "13",F_MESE|DISABLE,F_MESE
-  ITEM "7|Acconti IVA" MESSAGE "12",F_MESE|DISABLE,F_MESE
+  ITEM "1|Periodica"            MESSAGE ENABLE,F_MESE
+  ITEM "2|Annuale"              MESSAGE "13",F_MESE|DISABLE,F_MESE
+  ITEM "3|Articolo 74"          MESSAGE ENABLE,F_MESE
+  ITEM "4|Cessazione attivita'" MESSAGE ENABLE,F_MESE
+  ITEM "5|Integrativa"          MESSAGE ENABLE,F_MESE
+  ITEM "7|Acconti IVA"          MESSAGE "12",F_MESE|DISABLE,F_MESE
 END
 
 DATA F_DATA