From 3195e247e25ecdd246239176d87bb096135cebc4 Mon Sep 17 00:00:00 2001 From: villa Date: Fri, 2 Dec 1994 08:55:16 +0000 Subject: [PATCH] Corretto MI2003 liquidazione git-svn-id: svn://10.65.10.50/trunk@709 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg4301.cpp | 2 +- cg/cg4302.cpp | 2 +- cg/cg4303.cpp | 3 +-- cg/cg4304.cpp | 4 +++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cg/cg4301.cpp b/cg/cg4301.cpp index 9de3258f2..8d05a99ee 100755 --- a/cg/cg4301.cpp +++ b/cg/cg4301.cpp @@ -71,7 +71,7 @@ bool TLiquidazione_app::recalc_all() TApplication::set_firm(__firm); delete _prind; _prind = NULL; - + return !canc; } diff --git a/cg/cg4302.cpp b/cg/cg4302.cpp index b78f983e9..770c08c07 100755 --- a/cg/cg4302.cpp +++ b/cg/cg4302.cpp @@ -218,7 +218,7 @@ bool TLiquidazione_app::look_lim(int m, bool create) bool TLiquidazione_app::look_pla(const char* a, bool create) { - bool ok = FALSE; + bool ok = FALSE; _pla_r->zero(); // forza il tipoatt a 1 diff --git a/cg/cg4303.cpp b/cg/cg4303.cpp index 6189dc4eb..6f5a94360 100755 --- a/cg/cg4303.cpp +++ b/cg/cg4303.cpp @@ -105,10 +105,9 @@ void TLiquidazione_app::recalc_corrispettivi(int month, const char* codatt) // ricalcolo della malefica ventilazione void TLiquidazione_app::recalc_ventilation(int month, const char* codatt) { - if (_vend_arr.items() == 0) return; + if (!_isvent || _vend_arr.items() == 0) return; TString att(codatt); - _isvent = TRUE; // 1) ricalcola i pim dei mesi dal primo al corrente se necessario for (int m = 1; m < month; m++) diff --git a/cg/cg4304.cpp b/cg/cg4304.cpp index 084f573f4..7ec861201 100755 --- a/cg/cg4304.cpp +++ b/cg/cg4304.cpp @@ -154,7 +154,9 @@ void TLiquidazione_app::describe_plafond(int month, const char* codatt) } void TLiquidazione_app::describe_ventilation(int month, const char* codatt) -{ +{ + if (!_isvent) return; + if (_isriepilogo || _isannual) month = 12; _DescrItem* d = new _DescrItem(VENTILA);