diff --git a/cg/cg0500.cpp b/cg/cg0500.cpp index 889e06489..ec3d8c36e 100755 --- a/cg/cg0500.cpp +++ b/cg/cg0500.cpp @@ -17,7 +17,7 @@ #include "cg0500.h" typedef enum { no_descr, acquisto, vendita, incasso_pagamento, - ritenuta_occas, incasso_pagamento_gesval } tipo_descr; + ritenuta_occas } tipo_descr; class TCaus_app : public TRelation_application { @@ -240,9 +240,7 @@ void TCaus_app::causale_ritenute() void TCaus_app::causale_inc_pag() { - const tipo_descr tipo_des = valuta() ? incasso_pagamento_gesval : incasso_pagamento; - - if (_tipo_des != tipo_des) + if (_tipo_des != incasso_pagamento) { int i = 0; set_descr ( i++, "C Clienti/Fornitori"); @@ -252,13 +250,12 @@ void TCaus_app::causale_inc_pag() set_descr ( i++, "C Cessione"); set_descr ( i++, "C Paghero'"); set_descr ( i++, "C Lettera di credito"); - set_descr ( i++, "C Abb. pass/sc."); - set_descr ( i++, "C Abb. att/sc."); + set_descr ( i++, "C Abbuoni pass./sc."); + set_descr ( i++, "C Abbuoni att./sc."); set_descr ( i++, "C Spese e rimborsi"); set_descr ( i++, "C Ritenute fiscali"); - if (_tipo_des == incasso_pagamento_gesval) - set_descr (i++, "C Differenza cambio"); - _tipo_des = tipo_des; + set_descr ( i++, "C Differenza cambio"); + _tipo_des = incasso_pagamento; carica_righe_libere(i); } } @@ -552,8 +549,6 @@ bool TCaus_app::conto_hndl (TMask_field& f, KEY k) switch (app()._tipo_des) { case incasso_pagamento: - ultima = 11; break; - case incasso_pagamento_gesval: ultima = 12; break; default: ultima = 8; break; diff --git a/cg/cg2100.cpp b/cg/cg2100.cpp index 2e937506d..cef7a9de8 100755 --- a/cg/cg2100.cpp +++ b/cg/cg2100.cpp @@ -428,6 +428,7 @@ TMask* TPrimanota_application::get_mask(int mode) void TPrimanota_application::on_firm_change() { + TRelation_application::on_firm_change(); _rel->lfile().last(); _lastreg = _rel->lfile().get_long(MOV_NUMREG); // Init last registration number } diff --git a/cg/cg4400.cpp b/cg/cg4400.cpp index 4245c3e24..982b0b7b8 100755 --- a/cg/cg4400.cpp +++ b/cg/cg4400.cpp @@ -2481,6 +2481,8 @@ print_action CG4400_application::postprocess_page (int file, int counter) bool CG4400_application::set_print(int n) { + printer().read_configuration(); // Ripristina stampante standard + TMask m ("cg4400a"); int giorni_del_mese; bool ok; @@ -2500,7 +2502,7 @@ bool CG4400_application::set_print(int n) m.set_handler (BUT_DFR, fr_butt_handler); m.set_handler (ANNO, year_handler); - m.field(F_SELECT).set(format("%ld",_selected.ones())); + m.set(F_SELECT, _selected.ones()); set_choice_limits(m); //printer().footerlen(5);