From 093b31120599d3b8fa49c919ff78b70b5efd1e69 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 10 Feb 1995 17:40:11 +0000
Subject: [PATCH] Coretti ierrori sugli importi e sui metri quadrati

git-svn-id: svn://10.65.10.50/trunk@988 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ba/ba1100d.uml |  2 +-
 ba/ba2100f.uml | 51 +++++++++++++++++++++++++-------------------------
 ba/ba4200b.uml |  3 +++
 ba/ba4200c.uml |  3 +++
 ba/ba4400a.uml |  8 ++++----
 ba/prassi.mnu  |  1 +
 6 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/ba/ba1100d.uml b/ba/ba1100d.uml
index 1fd4424d6..c2df42c5f 100755
--- a/ba/ba1100d.uml
+++ b/ba/ba1100d.uml
@@ -50,7 +50,7 @@ END
 
 SPREADSHEET F_FIELDS 0 7
 BEGIN
-  PROMPT 1 4 ""
+  PROMPT 0 4 ""
   ITEM "Nome@10"
   ITEM "Tipo"
   ITEM "Lunghezza"
diff --git a/ba/ba2100f.uml b/ba/ba2100f.uml
index 255e795c7..9134b13f9 100755
--- a/ba/ba2100f.uml
+++ b/ba/ba2100f.uml
@@ -4,12 +4,12 @@ TOOLBAR "" 0 20 0 2
 
 BUTTON DLG_OK 10 2
 BEGIN
-	PROMPT -12 -1 ""
+  PROMPT -12 -1 ""
 END
 
 BUTTON DLG_CANCEL 10 2
 BEGIN
-	PROMPT -22 -1 ""
+  PROMPT -22 -1 ""
 END
 
 ENDPAGE
@@ -18,18 +18,18 @@ PAGE "CAMPO DI STAMPA" -1 -1 60 14
 
 LIST F_CLASS 10
 BEGIN
-	PROMPT 1 1 "Tipo          "
-	FLAGS "DG"
-	ITEM "STRINGA|Testo" MESSAGE HIDE,F_DECIMALS|SHOW,F_HEIGHT|HIDE,F_ITEMS
-	ITEM "NUMERO|Numero" MESSAGE SHOW,F_DECIMALS|HIDE,F_HEIGHT|HIDE,F_ITEMS
-	ITEM "DATA|Data"     MESSAGE HIDE,F_DECIMALS|HIDE,F_HEIGHT|HIDE,F_ITEMS
-	ITEM "LISTA|Lista"   MESSAGE HIDE,F_DECIMALS|HIDE,F_HEIGHT|SHOW,F_ITEMS
-	ITEM "GRUPPO|Gruppo" MESSAGE HIDE,F_DECIMALS|HIDE,F_HEIGHT|HIDE,F_ITEMS
+  PROMPT 1 1 "Tipo    "
+  FLAGS "DG"
+  ITEM "STRINGA|Testo" MESSAGE HIDE,F_DECIMALS|SHOW,F_HEIGHT|HIDE,F_ITEMS
+  ITEM "NUMERO|Numero" MESSAGE SHOW,F_DECIMALS|HIDE,F_HEIGHT|HIDE,F_ITEMS
+  ITEM "DATA|Data"     MESSAGE HIDE,F_DECIMALS|HIDE,F_HEIGHT|HIDE,F_ITEMS
+  ITEM "LISTA|Lista"   MESSAGE HIDE,F_DECIMALS|HIDE,F_HEIGHT|SHOW,F_ITEMS
+  ITEM "GRUPPO|Gruppo" MESSAGE HIDE,F_DECIMALS|HIDE,F_HEIGHT|HIDE,F_ITEMS
 END
 
 STRING F_KEY 80 60
 BEGIN
-	PROMPT 1 2 "Descrizione   "
+  PROMPT 1 2 "Descrizione   "
   HELP "Descrizione del campo da configurare"
   CHECKTYPE REQUIRED
   GROUP 7
@@ -37,39 +37,39 @@ END
 
 NUMBER F_Y 3
 BEGIN
-	PROMPT 1 3 "Riga          "
+  PROMPT 1 3 "Riga    "
   HELP "Riga in cui stampare"
 END
 
 NUMBER F_X 3
 BEGIN
-	PROMPT 24 3 "Colonna  "
+  PROMPT 24 3 "Colonna  "
   HELP "Colonna in cui stampare"
 END
 
 BOOLEAN F_HIDDEN
 BEGIN
-	PROMPT 60 3 "Nascosto"
+  PROMPT 60 3 "Nascosto"
   HELP "Il campo va elaborato ma non stampato"
 END
 
 NUMBER F_WIDTH 3
 BEGIN
-	PROMPT 1 4 "Larghezza     "
+  PROMPT 1 4 "Larghezza     "
   HELP "Lunghezza massima da stampare"
   GROUP 7
 END
 
 NUMBER F_HEIGHT 2
 BEGIN
-	PROMPT 24 4 "Altezza  "
+  PROMPT 24 4 "Altezza  "
   HELP "Righe massime su cui stampare"
   GROUP 7
 END
 
 NUMBER F_DECIMALS 2
 BEGIN
-	PROMPT 24 4 "Decimali "
+  PROMPT 24 4 "Decimali "
   HELP "Numero di decimali"
   MESSAGE COPY,F_HEIGHT
   GROUP 7
