diff --git a/lv/lv4500.cpp b/lv/lv4500.cpp index 889def4ff..ef24c6656 100755 --- a/lv/lv4500.cpp +++ b/lv/lv4500.cpp @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -450,8 +451,10 @@ TConfig* TImporta_fat_app::genera_testata(TImporta_fat_rec& recset, TFilename& t conf->set(MOV_NUMDOC, ndoc); conf->set(MOV_CODCAUS, _msk->get_bool(F_DECCAU) ? atol(_codici->decodifica_causali(recset.get("C.CODCAU").as_int())) : recset.get("C.CODCAU").as_int()); conf->set(MOV_ANNOIVA, datadoc.year()); - conf->set(MOV_REG, _codici->decodifica_regiva(recset.get("C.REGIVA").as_int())); -// conf->set(MOV_PROTIVA, recset.get("C.NREGIVA").as_int()); + TString regiva(recset.get("C.REGIVA").as_string()); + + regiva << recset.get("C.NREGIVA").as_int(); + conf->set(MOV_REG, _codici->decodifica_regiva(atoi(regiva))); const TString & codval = _msk->get_bool(F_DECVAL) ? _codici->decodifica_valute(recset.get("C.CODVAL").as_int()) : recset.get("C.CODVAL").as_string(); if (!::is_firm_value(codval) && codval != "EURO") conf->set(MOV_CODVAL, codval); @@ -519,12 +522,16 @@ void TImporta_fat_app::genera_righe_iva(TImporta_fat_rec& recset, TConfig& conf, //GENERA_RATE: genero le righe su SCAD void TImporta_fat_app::genera_rate(TImporta_fat_rec& recset, TConfig& conf, int nriga) { + const TDate datadoc = recset.get("R.DATADOC").as_date(); TString paragraph; + paragraph.format("%d,%d", LF_PARTITE, 1); + conf.set_paragraph(paragraph); + conf.set(PART_ANNO, datadoc.year()); + conf.set(PART_NUMPART, datadoc.month()); + paragraph.cut(0); paragraph.format("%d,%d", LF_SCADENZE, ++nriga); conf.set_paragraph(paragraph); - const TDate datadoc = recset.get("R.DATADOC").as_date(); - conf.set(SCAD_ANNO, datadoc.year()); conf.set(SCAD_NUMPART, datadoc.month()); conf.set(SCAD_NRIGA, nriga);