Corretti errori tabelle libro unico

git-svn-id: svn://10.65.10.50/trunk@984 c028cbd2-c16b-5b4b-a496-9718f37d4682

ba/ba1100d.uml

@@ -48,9 +48,9 @@ BEGIN
   FLAGS "D"
 END
 
-SPREADSHEET F_FIELDS 44 7
+SPREADSHEET F_FIELDS 0 7
 BEGIN
-  PROMPT 15 4 ""
+  PROMPT 1 4 ""
   ITEM "Nome@10"
   ITEM "Tipo"
   ITEM "Lunghezza"

ba/ba2.h

@@ -4,6 +4,7 @@
 int ba2100(int argc, char* argv[]);
 int ba2200(int argc, char* argv[]);
 int ba2300(int argc, char* argv[]);
+int ba2400(int argc, char* argv[]);
 
 #endif // __BA2_H
 

ba/ba2.url

@@ -54,3 +54,9 @@ MENUBAR MENU_BAR(2)
 
 MENU MENU_BAR(2)
   SUBMENU MENU_FILE "~File"
+
+MENUBAR MENU_BAR(3)
+
+MENU MENU_BAR(3)
+  SUBMENU MENU_FILE "~File"
+

ba/ba2100.h

@@ -24,6 +24,20 @@
 #define F_GROUP10   140
 #define F_GROUP11   141
 #define F_GROUP12   142
+#define F_GROUP13   143
+#define F_GROUP14   144
+#define F_GROUP15   145
+#define F_GROUP16   146
+#define F_GROUP17   147
+#define F_GROUP18   148
+#define F_GROUP19   149
+#define F_GROUP20   150
+#define F_GROUP21   151
+#define F_GROUP22   152
+#define F_GROUP23   153
+#define F_GROUP24   154
+
+
 
 #define F_ITEMS     200
 #define F_DECIMALS  206

ba/ba2100f.uml

@@ -117,7 +117,7 @@ BEGIN
   GROUP 7
 END
 
-GROUPBOX F_GROUP 78 3
+GROUPBOX F_GROUP 78 4
 BEGIN
 	PROMPT 1 9 "Gruppi di stampa"
   GROUP 7
@@ -195,9 +195,81 @@ BEGIN
   GROUP 7
 END
 
+BOOLEAN F_GROUP13
+BEGIN
+  PROMPT 4 11 "13"
+  GROUP 7
+END
+
+BOOLEAN F_GROUP14
+BEGIN
+  PROMPT 10 11 "14"
+  GROUP 7
+END
+
+BOOLEAN F_GROUP15
+BEGIN
+  PROMPT 16 11 "15"
+  GROUP 7
+END
+
+BOOLEAN F_GROUP16
+BEGIN
+  PROMPT 22 11 "16"
+  GROUP 7
+END
+
+BOOLEAN F_GROUP17
+BEGIN
+  PROMPT 28 11 "17"
+  GROUP 7
+END
+
+BOOLEAN F_GROUP18
+BEGIN
+  PROMPT 34 11 "18"
+  GROUP 7
+END
+
+BOOLEAN F_GROUP19
+BEGIN
+  PROMPT 40 11 "19"
+  GROUP 7
+END
+
+BOOLEAN F_GROUP20
+BEGIN
+  PROMPT 46 11 "20"
+  GROUP 7
+END
+
+BOOLEAN F_GROUP21
+BEGIN
+  PROMPT 52 11 "21"
+  GROUP 7
+END
+
+BOOLEAN F_GROUP22
+BEGIN
+  PROMPT 58 11 "22"
+  GROUP 7
+END
+
+BOOLEAN F_GROUP23
+BEGIN
+  PROMPT 64 11 "23"
+  GROUP 7
+END
+
+BOOLEAN F_GROUP24
+BEGIN
+  PROMPT 70 11 "24"
+  GROUP 7
+END
+
 SPREADSHEET F_ITEMS
 BEGIN
-  PROMPT 0 12 "Spreadsheet"
+  PROMPT 0 13 "Spreadsheet"
   ITEM "Codice@8"
   ITEM "Testo@32"
   ITEM "Messaggio@80"

ba/batbinl.uml

@@ -64,7 +64,7 @@ BEGIN
   FLAGS "M"
 END
 
-NUMBER F_PINI_LU 5 5
+NUMBER F_PINI_LU 5
 BEGIN
   PROMPT 1 3 "Numero pagina iniziale registro unico  "
   FIELD I2
@@ -94,7 +94,7 @@ BEGIN
   DISPLAY "Ragione sociale@50" RAGSOC
   OUTPUT F_DITTA CODDITTA
   OUTPUT F_RAGSOC RAGSOC
-  CHECKTYPE REQUIRED
+  CHECKTYPE REUIRED
   WARNING "E' necessario specificare un codice ditta valido"
 END
 
@@ -106,7 +106,7 @@ BEGIN
   DISPLAY "Ragione sociale@50" RAGSOC
   DISPLAY "Codice ditta" CODDITTA
   COPY OUTPUT F_DITTA
-  CHECKTYPE REQUIRED
+  CHECKTYPE NORMAL
 END
 
 STRING F_CODREG 3
