From e171b2fd7df94fd5a360cef5f319fd6b31d709b9 Mon Sep 17 00:00:00 2001 From: bonazzi Date: Mon, 9 Jan 2017 22:28:00 +0000 Subject: [PATCH] Patch level : 12.0 324 Files correlati : np0.exe np0300a.uml np0400a.uml np0500a.uml np0600a.uml np0600b.uml npmenu.men MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Aggiornato tutto il modulo Contabilità Separata. Le modifiche di contabilità sono sui define per NP e non necessitano di patch. I programmi cg1 e cg3 si compilano correttamente. git-svn-id: svn://10.65.10.50/branches/R_10_00@23505 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- src/cg/cg1500.cpp | 7 ++++++- src/cg/cg3100.cpp | 11 +++++++++++ src/cg/cg3200.cpp | 4 ++++ src/cg/cg3600.cpp | 4 ++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/cg/cg1500.cpp b/src/cg/cg1500.cpp index cefd3b185..c5122e679 100755 --- a/src/cg/cg1500.cpp +++ b/src/cg/cg1500.cpp @@ -3770,8 +3770,13 @@ void TStampa_bilanci::stampa_un_bilancio(const TMask& m) bool TStampa_bilanci::set_print(int) { + #ifdef CONT_SEP + TMask m ("np0300a"); +#else TMask m ("cg1500a"); - m.set_handler (F_VERIFICA, verifica_handler); +#endif + + m.set_handler (F_VERIFICA, verifica_handler); m.set_handler (F_BILANCIO, mask_bilancio); m.set_handler (F_STAMPA1, mask_bilancio); m.set_handler (F_STAMPA, mask_bilancio); diff --git a/src/cg/cg3100.cpp b/src/cg/cg3100.cpp index 48435d9a8..43e167007 100755 --- a/src/cg/cg3100.cpp +++ b/src/cg/cg3100.cpp @@ -2078,10 +2078,21 @@ bool TListaMov_application::set_print(int) { case 'C': masc = "cg3100b"; +#ifdef CONT_SEP + masc = "cg0600b"; +#else + masc = "cg3100b"; +#endif _tipo_lista = fatture; break; case 'M': default : +#ifdef CONT_SEP + masc = "cg0600a"; +#else + masc = "cg3100a"; +#endif + masc = "cg3100a"; _tipo_lista = movimenti; break; diff --git a/src/cg/cg3200.cpp b/src/cg/cg3200.cpp index a16851386..43154c2c3 100755 --- a/src/cg/cg3200.cpp +++ b/src/cg/cg3200.cpp @@ -3699,7 +3699,11 @@ bool TMastrini_application::user_create() _d22 = new TParagraph_string ("",22); _d30 = new TParagraph_string ("",30); +#ifdef CONT_SEP + _msk = new TMask("np0400a"); +#else _msk = new TMask("cg3200a"); +#endif set_handlers(_msk); _msk->set_handler(F_MEMORIZZA, memorizza_handler); diff --git a/src/cg/cg3600.cpp b/src/cg/cg3600.cpp index c1ae1d3c9..050acbc88 100755 --- a/src/cg/cg3600.cpp +++ b/src/cg/cg3600.cpp @@ -2583,7 +2583,11 @@ bool TQuery_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) return true; } +#ifdef CONT_SEP +TQuery_mask::TQuery_mask(TGrid_mask* gm) : TAutomask("np0500a"), _gm(gm), _last_tipo("") +#else TQuery_mask::TQuery_mask(TGrid_mask* gm) : TAutomask("cg3600a"), _gm(gm), _last_tipo("") +#endif { } void TQuery_mask::do_query()