From bbef7b6e4d8e010dc319181aab5a6797115719a1 Mon Sep 17 00:00:00 2001 From: angelo Date: Fri, 19 Jul 1996 09:51:29 +0000 Subject: [PATCH] Correzioni, nell'ordine: MI0972, MI0930, MI3214. git-svn-id: svn://10.65.10.50/trunk@3205 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg4400.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cg/cg4400.cpp b/cg/cg4400.cpp index 95eb57ac7..2eacafc7f 100755 --- a/cg/cg4400.cpp +++ b/cg/cg4400.cpp @@ -1557,7 +1557,7 @@ int CG4400_application::stampa_prospetto() if (_stampa && _tipo_reg == 2) { - if (_stampa_cred_pre && _mese_credito==0 && _credito > ZERO) + if (_stampa_cred_pre && _datareg.month() == 1 && _credito > ZERO) { set_row (++rr, "** CREDITO INIZIO ANNO @39g%r", &_credito); rr++; @@ -2221,12 +2221,12 @@ bool CG4400_application::preprocess_page(int file, int counter) { set_row (/*_r+1*/ i++, "@38g%-.23s %-3s",(const char *)viacf, (const char *)civcf); if (comune.not_empty()) - set_row (/*_r+2*/ i++, "@38g%s %-.21s", (const char *)capcf, (const char *)comune); + set_row (/*_r+2*/ i++, "@38g%s %-.21s (%2s)", (const char *)capcf, (const char *)comune, (const char *)prov); riga = /*_r+3*/ i; } else if (comune.not_empty()) { - set_row (/*_r+1*/ i++, "@38g%s %-.21s", (const char *)capcf, (const char *)comune); + set_row (/*_r+1*/ i++, "@38g%s %-.21s (%2s)", (const char *)capcf, (const char *)comune, (const char *)prov); riga = /*_r+2*/ i; } } @@ -2479,7 +2479,7 @@ void CG4400_application::preprocess_header() if (_stampa_ind_ditta) r = stampa_intestazione(); //02/02/1996 - else r++; + else r+=2; //fine } else // se stampa di prova o su libro unico l'intestazione della ditta