From b115973780eb12a445f7f9e11c048cbdff6530fe Mon Sep 17 00:00:00 2001 From: ale Date: Wed, 16 Oct 1996 11:22:25 +0000 Subject: [PATCH] - Correzione errori sul Quadro G. Inizio correzione 14-10-96 fine 16-10-96 git-svn-id: svn://10.65.10.50/trunk@3781 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- m770/77qc.frm | 7 +++++++ m770/77qg.frm | 54 ++++++++++++++++++++------------------------------ m770/77qgd.frm | 12 +++++------ m770/77stq.cpp | 45 ++++++++++++++++++++++++++++------------- 4 files changed, 66 insertions(+), 52 deletions(-) diff --git a/m770/77qc.frm b/m770/77qc.frm index 252b8bf81..218a77897 100755 --- a/m770/77qc.frm +++ b/m770/77qc.frm @@ -395,5 +395,12 @@ BEGIN PROMPT 120 1 "" PICTURE "###.###.###^^^" END + +STRINGA 2 +BEGIN + KEY "FIRMA" + PROMPT 83 6 "" + FIELD 116@->RAGSOC +END END diff --git a/m770/77qg.frm b/m770/77qg.frm index cd68eda6d..2e14b74f0 100755 --- a/m770/77qg.frm +++ b/m770/77qg.frm @@ -3,7 +3,7 @@ JOIN 9 INTO CODDITTA=CODDITTA JOIN 6 TO 9 ALIAS 116 INTO TIPOA=TIPOA CODANAGR=CODANAGR JOIN 8 TO 6 ALIAS 118 INTO CODANAGR=CODANAGR JOIN 13 TO 8 ALIAS 113 INTO COM=COMNASC -JOIN 13 TO 6 ALIAS 213 INTO COM=COMRF(COMRES) +JOIN 13 TO 6 ALIAS 213 INTO STATO=""(STATORES) COM=COMRF(COMRES) END DESCRIPTION @@ -81,7 +81,8 @@ END STRINGA 7 BEGIN KEY "VIA di RES." - PROMPT 65 13 "" + PROMPT 65 13 "" + FIELD 116@->INDRF FIELD 116@->INDRES GROUP 4 END @@ -90,6 +91,7 @@ STRINGA 8 BEGIN KEY "NUM. CIVICO di RES." PROMPT 101 13 "" + FIELD 116@->CIVRF FIELD 116@->CIVRES GROUP 4 END @@ -98,35 +100,11 @@ STRINGA 9 BEGIN KEY "CAP" PROMPT 122 13 "" + FIELD 116@->CAPRF FIELD 116@->CAPRES GROUP 4 END -STRINGA 10 -BEGIN - KEY "VIA di RES. RF" - PROMPT 65 13 "" - FIELD 116@->INDRF - MESSAGE EMPTY HIDE,5@ - GROUP 5 -END - -STRINGA 11 -BEGIN - KEY "NUM. CIVICO di RES. RF" - PROMPT 101 13 "" - FIELD 116@->CIVRF - GROUP 5 -END - -STRINGA 12 -BEGIN - KEY "CAP" - PROMPT 122 13 "" - FIELD 116@->CAPRF - GROUP 5 -END - STRINGA 13 BEGIN KEY "CODICE FISCALE DICHIARANTE" @@ -177,7 +155,8 @@ NUMBER 21 BEGIN KEY "Num.az.1" PROMPT 87 25 "" - FIELD 70->P1NUMQ1 + FIELD 70->P1NUMQ1 + PICTURE "#########" GROUP 3 END @@ -228,6 +207,7 @@ BEGIN KEY "Num.az.2" PROMPT 87 27 "" FIELD 70->P1NUMQ2 + PICTURE "#########" GROUP 3 END @@ -277,7 +257,8 @@ NUMBER 33 BEGIN KEY "Num.az.3" PROMPT 87 29 "" - FIELD 70->P1NUMQ3 + FIELD 70->P1NUMQ3 + PICTURE "#########" GROUP 3 END @@ -327,7 +308,8 @@ NUMBER 39 BEGIN KEY "Num.az.4" PROMPT 87 31 "" - FIELD 70->P1NUMQ4 + FIELD 70->P1NUMQ4 + PICTURE "#########" GROUP 3 END @@ -345,9 +327,10 @@ BEGIN KEY "Totale num.az" FIELD 70->P1NUMQT PROMPT 87 33 "" + PICTURE "#########" END -STRINGA 42 +NUMBER 42 BEGIN KEY "Totale amm.compl." FIELD 70->P1AMMT @@ -448,7 +431,7 @@ BEGIN KEY "IMP.IMPUT.AZ.QUOT" PROMPT 120 47 "" FIELD 70->P2IMPQ - PICTURE "###.###.###^^^" + PICTURE "###.###.###.###" END NUMBER 56 @@ -1171,6 +1154,13 @@ BEGIN PICTURE "###.###.###^^^" END +STRING 90 +BEGIN + KEY "P3 COL2 TOTALI quando c'e' l'allegato" + PROMPT 36 20 "" + FLAGS "H" +END + END END diff --git a/m770/77qgd.frm b/m770/77qgd.frm index 236a058e1..dfbb9c532 100755 --- a/m770/77qgd.frm +++ b/m770/77qgd.frm @@ -4,8 +4,8 @@ JOIN 6 TO 9 ALIAS 106 INTO TIPOA=TIPOA CODANAGR=CODANAGR JOIN 6 TO 101 ALIAS 216 INTO TIPOA=TIPOA CODANAGR=CODANAGR JOIN 8 TO 216@ ALIAS 218 INTO CODANAGR=CODANAGR JOIN 13 TO 218@ ALIAS 313 INTO COM=COMNASC -JOIN 13 TO 216@ ALIAS 413 INTO COM=COMRES -JOIN 13 TO 216@ ALIAS 513 INTO COM=COMRF(COMRES) +JOIN 13 TO 216@ ALIAS 413 INTO STATO=STATORES COM=COMRES +JOIN 13 TO 216@ ALIAS 513 INTO STATO=""(STATORES) COM=COMRF(COMRES) JOIN %STA TO 216@ ALIAS 24 INTO CODTAB=STATORES END @@ -142,9 +142,9 @@ END NUMBER 11 BEGIN KEY "NUMERO QUOTE" - PROMPT 125 5 "" + PROMPT 120 5 "" FIELD 101->NUMQUOTE - PICTURE "###@@" + PICTURE "###.###.###" END NUMBER 12 @@ -244,9 +244,9 @@ END NUMBER 11 BEGIN KEY "NUMERO QUOTE" - PROMPT 128 3 "" + PROMPT 120 3 "" FIELD 101->NUMQUOTE - PICTURE "###@@" + PICTURE "###.###.###" END NUMBER 12 diff --git a/m770/77stq.cpp b/m770/77stq.cpp index 068a14d84..4fcb5a989 100755 --- a/m770/77stq.cpp +++ b/m770/77stq.cpp @@ -950,17 +950,25 @@ void TQuadroG::stampa_prospetti3_4(TPrinter& pr) tot2 = ZERO; tot7 = ZERO; // Stampa totali - TForm_item& t2 = sez.find_field(k); - if (!bAggiuntivo) + TForm_item& t2 = sez.find_field(k); + TForm_item& allegato = sez.find_field(90); + if (i == 18) { - if (i == 18) - { + if (!bAggiuntivo) + { + t2.show(); + allegato.hide(); TForm_item& t7 = sez.find_field(k+54); t2.set(tot_tot2.string()); t7.set(tot_tot7.string()); } + else + { + allegato.show(); + t2.hide(); + allegato.set("VEDI ALLEGATO"); + } } - else t2.set("VEDI ALLEGATO"); } } @@ -1066,8 +1074,8 @@ bool TQuadroG::print(const long codditta, const long NumFis, const long NumNoFis if (_PaginaCorrente == PRIMA) { - if (!_PaginaPosizionamento) - fill_page(pr,HEADER_PRIMA_NOPOS); +// if (!_PaginaPosizionamento) +// fill_page(pr,HEADER_PRIMA_NOPOS); if (_modulaser) ClearFlagModulaser(); @@ -1096,7 +1104,7 @@ bool TQuadroG::print(const long codditta, const long NumFis, const long NumNoFis HIDDEN const int QGD_FORMLEN = 72; HIDDEN const int QGD_PAGINE = 2; -HIDDEN const int HEADER_SECONDA_GD = 15; +HIDDEN const int HEADER_SECONDA_GD = 16; HIDDEN const int QGD_RIGHE_PRIMA = 5; HIDDEN const int QGD_RIGHE_SECONDA = 6; @@ -1144,6 +1152,9 @@ void TDistintaG::stampa_totali(TPrinter& pr) pr.print(totali.row(i)); _RigaCorr++; } + totali.reset(); + for (int f = totali.fields()-1; f >= 0; f--) + totali.field(f).set(""); } else if (PagCorr == SECONDA) @@ -1155,7 +1166,10 @@ void TDistintaG::stampa_totali(TPrinter& pr) { pr.print(totali.row(i)); _RigaCorr++; - } + } + totali.reset(); + for (int f = totali.fields()-1; f >= 0; f--) + totali.field(f).set(""); } } @@ -1168,8 +1182,8 @@ void TDistintaG::next_page(TPrinter& pr) if (PagCorr == SECONDA) jump_to_line(pr,51); stampa_totali(pr); - TPrint_section& body = section('F', last_page); - body.reset(); +// TPrint_section& body = section('F', last_page); +// body.reset(); fill_page(pr, -1); // formfeed "adattato" inc_curr_page(); @@ -1240,7 +1254,7 @@ bool TDistintaG::print(const long codditta, const long NumFis, const long NumNoF bool LastRecord = FALSE; // Vero se letto l'ultimo record _PaginaCorrente = PRIMA; - _codditta = codditta; + _codditta = codditta; _RigaCorr = 0; const long items = filtra(codditta); @@ -2800,8 +2814,11 @@ bool TStampaQuadroG::print_quadro(const int OffsetDitta, const bool modulaser) // Numera i fogli a partire da 1 per ogni ditta normale e da 1 e di seguito negli estinti // per i sogg. dichiaranti - if (tipo == normale || tipo == dichiarante) - _form_g->set_num_foglio(1); + if (tipo == normale || tipo == dichiarante) + { + _form_g->set_num_foglio(1); + _form_gd->set_num_foglio(1); + } // Se la ditta e' estinta dice al form il cod.fis. del dichiarante if (tipo == estinto)