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

Patch level : 12.0 378

Browse Source 
Files correlati     : fe0
Commento            : Tolto doppio controllo durante l'eliminazione dei record in aggiornamento per lo spesometro

git-svn-id: svn://10.65.10.50/branches/R_10_00@23708 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
mtollari 2017-03-29 15:47:11 +00:00
parent ebef34b05d
commit 9b49c687de
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fe/fe0100.cpp
View File

@ -251,7 +251,7 @@ TExclusion_mode TSpesometro_msk::validate_mov(const TRectype& mov)
const char tipocf = mov.get_char(MOV_TIPO); const char tipocf = mov.get_char(MOV_TIPO);
const real impmin = get_real(F_IMPMIN); const real impmin = get_real(F_IMPMIN);
if (tipocf == 'C' && impmin > ZERO && abs(mov.get_real(MOV_TOTDOC)) <= impmin) if (tipocf == 'C' && impmin > ZERO && real(abs(mov.get_real(MOV_TOTDOC))) <= impmin)
return segnala_movimento(mov, em_importo_limite); return segnala_movimento(mov, em_importo_limite);
const TString& keytok = mov.get(MOV_NUMREG); const TString& keytok = mov.get(MOV_NUMREG);
@ -270,7 +270,7 @@ TExclusion_mode TSpesometro_msk::validate_mov(const TRectype& mov)
} }
if (tot_imponibile.is_zero() && tot_imposta.is_zero()) if (tot_imponibile.is_zero() && tot_imposta.is_zero())
return segnala_movimento(mov, em_importo_limite); return segnala_movimento(mov, em_importo_limite);
if (tipocf == 'C' && abs(tot_imponibile) < impmin) if (tipocf == 'C' && real(abs(tot_imponibile)) < impmin)
return segnala_movimento(mov, em_importo_limite); return segnala_movimento(mov, em_importo_limite);
TExclusion_mode em = validate_clifo(mov); TExclusion_mode em = validate_clifo(mov);
@ -509,7 +509,7 @@ bool TSpesometro_msk::azzera_alleg(TAssoc_array& manuali) const
TString query; TString query;
query << "USE " << LF_ALLEG query << "USE " << LF_ALLEG
<< "\nSELECT BETWEEN(DATAREG," << dataini.date2ansi() << ',' << datafin.date2ansi() << ')' //<< "\nSELECT BETWEEN(DATAREG," << dataini.date2ansi() << ',' << datafin.date2ansi() << ')'
<< "\nJOIN MOV INTO NUMREG==PROGR" << "\nJOIN MOV INTO NUMREG==PROGR"
<< "\nFROM ANNO=" << anno << "\nFROM ANNO=" << anno
<< "\nTO ANNO=" << anno << " PROGR=" << MANUAL_ROW; << "\nTO ANNO=" << anno << " PROGR=" << MANUAL_ROW;