Patch level :

Files correlati     : pi0001
Ricompilazione Demo : [ ]
Commento            :


git-svn-id: svn://10.65.10.50/branches/R_10_00@21710 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2011-02-24 12:35:27 +00:00
parent a2af48e4a3
commit cb18b1cf06

View File

@ -279,6 +279,8 @@ void TImporta_mov::transfer(const TMask& msk)
const TDate d(s.get(DTOPCM).as_int());
const long n = s.get(NONPCM).as_int();
descr = s.get(DSUPCM).as_string();
if (anno != a || reg != r || dataop != d || n != nmov )
{
if (iva && conf != NULL)
@ -331,8 +333,6 @@ void TImporta_mov::transfer(const TMask& msk)
conf->set(MOV_STAMPATO, "X");
conf->set(MOV_REGST, "X");
descr = s.get(DSUPCM).as_string();
if (iva)
{
TToken_string key(25, ',');
@ -345,6 +345,7 @@ void TImporta_mov::transfer(const TMask& msk)
}
descr << '-' << anno << '/' << reg << '/' << dataop << '/' << nmov;
conf->set(MOV_DESCR, descr);
descr.cut(0);
nrigac = 1;
nrigai = 1;
rows.destroy();
@ -383,7 +384,7 @@ void TImporta_mov::transfer(const TMask& msk)
conf->set(MOV_TIPO, tipocf);
conf->set(MOV_CODCF, sottoconto);
conf->set(MOV_TOTDOC, importo.string());
paragraph.format("%d,%d",LF_RMOV,nrigac++);
paragraph.format("%d,%d",LF_RMOV, nrigac++);
conf->set_paragraph(paragraph);
conf->set(RMV_SEZIONE, sez);
conf->set(RMV_TIPOC, tipocf);
@ -409,6 +410,7 @@ void TImporta_mov::transfer(const TMask& msk)
conf->set(RMV_CONTO, conto);
conf->set(RMV_SOTTOCONTO, sottoconto);
conf->set(RMV_TIPOC, tipocf);
conf->set(RMV_DESCR, descr);
}
}
else