diff --git a/cg/cg6700.cpp b/cg/cg6700.cpp index 6e8a89e56..272707f3d 100755 --- a/cg/cg6700.cpp +++ b/cg/cg6700.cpp @@ -97,7 +97,7 @@ class TRic_ListaMov : public TPrintapp int _gruppo_p, _conto_p, _anno_prec; TDate _datacomp, _datadoc, _datareg, _data74tr, _datacam, _datacam_part,_datapag; real _importo, _impo, _impos, _tot_dare, _tot_avere, _tot_doc, _tot_val; - real _cambio, _cambio_part; + real _cambio, _cambio_part, _impo_print, _impos_print; long _codcf, _numero, _protiva, _sottoconto, _numreg; long _sottocontoc, _sottocontocr, _codcf_p; TBit_array _err; @@ -2263,7 +2263,6 @@ bool TRic_ListaMov::preprocess_page(int file,int counter) _impo = impo; _impos = impos; - if (!_tipodoc.blank()) { TTable tabtpd("%TPD"); @@ -2280,9 +2279,21 @@ bool TRic_ListaMov::preprocess_page(int file,int counter) } int r = 1; + // Visualizza in positivo le note di credito e gli storni + if ((_tipodoc == "NC" || _tipodoc == "ST") && _impo < 0.0) + { + _impo_print = _impo * (-1); + _impos_print = _impos * (-1); + } + else + { + _impo_print = _impo; + _impos_print = _impos; + } + set_row(r, "I%d", numrig); - set_row(r, "@5gImponibile@16g%r",&_impo); - set_row(r, "@32gImposta@40g%r", &_impos); + set_row(r, "@5gImponibile@16g%r",&_impo_print); + set_row(r, "@32gImposta@40g%r", &_impos_print); set_row(r, "@56gCodice@63g%4s", (const char*) _codiva); set_row(r, "@68g%s", (const char*) codiva_des);