@@ -123,10 +123,11 @@ BEGIN
   OUTPUT F_ANNOREG CODTAB[1,4]
   OUTPUT F_CODREG CODTAB[5,7]
   OUTPUT F_DESCREG S0
-  CHECKTYPE NORMAL
+  CHECKTYPE REQUIRED
+  VALIDATE NOT_EMPTY_CHECK_FIELD
 END
 
-STRING F_DESCREG 50 50
+STRING F_DESCREG 50
 BEGIN
   PROMPT 1 9 "Descrizione     "
   USE REG KEY 2 SELECT CODTAB[1,4]=#F_ANNO
@@ -151,7 +152,7 @@ BEGIN
   FLAGS "R"
 END
 
-STRING F_CODVID 3 3
+STRING F_CODVID 3
 BEGIN
   PROMPT 1 14 "Codice vidimazione "
   FIELD S1
@@ -167,6 +168,8 @@ BOOLEAN F_PANN_LU
 BEGIN
   PROMPT 36 16 "Pagine libro unico annullate"
   FIELD B1
+  MESSAGE FALSE REQUIRED,F_DITTA|REQUIRED,F_CODREG
+  MESSAGE TRUE  NORMAL,F_DITTA|NORMAL,F_CODREG
 END
 
 ENDPAGE

ba/batblbu.uml

@@ -50,9 +50,23 @@ BEGIN
   KEY 2
 END
 
+NUMBER F_CODTABLIB 2
+BEGIN
+  PROMPT 3 3 "Codice libro         "
+  FIELD I3
+  FLAGS "Z"
+  USE %ITL
+  INPUT CODTAB F_CODTABLIB
+  DISPLAY "Codice" CODTAB
+  DISPLAY "Descrizione@50" S0
+  OUTPUT F_CODTABLIB CODTAB
+  OUTPUT F_DESCRLBU S0
+  CHECKTYPE NORMAL
+END
+
 LIST F_ULT_MESE_STAMP 2 12
 BEGIN
-  PROMPT 3 3 "Ultimo mese stampa   "
+  PROMPT 3 5 "Ultimo mese stampa   "
   FIELD I0
   ITEM " |Nessuno"
   FLAGS "M"
@@ -60,13 +74,13 @@ END
 
 NUMBER F_ULT_PAG 5
 BEGIN
-  PROMPT 55 3 "Ultima pagina "
+  PROMPT 55 5 "Ultima pagina "
   FIELD I1
 END
 
 LIST F_TIPOA 10
 BEGIN
-  PROMPT 3 4 "Tipo persona         "
+  PROMPT 3 6 "Tipo persona         "
   FIELD S2
   ITEM "F|Fisica"
   ITEM "G|Giuridica"
@@ -74,7 +88,7 @@ END
 
 NUMBER F_CODANAGR 5
 BEGIN
-  PROMPT 55 4 "Codice        "
+  PROMPT 55 6 "Codice        "
   FIELD I4
   USE LF_ANAG
   INPUT TIPOA F_TIPOA SELECT
@@ -90,7 +104,7 @@ END
 
 STRING F_TIPOANAGR 50
 BEGIN
-  PROMPT 3 5 "Tipo anagrafico      "
+  PROMPT 3 7 "Tipo anagrafico      "
   USE LF_ANAG KEY 2
   INPUT TIPOA F_TIPOA SELECT
   INPUT RAGSOC F_TIPOANAGR
@@ -101,31 +115,6 @@ BEGIN
   CHECKTYPE REQUIRED
 END
 
-NUMBER F_CODTABLIB 2
-BEGIN
-  PROMPT 3 6 "Codice libro         "
-  FIELD I3
-  FLAGS "Z"
-  USE %ITL
-  INPUT CODTAB F_CODTABLIB
-  DISPLAY "Codice" CODTAB
-  DISPLAY "Descrizione@50" S0
-  OUTPUT F_CODTABLIB CODTAB
-  OUTPUT F_DESCR S0
-  CHECKTYPE REQUIRED
-END
-
-STRING F_DESCR 50
-BEGIN
-  PROMPT 3 7 "Descrizione          "
-  USE %ITL KEY 2
-  INPUT S0 F_DESCR
-  DISPLAY "Descrizione@50" S0
-  DISPLAY "Codice" CODTAB
-  COPY OUTPUT F_CODTABLIB
-  CHECKTYPE REQUIRED
-END
-
 STRING F_CONSPRESSO 40
 BEGIN
   PROMPT 3 8 "Conservato presso    "
@@ -164,7 +153,7 @@ END
 
 BOOLEAN F_STAMPAINDCOMP
 BEGIN
-  PROMPT 3 14 "Stampa l' indirizzo completo della ditta"
+  PROMPT 3 14 "Stampa l'indirizzo completo della ditta"
   FIELD B1
 END
 

ba/batbreg.uml

@@ -225,6 +225,7 @@ BEGIN
   OUTPUT F_ANNO CODTAB[1,4]
   OUTPUT F_CODLBU CODTAB[5,7]
   WARNING "Libro unico assente"
+  CHECKTYPE NORMAL
 END 
  
 ENDPAGE