diff --git a/lv/lv3800.cpp b/lv/lv3800.cpp index a6dd5aea2..572279ff2 100755 --- a/lv/lv3800.cpp +++ b/lv/lv3800.cpp @@ -77,7 +77,7 @@ void TInvia_articoli_skema::aggiungi_riga(const TString& codart) const TString80 desart = anamag.get(ANAMAG_DESCR); const TString80 tpart = anamag.get(ANAMAG_TIPOPARTE); - TString4 codlav; codlav.format("%05d", anamag.get(ANAMAG_CODLAV1)); + TString8 codlav; codlav.format("%05d", anamag.get(ANAMAG_CODLAV1)); TString16 peso; peso.format("%010d", anamag.get(ANAMAG_PESO)); const real lunghezza = anamag.get_real(ANAMAG_USER9); const real larghezza = anamag.get_real(ANAMAG_USER10); @@ -175,11 +175,12 @@ void TInvcon_skema_msk::esporta() const TFilename file_dot = path; file_dot.add("dotazione.txt"); //preparo il recodset che contiene tutti i contratti validi - TString query; +TString query; query << "USE LVCONDV\n" - << "SELECT (BETWEEN(DATAIN,\"\",#DATA))&&((NUM(ANSI(DATASC))>=" << datasc.date2ansi() << ")||(DATASC=\"\"))&&(CONTSPOR>0)\n" + << "SELECT (BETWEEN(DATAIN,\"\",#DATA))&&((NUM(ANSI(DATASC))>=" << datasc.date2ansi() << ")||(DATASC=\"\"))&&(CONTSPOR>0)\n" << "BY CODCF"; + TISAM_recordset contratti(query); contratti.set_var("#DATA", datasc); @@ -214,7 +215,7 @@ void TInvcon_skema_msk::esporta() const recset_dotazioni->aggiungi_riga(codcf, codcon); } recset_clienti->save_as(file_cli); - recset_articoli->save_as(file_art); + recset_dotazioni->save_as(file_dot); TISAM_recordset anamag(TR("USE ANAMAG")); @@ -223,7 +224,7 @@ void TInvcon_skema_msk::esporta() const const TString80 codart = anamag.get(ANAMAG_CODART).as_string(); recset_articoli->aggiungi_riga(codart); } - recset_dotazioni->save_as(file_dot); + recset_articoli->save_as(file_art); message_box(TR("Esportazione terminata")); } else