From cdcf43cc703aac197b9b5e4c3f807f036851063d Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 28 Oct 2005 12:13:28 +0000 Subject: [PATCH] Patch level : 2.2 209 Files correlati : gli stessi file della 2.1 Ricompilazione Demo : [ ] Commento Riportata la versione 2.1 patch 408 git-svn-id: svn://10.65.10.50/trunk@13463 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- in/in0100.cpp | 8 +- in/in0100a.h | 1 + in/in0100a.uml | 7 +- in/in0100c.frm | 907 +++++++++++++++++++++++++++ in/in0100d.frm | 1379 ++++++++++++++++++++++++++++++++++++++++++ include/validate.cpp | 4 +- m770/77qst.frm | 4 +- mg/mg1100a.uml | 24 +- projects/Cg7.dsp | 3 +- projects/dt0.dsp | 35 ++ projects/in0.dsp | 270 ++++----- projects/msk232.bat | 1 - projects/ps.dsw | 15 + projects/ps0544.dsp | 328 ++++++++++ projects/ps0920.dsp | 106 +++- server/authoriz.cpp | 10 +- ve/ve0300b.dat | 8 +- ve/velib04b.cpp | 25 +- ve/verig.uml | 44 +- xvaga/xvaga.cpp | 13 +- 20 files changed, 3002 insertions(+), 190 deletions(-) create mode 100755 in/in0100c.frm create mode 100755 in/in0100d.frm create mode 100755 projects/ps0544.dsp diff --git a/in/in0100.cpp b/in/in0100.cpp index e14747678..d7c0d207c 100755 --- a/in/in0100.cpp +++ b/in/in0100.cpp @@ -359,6 +359,7 @@ protected: virtual short period_field() const { return R_PERIODO_M; } virtual int anno() const { return get_int(R_ANNO); } virtual bool solofronte() const { return get_bool(R_SOLOFRONTE); } + virtual bool descrizioni() const { return get_bool(R_DESCRIZIONI); } public: void print(); @@ -373,7 +374,12 @@ TStampaIntra_mask::TStampaIntra_mask() void TStampaIntra_mask::print() { const int anno_s = anno(); - TStampaIntra_form form(tipo() == 'A' ? "in0100a" : "in0100b", tipo(), frequenza(anno_s), periodo(), anno_s, solofronte()); + TString16 nomeform; + if (descrizioni()) + nomeform = tipo() == 'A' ? "in0100c" : "in0100d"; + else + nomeform = tipo() == 'A' ? "in0100a" : "in0100b"; + TStampaIntra_form form((const char*) nomeform, tipo(), frequenza(anno_s), periodo(), anno_s, solofronte()); form.print(); } diff --git a/in/in0100a.h b/in/in0100a.h index 7a373562b..c3fc8c856 100755 --- a/in/in0100a.h +++ b/in/in0100a.h @@ -5,3 +5,4 @@ #define R_PERIODO_T 104 #define R_PERIODO_A 105 #define R_SOLOFRONTE 106 +#define R_DESCRIZIONI 107 diff --git a/in/in0100a.uml b/in/in0100a.uml index f4c673cdc..9c162372f 100755 --- a/in/in0100a.uml +++ b/in/in0100a.uml @@ -1,6 +1,6 @@ #include "in0100a.h" -PAGE "Stampa Riepiloghi" -1 -1 32 8 +PAGE "Stampa Riepiloghi" -1 -1 32 10 LIST R_TIPO 1 10 BEGIN @@ -47,6 +47,11 @@ BEGIN PROMPT 1 5 "Stampa solo il frontespizio" END +BOOLEAN R_DESCRIZIONI +BEGIN + PROMPT 1 6 "Stampa descrizioni" +END + BUTTON DLG_PRINT 10 2 BEGIN PROMPT -12 -1 "" diff --git a/in/in0100c.frm b/in/in0100c.frm new file mode 100755 index 000000000..a562fbff5 --- /dev/null +++ b/in/in0100c.frm @@ -0,0 +1,907 @@ +// Form per la stampa riepiloghi INTRA (Acquisti) + +USE 9 +JOIN 6 TO 9 ALIAS 106 INTO TIPOA=TIPOA CODANAGR=CODANAGR +JOIN 8 TO 106@ ALIAS 118 INTO CODANAGR=CODANAGR +JOIN 13 TO 118@ ALIAS 213 INTO STATO=="" COM==COMNASC +JOIN 13 TO 106@ ALIAS 313 INTO STATO==STATORES COM==COMRES +JOIN 13 TO 106@ ALIAS 413 INTO STATO=="" COM==COMRF +JOIN 6 TO 9 ALIAS 206 INTO TIPOA==TIPOSOGDEL CODANAGR==CODSOGDEL +JOIN 13 TO 206@ ALIAS 513 INTO STATO==STATORES COM==COMRES +JOIN 13 TO 206@ ALIAS 613 INTO STATO=="" COM==COMRF +JOIN 135 TO 9 INTO ANNO=CODDITTA +END + +DESCRIPTION +BEGIN +END + + +GENERAL +BEGIN + OFFSET 0 0 + CARATTERE "X" + INIZIO_POS 2 4 + FINE_POS 76 +END + +SECTION HEADER FIRST 16 + +NUMERO 1 4 +BEGIN + KEY "Mese" + PROMPT 43 14 "" + PICTURE "@ #" +END + +NUMERO 2 1 +BEGIN + KEY "Trimestre" + PROMPT 55 14 "" +END + +NUMERO 3 5 +BEGIN + KEY "Anno" + PROMPT 64 14 "" + PICTURE "^^# #" +END + +STRINGA 4 1 +BEGIN + KEY "Tipo riepilogo" + PROMPT 40 16 "" //1 dx +END + +STRINGA -1 80 +BEGIN + PROMPT 3 4 "E L E N C O R I E P I L O G A T I V O" +END + +STRINGA -1 80 +BEGIN + PROMPT 3 6 "D E G L I A C Q U I S T I" +END + +STRINGA -1 80 +BEGIN + PROMPT 3 8 "I N T R A C O M U N I T A R I D I B E N I" +END + +STRINGA -1 10 +BEGIN + PROMPT 68 4 "(EURO)" +END + +STRINGA -1 15 +BEGIN + PROMPT 20 13 "Periodo :" +END + +STRINGA -1 10 +BEGIN + PROMPT 43 13 "Mese" +END + +STRINGA -1 10 +BEGIN + PROMPT 51 13 "Trimestre" +END + +STRINGA -1 10 +BEGIN + PROMPT 65 13 "Anno" +END + +STRINGA -1 20 +BEGIN + PROMPT 20 16 "Tipo riepilogo: " +END + +END + +END + +SECTION BODY FIRST 33 + +LISTA 99 +BEGIN + KEY "Tipo anagrafica" + PROMPT 1 1 "" + FIELD TIPOA + ITEM "F| " MESSAGE ENABLE,1@|DISABLE,2@ + ITEM "G| " MESSAGE ENABLE,2@|DISABLE,1@ +END + +STRINGA 1 +BEGIN + KEY "Codice Fiscale" + PROMPT 3 7 "" + FIELD 106@->COFI +END + +STRINGA 2 +BEGIN + KEY "Partita IVA" + PROMPT 53 7 "" + FIELD 106@->PAIV +END + +STRINGA 3 +BEGIN + KEY "Cognome" + PROMPT 3 10 "" + FIELD 106@->RAGSOC[1,30] + GROUP 1 +END + +STRINGA 4 +BEGIN + KEY "Nome" + PROMPT 43 10 "" + FIELD 106@->RAGSOC[31,50] + GROUP 1 +END + +DATA 5 +BEGIN + KEY "Data di nascita" + PROMPT 4 13 "" + FIELD 118@->DATANASC + FORMAT "1442-" + PICTURE "# #^# #^# #" + GROUP 1 +END + +LISTA 6 +BEGIN + KEY "Sesso" + PROMPT 19 13 "" + FIELD 118@->SESSO + ITEM "M|X" + ITEM "F| X" + GROUP 1 +END + +STRINGA 7 32 +BEGIN + KEY "Comune di nascita" + PROMPT 23 13 "" + FIELD 213@->DENCOM + GROUP 1 +END + +STRINGA 8 2 +BEGIN + KEY "Provincia di nascita" + PROMPT 59 13 "" + FIELD 213@->PROVCOM + GROUP 1 +END + +STRINGA 9 4 +BEGIN + KEY "Prefisso telefonico" + PROMPT 64 13 "" + FIELD 106@->PTELRF + GROUP 1 +END + +STRINGA 10 9 +BEGIN + KEY "Numero telefonico" + PROMPT 69 13 "" + FIELD 106@->TELRF + GROUP 1 +END + +STRINGA 11 +BEGIN + KEY "Denominazione o ragione sociale" + PROMPT 3 17 "" + FIELD 106@->RAGSOC + GROUP 2 +END + +STRINGA 12 4 +BEGIN + KEY "Prefisso telefonico" + PROMPT 64 17 "" + FIELD 106@->PTELRF + GROUP 2 +END + +STRINGA 13 9 +BEGIN + KEY "Numero telefonico" + PROMPT 69 17 "" + FIELD 106@->TELRF + GROUP 2 +END + +STRINGA 14 20 +BEGIN + KEY "Comune di residenza fiscale" + PROMPT 52 20 "" + FIELD 413@->DENCOM + MESSAGE EMPTY SHOW,3@|HIDE,4@ + MESSAGE SHOW,4@|HIDE,3@ +END + +STRINGA 15 20 +BEGIN + KEY "Comune di residenza" + PROMPT 52 20 "" + FIELD 313@->DENCOM + GROUP 3 +END + +STRINGA 16 +BEGIN + KEY "Provincia di residenza fiscale" + PROMPT 74 20 "" + FIELD 413@->PROVCOM + GROUP 4 +END + +STRINGA 17 +BEGIN + KEY "Provincia di residenza" + PROMPT 74 20 "" + FIELD 313@->PROVCOM + GROUP 3 +END + +STRINGA 18 +BEGIN + KEY "Indirizzo residenza fiscale" + PROMPT 1 20 "" + FIELD 106@->INDRF[1,35] + FLAGS "H" + MESSAGE COPY,20 +END + +STRINGA 19 +BEGIN + KEY "Nr. civico di residenza fiscale" + PROMPT 1 20 "" + FIELD 106@->CIVRF + FLAGS "H" + MESSAGE APPEND,20 +END + +STRINGA 20 38 +BEGIN + KEY "Indirizzo residenza fiscale+nr. civico" + PROMPT 3 20 "" + GROUP 4 +END + +STRINGA 21 +BEGIN + KEY "Indirizzo residenza" + PROMPT 1 20 "" + FIELD 106@->INDRES[1,35] + FLAGS "H" + MESSAGE COPY,23 +END + +STRINGA 22 +BEGIN + KEY "Nr. civico di residenza" + PROMPT 1 20 "" + FIELD 106@->CIVRES + FLAGS "H" + MESSAGE APPEND,23 +END + +STRINGA 23 38 +BEGIN + KEY "Indirizzo residenza+nr. civico" + PROMPT 3 20 "" + GROUP 3 +END + +STRINGA 24 +BEGIN + KEY "CAP residenza fiscale" + PROMPT 42 20 "" + FIELD 106@->CAPRF + GROUP 4 +END + +STRINGA 25 +BEGIN + KEY "CAP residenza" + PROMPT 42 20 "" + FIELD 106@->CAPRES + GROUP 3 +END + +LISTA 26 1 +BEGIN + KEY "Elenchi presentati in precedenza" + PROMPT 7 23 "" + ITEM " | " + ITEM "X|X" + FIELD PRESELEN +END + +LISTA 26 1 +BEGIN + KEY "Cessazione attivita'" + PROMPT 40 23 "" + ITEM " | " + ITEM "X|X" + FIELD CESSIVA +END + +STRINGA 27 +BEGIN + KEY "Partita IVA delegato" + PROMPT 11 27 "" + FIELD 206@->PAIV +END + +STRINGA 28 50 +BEGIN + KEY "Nome e Cognome o Ragione sociale delegato" + PROMPT 3 30 "" + FIELD 206@->RAGSOC +END + +STRINGA 29 4 +BEGIN + KEY "Prefisso telefonico delegato" + PROMPT 64 30 "" + FIELD 206@->PTELRF +END + +STRINGA 30 9 +BEGIN + KEY "Numero telefonico delegato" + PROMPT 69 30 "" + FIELD 206@->TELRF +END + +STRINGA 31 20 +BEGIN + KEY "Comune di residenza fiscale delegato" + PROMPT 52 33 "" + FIELD 613@->DENCOM + MESSAGE EMPTY SHOW,5@|HIDE,6@ + MESSAGE SHOW,6@|HIDE,5@ +END + +STRINGA 32 20 +BEGIN + KEY "Comune di residenza delegato" + PROMPT 52 33 "" + FIELD 513@->DENCOM + GROUP 5 +END + +STRINGA 33 +BEGIN + KEY "Provincia di residenza fiscale delegato" + PROMPT 74 33 "" + FIELD 613@->PROVCOM + GROUP 6 +END + +STRINGA 34 +BEGIN + KEY "Provincia di residenza delegato" + PROMPT 74 33 "" + FIELD 513@->PROVCOM + GROUP 5 +END + +STRINGA 35 +BEGIN + KEY "Indirizzo residenza fiscale delegato" + PROMPT 1 33 "" + FIELD 206@->INDRF[1,35] + FLAGS "H" + MESSAGE COPY,37 +END + +STRINGA 36 +BEGIN + KEY "Nr. civico di residenza fiscale delegato" + PROMPT 1 33 "" + FIELD 206@->CIVRF + FLAGS "H" + MESSAGE APPEND,37 +END + +STRINGA 37 38 +BEGIN + KEY "Indirizzo residenza fiscale+nr. civico delegato" + PROMPT 3 33 "" + GROUP 6 +END + +STRINGA 38 +BEGIN + KEY "Indirizzo residenza delegato" + PROMPT 1 33 "" + FIELD 206@->INDRES[1,35] + FLAGS "H" + MESSAGE COPY,40 +END + +STRINGA 39 +BEGIN + KEY "Nr. civico di residenza delegato" + PROMPT 1 33 "" + FIELD 206@->CIVRES + FLAGS "H" + MESSAGE APPEND,40 +END + +STRINGA 40 38 +BEGIN + KEY "Indirizzo residenza+nr. civico delegato" + PROMPT 3 33 "" + GROUP 5 +END + +STRINGA 41 +BEGIN + KEY "CAP residenza fiscale delegato" + PROMPT 42 33 "" + FIELD 206@->CAPRF + GROUP 6 +END + +STRINGA 42 +BEGIN + KEY "CAP residenza delegato" + PROMPT 42 33 "" + FIELD 206@->CAPRES + GROUP 5 +END + +END + +SECTION FOOTER FIRST 23 + +NUMERO 1 3 +BEGIN + KEY "Totale pagine sezione 1" + PROMPT 11 6 "" +END + +NUMERO 2 5 +BEGIN + KEY "Totale righe dettaglio sezione 1" + PROMPT 18 6 "" +END + +NUMERO 3 15 +BEGIN + KEY "Ammontare complessivo sezione 1" + PROMPT 25 6 "" + PICTURE "###.###.###" + MESSAGE _IMP +END + +NUMERO 4 3 +BEGIN + KEY "Totale pagine sezione 2" + PROMPT 49 6 "" +END + +NUMERO 5 5 +BEGIN + KEY "Totale righe dettaglio sezione 2" + PROMPT 56 6 "" +END + +NUMERO 6 15 +BEGIN + KEY "Ammontare complessivo sezione 2" + PROMPT 64 6 "" + PICTURE "###.###.###" + MESSAGE _IMP +END + +DATA 8 10 +BEGIN + KEY "Data di stampa" + PROMPT 6 10 "" + MESSAGE _TODAY +END + +END + +SECTION HEADER ODD 21 + +NUMERO 1 4 +BEGIN + KEY "Mese" + PROMPT 16 15 "" + PICTURE "@ #" +END + +NUMERO 2 1 +BEGIN + KEY "Trimestre" + PROMPT 29 15 "" +END + +NUMERO 3 5 +BEGIN + KEY "Anno" + PROMPT 37 15 "" + PICTURE "^^# #" +END + +STRINGA 4 +BEGIN + KEY "Partita IVA" + PROMPT 53 15 "" + FIELD 106@->PAIV +END + +END + +SECTION BODY ODD 2 + +NUMERO 1 3 +BEGIN + KEY "Progressivo riga" + PROMPT 3 1 "" + FIELD 135->NUMRIG +END + +STRINGA 2 2 +BEGIN + KEY "Stato" + PROMPT 7 1 "" + FIELD 135->STATO +END + +STRINGA 3 +BEGIN + KEY "Partita IVA" + PROMPT 11 1 "" + FIELD 135->PIVA +END + +NUMERO 4 12 +BEGIN + KEY "Ammontare operazioni in Euro" //++ + PROMPT 23 1 "" //2 sx + FIELD 135->AMMLIRE + PICTURE "####.###.###" + MESSAGE _IMP +END + +STRINGA 51 3 +BEGIN + PROMPT 35 1 "" //2 sx + FIELD 135->CODVAL + FLAGS "H" +END + +NUMERO 5 12 +BEGIN + KEY "Ammontare operazioni in valuta" + PROMPT 35 1 "" //2 sx + FIELD 135->AMMVALUTA + MESSAGE _IMP + PICTURE "####.###.###" +END + +STRINGA 6 1 +BEGIN + KEY "Natura della transazione" + PROMPT 49 1 "" //1 sx + FIELD 135->NATURA +END + +NUMERO 7 4 +BEGIN + KEY "Nomenclatura combinata prima parte" + PROMPT 53 1 "" + FIELD 135->NOMENCL[1,4] + PICTURE "@@@@" +END + +NUMERO 71 2 +BEGIN + KEY "Nomenclatura combinata seconda parte" + PROMPT 57 1 "" + FIELD 135->NOMENCL[5,6] + PICTURE "@@" +END + +NUMERO 72 2 +BEGIN + KEY "Nomenclatura combinata terza parte" + PROMPT 59 1 "" + FIELD 135->NOMENCL[7,8] + PICTURE "@@" +END + +NUMERO 8 9 +BEGIN + KEY "Massa netta in kilogrammi" + PROMPT 62 1 "" + FIELD 135->MASSAKG + PICTURE "#########" + MESSAGE _ROUND,0 +END + +NUMERO 9 9 +BEGIN + KEY "Massa in unita' supplementare" + PROMPT 72 1 "" //1 sx + FIELD 135->MASSAUMS + PICTURE "#########" + MESSAGE _ROUND,0 +END + +NUMERO 10 12 +BEGIN + KEY "Valore statistico" + PROMPT 82 1 "" //2 sx + FIELD 135->VALSTAT + PICTURE "####.###.###" + MESSAGE _IMP +END + +STRINGA 11 1 +BEGIN + KEY "Codice consegna" + PROMPT 96 1 "" //1 sx + FIELD 135->CONSEGNA[1,1] +END + +STRINGA 12 1 +BEGIN + KEY "Modo di trasporto" + PROMPT 99 1 "" //1 sx + FIELD 135->TRASPORTO +END + +STRINGA 13 2 +BEGIN + KEY "Paese destinazione/provenienza" + PROMPT 102 1 "" //1 sx + FIELD 135->PAESE +END + +STRINGA 14 2 +BEGIN + KEY "Paese di origine" + PROMPT 106 1 "" //1 sx + FIELD 135->PAESEORIG +END + +STRINGA 15 2 +BEGIN + KEY "Provincia di destinazione" + PROMPT 110 1 "" //1 sx + FIELD 135->PROV +END + +END + +SECTION FOOTER ODD 31 + +NUMERO 1 12 +BEGIN + KEY "Riporto dalla pagina precedente" + PROMPT 23 1 "" //2 sx + PICTURE "####.###.###" + MESSAGE _IMP +END + +NUMERO 2 12 +BEGIN + KEY "Totale riepiloghi" + PROMPT 23 3 "" //2 sx + PICTURE "####.###.###" + MESSAGE _IMP +END + +NUMERO 3 3 +BEGIN + KEY "Numero di pagina" + PROMPT 110 3 "" //1 sx +END + +END + +SECTION HEADER EVEN 22 + +NUMERO 1 4 +BEGIN + KEY "Mese" + PROMPT 16 15 "" + PICTURE "@ #" +END + +NUMERO 2 1 +BEGIN + KEY "Trimestre" + PROMPT 29 15 "" + PICTURE "" +END + +NUMERO 3 6 +BEGIN + KEY "Anno" + PROMPT 37 15 "" + PICTURE "^^# #" +END + +STRINGA 4 +BEGIN + KEY "Partita IVA" + PROMPT 53 15 "" + FIELD 106@->PAIV +END + +END + +// Sezione di stampa rettifiche + +SECTION BODY EVEN 2 + +NUMERO 1 3 +BEGIN + KEY "Progressivo riga" + PROMPT 3 1 "" + FIELD 135->NUMRIG +END + +NUMERO 2 2 +BEGIN + KEY "Mese del periodo di riferimento (riempito da programma)" + PROMPT 7 1 "" + PICTURE "#@" +END + +NUMERO 3 1 +BEGIN + KEY "Trimestre del periodo di riferimento (riempito da programma)" + PROMPT 11 1 "" + PICTURE "@" +END + +NUMERO 4 4 +BEGIN + KEY "Anno del periodo di riferimento" + PROMPT 14 1 "" + FIELD 135->ANNORETT +END + +STRINGA 5 2 +BEGIN + KEY "Stato" + PROMPT 19 1 "" + FIELD 135->STATO +END + +STRINGA 6 +BEGIN + KEY "Partita IVA" + PROMPT 23 1 "" + FIELD 135->PIVA +END + +STRINGA 7 1 +BEGIN + KEY "Segno" + PROMPT 37 1 "" + FIELD 135->SEGNORETT +END + +NUMERO 8 12 +BEGIN + KEY "Ammontare operazioni in Euro" + PROMPT 39 1 "" //2 sx + FIELD 135->AMMLIRE + PICTURE "####.###.###" + MESSAGE _IMP +END + +STRINGA 91 3 +BEGIN + PROMPT 35 1 "" //2 sx + FIELD 135->CODVAL + FLAGS "H" +END + +NUMERO 9 12 +BEGIN + KEY "Ammontare operazioni in valuta" + PROMPT 52 1 "" //2 sx + FIELD 135->AMMVALUTA + MESSAGE _IMP + PICTURE "####.###.###" +END + +STRINGA 10 1 +BEGIN + KEY "Natura della transazione" + PROMPT 65 1 "" //1 sx + FIELD 135->NATURA +END + +NUMERO 11 4 +BEGIN + KEY "Nomenclatura combinata prima parte" + PROMPT 68 1 "" //1 sx + FIELD 135->NOMENCL[1,4] + PICTURE "@@@@" +END + +NUMERO 111 2 +BEGIN + KEY "Nomenclatura combinata seconda parte" + PROMPT 72 1 "" + FIELD 135->NOMENCL[5,6] + PICTURE "@@" +END + +NUMERO 112 2 +BEGIN + KEY "Nomenclatura combinata terza parte" + PROMPT 74 1 "" + FIELD 135->NOMENCL[7,8] + PICTURE "@@" +END + +NUMERO 12 12 +BEGIN + KEY "Valore statistico" + PROMPT 78 1 "" //2 sx + FIELD 135->VALSTAT + PICTURE "####.###.###" + MESSAGE _IMP +END + +END + +SECTION FOOTER EVEN 36 + +STRINGA 4 1 +BEGIN + KEY "Segno riporto rettifiche" + PROMPT 37 1 "" +END + +NUMERO 1 12 +BEGIN + KEY "Riporto dalla pagina precedente" + PROMPT 39 1 "" //2 sx + PICTURE "####.###.###" + MESSAGE _IMP +END + +STRINGA 7 1 +BEGIN + KEY "Segno Totale rettifiche" + PROMPT 37 3 "" +END + +NUMERO 2 12 +BEGIN + KEY "Totale rettifiche" + PROMPT 39 3 "" //2 sx + PICTURE "####.###.###" + MESSAGE _IMP +END + +NUMERO 3 3 +BEGIN + KEY "Numero di pagina" + PROMPT 87 4 "" //2 sx +END + +END diff --git a/in/in0100d.frm b/in/in0100d.frm new file mode 100755 index 000000000..18e35a090 --- /dev/null +++ b/in/in0100d.frm @@ -0,0 +1,1379 @@ +// Form per la stampa riepiloghi INTRA (Cessioni) + +USE 9 +JOIN 6 TO 9 ALIAS 106 INTO TIPOA=TIPOA CODANAGR=CODANAGR +JOIN 8 TO 106@ ALIAS 118 INTO CODANAGR=CODANAGR +JOIN 13 TO 118@ ALIAS 213 INTO STATO=="" COM==COMNASC +JOIN 13 TO 106@ ALIAS 313 INTO STATO==STATORES COM==COMRES +JOIN 13 TO 106@ ALIAS 413 INTO STATO=="" COM==COMRF +JOIN 6 TO 9 ALIAS 206 INTO TIPOA==TIPOSOGDEL CODANAGR==CODSOGDEL +JOIN 13 TO 206@ ALIAS 513 INTO STATO==STATORES COM==COMRES +JOIN 13 TO 206@ ALIAS 613 INTO STATO=="" COM==COMRF +JOIN 135 TO 9 INTO ANNO=CODDITTA +END + +DESCRIPTION +BEGIN +END + + +GENERAL +BEGIN + OFFSET 0 0 + CARATTERE "X" + INIZIO_POS 2 4 + FINE_POS 76 +END + +SECTION HEADER FIRST 16 + +NUMERO 1 4 +BEGIN + KEY "Mese" + PROMPT 43 14 "" + PICTURE "@ #" +END + +NUMERO 2 1 +BEGIN + KEY "Trimestre" + PROMPT 55 14 "" +END + +NUMERO 3 5 +BEGIN + KEY "Anno" + PROMPT 64 14 "" + PICTURE "^^# #" +END + +STRINGA 4 1 +BEGIN + KEY "Tipo riepilogo" + PROMPT 39 16 "" +END + +STRINGA -1 80 +BEGIN + PROMPT 3 4 "E L E N C O R I E P I L O G A T I V O" +END + +STRINGA -1 80 +BEGIN + PROMPT 3 6 "D E L L E C E S S I O N I" +END + +STRINGA -1 80 +BEGIN + PROMPT 3 8 "I N T R A C O M U N I T A R I E D I B E N I" +END + +STRINGA -1 10 +BEGIN + PROMPT 68 4 "(EURO)" +END + +STRINGA -1 15 +BEGIN + PROMPT 20 13 "Periodo :" +END + +STRINGA -1 10 +BEGIN + PROMPT 43 13 "Mese" +END + +STRINGA -1 10 +BEGIN + PROMPT 51 13 "Trimestre" +END + +STRINGA -1 10 +BEGIN + PROMPT 65 13 "Anno" +END + +STRINGA -1 20 +BEGIN + PROMPT 20 16 "Tipo riepilogo: " +END + +END + +SECTION BODY FIRST 33 + +LISTA 99 +BEGIN + KEY "Tipo anagrafica" + PROMPT 1 1 "" + FIELD TIPOA + ITEM "F| " MESSAGE ENABLE,1@|DISABLE,2@ + ITEM "G| " MESSAGE ENABLE,2@|DISABLE,1@ +END + +STRINGA 1 +BEGIN + KEY "Codice Fiscale" + PROMPT 3 7 "" + FIELD 106@->COFI +END + +STRINGA 2 +BEGIN + KEY "Partita IVA" + PROMPT 53 7 "" + FIELD 106@->PAIV +END + +STRINGA 3 +BEGIN + KEY "Cognome" + PROMPT 3 10 "" + FIELD 106@->RAGSOC[1,30] + GROUP 1 +END + +STRINGA 4 +BEGIN + KEY "Nome" + PROMPT 43 10 "" + FIELD 106@->RAGSOC[31,50] + GROUP 1 +END + +DATA 5 +BEGIN + KEY "Data di nascita" + PROMPT 4 13 "" + FIELD 118@->DATANASC + FORMAT "1442-" + PICTURE "# #^# #^# #" + GROUP 1 +END + +LISTA 6 +BEGIN + KEY "Sesso" + PROMPT 19 13 "" + FIELD 118@->SESSO + ITEM "M|X" + ITEM "F| X" + GROUP 1 +END + +STRINGA 7 32 +BEGIN + KEY "Comune di nascita" + PROMPT 23 13 "" + FIELD 213@->DENCOM + GROUP 1 +END + +STRINGA 8 2 +BEGIN + KEY "Provincia di nascita" + PROMPT 59 13 "" + FIELD 213@->PROVCOM + GROUP 1 +END + +STRINGA 9 4 +BEGIN + KEY "Prefisso telefonico" + PROMPT 64 13 "" + FIELD 106@->PTELRF + GROUP 1 +END + +STRINGA 10 9 +BEGIN + KEY "Numero telefonico" + PROMPT 69 13 "" + FIELD 106@->TELRF + GROUP 1 +END + +STRINGA 11 +BEGIN + KEY "Denominazione o ragione sociale" + PROMPT 3 17 "" + FIELD 106@->RAGSOC + GROUP 2 +END + +STRINGA 12 4 +BEGIN + KEY "Prefisso telefonico" + PROMPT 64 17 "" + FIELD 106@->PTELRF + GROUP 2 +END + +STRINGA 13 9 +BEGIN + KEY "Numero telefonico" + PROMPT 69 17 "" + FIELD 106@->TELRF + GROUP 2 +END + +STRINGA 14 20 +BEGIN + KEY "Comune di residenza fiscale" + PROMPT 52 20 "" + FIELD 413@->DENCOM + MESSAGE EMPTY SHOW,3@|HIDE,4@ + MESSAGE SHOW,4@|HIDE,3@ +END + +STRINGA 15 20 +BEGIN + KEY "Comune di residenza" + PROMPT 52 20 "" + FIELD 313@->DENCOM + GROUP 3 +END + +STRINGA 16 +BEGIN + KEY "Provincia di residenza fiscale" + PROMPT 74 20 "" + FIELD 413@->PROVCOM + GROUP 4 +END + +STRINGA 17 +BEGIN + KEY "Provincia di residenza" + PROMPT 74 20 "" + FIELD 313@->PROVCOM + GROUP 3 +END + +STRINGA 18 +BEGIN + KEY "Indirizzo residenza fiscale" + PROMPT 1 20 "" + FIELD 106@->INDRF[1,35] + FLAGS "H" + MESSAGE COPY,20 +END + +STRINGA 19 +BEGIN + KEY "Nr. civico di residenza fiscale" + PROMPT 1 20 "" + FIELD 106@->CIVRF + FLAGS "H" + MESSAGE APPEND,20 +END + +STRINGA 20 38 +BEGIN + KEY "Indirizzo residenza fiscale+nr. civico" + PROMPT 3 20 "" + GROUP 4 +END + +STRINGA 21 +BEGIN + KEY "Indirizzo residenza" + PROMPT 1 20 "" + FIELD 106@->INDRES[1,35] + FLAGS "H" + MESSAGE COPY,23 +END + +STRINGA 22 +BEGIN + KEY "Nr. civico di residenza" + PROMPT 1 20 "" + FIELD 106@->CIVRES + FLAGS "H" + MESSAGE APPEND,23 +END + +STRINGA 23 38 +BEGIN + KEY "Indirizzo residenza+nr. civico" + PROMPT 3 20 "" + GROUP 3 +END + +STRINGA 24 +BEGIN + KEY "CAP residenza fiscale" + PROMPT 42 20 "" + FIELD 106@->CAPRF + GROUP 4 +END + +STRINGA 25 +BEGIN + KEY "CAP residenza" + PROMPT 42 20 "" + FIELD 106@->CAPRES + GROUP 3 +END + +LISTA 26 1 +BEGIN + KEY "Elenchi presentati in precedenza" + PROMPT 7 23 "" + ITEM " | " + ITEM "X|X" + FIELD PRESELEN +END + +LISTA 26 1 +BEGIN + KEY "Cessazione attivita'" + PROMPT 40 23 "" + ITEM " | " + ITEM "X|X" + FIELD CESSIVA +END + +STRINGA 27 +BEGIN + KEY "Partita IVA delegato" + PROMPT 11 27 "" + FIELD 206@->PAIV +END + +STRINGA 28 50 +BEGIN + KEY "Nome e Cognome o Ragione sociale delegato" + PROMPT 3 30 "" + FIELD 206@->RAGSOC +END + +STRINGA 29 4 +BEGIN + KEY "Prefisso telefonico delegato" + PROMPT 64 30 "" + FIELD 206@->PTELRF +END + +STRINGA 30 9 +BEGIN + KEY "Numero telefonico delegato" + PROMPT 69 30 "" + FIELD 206@->TELRF +END + +STRINGA 31 20 +BEGIN + KEY "Comune di residenza fiscale delegato" + PROMPT 52 33 "" + FIELD 613@->DENCOM + MESSAGE EMPTY SHOW,5@|HIDE,6@ + MESSAGE SHOW,6@|HIDE,5@ +END + +STRINGA 32 20 +BEGIN + KEY "Comune di residenza delegato" + PROMPT 52 33 "" + FIELD 513@->DENCOM + GROUP 5 +END + +STRINGA 33 +BEGIN + KEY "Provincia di residenza fiscale delegato" + PROMPT 74 33 "" + FIELD 613@->PROVCOM + GROUP 6 +END + +STRINGA 34 +BEGIN + KEY "Provincia di residenza delegato" + PROMPT 74 33 "" + FIELD 513@->PROVCOM + GROUP 5 +END + +STRINGA 35 +BEGIN + KEY "Indirizzo residenza fiscale delegato" + PROMPT 1 33 "" + FIELD 206@->INDRF[1,35] + FLAGS "H" + MESSAGE COPY,37 +END + +STRINGA 36 +BEGIN + KEY "Nr. civico di residenza fiscale delegato" + PROMPT 1 33 "" + FIELD 206@->CIVRF + FLAGS "H" + MESSAGE APPEND,37 +END + +STRINGA 37 38 +BEGIN + KEY "Indirizzo residenza fiscale+nr. civico delegato" + PROMPT 3 33 "" + GROUP 6 +END + +STRINGA 38 +BEGIN + KEY "Indirizzo residenza delegato" + PROMPT 1 33 "" + FIELD 206@->INDRES[1,35] + FLAGS "H" + MESSAGE COPY,40 +END + +STRINGA 39 +BEGIN + KEY "Nr. civico di residenza delegato" + PROMPT 1 33 "" + FIELD 206@->CIVRES + FLAGS "H" + MESSAGE APPEND,40 +END + +STRINGA 40 38 +BEGIN + KEY "Indirizzo residenza+nr. civico delegato" + PROMPT 3 33 "" + GROUP 5 +END + +STRINGA 41 +BEGIN + KEY "CAP residenza fiscale delegato" + PROMPT 42 33 "" + FIELD 206@->CAPRF + GROUP 6 +END + +STRINGA 42 +BEGIN + KEY "CAP residenza delegato" + PROMPT 42 33 "" + FIELD 206@->CAPRES + GROUP 5 +END + +STRINGA -1 50 +BEGIN + PROMPT 1 5 "----- Soggetto obbligato -----" +END + +STRINGA -1 20 +BEGIN + PROMPT 3 6 "Codice fiscale" +END + +STRINGA -1 20 +BEGIN + PROMPT 53 6 "Partita IVA" +END + +STRINGA -1 50 +BEGIN + PROMPT 1 8 "----- Persona fisica -----" + GROUP 1 +END + +STRINGA -1 20 +BEGIN + PROMPT 3 9 "Cognome" + GROUP 1 +END + +STRINGA -1 20 +BEGIN + PROMPT 43 9 "Nome" + GROUP 1 +END + +STRINGA -1 20 +BEGIN + PROMPT 3 12 "Data di nasc." + GROUP 1 +END + +STRINGA -1 20 +BEGIN + PROMPT 19 12 "Sesso" + GROUP 1 +END + +STRINGA -1 20 +BEGIN + PROMPT 23 12 "Comune di nascita" + GROUP 1 +END + +STRINGA -1 20 +BEGIN + PROMPT 59 12 "Prov." + GROUP 1 +END + +STRINGA -1 20 +BEGIN + PROMPT 64 12 "Telefono" + GROUP 1 +END + +STRINGA -1 50 +BEGIN + PROMPT 1 15 "----- Soggetto diverso da persona fisica -----" + GROUP 2 +END + +STRINGA -1 50 +BEGIN + PROMPT 3 16 "Denominazione o ragione sociale" + GROUP 2 +END + +STRINGA -1 20 +BEGIN + PROMPT 64 16 "Telefono" + GROUP 2 +END + +STRINGA -1 50 +BEGIN + PROMPT 1 18 "----- Domicilio fiscale (indirizzo completo) -----" +END + +STRINGA -1 20 +BEGIN + PROMPT 3 19 "Via, num. civico, scala, etc." +END + +STRINGA -1 20 +BEGIN + PROMPT 53 19 "Comune" +END + +STRINGA -1 20 +BEGIN + PROMPT 74 19 "Prov." +END + +STRINGA -1 20 +BEGIN + PROMPT 42 19 "C.A.P." +END + +STRINGA -1 40 +BEGIN + PROMPT 1 21 "Barrare se non sono stati presentati" +END + +STRINGA -1 50 +BEGIN + PROMPT 1 22 "in precedenza elenchi riepilogativi" +END + +STRINGA -1 40 +BEGIN + PROMPT 40 21 "Barrare in caso di cessazione della" +END + +STRINGA -1 50 +BEGIN + PROMPT 40 22 "attivita o di variazione della partita iva" +END + +STRINGA -1 50 +BEGIN + PROMPT 1 25 "----- Soggetto delegato -----" +END + +STRINGA -1 20 +BEGIN + PROMPT 11 26 "Partita IVA" +END + +STRINGA -1 50 +BEGIN + PROMPT 3 29 "Cognome e nome, denominazione o ragione sociale" +END + +STRINGA -1 20 +BEGIN + PROMPT 64 29 "Telefono" +END + +STRINGA -1 50 +BEGIN + PROMPT 1 31 "----- Domicilio fiscale (indirizzo completo) -----" +END + +STRINGA -1 20 +BEGIN + PROMPT 3 32 "Via, num. civico, scala, etc." +END + +STRINGA -1 20 +BEGIN + PROMPT 53 32 "Comune" +END + +STRINGA -1 20 +BEGIN + PROMPT 74 32 "Prov." +END + +STRINGA -1 20 +BEGIN + PROMPT 42 32 "C.A.P." +END + +END + +SECTION FOOTER FIRST 23 + +NUMERO 1 3 +BEGIN + KEY "Totale pagine sezione 1" + PROMPT 11 6 "" +END + +NUMERO 2 5 +BEGIN + KEY "Totale righe dettaglio sezione 1" + PROMPT 18 6 "" +END + +NUMERO 3 15 +BEGIN + KEY "Ammontare complessivo sezione 1" + PROMPT 25 6 "" + PICTURE "###.###.###" + MESSAGE _IMP +END + +NUMERO 4 3 +BEGIN + KEY "Totale pagine sezione 2" + PROMPT 49 6 "" +END + +NUMERO 5 5 +BEGIN + KEY "Totale righe dettaglio sezione 2" + PROMPT 56 6 "" +END + +NUMERO 6 15 +BEGIN + KEY "Ammontare complessivo sezione 2" + PROMPT 64 6 "" + PICTURE "###.###.###" + MESSAGE _IMP +END + +DATA 7 10 +BEGIN + KEY "Data di stampa" + PROMPT 6 10 "" + MESSAGE _TODAY +END + +STRINGA -1 +BEGIN + PROMPT 1 1 "----- Dati riassuntivi dell'elenco -----" +END + +STRINGA -1 +BEGIN + PROMPT 1 4 "Sez." +END + +STRINGA -1 +BEGIN + PROMPT 3 6 "1" +END + +STRINGA -1 +BEGIN + PROMPT 8 4 "Totali" +END + +STRINGA -1 +BEGIN + PROMPT 8 5 "Pagine" +END + +STRINGA -1 +BEGIN + PROMPT 18 5 "Righe" +END + +STRINGA -1 +BEGIN + PROMPT 22 4 "Ammont.comples." +END + +STRINGA -1 +BEGIN + PROMPT 39 4 "Sez." +END + +STRINGA -1 +BEGIN + PROMPT 41 6 "2" +END + +STRINGA -1 +BEGIN + PROMPT 46 4 "Totali" +END + +STRINGA -1 +BEGIN + PROMPT 46 5 "Pagine" +END + +STRINGA -1 +BEGIN + PROMPT 56 5 "Righe" +END + +STRINGA -1 +BEGIN + PROMPT 60 4 "Ammont.comples." +END + +STRINGA -1 +BEGIN + PROMPT 6 9 "Data" +END + +END + +SECTION HEADER ODD 21 + +NUMERO 1 4 +BEGIN + KEY "Mese" + PROMPT 16 15 "" + PICTURE "@ #" +END + +NUMERO 2 1 +BEGIN + KEY "Trimestre" + PROMPT 29 15 "" +END + +NUMERO 3 5 +BEGIN + KEY "Anno" + PROMPT 37 15 "" + PICTURE "^^# #" +END + +STRINGA 4 +BEGIN + KEY "Partita IVA" + PROMPT 53 15 "" + FIELD 106@->PAIV +END + +STRINGA -1 80 +BEGIN + PROMPT 3 6 "RIEPILOGO DELLE CESSIONI INTRACOMUNITARIE DI BENI" +END + +STRINGA -1 80 +BEGIN + PROMPT 3 8 "SEZ. 1: CESSIONI REGISTRATE NEL PERIODO" +END + +STRINGA -1 15 +BEGIN + PROMPT 3 14 "Periodo :" +END + +STRINGA -1 10 +BEGIN + PROMPT 16 14 "Mese" +END + +STRINGA -1 20 +BEGIN + PROMPT 24 14 "Trimestre" +END + +STRINGA -1 10 +BEGIN + PROMPT 38 14 "Anno" +END + +STRINGA -1 20 +BEGIN + PROMPT 53 14 "Partita IVA" +END + +STRINGA -1 +BEGIN + PROMPT 3 18 "Prg." +END + +STRINGA -1 +BEGIN + PROMPT 7 18 " Acquirente" +END + +STRINGA -1 +BEGIN + PROMPT 7 19 "Stato e P.Iva" +END + +STRINGA -1 +BEGIN + PROMPT 26 18 "Ammontare" +END + +STRINGA -1 +BEGIN + PROMPT 26 19 "oper.Euro" +END + +STRINGA -1 +BEGIN + PROMPT 36 18 "Nat." +END + +STRINGA -1 +BEGIN + PROMPT 36 19 "tra." +END + +STRINGA -1 +BEGIN + PROMPT 40 18 "Nomencl." +END + +STRINGA -1 +BEGIN + PROMPT 40 19 " combin." +END + +STRINGA -1 +BEGIN + PROMPT 48 18 "Massa" +END + +STRINGA -1 +BEGIN + PROMPT 48 19 "netta" +END + +STRINGA -1 +BEGIN + PROMPT 58 18 "Unita'" +END + +STRINGA -1 +BEGIN + PROMPT 58 19 "suppl." +END + +STRINGA -1 +BEGIN + PROMPT 69 18 "Valore" +END + +STRINGA -1 +BEGIN + PROMPT 69 19 "statist." +END + +STRINGA -1 +BEGIN + PROMPT 84 18 "C." +END + +STRINGA -1 +BEGIN + PROMPT 84 19 "con" +END + +STRINGA -1 +BEGIN + PROMPT 86 18 "Tr." +END + +STRINGA -1 +BEGIN + PROMPT 89 18 "Pae." +END + +STRINGA -1 +BEGIN + PROMPT 89 19 "des." +END + +STRINGA -1 +BEGIN + PROMPT 93 18 "Prov." +END + +STRINGA -1 +BEGIN + PROMPT 93 19 "or." +END + +END + +SECTION BODY ODD 2 + +NUMERO 1 3 +BEGIN + KEY "Progressivo riga" + PROMPT 3 1 "" + FIELD 135->NUMRIG +END + +STRINGA 2 2 +BEGIN + KEY "Stato" + PROMPT 7 1 "" + FIELD 135->STATO +END + +STRINGA 3 +BEGIN + KEY "Partita IVA" + PROMPT 11 1 "" + FIELD 135->PIVA +END + +NUMERO 4 12 +BEGIN + KEY "Ammontare operazioni in euro" + PROMPT 23 1 "" //2sx + FIELD 135->AMMLIRE + PICTURE "####.###.###" + MESSAGE _IMP +END + +STRINGA 6 1 +BEGIN + KEY "Natura della transazione" + PROMPT 36 1 "" //1sx + FIELD 135->NATURA +END + +STRINGA 7 4 +BEGIN + KEY "Nomenclatura combinata prima parte" + PROMPT 39 1 "" + FIELD 135->NOMENCL[1,4] + PICTURE "@@@@" +END + +NUMERO 71 2 +BEGIN + KEY "Nomenclatura combinata seconda parte" + PROMPT 43 1 "" + FIELD 135->NOMENCL[5,6] + PICTURE "@@" +END + +NUMERO 72 2 +BEGIN + KEY "Nomenclatura combinata terza parte" + PROMPT 45 1 "" + FIELD 135->NOMENCL[7,8] + PICTURE "@@" +END + +NUMERO 8 9 +BEGIN + KEY "Massa netta in kilogrammi" + PROMPT 48 1 "" //1sx + FIELD 135->MASSAKG + PICTURE "#########" + MESSAGE _ROUND,0 +END + +NUMERO 9 9 +BEGIN + KEY "Massa in unita' supplementare" + PROMPT 58 1 "" //2sx + FIELD 135->MASSAUMS + PICTURE "#########" + MESSAGE _ROUND,0 +END + +NUMERO 10 12 +BEGIN + KEY "Valore statistico" + PROMPT 69 1 "" //2sx + FIELD 135->VALSTAT + PICTURE "####.###.###" + MESSAGE _IMP +END + +STRINGA 11 1 +BEGIN + KEY "Codice consegna" + PROMPT 84 1 "" + FIELD 135->CONSEGNA[1,1] +END + +STRINGA 12 1 +BEGIN + KEY "Modo di trasporto" + PROMPT 86 1 "" //1sx + FIELD 135->TRASPORTO +END + +STRINGA 13 2 +BEGIN + KEY "Paese destinazione" + PROMPT 89 1 "" //1sx + FIELD 135->PAESE +END + +STRINGA 14 2 +BEGIN + KEY "Provincia Origine" + PROMPT 93 1 "" //1sx + FIELD 135->PROV +END + +END + +SECTION FOOTER ODD 31 + +NUMERO 1 +BEGIN + KEY "Riporto dalla pagina precedente" + PROMPT 2 1 "Riporto pagina prec. " //2sx + PICTURE "####.###.###" + MESSAGE _IMP +END + +NUMERO 2 +BEGIN + KEY "Totale" + PROMPT 16 3 "Totale " //2sx + PICTURE "####.###.###" + MESSAGE _IMP +END + +NUMERO 3 +BEGIN + KEY "Numero di pagina" + PROMPT 86 3 "Pagina " //1sx + PICTURE "###" +END + +END + +SECTION HEADER EVEN 22 + +NUMERO 1 4 +BEGIN + KEY "Mese" + PROMPT 16 15 "" + PICTURE "@ #" +END + +NUMERO 2 1 +BEGIN + KEY "Trimestre" + PROMPT 29 15 "" +END + +NUMERO 3 6 +BEGIN + KEY "Anno" + PROMPT 37 15 "" + PICTURE "^^# #" +END + +STRINGA 4 +BEGIN + KEY "Partita IVA" + PROMPT 53 15 "" + FIELD 106@->PAIV +END + +STRINGA -1 80 +BEGIN + PROMPT 3 6 "RIEPILOGO DELLE CESSIONI INTRACOMUNITARIE DI BENI" +END + +STRINGA -1 80 +BEGIN + PROMPT 3 8 "SEZ. 2: RETTIFICHE RELATIVE A PERIODI PRECEDENTI" +END + +STRINGA -1 15 +BEGIN + PROMPT 3 14 "Periodo :" +END + +STRINGA -1 10 +BEGIN + PROMPT 16 14 "Mese" +END + +STRINGA -1 20 +BEGIN + PROMPT 24 14 "Trimestre" +END + +STRINGA -1 10 +BEGIN + PROMPT 38 14 "Anno" +END + +STRINGA -1 20 +BEGIN + PROMPT 53 14 "Partita IVA" +END + +STRINGA -1 +BEGIN + PROMPT 3 18 "Prg." +END + +STRINGA -1 +BEGIN + PROMPT 7 18 "Periodo rif." +END + +STRINGA -1 +BEGIN + PROMPT 7 19 "MM" +END + +STRINGA -1 +BEGIN + PROMPT 11 19 "TR" +END + +STRINGA -1 +BEGIN + PROMPT 14 19 " AA " +END + +STRINGA -1 +BEGIN + PROMPT 19 18 " Acquirente" +END + +STRINGA -1 +BEGIN + PROMPT 19 19 "Stato e P.Iva" +END + +STRINGA -1 +BEGIN + PROMPT 35 18 "Segno" +END + +STRINGA -1 +BEGIN + PROMPT 37 18 "Ammontare" +END + +STRINGA -1 +BEGIN + PROMPT 37 19 "oper.Euro" +END + +STRINGA -1 +BEGIN + PROMPT 51 18 "Nat." +END + +STRINGA -1 +BEGIN + PROMPT 51 19 "tra." +END + +STRINGA -1 +BEGIN + PROMPT 56 18 "Nomen." +END + +STRINGA -1 +BEGIN + PROMPT 56 19 "combin." +END + +STRINGA -1 +BEGIN + PROMPT 65 18 "Valore" +END + +STRINGA -1 +BEGIN + PROMPT 65 19 "statistico" +END + +END + +// Sezione di stampa rettifiche + +SECTION BODY EVEN 2 + +NUMERO 1 3 +BEGIN + KEY "Progressivo riga" + PROMPT 3 1 "" + FIELD 135->NUMRIG +END + +NUMERO 2 2 +BEGIN + KEY "Mese del periodo di riferimento (Settato da programma)" + PROMPT 7 1 "" + PICTURE "#@" +END + +NUMERO 3 1 +BEGIN + KEY "Trimestre del periodo di riferimento (Settato da programma)" + PROMPT 11 1 "" + PICTURE "@" +END + +NUMERO 4 4 +BEGIN + KEY "Anno del periodo di riferimento" + PROMPT 14 1 "" + FIELD 135->ANNORETT +END + +STRINGA 5 2 +BEGIN + KEY "Stato" + PROMPT 19 1 "" + FIELD 135->STATO +END + +STRINGA 6 +BEGIN + KEY "Partita IVA" + PROMPT 23 1 "" + FIELD 135->PIVA +END + +STRINGA 7 1 +BEGIN + KEY "Segno" + PROMPT 37 1 "" + FIELD 135->SEGNORETT +END + +NUMERO 8 12 +BEGIN + KEY "Ammontare operazioni in euro" + PROMPT 39 1 "" //2sx + FIELD 135->AMMLIRE + PICTURE "####.###.###" + MESSAGE _IMP +END + +STRINGA 10 1 +BEGIN + KEY "Natura della transazione" + PROMPT 52 1 "" //1sx + FIELD 135->NATURA +END + +NUMERO 11 4 +BEGIN + KEY "Nomenclatura combinata prima parte" + PROMPT 56 1 "" + FIELD 135->NOMENCL[1,4] + PICTURE "@@@@" +END + +NUMERO 111 2 +BEGIN + KEY "Nomenclatura combinata seconda parte" + PROMPT 60 1 "" + FIELD 135->NOMENCL[5,6] + PICTURE "@@" +END + +NUMERO 112 2 +BEGIN + KEY "Nomenclatura combinata terza parte" + PROMPT 62 1 "" + FIELD 135->NOMENCL[7,8] + PICTURE "@@" +END + +NUMERO 12 12 +BEGIN + KEY "Valore statistico" + PROMPT 65 1 "" //2sx + FIELD 135->VALSTAT + PICTURE "####.###.###" + MESSAGE _IMP +END + +END + +SECTION FOOTER EVEN 36 + +STRINGA 4 1 +BEGIN + KEY "Segno riporto rettifiche" + PROMPT 37 1 "" +END + +NUMERO 1 12 +BEGIN + KEY "Riporto dala pagina precedente" + PROMPT 39 1 "" //2sx + PICTURE "####.###.###" + MESSAGE _IMP +END + +STRINGA 7 1 +BEGIN + KEY "Segno Totale rettifiche" + PROMPT 37 3 "" +END + +NUMERO 2 12 +BEGIN + KEY "Totale" + PROMPT 39 3 "" //2sx + PICTURE "####.###.###" + MESSAGE _IMP +END + +NUMERO 3 +BEGIN + KEY "Numero di pagina" + PROMPT 74 4 "Pagina " //1sx + PICTURE "###" +END + +STRINGA -1 +BEGIN + PROMPT 3 1 "Riporto dalla pagina precedente" +END + +STRINGA -1 +BEGIN + PROMPT 3 3 " totale" +END + +END + diff --git a/include/validate.cpp b/include/validate.cpp index 03936c75e..dd82bc930 100755 --- a/include/validate.cpp +++ b/include/validate.cpp @@ -944,11 +944,11 @@ HIDDEN bool _iban_val(TMask_field& f, KEY key) m.show(id[6], italy); m.show(id[7], italy); } - if (f.dlg() == id[2] && !f.empty() && key == K_ENTER) + if (f.dlg() == id[2] && key == K_ENTER) { const TString& stato = m.get(id[1]); const bool italy = stato.empty() || stato == "IT"; - const bool do_test = !m.field(id[italy ? 7 : 3]).empty(); // Faccio il test solo in presenza di conto corrente + const bool do_test = !f.empty() && !m.field(id[italy ? 7 : 3]).empty(); // Faccio il test solo in presenza di conto corrente TString80 iban; if (do_test) { diff --git a/m770/77qst.frm b/m770/77qst.frm index 7cc59415c..a0caa6f4c 100755 --- a/m770/77qst.frm +++ b/m770/77qst.frm @@ -141,11 +141,11 @@ BEGIN FIELD QLREGIONE END -NUMERO 12 +STRINGA 12 BEGIN KEY "Data versamento" PROMPT 79 2 "" - SPECIAL STRINGA TRASFER "ST002012" "NU" + SPECIAL STRINGA TRASFER "ST002012" "DT" FIELD QLDV END diff --git a/mg/mg1100a.uml b/mg/mg1100a.uml index dad560ddf..2e18d59dc 100755 --- a/mg/mg1100a.uml +++ b/mg/mg1100a.uml @@ -147,64 +147,64 @@ BEGIN END //Livelli giacenza -STRING F_LIV1 10 +STRING F_LIV1 15 BEGIN PROMPT 2 8 "Livello giacenza 1 " FLAGS "U" USE GCG JOIN FCG ALIAS ALIAS_FCG INTO CODTAB==CODTAB[1,1] INPUT CODTAB[1,1] "1" - INPUT CODTAB[2,11] F_LIV1 + INPUT CODTAB[2,16] F_LIV1 // DISPLAY "Livello@20" ALIAS_FCG@->S0 DISPLAY "Gruppo@20" CODTAB[2,20] DISPLAY "Descr.@30" S0 - OUTPUT F_LIV1 CODTAB[2,12] + OUTPUT F_LIV1 CODTAB[2,16] CHECKTYPE NORMAL MESSAGE EMPTY CHECK,F_GIAC|CLEAR,F_LIV2|CHECK,F_LIV2 GROUP G_NOAUTO MESSAGE CHECK,F_GIAC|ENABLE,F_LIV2 END -STRING F_LIV2 10 +STRING F_LIV2 15 BEGIN FLAGS "U" PROMPT 40 8 "Livello giacenza 2 " // Non mettere FLAGS "D" perchè disabiliterebbe tutta la colonna COPY USE F_LIV1 INPUT CODTAB[1,1] "2" - INPUT CODTAB[2,12] F_LIV2 + INPUT CODTAB[2,16] F_LIV2 COPY DISPLAY F_LIV1 - OUTPUT F_LIV2 CODTAB[2,12] + OUTPUT F_LIV2 CODTAB[2,16] CHECKTYPE NORMAL GROUP G_NOAUTO MESSAGE EMPTY CHECK,F_GIAC|CLEAR,F_LIV3|CHECK,F_LIV3 MESSAGE CHECK,F_GIAC|ENABLE,F_LIV3 END -STRING F_LIV3 10 +STRING F_LIV3 15 BEGIN FLAGS "U" PROMPT 2 9 "Livello giacenza 3 " COPY USE F_LIV1 INPUT CODTAB[1,1] "3" - INPUT CODTAB[2,12] F_LIV3 + INPUT CODTAB[2,16] F_LIV3 COPY DISPLAY F_LIV1 - OUTPUT F_LIV3 CODTAB[2,12] + OUTPUT F_LIV3 CODTAB[2,16] CHECKTYPE NORMAL GROUP G_NOAUTO MESSAGE EMPTY CHECK,F_GIAC|CLEAR,F_LIV4|CHECK,F_LIV4 MESSAGE CHECK,F_GIAC|ENABLE,F_LIV4 END -STRING F_LIV4 10 +STRING F_LIV4 15 BEGIN FLAGS "U" PROMPT 40 9 "Livello giacenza 4 " COPY USE F_LIV1 INPUT CODTAB[1,1] "4" - INPUT CODTAB[2,12] F_LIV4 + INPUT CODTAB[2,16] F_LIV4 COPY DISPLAY F_LIV1 - OUTPUT F_LIV4 CODTAB[2,12] + OUTPUT F_LIV4 CODTAB[2,16] CHECKTYPE NORMAL GROUP G_NOAUTO MESSAGE CHECK,F_GIAC diff --git a/projects/Cg7.dsp b/projects/Cg7.dsp index 95048be35..61e869631 100755 --- a/projects/Cg7.dsp +++ b/projects/Cg7.dsp @@ -200,6 +200,7 @@ SOURCE=..\cg\proforma.ini # Begin Custom Build - Copying mask $(InputPath)... TargetDir=D:\Release\Campo22 + InputPath=..\cg\proforma.ini InputName=proforma @@ -229,4 +230,4 @@ InputName=proforma SOURCE=.\cg7.rc # End Source File # End Target -# End Project +# End Project \ No newline at end of file diff --git a/projects/dt0.dsp b/projects/dt0.dsp index 669d2591c..fe618a83f 100755 --- a/projects/dt0.dsp +++ b/projects/dt0.dsp @@ -407,6 +407,41 @@ InputName=dt0400a !ENDIF +# End Source File +# End Group +# Begin Group "Menus" + +# PROP Default_Filter "men" +# Begin Source File + +SOURCE=..\dt\dtmenu.men + +!IF "$(CFG)" == "dt0 - Win32 Release" + +# Begin Custom Build - Copy men $(InputPath)... +TargetDir=D:\Release\Campo21 +InputPath=..\dt\dtmenu.men +InputName=dtmenu + +"$(TargetDir)\$(InputName).men" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) $(TargetDir)\$(InputName).men + +# End Custom Build + +!ELSEIF "$(CFG)" == "dt0 - Win32 Debug" + +# Begin Custom Build - Copy men $(InputPath)... +TargetDir=\U\Luca\D_02_01\exed +InputPath=..\dt\dtmenu.men +InputName=dtmenu + +"$(TargetDir)\$(InputName).men" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) $(TargetDir)\$(InputName).men + +# End Custom Build + +!ENDIF + # End Source File # End Group # Begin Source File diff --git a/projects/in0.dsp b/projects/in0.dsp index ddb567247..37feb764b 100755 --- a/projects/in0.dsp +++ b/projects/in0.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo22/in0.exe" +# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo21/in0.exe" # SUBTRACT LINK32 /map /debug /nodefaultlib !ELSEIF "$(CFG)" == "in0 - Win32 Debug" @@ -141,7 +141,7 @@ SOURCE=..\in\basticc.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\basticc.uml InputName=basticc @@ -153,7 +153,7 @@ InputName=basticc !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\basticc.uml InputName=basticc @@ -172,7 +172,7 @@ SOURCE=..\in\bastimt.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\bastimt.uml InputName=bastimt @@ -184,7 +184,7 @@ InputName=bastimt !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\bastimt.uml InputName=bastimt @@ -203,7 +203,7 @@ SOURCE=..\in\bastint.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\bastint.uml InputName=bastint @@ -215,7 +215,7 @@ InputName=bastint !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\bastint.uml InputName=bastint @@ -234,7 +234,7 @@ SOURCE=..\in\bastird.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\bastird.uml InputName=bastird @@ -246,7 +246,7 @@ InputName=bastird !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\bastird.uml InputName=bastird @@ -265,7 +265,7 @@ SOURCE=..\in\batbicc.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\batbicc.uml InputName=batbicc @@ -277,7 +277,7 @@ InputName=batbicc !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\batbicc.uml InputName=batbicc @@ -296,7 +296,7 @@ SOURCE=..\in\batbimt.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\batbimt.uml InputName=batbimt @@ -308,7 +308,7 @@ InputName=batbimt !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\batbimt.uml InputName=batbimt @@ -327,7 +327,7 @@ SOURCE=..\in\batbint.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\batbint.uml InputName=batbint @@ -339,7 +339,7 @@ InputName=batbint !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\batbint.uml InputName=batbint @@ -358,7 +358,7 @@ SOURCE=..\in\batbird.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\batbird.uml InputName=batbird @@ -370,7 +370,7 @@ InputName=batbird !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\batbird.uml InputName=batbird @@ -389,7 +389,7 @@ SOURCE=..\in\in0100a.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\in0100a.uml InputName=in0100a @@ -401,7 +401,7 @@ InputName=in0100a !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\in0100a.uml InputName=in0100a @@ -420,7 +420,7 @@ SOURCE=..\in\in0200a.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\in0200a.uml InputName=in0200a @@ -432,7 +432,7 @@ InputName=in0200a !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\in0200a.uml InputName=in0200a @@ -451,7 +451,7 @@ SOURCE=..\in\in0500a.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\in0500a.uml InputName=in0500a @@ -463,7 +463,7 @@ InputName=in0500a !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\in0500a.uml InputName=in0500a @@ -482,7 +482,7 @@ SOURCE=..\in\in0500b.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\in0500b.uml InputName=in0500b @@ -494,7 +494,7 @@ InputName=in0500b !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\in0500b.uml InputName=in0500b @@ -513,7 +513,7 @@ SOURCE=..\in\in0600a.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\in0600a.uml InputName=in0600a @@ -525,7 +525,7 @@ InputName=in0600a !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\in0600a.uml InputName=in0600a @@ -544,7 +544,7 @@ SOURCE=..\in\in0700a.uml !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\in0700a.uml InputName=in0700a @@ -556,7 +556,7 @@ InputName=in0700a !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\in0700a.uml InputName=in0700a @@ -611,7 +611,7 @@ SOURCE=..\in\batbint.frm !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\batbint.frm InputName=batbint @@ -623,7 +623,7 @@ InputName=batbint !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\batbint.frm InputName=batbint @@ -642,7 +642,7 @@ SOURCE=..\in\in0100a.frm !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\in0100a.frm InputName=in0100a @@ -654,7 +654,7 @@ InputName=in0100a !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\in0100a.frm InputName=in0100a @@ -673,7 +673,7 @@ SOURCE=..\in\in0100b.frm !IF "$(CFG)" == "in0 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=D:\Release\Campo22 +TargetDir=D:\Release\Campo21 InputPath=..\in\in0100b.frm InputName=in0100b @@ -685,7 +685,7 @@ InputName=in0100b !ELSEIF "$(CFG)" == "in0 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed +TargetDir=\U\Luca\D_02_01\exed InputPath=..\in\in0100b.frm InputName=in0100b @@ -697,35 +697,31 @@ InputName=in0100b !ENDIF # End Source File -# End Group -# Begin Group "Trr" - -# PROP Default_Filter "trr" # Begin Source File -SOURCE=..\in\f133.trr +SOURCE=..\in\in0100c.frm !IF "$(CFG)" == "in0 - Win32 Release" -# Begin Custom Build - Copying trr $(InputPath)... -TargetDir=D:\Release\Campo22 -InputPath=..\in\f133.trr -InputName=f133 +# Begin Custom Build - Compiling form $(InputPath)... +TargetDir=D:\Release\Campo21 +InputPath=..\in\in0100c.frm +InputName=in0100c -"$(TargetDir)\recdesc\$(InputName).trr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(TargetDir)\recdesc\$(InputName).trr +"$(TargetDir)\$(InputName).frm" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + frm32 $(InputPath) $(TargetDir)\$(InputName).frm # End Custom Build !ELSEIF "$(CFG)" == "in0 - Win32 Debug" -# Begin Custom Build - Copying trr $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed -InputPath=..\in\f133.trr -InputName=f133 +# Begin Custom Build - Compiling form $(InputPath)... +TargetDir=\U\Luca\D_02_01\exed +InputPath=..\in\in0100c.frm +InputName=in0100c -"$(TargetDir)\recdesc\$(InputName).trr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(TargetDir)\recdesc\$(InputName).trr +"$(TargetDir)\$(InputName).frm" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + frm32 $(InputPath) $(TargetDir)\$(InputName).frm # End Custom Build @@ -734,60 +730,29 @@ InputName=f133 # End Source File # Begin Source File -SOURCE=..\in\f134.trr +SOURCE=..\in\in0100d.frm !IF "$(CFG)" == "in0 - Win32 Release" -# Begin Custom Build - Copying trr $(InputPath)... -TargetDir=D:\Release\Campo22 -InputPath=..\in\f134.trr -InputName=f134 +# Begin Custom Build - Compiling form $(InputPath)... +TargetDir=D:\Release\Campo21 +InputPath=..\in\in0100d.frm +InputName=in0100d -"$(TargetDir)\recdesc\$(InputName).trr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(TargetDir)\recdesc\$(InputName).trr +"$(TargetDir)\$(InputName).frm" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + frm32 $(InputPath) $(TargetDir)\$(InputName).frm # End Custom Build !ELSEIF "$(CFG)" == "in0 - Win32 Debug" -# Begin Custom Build - Copying trr $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed -InputPath=..\in\f134.trr -InputName=f134 +# Begin Custom Build - Compiling form $(InputPath)... +TargetDir=\U\Luca\D_02_01\exed +InputPath=..\in\in0100d.frm +InputName=in0100d -"$(TargetDir)\recdesc\$(InputName).trr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(TargetDir)\recdesc\$(InputName).trr - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\in\f135.trr - -!IF "$(CFG)" == "in0 - Win32 Release" - -# Begin Custom Build - Copying trr $(InputPath)... -TargetDir=D:\Release\Campo22 -InputPath=..\in\f135.trr -InputName=f135 - -"$(TargetDir)\recdesc\$(InputName).trr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(TargetDir)\recdesc\$(InputName).trr - -# End Custom Build - -!ELSEIF "$(CFG)" == "in0 - Win32 Debug" - -# Begin Custom Build - Copying trr $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed -InputPath=..\in\f135.trr -InputName=f135 - -"$(TargetDir)\recdesc\$(InputName).trr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(TargetDir)\recdesc\$(InputName).trr +"$(TargetDir)\$(InputName).frm" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + frm32 $(InputPath) $(TargetDir)\$(InputName).frm # End Custom Build @@ -795,34 +760,34 @@ InputName=f135 # End Source File # End Group -# Begin Group "Dir" +# Begin Group "Rpt" -# PROP Default_Filter "dir" +# PROP Default_Filter "rpt" # Begin Source File -SOURCE=..\in\f133.dir +SOURCE=..\in\batbicc.rpt !IF "$(CFG)" == "in0 - Win32 Release" -# Begin Custom Build - Copying dir $(InputPath)... -TargetDir=D:\Release\Campo22 -InputPath=..\in\f133.dir -InputName=f133 +# Begin Custom Build - Compiling rpt $(InputPath)... +TargetDir=D:\Release\Campo21 +InputPath=..\in\batbicc.rpt +InputName=batbicc -"$(TargetDir)\recdesc\$(InputName).dir" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(TargetDir)\recdesc\$(InputName).dir +"$(TargetDir)\$(InputName).rpt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + rpt32 $(InputPath) $(TargetDir)\$(InputName).rpt # End Custom Build !ELSEIF "$(CFG)" == "in0 - Win32 Debug" -# Begin Custom Build - Copying dir $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed -InputPath=..\in\f133.dir -InputName=f133 +# Begin Custom Build - Compiling rpt $(InputPath)... +TargetDir=\U\Luca\D_02_01\exed +InputPath=..\in\batbicc.rpt +InputName=batbicc -"$(TargetDir)\recdesc\$(InputName).dir" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(TargetDir)\recdesc\$(InputName).dir +"$(TargetDir)\$(InputName).rpt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + rpt32 $(InputPath) $(TargetDir)\$(InputName).rpt # End Custom Build @@ -831,29 +796,29 @@ InputName=f133 # End Source File # Begin Source File -SOURCE=..\in\f134.dir +SOURCE=..\in\batbimt.rpt !IF "$(CFG)" == "in0 - Win32 Release" -# Begin Custom Build - Copying dir $(InputPath)... -TargetDir=D:\Release\Campo22 -InputPath=..\in\f134.dir -InputName=f134 +# Begin Custom Build - Compiling rpt $(InputPath)... +TargetDir=D:\Release\Campo21 +InputPath=..\in\batbimt.rpt +InputName=batbimt -"$(TargetDir)\recdesc\$(InputName).dir" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(TargetDir)\recdesc\$(InputName).dir +"$(TargetDir)\$(InputName).rpt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + rpt32 $(InputPath) $(TargetDir)\$(InputName).rpt # End Custom Build !ELSEIF "$(CFG)" == "in0 - Win32 Debug" -# Begin Custom Build - Copying dir $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed -InputPath=..\in\f134.dir -InputName=f134 +# Begin Custom Build - Compiling rpt $(InputPath)... +TargetDir=\U\Luca\D_02_01\exed +InputPath=..\in\batbimt.rpt +InputName=batbimt -"$(TargetDir)\recdesc\$(InputName).dir" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(TargetDir)\recdesc\$(InputName).dir +"$(TargetDir)\$(InputName).rpt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + rpt32 $(InputPath) $(TargetDir)\$(InputName).rpt # End Custom Build @@ -862,29 +827,60 @@ InputName=f134 # End Source File # Begin Source File -SOURCE=..\in\f135.dir +SOURCE=..\in\batbint.rpt !IF "$(CFG)" == "in0 - Win32 Release" -# Begin Custom Build - Copying dir $(InputPath)... -TargetDir=D:\Release\Campo22 -InputPath=..\in\f135.dir -InputName=f135 +# Begin Custom Build - Compiling rpt $(InputPath)... +TargetDir=D:\Release\Campo21 +InputPath=..\in\batbint.rpt +InputName=batbint -"$(TargetDir)\recdesc\$(InputName).dir" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(TargetDir)\recdesc\$(InputName).dir +"$(TargetDir)\$(InputName).rpt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + rpt32 $(InputPath) $(TargetDir)\$(InputName).rpt # End Custom Build !ELSEIF "$(CFG)" == "in0 - Win32 Debug" -# Begin Custom Build - Copying dir $(InputPath)... -TargetDir=\U\Luca\R_02_02\exed -InputPath=..\in\f135.dir -InputName=f135 +# Begin Custom Build - Compiling rpt $(InputPath)... +TargetDir=\U\Luca\D_02_01\exed +InputPath=..\in\batbint.rpt +InputName=batbint -"$(TargetDir)\recdesc\$(InputName).dir" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) $(TargetDir)\recdesc\$(InputName).dir +"$(TargetDir)\$(InputName).rpt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + rpt32 $(InputPath) $(TargetDir)\$(InputName).rpt + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\in\batbird.rpt + +!IF "$(CFG)" == "in0 - Win32 Release" + +# Begin Custom Build - Compiling rpt $(InputPath)... +TargetDir=D:\Release\Campo21 +InputPath=..\in\batbird.rpt +InputName=batbird + +"$(TargetDir)\$(InputName).rpt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + rpt32 $(InputPath) $(TargetDir)\$(InputName).rpt + +# End Custom Build + +!ELSEIF "$(CFG)" == "in0 - Win32 Debug" + +# Begin Custom Build - Compiling rpt $(InputPath)... +TargetDir=\U\Luca\D_02_01\exed +InputPath=..\in\batbird.rpt +InputName=batbird + +"$(TargetDir)\$(InputName).rpt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + rpt32 $(InputPath) $(TargetDir)\$(InputName).rpt # End Custom Build diff --git a/projects/msk232.bat b/projects/msk232.bat index 56a885908..071039c2f 100755 --- a/projects/msk232.bat +++ b/projects/msk232.bat @@ -16,4 +16,3 @@ del %TMP%\tmp.msk del %TMP%\tmp1.msk del %TMP%\tmp.uml del %TMP%\tmp.tmp - diff --git a/projects/ps.dsw b/projects/ps.dsw index 658d9cd31..15c8515e0 100755 --- a/projects/ps.dsw +++ b/projects/ps.dsw @@ -90,6 +90,21 @@ Package=<4> ############################################################################### +Project: "ps0913"=".\ps0913 .dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name AgaLib + End Project Dependency +}}} + +############################################################################### + Project: "ps0920"=.\ps0920.dsp - Package Owner=<4> Package=<5> diff --git a/projects/ps0544.dsp b/projects/ps0544.dsp new file mode 100755 index 000000000..f1a2a613f --- /dev/null +++ b/projects/ps0544.dsp @@ -0,0 +1,328 @@ +# Microsoft Developer Studio Project File - Name="ps0544" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=ps0544 - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "ps0544.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "ps0544.mak" CFG="ps0544 - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "ps0544 - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "ps0544 - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "ps0544 - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\release" +# PROP Intermediate_Dir "..\release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"D:\Release\Campo21/ps0544.exe" +# SUBTRACT LINK32 /map /debug /nodefaultlib + +!ELSEIF "$(CFG)" == "ps0544 - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\debug" +# PROP Intermediate_Dir "..\debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /FR /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /i "..\..\wx240\include" /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\exed\ps0544.exe" /pdbtype:sept +# SUBTRACT LINK32 /nodefaultlib + +!ENDIF + +# Begin Target + +# Name "ps0544 - Win32 Release" +# Name "ps0544 - Win32 Debug" +# Begin Group "Sources" + +# PROP Default_Filter "cpp" +# Begin Source File + +SOURCE=..\cg\cg2103.cpp +# End Source File +# Begin Source File + +SOURCE=..\cg\cglib01.cpp +# End Source File +# Begin Source File + +SOURCE=..\cg\cgpagame.cpp +# End Source File +# Begin Source File + +SOURCE=..\cg\cgsaldac.cpp +# End Source File +# Begin Source File + +SOURCE=..\ve\clifor.cpp +# End Source File +# Begin Source File + +SOURCE=..\db\dblib.cpp +# End Source File +# Begin Source File + +SOURCE=..\mg\mglib01.cpp +# End Source File +# Begin Source File + +SOURCE=..\mg\mglib02.cpp +# End Source File +# Begin Source File + +SOURCE=..\mg\mglib02a.cpp +# End Source File +# Begin Source File + +SOURCE=..\pr\prlib01.cpp +# End Source File +# Begin Source File + +SOURCE=..\ps\ps0544.cpp +# End Source File +# Begin Source File + +SOURCE=..\ps\ps0544100.cpp +# End Source File +# Begin Source File + +SOURCE=..\ps\ps0544200.cpp +# End Source File +# Begin Source File + +SOURCE=..\ve\sconti.cpp +# End Source File +# Begin Source File + +SOURCE=..\sv\svlib01.cpp +# End Source File +# Begin Source File + +SOURCE=..\sv\svlib09.cpp +# End Source File +# Begin Source File + +SOURCE=..\ve\velib01.cpp +# End Source File +# Begin Source File + +SOURCE=..\ve\velib02.cpp +# End Source File +# Begin Source File + +SOURCE=..\ve\velib03.cpp +# End Source File +# Begin Source File + +SOURCE=..\ve\velib03a.cpp +# End Source File +# Begin Source File + +SOURCE=..\ve\velib05.cpp +# End Source File +# End Group +# Begin Group "Masks" + +# PROP Default_Filter "uml" +# Begin Source File + +SOURCE=..\ps\ps0544100a.uml + +!IF "$(CFG)" == "ps0544 - Win32 Release" + +# Begin Custom Build - Compiling mask $(InputPath)... +TargetDir=D:\Release\Campo21 +InputPath=..\ps\ps0544100a.uml +InputName=ps0544100a + +"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + msk32 $(InputPath) $(TargetDir)\$(InputName).msk + +# End Custom Build + +!ELSEIF "$(CFG)" == "ps0544 - Win32 Debug" + +# Begin Custom Build - Compiling mask $(InputPath)... +TargetDir=\U\cris\D_02_01\exed +InputPath=..\ps\ps0544100a.uml +InputName=ps0544100a + +"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + msk32 $(InputPath) $(TargetDir)\$(InputName).msk + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ps\ps0544200a.uml + +!IF "$(CFG)" == "ps0544 - Win32 Release" + +# Begin Custom Build - Compiling mask $(InputPath)... +TargetDir=D:\Release\Campo21 +InputPath=..\ps\ps0544200a.uml +InputName=ps0544200a + +"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + msk32 $(InputPath) $(TargetDir)\$(InputName).msk + +# End Custom Build + +!ELSEIF "$(CFG)" == "ps0544 - Win32 Debug" + +# Begin Custom Build - Compiling mask $(InputPath)... +TargetDir=\U\cris\D_02_01\exed +InputPath=..\ps\ps0544200a.uml +InputName=ps0544200a + +"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + msk32 $(InputPath) $(TargetDir)\$(InputName).msk + +# End Custom Build + +!ENDIF + +# End Source File +# End Group +# Begin Group "Headers" + +# PROP Default_Filter "h" +# Begin Source File + +SOURCE=..\ps\ps0544.h +# End Source File +# Begin Source File + +SOURCE=..\ps\ps0544100a.h +# End Source File +# Begin Source File + +SOURCE=..\ps\ps0544200a.h +# End Source File +# End Group +# Begin Group "Ini" + +# PROP Default_Filter ".ini" +# Begin Source File + +SOURCE=..\ps\ps0544100.ini + +!IF "$(CFG)" == "ps0544 - Win32 Release" + +!ELSEIF "$(CFG)" == "ps0544 - Win32 Debug" + +# Begin Custom Build +TargetDir=\U\cris\D_02_01\exed +InputPath=..\ps\ps0544100.ini +InputName=ps0544100 + +"$(TargetDir)\$(InputName).ini" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cpini32 $(InputPath) $(TargetDir)\$(InputName).ini + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ps\ps0544200.ini + +!IF "$(CFG)" == "ps0544 - Win32 Release" + +!ELSEIF "$(CFG)" == "ps0544 - Win32 Debug" + +# Begin Custom Build +TargetDir=\U\cris\D_02_01\exed +InputPath=..\ps\ps0544200.ini +InputName=ps0544200 + +"$(TargetDir)\$(InputName).ini" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cpini32 $(InputPath) $(TargetDir)\$(InputName).ini + +# End Custom Build + +!ENDIF + +# End Source File +# End Group +# Begin Source File + +SOURCE=.\ps0544.rc + +!IF "$(CFG)" == "ps0544 - Win32 Release" + +# ADD BASE RSC /l 0x410 +# ADD RSC /l 0x410 + +!ELSEIF "$(CFG)" == "ps0544 - Win32 Debug" + +# ADD BASE RSC /l 0x410 +# ADD RSC /l 0x410 /fo"..\Debug/ps0544.res" + +!ENDIF + +# End Source File +# End Target +# End Project diff --git a/projects/ps0920.dsp b/projects/ps0920.dsp index cd30cafab..8c311df08 100755 --- a/projects/ps0920.dsp +++ b/projects/ps0920.dsp @@ -96,12 +96,80 @@ LINK32=link.exe # PROP Default_Filter "cpp" # Begin Source File +SOURCE=..\cg\cg2103.cpp +# End Source File +# Begin Source File + +SOURCE=..\cg\cglib01.cpp +# End Source File +# Begin Source File + +SOURCE=..\cg\cgpagame.cpp +# End Source File +# Begin Source File + +SOURCE=..\ve\clifor.cpp +# End Source File +# Begin Source File + +SOURCE=..\db\dblib.cpp +# End Source File +# Begin Source File + +SOURCE=..\mg\mglib01.cpp +# End Source File +# Begin Source File + +SOURCE=..\mg\mglib02.cpp +# End Source File +# Begin Source File + +SOURCE=..\mg\mglib02a.cpp +# End Source File +# Begin Source File + +SOURCE=..\pr\prlib01.cpp +# End Source File +# Begin Source File + SOURCE=..\ps\ps0920.cpp # End Source File # Begin Source File SOURCE=..\ps\ps0920100.cpp # End Source File +# Begin Source File + +SOURCE=..\ps\ps0920200.cpp +# End Source File +# Begin Source File + +SOURCE=..\ve\sconti.cpp +# End Source File +# Begin Source File + +SOURCE=..\sv\svlib01.cpp +# End Source File +# Begin Source File + +SOURCE=..\sv\svlib09.cpp +# End Source File +# Begin Source File + +SOURCE=..\ve\velib01.cpp +# End Source File +# Begin Source File + +SOURCE=..\ve\velib02.cpp +# End Source File +# Begin Source File + +SOURCE=..\ve\velib03.cpp +# End Source File +# Begin Source File + +SOURCE=..\ve\velib03a.cpp +# End Source File # End Group # Begin Group "Masks" @@ -126,6 +194,7 @@ InputName=ps0920100a # Begin Custom Build - Compiling mask $(InputPath)... TargetDir=\U\Luca\R_02_02\exed + InputPath=..\ps\ps0920100a.uml InputName=ps0920100a @@ -136,6 +205,37 @@ InputName=ps0920100a !ENDIF +# End Source File +# Begin Source File + +SOURCE=..\ps\ps0920200a.uml + +!IF "$(CFG)" == "ps0920 - Win32 Release" + +# Begin Custom Build - Compiling mask $(InputPath)... +TargetDir=D:\Release\Campo21 +InputPath=..\ps\ps0920200a.uml +InputName=ps0920200a + +"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + msk32 $(InputPath) $(TargetDir)\$(InputName).msk + +# End Custom Build + +!ELSEIF "$(CFG)" == "ps0920 - Win32 Debug" + +# Begin Custom Build - Compiling mask $(InputPath)... +TargetDir=\U\Luca\D_02_01\exed +InputPath=..\ps\ps0920200a.uml +InputName=ps0920200a + +"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + msk32 $(InputPath) $(TargetDir)\$(InputName).msk + +# End Custom Build + +!ENDIF + # End Source File # End Group # Begin Group "Headers" @@ -149,6 +249,10 @@ SOURCE=..\ps\ps0920.h SOURCE=..\ps\ps0920100a.h # End Source File +# Begin Source File + +SOURCE=..\ps\ps0920200a.h +# End Source File # End Group # Begin Source File @@ -168,4 +272,4 @@ SOURCE=.\ps0920.rc # End Source File # End Target -# End Project +# End Project \ No newline at end of file diff --git a/server/authoriz.cpp b/server/authoriz.cpp index e88c2d5e1..4bd41658c 100755 --- a/server/authoriz.cpp +++ b/server/authoriz.cpp @@ -912,7 +912,15 @@ bool TAuthorizationServer::Initialization() if (::GlobalFindAtom(ATOMIC_SEMAPHORE) == NULL) ::GlobalAddAtom(ATOMIC_SEMAPHORE); // Same as old Frontend.exe #endif - m_Dongle.Login(); + int delay = GetConfigInt("Delay", 10); + + for (int i = 0; i < 3; i++) + { + if (i > 0) + wxSleep(delay); + if (m_Dongle.Login()) + break; + } InitModules(); return true; diff --git a/ve/ve0300b.dat b/ve/ve0300b.dat index d5f267f43..ba178291d 100755 --- a/ve/ve0300b.dat +++ b/ve/ve0300b.dat @@ -3,10 +3,10 @@ TIPORIGA|2|2|Tipo riga|2 CODMAG[1,3]|2|3|Mag. |3 CODMAG[4,5]|2|2|Dep.|2 CODART|2|20|Codice Articolo|20 -CODG1|2|9|Codice\nLivello 1|9 -CODG2|2|9|Codice\nLivello 2|9 -CODG3|2|9|Codice\nLivello 3|9 -CODG4|2|9|Codice\nLivello 4|9 +CODG1|2|15|Codice\nLivello 1|15 +CODG2|2|15|Codice\nLivello 2|15 +CODG3|2|15|Codice\nLivello 3|15 +CODG4|2|15|Codice\nLivello 4|15 DESCR|2|50|Descrizione|50 UMQTA|2|2|UM|2 QTA|3|1305|Quantita'|11 diff --git a/ve/velib04b.cpp b/ve/velib04b.cpp index e2aba2803..db607021f 100755 --- a/ve/velib04b.cpp +++ b/ve/velib04b.cpp @@ -958,7 +958,30 @@ bool TContabilizzazione::load_parameters() bool TContabilizzazione::test_swap() { const char sez = _caus->sezione_clifo(); - const bool s = (_caus->reg().iva() == iva_vendite) ^ (sez == 'D'); + TipoIVA t = _caus->reg().iva(); + + if (t == nessuna_iva) + { + TBill c; + + _caus->bill(1, c); + char tipocf = c.tipo(); + + if (tipocf == 'C') + t = iva_vendite; + else + if (tipocf == 'F') + t = iva_acquisti; + else + { + if (_caus->tipo_doc() == "FA") + t = iva_acquisti; + else + t = iva_vendite; + } + + } + const bool s = (t == iva_vendite) ^ (sez == 'D'); return s; } diff --git a/ve/verig.uml b/ve/verig.uml index e30dcb6f9..873fb926c 100755 --- a/ve/verig.uml +++ b/ve/verig.uml @@ -167,7 +167,7 @@ BEGIN IFDEF(X_CODART) PROMPT X_CODART Y_CODART PR_CODART ELSEIF - PROMPT 2 6 "Articolo " + PROMPT 2 5 "Articolo " ENDIF USE LF_ANAMAG KEY 1 INPUT CODART FR_CODART @@ -196,7 +196,7 @@ BEGIN IFDEF(X_CODALT) PROMPT X_CODART Y_CODART PR_CODART ELSEIF - PROMPT 2 6 "Articolo " + PROMPT 2 5 "Articolo " ENDIF USE LF_CODCORR KEY 2 JOIN LF_ANAMAG INTO CODART==CODART @@ -234,19 +234,19 @@ BEGIN FLAGS "D" END -STRING FR_LIV1 10 +STRING FR_LIV1 15 BEGIN IFDEF(X_LIV1) PROMPT X_LIV1 Y_LIV1 "" ELSEIF - PROMPT 37 6 "" + PROMPT 37 5 "" FLAGS "U" USE GCG JOIN FCG ALIAS 500 INTO CODTAB==CODTAB[1,1] INPUT CODTAB[1,1] "1" INPUT CODTAB[2,] FR_LIV1 DISPLAY "Livello@20" 500@->S0 - DISPLAY "Gruppo@10" CODTAB[2,] + DISPLAY "Gruppo@15" CODTAB[2,] DISPLAY "Descrizione@30" S0 OUTPUT FR_LIV1 CODTAB[2,] MESSAGE EMPTY RESET,FR_LIV2|RESET,FR_LIV3|RESET,FR_LIV4 @@ -258,12 +258,12 @@ ENDIF ENDIF END -STRING FR_LIV2 6 +STRING FR_LIV2 15 BEGIN IFDEF(X_LIV2) PROMPT X_LIV2 Y_LIV2 "" ELSEIF - PROMPT 50 6 "" + PROMPT 55 5 "" ENDIF FLAGS "U" USE GCG @@ -271,7 +271,7 @@ ENDIF INPUT CODTAB[1,1] "2" INPUT CODTAB[2,] FR_LIV2 DISPLAY "Livello@20" 500@->S0 - DISPLAY "Gruppo@10" CODTAB[2,] + DISPLAY "Gruppo@15" CODTAB[2,] DISPLAY "Descrizione@30" S0 OUTPUT FR_LIV2 CODTAB[2,] MESSAGE EMPTY RESET,FR_LIV3|RESET,FR_LIV4 @@ -282,12 +282,12 @@ ENDIF CHECKTYPE NORMAL END -STRING FR_LIV3 6 +STRING FR_LIV3 15 BEGIN IFDEF(X_LIV3) PROMPT X_LIV3 Y_LIV3 "" ELSEIF - PROMPT 59 6 "" + PROMPT 37 6 "" ENDIF FLAGS "U" USE GCG @@ -295,7 +295,7 @@ ENDIF INPUT CODTAB[1,1] "3" INPUT CODTAB[2,] FR_LIV3 DISPLAY "Livello@20" 500@->S0 - DISPLAY "Gruppo@10" CODTAB[2,] + DISPLAY "Gruppo@15" CODTAB[2,] DISPLAY "Descrizione@30" S0 OUTPUT FR_LIV3 CODTAB[2,] MESSAGE EMPTY RESET,FR_LIV4 @@ -306,12 +306,12 @@ ENDIF CHECKTYPE NORMAL END -STRING FR_LIV4 6 +STRING FR_LIV4 15 BEGIN IFDEF(X_LIV4) PROMPT X_LIV4 Y_LIV4 "" ELSEIF - PROMPT 67 6 "" + PROMPT 55 6 "" ENDIF FLAGS "U" USE GCG @@ -319,7 +319,7 @@ ENDIF INPUT CODTAB[1,1] "4" INPUT CODTAB[2,] FR_LIV4 DISPLAY "Livello@20" 500@->S0 - DISPLAY "Gruppo@10" CODTAB[2,] + DISPLAY "Gruppo@15" CODTAB[2,] DISPLAY "Descrizione@30" S0 OUTPUT FR_LIV4 CODTAB[2,] IFDEF(MS_LIV4) @@ -335,7 +335,7 @@ BEGIN IFDEF(X_CODSP) PROMPT X_CODSP Y_CODSP PR_CODSP ELSEIF - PROMPT 2 6 "Spesa " + PROMPT 2 5 "Spesa " ENDIF USE SPP INPUT CODTAB FR_CODSP @@ -367,7 +367,7 @@ BEGIN IFDEF(X_CODSPV) PROMPT X_CODSPV Y_CODSPV PR_CODSPV ELSEIF - PROMPT 2 6 "Spesa " + PROMPT 2 5 "Spesa " ENDIF USE SPP SELECT S6=="V" INPUT CODTAB FR_CODSPV @@ -397,7 +397,7 @@ BEGIN IFDEF(X_CODSPQ) PROMPT X_CODSPQ Y_CODSPQ PR_CODSPQ ELSEIF - PROMPT 2 6 "Spesa " + PROMPT 2 5 "Spesa " ENDIF USE SPP SELECT S6=="Q" INPUT CODTAB FR_CODSPQ @@ -428,7 +428,7 @@ BEGIN IFDEF(X_CODSPP) PROMPT X_CODSPP Y_CODSPP PR_CODSPP ELSEIF - PROMPT 2 6 "Spesa " + PROMPT 2 5 "Spesa " ENDIF USE SPP SELECT S6=="P" INPUT CODTAB FR_CODSPP @@ -491,7 +491,7 @@ BEGIN IFDEF(X_CODPRSV) PROMPT X_CODPRSV Y_CODPRSV PR_CODPRSV ELSEIF - PROMPT 2 6 "Prestazione " + PROMPT 2 5 "Prestazione " ENDIF USE PRS SELECT S6=='V' INPUT CODTAB FR_CODPRSV @@ -521,7 +521,7 @@ BEGIN IFDEF(X_CODPRSQ) PROMPT X_CODPRSQ Y_CODPRSQ PR_CODPRSQ ELSEIF - PROMPT 2 6 "Prestazione " + PROMPT 2 5 "Prestazione " ENDIF USE PRS SELECT S6=='Q' INPUT CODTAB FR_CODPRSQ @@ -552,7 +552,7 @@ BEGIN IFDEF(X_CODPRSP) PROMPT X_CODPRSP Y_CODPRSP PR_CODPRSP ELSEIF - PROMPT 2 6 "Prestazione " + PROMPT 2 5 "Prestazione " ENDIF USE PRS SELECT S6=='P' INPUT CODTAB FR_CODPRSQ @@ -580,7 +580,7 @@ ENDIF IFDEF(FLD_DESCR) STRING FR_CODGOL 8 BEGIN - PROMPT 2 6 "Codice " + PROMPT 2 5 "Codice " FLAGS "U" USE LF_GOLEM INPUT CODICE FR_CODGOL diff --git a/xvaga/xvaga.cpp b/xvaga/xvaga.cpp index 168974c3b..def78fdcf 100755 --- a/xvaga/xvaga.cpp +++ b/xvaga/xvaga.cpp @@ -2175,9 +2175,10 @@ wxFont& TFontId::Font(wxDC* dc, WINDOW win) const const wxSize ppi = dc->GetPPI(); - const int nTarget10 = 10 * ppi.x; - const int cpi10 = 10 * 120 / nSize; - const wxString str('M', cpi10); + + const int nTarget10 = 10 * ppi.x; // pixel in 10 pollici in larghezza + const int cpi10 = 10 * 120 / nSize; // caratteri stimati in 10 pollici + const wxString str('M', cpi10); // stringa campione per stimare la larghezza int nMin = 1, nMax = nSize*16; // Limiti arbitrari int nBest = 0; @@ -2185,6 +2186,7 @@ wxFont& TFontId::Font(wxDC* dc, WINDOW win) const { const int nFontSize = (nMin+nMax)/2; wxFont courier(nFontSize, wxFIXED, wxNORMAL, wxNORMAL, FALSE, DEFAULT_FONT_NAME); + dc->SetFont(courier); int tw; dc->GetTextExtent(str, &tw, NULL); if (tw <= nTarget10) @@ -2206,6 +2208,7 @@ wxFont& TFontId::Font(wxDC* dc, WINDOW win) const int major, minor; const int nVer = ::wxGetOsVersion(&major, &minor); if (nVer != wxWINDOWS_NT) + { bool bPrevGood = true; for (int i = 15; i > 0; i--) @@ -2224,9 +2227,11 @@ wxFont& TFontId::Font(wxDC* dc, WINDOW win) const } #endif */ + dPrintScale = double(nBest) / double(nSize); #ifdef LINUX dPrintScale /= 10.0; // * wxPostScriptDC::GetResolution()) / 72.0); + #endif lastDC = dc; } @@ -4988,4 +4993,4 @@ WINDOW statbar_create(int cid, int left, int top, int right, int bottom, w.SetStatusWidths(2, widths); return (WINDOW)&w; -} +} \ No newline at end of file