diff --git a/src/cg/cg4304.cpp b/src/cg/cg4304.cpp index ed3606ade..8eb652656 100755 --- a/src/cg/cg4304.cpp +++ b/src/cg/cg4304.cpp @@ -1415,7 +1415,7 @@ void TLiquidazione_app::set_firm(_DescrItem& d) else { if (d._s2 == "T") - tim_title << format(FR(" del %d° Trimestre %s"), d._f1/3, (const char*) _year); + tim_title << format(FR(" del %d° Trimestre %s"), (d._f1 - 1) / 3 + 1, (const char*) _year); else if (_is_liq_acconto) tim_title << format(FR(" al %d %s %s"), _ver->giorno_acc(), itom(d._f1), (const char*)_year); @@ -1479,7 +1479,7 @@ void TLiquidazione_app::set_att(_DescrItem& d) else { if (d._s4 == "T") - tim_title << format(FR(" del %d° Trimestre %s"), d._f1 / 3, (const char*)_year); + tim_title << format(FR(" del %d° Trimestre %s"), (d._f1 - 1) / 3 + 1, (const char*)_year); else if (_is_liq_acconto) tim_title << format(FR(" al %d %s %s"), _ver->giorno_acc(), itom(d._f1), (const char*)_year); diff --git a/src/cg/cg4400.cpp b/src/cg/cg4400.cpp index b3391fcda..6a0a20407 100755 --- a/src/cg/cg4400.cpp +++ b/src/cg/cg4400.cpp @@ -2095,10 +2095,10 @@ bool TStampa_registri_app::print_IVAxCassa(int da_month, int a_month) print_real(riga, importo, 70); print_real(riga, imponibile, 85); riga.put(rec.get(ID_CODIVA), 102); - print_real(riga, imposta, 107); + print_real(riga, imposta, 107); riga.put(rec.get_int(ID_NUMPRO) >= 999 ? "X" : "", 123); if (_tipo_stampa == prova) - riga.put(format("%6ld", rec.get_long(MOV_NUMREG)), 125); + riga.put(format("%6ld", rec.get_long(MOV_NUMREG)), 125); pr.print(riga); if(!id.get(ID_INDETR).as_bool()) diff --git a/src/cg/cg4400.h b/src/cg/cg4400.h index edba0f3b4..240942eb7 100755 --- a/src/cg/cg4400.h +++ b/src/cg/cg4400.h @@ -151,7 +151,8 @@ public: virtual void preprocess_footer(); virtual void on_page_printed(int file); - TStampa_registri_app() : TPrintapp(), _ditte(NULL), _nomiditte(100), _test(false), _stampa_acconto(false) {} + TStampa_registri_app() : TPrintapp(), _ditte(NULL), _nomiditte(100), + _isviaggio(false), _test(false), _stampa_acconto(false) {} };