From 7a80be976f731c4d7ceadfafcaa5e8ebb28815f9 Mon Sep 17 00:00:00 2001 From: angelo Date: Mon, 9 Dec 1996 10:19:04 +0000 Subject: [PATCH] Correzione Mi2265 e MI2267 relativi all'ag. viaggi in annuale. git-svn-id: svn://10.65.10.50/trunk@3981 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg4301.cpp | 2 +- cg/cg4304.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cg/cg4301.cpp b/cg/cg4301.cpp index ca612fdfc..88ef34615 100755 --- a/cg/cg4301.cpp +++ b/cg/cg4301.cpp @@ -2412,7 +2412,7 @@ void TLiquidazione_app::write_liq(int month, const char* codatts) debt_precd.round(ROUND_MILLELIRE); res_cred = iva_acq + versamenti + vers_int + cred_prec + acc_dec; - res_debt = iva_vend + rimborsi + deb_mens + debt_precd; + res_debt = iva_vend + rimborsi + debt_precd; // Tolto la somma di deb_mens, perche' gia' presente in iva_vend if (tot_cong.sign() > 0) res_debt += tot_cong; else res_cred -= tot_cong; diff --git a/cg/cg4304.cpp b/cg/cg4304.cpp index dc3edf47c..d458787b1 100755 --- a/cg/cg4304.cpp +++ b/cg/cg4304.cpp @@ -414,6 +414,12 @@ void TLiquidazione_app::describe_viaggio(int month, const char* codatt) if (month == 13) d->_r11.round(ROUND_MILLELIRE); else d->_r11.ceil(ROUND_LIRA); } + if (month == 13) + { + look_plm(month,codatt); // Scrive l'iva dovuta, visto che la describe_pims() viene chiamata successivamente. + _pom->put("R13",d->_r11); + _pom->rewrite(); + } _descr_arr.add(d); }