Correzione errori

git-svn-id: svn://10.65.10.50/trunk@1657 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
nik 1995-07-31 09:49:11 +00:00
parent 5be42f00f4
commit 5ec94653a6
8 changed files with 5914 additions and 5906 deletions

View File

@ -667,8 +667,11 @@ void CG1100_application::set_senza_IV()
} }
if (sottoc != 0l) if (sottoc != 0l)
{ {
char tipospric = rec.get_char(PCN_TIPOSPRIC);
if (tipospric == '\0') tipospric = '0';
set_row (i, "@104g@1n", FLD(LF_PCON, PCN_RICSER) ); set_row (i, "@104g@1n", FLD(LF_PCON, PCN_RICSER) );
set_row (i, "@109g@1n", FLD(LF_PCON, PCN_TIPOSPRIC) ); //set_row (i, "@109g@1n", FLD(LF_PCON, PCN_TIPOSPRIC) );
set_row (i, "@109g%c", tipospric);
set_row (i, "@115g@1s", FLD(LF_PCON, PCN_SEZSALDI) ); set_row (i, "@115g@1s", FLD(LF_PCON, PCN_SEZSALDI) );
set_row (i, "@129g@f", FLD(LF_PCON, PCN_STSOTTAB) ); set_row (i, "@129g@f", FLD(LF_PCON, PCN_STSOTTAB) );
} }
@ -712,7 +715,6 @@ void CG1100_application::set_con_ana()
void CG1100_application::set_senza_ana() void CG1100_application::set_senza_ana()
{ {
reset_row (1); reset_row (1);
set_row (1, "$[r]@pn$[n] $[r]@pn$[n] $[r]@pn$[n]", set_row (1, "$[r]@pn$[n] $[r]@pn$[n] $[r]@pn$[n]",
@ -731,14 +733,14 @@ void CG1100_application::set_senza_ana()
set_row (1, "@92g@1s", FLD(LF_PCON, PCN_TMCF) ); set_row (1, "@92g@1s", FLD(LF_PCON, PCN_TMCF) );
set_row (1, "@99g@f", FLD(LF_PCON, PCN_STSOTTBIL) ); set_row (1, "@99g@f", FLD(LF_PCON, PCN_STSOTTBIL) );
set_row (1, "@107g@f", FLD(LF_PCON, PCN_COMPENS) ); set_row (1, "@107g@f", FLD(LF_PCON, PCN_COMPENS) );
set_row (1, "@114g@1n", FLD(LF_PCON, PCN_TIPOSPRIC) ); //set_row (1, "@114g@1n", FLD(LF_PCON, PCN_TIPOSPRIC) );
set_row (1, "@120g@1s", FLD(LF_PCON, PCN_SEZSALDI) ); set_row (1, "@120g@1s", FLD(LF_PCON, PCN_SEZSALDI) );
} }
void CG1100_application::set_completa() void CG1100_application::set_completa()
{ {
TRectype & rec = current_cursor()->curr(); TRectype& rec = current_cursor()->curr();
char sezione; char sezione;
int i; int i;
@ -790,8 +792,11 @@ void CG1100_application::set_completa()
} }
if (sottoc != 0l) if (sottoc != 0l)
{ {
char tipospric = rec.get_char(PCN_TIPOSPRIC);
if (tipospric == '\0') tipospric = '0';
set_row (i, "@104g@1n", FLD(LF_PCON, PCN_RICSER) ); set_row (i, "@104g@1n", FLD(LF_PCON, PCN_RICSER) );
set_row (i, "@109g@1n", FLD(LF_PCON, PCN_TIPOSPRIC) ); //set_row (i, "@109g@1n", FLD(LF_PCON, PCN_TIPOSPRIC) );
set_row (i, "@109g%c", tipospric);
set_row (i, "@115g@1s", FLD(LF_PCON, PCN_SEZSALDI) ); set_row (i, "@115g@1s", FLD(LF_PCON, PCN_SEZSALDI) );
set_row (i, "@129g@f", FLD(LF_PCON, PCN_STSOTTAB) ); set_row (i, "@129g@f", FLD(LF_PCON, PCN_STSOTTAB) );
} }
@ -818,6 +823,9 @@ bool CG1100_application::elabora_riga()
// se e' un sottoconto stampo sotttab in 127 // se e' un sottoconto stampo sotttab in 127
if (sottoc != 0) if (sottoc != 0)
{ {
char tipospric = curr_rec.get_char(PCN_TIPOSPRIC);
if (tipospric == '\0') tipospric = '0';
set_row (1, "@114g%c", tipospric);
set_row (1, "@127g@f", FLD(LF_PCON, PCN_STSOTTAB)); set_row (1, "@127g@f", FLD(LF_PCON, PCN_STSOTTAB));
set_row (1, "@117g "); set_row (1, "@117g ");
} }
@ -908,7 +916,7 @@ bool CG1100_application::preprocess_page(int file,int counter)
{ {
if (file == LF_PCON) if (file == LF_PCON)
{ {
TRectype & rec = current_cursor()->curr(); TRectype& rec = current_cursor()->curr();
int gruppo = rec.get_int (PCN_GRUPPO); int gruppo = rec.get_int (PCN_GRUPPO);
int conto = rec.get_int (PCN_CONTO); int conto = rec.get_int (PCN_CONTO);
long sottoc = rec.get_long(PCN_SOTTOCONTO); long sottoc = rec.get_long(PCN_SOTTOCONTO);
@ -963,8 +971,8 @@ bool CG1100_application::preprocess_page(int file,int counter)
} }
if (_tipo_stampa == senza_ana_bil) if (_tipo_stampa == senza_ana_bil)
{ {
TRectype & rec = current_cursor()->curr(); TRectype& rec = current_cursor()->curr();
force_setpage();
if (rec.get_int(PCN_CONTO) == 0) return FALSE; if (rec.get_int(PCN_CONTO) == 0) return FALSE;
if (rec.get_long(PCN_SOTTOCONTO) == 0L) if (rec.get_long(PCN_SOTTOCONTO) == 0L)
a1 = rec.get(PCN_CODCBL); a1 = rec.get(PCN_CODCBL);
@ -1165,7 +1173,7 @@ bool CG1100_application::user_create()
add_file(LF_PCON); add_file(LF_PCON);
set_print_zero(); //set_print_zero();
_tipo_stampa = completa; _tipo_stampa = completa;
_salto_pag = FALSE; _salto_pag = FALSE;

View File

@ -184,7 +184,7 @@ public:
virtual print_action postprocess_page(int, int); virtual print_action postprocess_page(int, int);
virtual bool preprocess_print(int, int); virtual bool preprocess_print(int, int);
virtual void postclose_print(); virtual void postclose_print();
// virtual bool cancel_hook(); // virtual bool cancel_hook();
virtual bool set_print(int); virtual bool set_print(int);
virtual bool user_create(); virtual bool user_create();
@ -854,8 +854,8 @@ bool CG3400_application::preprocess_print(int file, int counter)
} }
/*** /***
bool CG3400_application::cancel_hook() bool CG3400_application::cancel_hook()
{ {
int ultima_fatta = printer().getcurrentpage() - 1; int ultima_fatta = printer().getcurrentpage() - 1;
// int stampate = ultima_fatta - _pagina_da + 1; // int stampate = ultima_fatta - _pagina_da + 1;
@ -867,8 +867,8 @@ bool CG3400_application::cancel_hook()
} }
else else
return FALSE; return FALSE;
} }
***/ ***/
void CG3400_application::fill_page(int riga) void CG3400_application::fill_page(int riga)
{ {