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
This commit is contained in:
luca83 2010-05-27 10:19:42 +00:00
parent 972d406ac9
commit 490691820a
4 changed files with 34 additions and 18 deletions

View File

@ -71,11 +71,16 @@ long TImporta_fatacq_app::genera_movcg()
{ {
TISAM_recordset movrec("USE MOV"); TISAM_recordset movrec("USE MOV");
movrec.move_last(); 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); TLocalisamfile mov(LF_MOV);
mov.put(MOV_NUMREG, numreg); mov.put(MOV_NUMREG, numreg);
mov.rewrite(); 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; return numreg;
} }
@ -126,11 +131,13 @@ void TImporta_fatacq_app::genera_analitica(const long numreg, TAssoc_array& righ
ranmo.put(RMOVANA_IMPORTO, imp); 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) 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); 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("Mode","AUTO");
_configfile->set_paragraph("23"); //setto il paragrafo [23] del file ini (testata) _configfile->set_paragraph("23"); //setto il paragrafo [23] del file ini (testata)
_configfile->set(MOV_NUMREG, numreg); _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; int nriga = 1;
@ -156,6 +159,8 @@ bool TImporta_fatacq_app::transfer(const TFilename& file, const long numreg, TAs
_configfile->set_paragraph(paragraph); _configfile->set_paragraph(paragraph);
TString16 codcom = s.get(0).as_string(); TString16 codcom = s.get(0).as_string();
if(codcom.empty())
continue;
real imp = s.get(1).as_real(); real imp = s.get(1).as_real();
TCommessa cms(codcom); TCommessa cms(codcom);

View File

@ -10,7 +10,7 @@ PAGE "Importazione fatture" 0 0 0 0
STRING DLG_PROFILE 50 STRING DLG_PROFILE 50
BEGIN BEGIN
PROMPT 1 -1 "Profilo " PROMPT 9 -12 "Profilo "
PSELECT PSELECT
FLAGS "H" FLAGS "H"
END END
@ -97,7 +97,7 @@ END
STRING F_CODCF 4 STRING F_CODCF 4
BEGIN BEGIN
PROMPT 2 9 "Fornitore " PROMPT 2 8 "Fornitore "
FLAG "UR" FLAG "UR"
USE LF_CLIFO USE LF_CLIFO
INPUT TIPOCF "F" INPUT TIPOCF "F"
@ -111,7 +111,7 @@ END
STRING F_FRAGSOC 50 24 STRING F_FRAGSOC 50 24
BEGIN BEGIN
PROMPT 25 9 "Ragione Sociale " PROMPT 25 8 "Ragione Sociale "
USE LF_CLIFO KEY 2 USE LF_CLIFO KEY 2
INPUT TIPOCF "F" INPUT TIPOCF "F"
INPUT RAGSOC F_FRAGSOC INPUT RAGSOC F_FRAGSOC
@ -122,7 +122,7 @@ END
DATE F_DATAREG DATE F_DATAREG
BEGIN BEGIN
PROMPT 2 10 "Data registrazione " PROMPT 2 9 "Data registrazione "
CHECKTYPE REQUIRED CHECKTYPE REQUIRED
END END

View File

@ -100,9 +100,13 @@ long TImporta_spese_app::genera_movcg()
movrec.move_last(); movrec.move_last();
long numreg = movrec.get(MOV_NUMREG).as_int(); numreg++; long numreg = movrec.get(MOV_NUMREG).as_int(); numreg++;
const TDate datareg(TODAY);
TLocalisamfile mov(LF_MOV); TLocalisamfile mov(LF_MOV);
mov.put(MOV_NUMREG, numreg); mov.put(MOV_NUMREG, numreg);
mov.rewrite(); mov.put(MOV_DATACOMP, datareg);
mov.put(MOV_DATAREG, datareg);
mov.write();
return numreg; return numreg;
} }
@ -157,6 +161,9 @@ void TImporta_spese_app::genera_movana(const long numreg, TAssoc_array& righean)
ranmo.put(RMOVANA_SEZIONE, importo.sezione()); ranmo.put(RMOVANA_SEZIONE, importo.sezione());
} }
} }
TLocalisamfile fmov(LF_MOVANA);
anmo.write(fmov);
} }
bool TImporta_spese_app::transfer() bool TImporta_spese_app::transfer()

View File

@ -199,8 +199,10 @@ long TImporta_fat_for_app::genera_movcg()
long numreg = movrec.get(MOV_NUMREG).as_int(); numreg++; long numreg = movrec.get(MOV_NUMREG).as_int(); numreg++;
TLocalisamfile mov(LF_MOV); TLocalisamfile mov(LF_MOV);
mov.put(MOV_NUMREG, numreg); mov.put(MOV_NUMREG, numreg);
mov.rewrite(); mov.put(MOV_DATACOMP, _msk->get_date(F_DATAREG));
mov.put(MOV_DATAREG, _msk->get_date(F_DATAREG));
mov.write();
return numreg; 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_CODCMS, kmax.idlavoro());
ranmo.put(RMOVANA_IMPORTO, importo.valore().string()); 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 //IMPORTA_FAT: metodo che genera l'ini per l'importazione delle fatture a fornitore
@ -339,7 +344,6 @@ void TImporta_fat_for_app::importa_fat(TAssoc_array& righecg, TCommessa_string&
configfile->set_paragraph("23"); //setto il paragrafo [23] del file ini (testata) configfile->set_paragraph("23"); //setto il paragrafo [23] del file ini (testata)
configfile->set(MOV_NUMREG, numregcg); configfile->set(MOV_NUMREG, numregcg);
configfile->set(MOV_DATAREG, datareg);
configfile->set(MOV_DATADOC, datadoc); configfile->set(MOV_DATADOC, datadoc);
configfile->set(MOV_NUMDOC, ndoc); configfile->set(MOV_NUMDOC, ndoc);
configfile->set(MOV_CODCAUS, codcau); configfile->set(MOV_CODCAUS, codcau);