From 490691820a2015efb980e06488ebe1252a18408b Mon Sep 17 00:00:00 2001 From: luca83 Date: Thu, 27 May 2010 10:19:42 +0000 Subject: [PATCH] Patch level : 10.0 Files correlati : ps0713 e maschere Ricompilazione Demo : [ ] Commento : Corretta la generazione dei movimenti di prima nota e il salvataggio dei movimenti di analitica git-svn-id: svn://10.65.10.50/trunk@20505 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ps/ps0713300.cpp | 21 +++++++++++++-------- ps/ps0713300a.uml | 8 ++++---- ps/ps0713500.cpp | 11 +++++++++-- ps/ps0713600.cpp | 12 ++++++++---- 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/ps/ps0713300.cpp b/ps/ps0713300.cpp index a1e209d16..d14bc5a01 100755 --- a/ps/ps0713300.cpp +++ b/ps/ps0713300.cpp @@ -71,11 +71,16 @@ long TImporta_fatacq_app::genera_movcg() { TISAM_recordset movrec("USE MOV"); movrec.move_last(); - long numreg = movrec.get(MOV_NUMREG).as_int(); numreg++; + long numreg = movrec.cursor()->curr().get_int(MOV_NUMREG); numreg++; TLocalisamfile mov(LF_MOV); - mov.put(MOV_NUMREG, numreg); - mov.rewrite(); + mov.put(MOV_NUMREG, numreg); + mov.put(MOV_DATACOMP, _msk->get_date(F_DATAREG)); + mov.put(MOV_DATAREG, _msk->get_date(F_DATAREG)); + mov.put(MOV_TIPO, 'F'); + mov.put(MOV_CODCF, _msk->get(F_CODCF)); + mov.put(MOV_CODCAUS, _msk->get(F_CODCAU)); + mov.write(); return numreg; } @@ -126,11 +131,13 @@ void TImporta_fatacq_app::genera_analitica(const long numreg, TAssoc_array& righ ranmo.put(RMOVANA_IMPORTO, imp); } } + TLocalisamfile fmov(LF_MOVANA); + anmo.write(fmov); } bool TImporta_fatacq_app::transfer(const TFilename& file, const long numreg, TAssoc_array& righean) { - TVB_recset s(file, '\t'); + TVB_recset s(file, ','); TProgind pi(s.items(),"Importazione fatture in corso ...",true,true); @@ -139,10 +146,6 @@ bool TImporta_fatacq_app::transfer(const TFilename& file, const long numreg, TAs _configfile->set("Mode","AUTO"); _configfile->set_paragraph("23"); //setto il paragrafo [23] del file ini (testata) _configfile->set(MOV_NUMREG, numreg); - _configfile->set(MOV_TIPO,"F"); - _configfile->set(MOV_CODCF, _msk->get(F_CODCF)); - _configfile->set(MOV_CODCAUS, _msk->get(F_CODCAU)); - _configfile->set(MOV_DATAREG, _msk->get(F_DATAREG)); int nriga = 1; @@ -156,6 +159,8 @@ bool TImporta_fatacq_app::transfer(const TFilename& file, const long numreg, TAs _configfile->set_paragraph(paragraph); TString16 codcom = s.get(0).as_string(); + if(codcom.empty()) + continue; real imp = s.get(1).as_real(); TCommessa cms(codcom); diff --git a/ps/ps0713300a.uml b/ps/ps0713300a.uml index d43e2da3d..4b92b9c2d 100755 --- a/ps/ps0713300a.uml +++ b/ps/ps0713300a.uml @@ -10,7 +10,7 @@ PAGE "Importazione fatture" 0 0 0 0 STRING DLG_PROFILE 50 BEGIN - PROMPT 1 -1 "Profilo " + PROMPT 9 -12 "Profilo " PSELECT FLAGS "H" END @@ -97,7 +97,7 @@ END STRING F_CODCF 4 BEGIN - PROMPT 2 9 "Fornitore " + PROMPT 2 8 "Fornitore " FLAG "UR" USE LF_CLIFO INPUT TIPOCF "F" @@ -111,7 +111,7 @@ END STRING F_FRAGSOC 50 24 BEGIN - PROMPT 25 9 "Ragione Sociale " + PROMPT 25 8 "Ragione Sociale " USE LF_CLIFO KEY 2 INPUT TIPOCF "F" INPUT RAGSOC F_FRAGSOC @@ -122,7 +122,7 @@ END DATE F_DATAREG BEGIN - PROMPT 2 10 "Data registrazione " + PROMPT 2 9 "Data registrazione " CHECKTYPE REQUIRED END diff --git a/ps/ps0713500.cpp b/ps/ps0713500.cpp index cdd3f4216..ad49cafbb 100755 --- a/ps/ps0713500.cpp +++ b/ps/ps0713500.cpp @@ -100,9 +100,13 @@ long TImporta_spese_app::genera_movcg() movrec.move_last(); long numreg = movrec.get(MOV_NUMREG).as_int(); numreg++; + const TDate datareg(TODAY); + TLocalisamfile mov(LF_MOV); - mov.put(MOV_NUMREG, numreg); - mov.rewrite(); + mov.put(MOV_NUMREG, numreg); + mov.put(MOV_DATACOMP, datareg); + mov.put(MOV_DATAREG, datareg); + mov.write(); return numreg; } @@ -157,6 +161,9 @@ void TImporta_spese_app::genera_movana(const long numreg, TAssoc_array& righean) ranmo.put(RMOVANA_SEZIONE, importo.sezione()); } } + + TLocalisamfile fmov(LF_MOVANA); + anmo.write(fmov); } bool TImporta_spese_app::transfer() diff --git a/ps/ps0713600.cpp b/ps/ps0713600.cpp index 8af46c560..be7d9105d 100755 --- a/ps/ps0713600.cpp +++ b/ps/ps0713600.cpp @@ -199,8 +199,10 @@ long TImporta_fat_for_app::genera_movcg() long numreg = movrec.get(MOV_NUMREG).as_int(); numreg++; TLocalisamfile mov(LF_MOV); - mov.put(MOV_NUMREG, numreg); - mov.rewrite(); + mov.put(MOV_NUMREG, numreg); + mov.put(MOV_DATACOMP, _msk->get_date(F_DATAREG)); + mov.put(MOV_DATAREG, _msk->get_date(F_DATAREG)); + mov.write(); return numreg; } @@ -295,6 +297,9 @@ void TImporta_fat_for_app::genera_analitica(TAssoc_array& righean, TCommessa_str ranmo.put(RMOVANA_CODCMS, kmax.idlavoro()); ranmo.put(RMOVANA_IMPORTO, importo.valore().string()); } + + TLocalisamfile fmov(LF_MOVANA); + anmo.write(fmov); } //IMPORTA_FAT: metodo che genera l'ini per l'importazione delle fatture a fornitore @@ -338,8 +343,7 @@ void TImporta_fat_for_app::importa_fat(TAssoc_array& righecg, TCommessa_string& TProgind pi(righecg.items(), "Importazione in corso...", true, true); configfile->set_paragraph("23"); //setto il paragrafo [23] del file ini (testata) - configfile->set(MOV_NUMREG, numregcg); - configfile->set(MOV_DATAREG, datareg); + configfile->set(MOV_NUMREG, numregcg); configfile->set(MOV_DATADOC, datadoc); configfile->set(MOV_NUMDOC, ndoc); configfile->set(MOV_CODCAUS, codcau);