diff --git a/ps/pe0001100.cpp b/ps/pe0001100.cpp index f4b94ad96..990b95d46 100755 --- a/ps/pe0001100.cpp +++ b/ps/pe0001100.cpp @@ -279,7 +279,7 @@ void TImporta_mov::transfer(const TFilename& file) if (anno != a || reg != r || dataop != d || n != nmov ) { - if (iva) + if (iva && conf != NULL) build_IVA(*conf, rows, concg, impcg); anno = a; reg = r; @@ -289,9 +289,6 @@ void TImporta_mov::transfer(const TFilename& file) if (conf != NULL) delete conf; conf = NULL; - } - if (conf == NULL) - { TFilename temp(outdir); temp << '/' << format("%05ld", ntran++); @@ -443,14 +440,17 @@ void TImporta_mov::transfer(const TFilename& file) rows.add(rec); } } - delete conf; + if (conf != NULL) + delete conf; - TString app; + if (yesno_box(FR("Si desidera confermare l'importazione di %ld movimenti"), ntran -1)) + { + TString app; -/* app << "cg2 -0 -i" << outdir; - TExternal_app primanota(app); - primanota.run(); - message_box(TR("Importazione movimenti completata")); */ + app << "cg2 -0 -i" << outdir << "/*.ini"; + TExternal_app primanota(app); + primanota.run(true); + } }