From 7f6132a0338d39d3a7392e9996023c9eeb29808f Mon Sep 17 00:00:00 2001 From: angelo Date: Tue, 10 Dec 1996 10:42:46 +0000 Subject: [PATCH] Corretti MI3463 e MI3464. git-svn-id: svn://10.65.10.50/trunk@3992 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg4400.cpp | 11 ++++++++--- cg/cg4400.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cg/cg4400.cpp b/cg/cg4400.cpp index 7a8cb61ca..87fa0c7fa 100755 --- a/cg/cg4400.cpp +++ b/cg/cg4400.cpp @@ -1390,7 +1390,7 @@ messaggio CG4400_application::controlla_liquidazione() chiave = ""; TString16 m (format("%02d", i)); chiave << _annoes << m; - lim.put("CODTAB", chiave); + lim.put("CODTAB", chiave); if (lim.read() != NOERR || !lim.get_bool("B0")) mesi_cal << itom(i) << "\n"; } @@ -1534,7 +1534,7 @@ int CG4400_application::stampa_prospetto() set_row(r, "@78g3=operazione intracomunitaria e AF art.34 comma 3"); r++; - _stampa = stampa_totali_finali(); + _stampa = _st_tot_fin; if (_stampa) { set_row(++r, "Tipo documento@54gTotale documento"); @@ -2109,6 +2109,8 @@ bool CG4400_application::preprocess_page(int file, int counter) long protiva = mov.get_long(MOV_PROTIVA); long uprotiva = mov.get_long(MOV_UPROTIVA); real totdoc = mov.get_real(MOV_TOTDOC); + real ritsoc = mov.get_real(MOV_RITSOC); + real ritfis = mov.get_real(MOV_RITFIS); TString16 numdoc = mov.get(MOV_NUMDOC); char tipocf = mov.get(MOV_TIPO)[0]; TString16 ocfpi = mov.get(MOV_OCFPI); @@ -2173,7 +2175,9 @@ bool CG4400_application::preprocess_page(int file, int counter) _descr_doc = descr_doc(); TString app(datadoc.string(brief, '/')); - if (stampa_totali_finali()) + totdoc += ritsoc+ritfis; + + if (_st_tot_fin) _doc_array.add_riga(_tipodoc,_descr_doc,totdoc); //setto le righe di stampa @@ -3359,6 +3363,7 @@ bool CG4400_application::stampa_registri_IVA(const TMask& m) _stampa_mese = 13; TApplication::set_firm(_ditta); + _st_tot_fin = stampa_totali_finali(); look_lia(); ok = compila_reg(m); if (!ok) continue; diff --git a/cg/cg4400.h b/cg/cg4400.h index 012f32a86..cec1cc2db 100755 --- a/cg/cg4400.h +++ b/cg/cg4400.h @@ -55,6 +55,7 @@ class CG4400_application : public TPrintapp bool _corrispettivi, _liquidazione, _stampa_ind_comp, _esiste_riga_iva, _stampa_cred_pre; bool _rif_vid, _intesta_vidi, _intesta_liq, _stampa_data_reg, _ok_vidi; bool _sosp_imposta, _riep_liq; + bool _st_tot_fin; char _frequiva, _tipo_riepilogativo, _freq_riepilogo; TDate _data_da, _data_a, _data_stampa, _dataregp, _dataregs, _datareg; TDate _u_data;