diff --git a/cg/cg3401.cpp b/cg/cg3401.cpp index 4d0a7619d..01c380ec8 100755 --- a/cg/cg3401.cpp +++ b/cg/cg3401.cpp @@ -7,7 +7,7 @@ #include #include "cg3401.h" -bool TRigaiva_array::add_riga(const real& imponibile, const real& imposta, const char* codiva, const int tipodet) +bool TRigaiva_array::add_riga(const real& imponibile, const real& imposta, const char* codiva, const int tipodet, const real& imponibilep, const real& impostap) { bool found = FALSE; for (int i = 0; i < items(); i++) @@ -18,11 +18,13 @@ bool TRigaiva_array::add_riga(const real& imponibile, const real& imposta, const found = TRUE; r._imponibile += imponibile; r._imposta += imposta; + r._imponibilep += imponibilep; + r._impostap += impostap; } } if (!found) { - TRigaiva* r = new TRigaiva(imponibile,imposta,codiva,tipodet); + TRigaiva* r = new TRigaiva(imponibile,imposta,codiva,tipodet, imponibilep, impostap); add(r); } return found; @@ -58,3 +60,11 @@ bool TDociva_array::add_riga(const char* _descrdociva, const real& _importo,cons + + + + + + + +