Correzioni alla stampa lista movimenti

git-svn-id: svn://10.65.10.50/trunk@458 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
nik 1994-10-25 17:27:44 +00:00
parent 0461908b2b
commit 57f56bc9ed

View File

@ -97,7 +97,7 @@ public:
void incrementa_totali();
void compila_clifo();
void compila_comuni();
int my_next (TLocalisamfile&);
// int my_next (TLocalisamfile&);
CG3100_application() {}
};
@ -1223,7 +1223,7 @@ print_action CG3100_application::postprocess_page(int file,int count)
return NEXT_PAGE;
}
/************
int CG3100_application::my_next(TLocalisamfile & mov)
{
int esito;
@ -1263,6 +1263,7 @@ int CG3100_application::my_next(TLocalisamfile & mov)
}
return esito;
}
********/
print_action CG3100_application::postprocess_print(int file,int count)
{
@ -1434,8 +1435,14 @@ bool CG3100_application::segnala_errori_ogniriga()
if ((_tiporegistro == 1)||(_tiporegistro == 2)) //movimento iva
{
long record, numreg;
<<<<<<< cg3100.cpp
TLocalisamfile& rmoviva = current_cursor()->file(LF_RMOVIVA);
_numreg = current_cursor()->file(LF_MOV).get_long(MOV_NUMREG);
=======
TLocalisamfile& rmoviva = current_cursor()->file(LF_RMOVIVA);
_numreg = current_cursor()->file(LF_MOV).get_long(MOV_NUMREG);
>>>>>>> 1.13
if (current_cursor()->is_first_match(LF_RMOVIVA))
{
record = rmoviva.recno();