@@ -77,28 +77,27 @@ END
 
 STRING F_PROMPT 80 60
 BEGIN
-	PROMPT 1 5 "Testo         "
+  PROMPT 1 5 "Testo   "
   HELP "Eventuale testo fisso da stampare"
   GROUP 7
 END
 
 STRING F_PICTURE 80 40
 BEGIN
-	PROMPT 1 6 "Formato       "
-  HELP "Formato di stampa (vedere codici sul manuale)"
-  GROUP 7
+  PROMPT 1 6 "Formato       "
+  HELP "Formato di stampa (# = ' ', @ = '0', ~ = '')"
 END
 
 STRING F_FIELD 40
 BEGIN
-	PROMPT 1 7 "Campo su file "
+  PROMPT 1 7 "Campo su file "
   HELP "Nome del campo su file"
   GROUP 7
 END
 
 STRING F_FIELD2 40
 BEGIN
-	PROMPT 1 8 "II campo      "
+  PROMPT 1 8 "II campo      "
   HELP "Nome del campo su file da utilizzare se il primo e' vuoto"
   GROUP 7
 END
@@ -112,14 +111,14 @@ END
 
 BOOLEAN F_AUTOMAGIC
 BEGIN
-	PROMPT 60 8 "Automatico"
+  PROMPT 60 8 "Automatico"
   HELP "Il campo viene calcolato automaticamente"
   GROUP 7
 END
 
 GROUPBOX F_GROUP 78 4
 BEGIN
-	PROMPT 1 9 "Gruppi di stampa"
+  PROMPT 1 9 "Gruppi di stampa"
   GROUP 7
 END
 
@@ -300,12 +299,12 @@ END
 
 BUTTON DLG_OK 10 2
 BEGIN
-	PROMPT -12 -1 ""
+  PROMPT -12 -1 ""
 END
 
 BUTTON DLG_CANCEL 10 2
 BEGIN
-	PROMPT -22 -1 ""
+  PROMPT -22 -1 ""
 END
 
 ENDPAGE
diff --git a/ba/ba4200b.uml b/ba/ba4200b.uml
index 0a8898896..fa9a11c13 100755
--- a/ba/ba4200b.uml
+++ b/ba/ba4200b.uml
@@ -789,6 +789,7 @@ BEGIN
   DISPLAY "Descrizione@50" S0
   OUTPUT F_CODABI CODTAB[1,5]
   OUTPUT F_CODCAB CODTAB[6,10]
+  CHECKTYPE NORMAL
 END
 
 NUMBER F_CODCAB 5
@@ -798,6 +799,8 @@ BEGIN
   FIELD LF_ANAG->CODCAB
   FLAGS "RZ"
   COPY ALL F_CODABI
+  CHECKTYPE NORMAL
+  VALIDATE REQIF_FUNC F_CODABI
 END
 
 ENDPAGE
diff --git a/ba/ba4200c.uml b/ba/ba4200c.uml
index e17567909..598996c3b 100755
--- a/ba/ba4200c.uml
+++ b/ba/ba4200c.uml
@@ -891,6 +891,7 @@ BEGIN
   DISPLAY "Descrizione@50" S0
   OUTPUT F_CODABI CODTAB[1,5]
   OUTPUT F_CODCAB CODTAB[6,10]
+  CHECKTYPE NORMAL
 END
 
 NUMBER F_CODCAB 5
@@ -900,6 +901,8 @@ BEGIN
   FIELD LF_ANAG->CODCAB
   FLAGS "RZ"
   COPY ALL F_CODABI
+  CHECKTYPE NORMAL
+  VALIDATE REQIF_FUNC F_CODABI
 END
 
 ENDPAGE
diff --git a/ba/ba4400a.uml b/ba/ba4400a.uml
index c1ac7d0c1..6755929e3 100755
--- a/ba/ba4400a.uml
+++ b/ba/ba4400a.uml
@@ -413,9 +413,9 @@ NUMBER FLD_UL2_MQULC 6
 BEGIN
   PROMPT 1 15 "Mq. Locali        "
   FIELD LF_UNLOC->MQULC
-  FLAGS "R"
+  FLAGS "UR"   
+  PICTURE "."
   HELP "Numero di metri quadri dei locali"
-	NUM_EXPR {#THIS_FIELD >= 0}
   WARNING "N.ro mq. errati"
 END
 
@@ -423,10 +423,10 @@ NUMBER FDL_UL2_MQULCMAG 6
 BEGIN
   PROMPT 45 15 "Di cui a magazzino    "
   FIELD LF_UNLOC->MQULCMAG
-  FLAGS "R"
+  FLAGS "UR"
+  PICTURE "."
   HELP "Numero di metri quadri del locale adibiti a magazzino"
   WARNING "N.ro mq. errati"
-	NUM_EXPR {#THIS_FIELD >= 0}
 END
 
 ENDPAGE
diff --git a/ba/prassi.mnu b/ba/prassi.mnu
index a4f0fd224..4db4053a0 100755
--- a/ba/prassi.mnu
+++ b/ba/prassi.mnu
@@ -3,6 +3,7 @@
 0|Contabilita'|4|7
 0|Terreni e fabbricati|tefa -t
 0|Modello 740|740 -t
+0|Modello 760|760 -t
 0|Modello 770|17|4
 0|Manutenzione|15|P
 1|Gestione Anagrafiche|1