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

Patch level : 12.0 324

Browse Source 
Files correlati     : np0.exe np0300a.uml np0400a.uml np0500a.uml np0600a.uml np0600b.uml npmenu.men

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
This commit is contained in:
bonazzi 2017-01-09 22:28:00 +00:00
parent 25fa8d82c0
commit e171b2fd7d
4 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cg/cg1500.cpp
View File

@ -3770,8 +3770,13 @@ void TStampa_bilanci::stampa_un_bilancio(const TMask& m)
bool TStampa_bilanci::set_print(int) bool TStampa_bilanci::set_print(int)
{ {
#ifdef CONT_SEP
TMask m ("np0300a");
#else
TMask m ("cg1500a"); 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_BILANCIO, mask_bilancio);
m.set_handler (F_STAMPA1, mask_bilancio); m.set_handler (F_STAMPA1, mask_bilancio);
m.set_handler (F_STAMPA, mask_bilancio); m.set_handler (F_STAMPA, mask_bilancio);

11
src/cg/cg3100.cpp
View File

@ -2078,10 +2078,21 @@ bool TListaMov_application::set_print(int)
{ {
case 'C': case 'C':
masc = "cg3100b"; masc = "cg3100b";
#ifdef CONT_SEP
masc = "cg0600b";
#else
masc = "cg3100b";
#endif
_tipo_lista = fatture; _tipo_lista = fatture;
break; break;
case 'M': case 'M':
default : default :
#ifdef CONT_SEP
masc = "cg0600a";
#else
masc = "cg3100a";
#endif
masc = "cg3100a"; masc = "cg3100a";
_tipo_lista = movimenti; _tipo_lista = movimenti;
break; break;

4
src/cg/cg3200.cpp
View File

@ -3699,7 +3699,11 @@ bool TMastrini_application::user_create()
_d22 = new TParagraph_string ("",22); _d22 = new TParagraph_string ("",22);
_d30 = new TParagraph_string ("",30); _d30 = new TParagraph_string ("",30);
#ifdef CONT_SEP
_msk = new TMask("np0400a");
#else
_msk = new TMask("cg3200a"); _msk = new TMask("cg3200a");
#endif
set_handlers(_msk); set_handlers(_msk);
_msk->set_handler(F_MEMORIZZA, memorizza_handler); _msk->set_handler(F_MEMORIZZA, memorizza_handler);

4
src/cg/cg3600.cpp
View File

@ -2583,7 +2583,11 @@ bool TQuery_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
return true; 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("") TQuery_mask::TQuery_mask(TGrid_mask* gm) : TAutomask("cg3600a"), _gm(gm), _last_tipo("")
#endif
{ } { }
void TQuery_mask::do_query() void TQuery_mask::do_query()