root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correzione MI2232. In realta' la modifica vera e' stata fatta solamente

Browse Source 
in cg6700.cpp, visto che le modifiche in cglib04 sono state rimosse.
Ora il cambio di segno avviene solo la prima volta che si effettua
la lista controllo.


git-svn-id: svn://10.65.10.50/trunk@3905 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
angelo 1996-11-18 08:27:31 +00:00
parent a3afbf8fff
commit 9db4e1ff7c
3 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cg/cg6700.cpp
View File

@ -2695,6 +2695,8 @@ void TRic_ListaMov::aggiorna_mov()
if (mov.get(MOV_TIPOMOV).empty()) if (mov.get(MOV_TIPOMOV).empty())
mov.put(MOV_TIPOMOV, _tipom_cau); mov.put(MOV_TIPOMOV, _tipom_cau);
mov.put(MOV_CODPAG, _codpag_scad); mov.put(MOV_CODPAG, _codpag_scad);
if ((_tipodoc == "NC" || _tipodoc == "ST") && _tot_doc > 0.0) // swap sign only if positive
_tot_doc = _tot_doc * -1;
mov.put(MOV_TOTDOC, _tot_doc); mov.put(MOV_TOTDOC, _tot_doc);
if (_is_salda) if (_is_salda)
{ {
@ -2730,6 +2732,13 @@ void TRic_ListaMov::aggiorna_iva(char tipo)
if (_anno == 0) if (_anno == 0)
riva.put(RMI_ANNOES, _annoese); riva.put(RMI_ANNOES, _annoese);
if ((_tipodoc == "NC" || _tipodoc == "ST") && _impo > 0.0) // swap sign only if positive
{
_impo = _impo * -1;
_impos = _impos * -1;
}
riva.put(RMI_IMPONIBILE, _impo);
riva.put(RMI_IMPOSTA, _impos);
riva.put(RMI_TIPOC, tipo); riva.put(RMI_TIPOC, tipo);
riva.rewrite(); riva.rewrite();

67
cg/cglib04.cpp
View File

@ -1727,18 +1727,21 @@ void TTransfer_file::write_tmp_movPN(TString& record,bool create)
int TTransfer_file::trasfer_data_mov(TIsamtempfile& file, TRectype& dep) int TTransfer_file::trasfer_data_mov(TIsamtempfile& file, TRectype& dep)
{ {
const int ln = file.num();
file.zero(); file.zero();
file.curr() = dep; file.curr() = dep;
const bool ok = file.read() == NOERR; if (file.read() == NOERR)
file.zero(); {
file.curr() = dep; file.zero();
file.curr() = dep;
if (ok)
file.rewrite(); file.rewrite();
}
else else
{
file.zero();
file.curr() = dep;
file.write(); file.write();
}
return 0; return 0;
} }
@ -1868,7 +1871,7 @@ void TTransfer_file::write_tmp_movIVA(TString& record, bool create)
{ {
if (logicnum_p) if (logicnum_p)
{ {
trasfer_data_moviva(*file, *dep, logicnum_p, tipodoc); trasfer_data_moviva(*file, *dep, logicnum_p);
delete file; delete file;
delete dep; delete dep;
} }
@ -1959,40 +1962,22 @@ void TTransfer_file::write_tmp_movIVA(TString& record, bool create)
while (trc.is_key((const char*) key)); while (trc.is_key((const char*) key));
_prog->addstatus(1); _prog->addstatus(1);
trasfer_data_moviva(*file, *dep, logicnum_p, tipodoc); trasfer_data_moviva(*file, *dep, logicnum_p);
delete file; delete file;
delete dep; delete dep;
} // if (trc.is_key((const char*) key)) } // if (trc.is_key((const char*) key))
} }
int TTransfer_file::trasfer_data_moviva(TIsamtempfile& file, TRectype& dep, int ln, TString& tipodoc) int TTransfer_file::trasfer_data_moviva(TIsamtempfile& file, TRectype& dep, int ln)
{ {
file.zero(); file.zero();
file.curr() = dep; file.curr() = dep;
const bool ok = file.read() == NOERR; if (file.read() == NOERR)
if (ln != LF_MOV) {
{ if (ln == LF_MOV)
file.zero(); {
file.curr() = dep;
if (tipodoc == "NC" || tipodoc == "ST")
{
real imp = file.get_real(RMI_IMPONIBILE);
real iva = file.get_real(RMI_IMPOSTA);
imp = imp * -1;
iva = iva * -1;
file.put(RMI_IMPONIBILE,imp);
file.put(RMI_IMPOSTA,iva);
}
if (ok) file.rewrite();
else file.write();
}
else
if (ok)
{
TDate data74ter (dep.get_date(MOV_DATA74TER)); TDate data74ter (dep.get_date(MOV_DATA74TER));
TString codval (dep.get (MOV_CODVALI)); TString codval (dep.get (MOV_CODVALI));
TString ocfpi (dep.get (MOV_OCFPI)); TString ocfpi (dep.get (MOV_OCFPI));
@ -2000,7 +1985,7 @@ int TTransfer_file::trasfer_data_moviva(TIsamtempfile& file, TRectype& dep, int
real cambioi (dep.get_real(MOV_CAMBIOI)); real cambioi (dep.get_real(MOV_CAMBIOI));
real corrlire (dep.get_real(MOV_CORRLIRE)); real corrlire (dep.get_real(MOV_CORRLIRE));
real corrvaluta(dep.get_real(MOV_CORRVALUTA)); real corrvaluta(dep.get_real(MOV_CORRVALUTA));
file.put(MOV_DATA74TER, data74ter); file.put(MOV_DATA74TER, data74ter);
file.put(MOV_CODVALI, codval); file.put(MOV_CODVALI, codval);
file.put(MOV_OCFPI, ocfpi); file.put(MOV_OCFPI, ocfpi);
@ -2008,9 +1993,23 @@ int TTransfer_file::trasfer_data_moviva(TIsamtempfile& file, TRectype& dep, int
file.put(MOV_CAMBIOI, cambioi); file.put(MOV_CAMBIOI, cambioi);
file.put(MOV_CORRLIRE, corrlire); file.put(MOV_CORRLIRE, corrlire);
file.put(MOV_CORRVALUTA,corrvaluta); file.put(MOV_CORRVALUTA,corrvaluta);
file.rewrite(); file.rewrite();
} }
else
{
file.zero();
file.curr() = dep;
file.rewrite();
}
}
else
{
file.zero();
file.curr() = dep;
file.write();
}
return 0; return 0;
} }

2
cg/cglib04.h
View File

@ -213,7 +213,7 @@ private:
void write_tmp_movPN(TString& record, bool create); void write_tmp_movPN(TString& record, bool create);
int trasfer_data_mov(TIsamtempfile& file, TRectype& dep); int trasfer_data_mov(TIsamtempfile& file, TRectype& dep);
void write_tmp_movIVA(TString& record, bool create); void write_tmp_movIVA(TString& record, bool create);
int trasfer_data_moviva(TIsamtempfile& file, TRectype& dep, int ln, TString& tipodoc); int trasfer_data_moviva(TIsamtempfile& file, TRectype& dep, int ln);
// Funzioni per la ricezione del Saldaconto da Sistema // Funzioni per la ricezione del Saldaconto da Sistema
void write_tmp_movSC(TString& record, bool create); void write_tmp_movSC(TString& record, bool create);
void new_key(TString& key, int tipo, TString& buffer); void new_key(TString& key, int tipo, TString& buffer);