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@23506 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
bonazzi 2017-01-09 23:12:51 +00:00
parent e171b2fd7d
commit 58380389b6
5 changed files with 545 additions and 548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cg/cg3100.cpp
View File

@ -786,7 +786,7 @@ void TListaMov_application::set_page(int file, int count)
set_row (_n, FR("@75gdoc. @7s"),FLD(LF_MOV,MOV_NUMDOC));
set_row (_n, FR("@88gdel@92g@d"), FLD(LF_MOV,MOV_DATADOC));
#ifdef CONT_SEP
set_row (_n, "@37g@36s", &_descr_cs);
set_row (++_n, "@37g#-36t", &_descr_cs);
#endif
current_cursor()->curr(LF_MOV).get_int(MOV_ANNOES); // qui verificare
@ -2077,9 +2077,8 @@ bool TListaMov_application::set_print(int)
switch(toupper(_tipoc))
{
case 'C':
masc = "cg3100b";
#ifdef CONT_SEP
masc = "cg0600b";
masc = "np0600b";
#else
masc = "cg3100b";
#endif
@ -2088,12 +2087,10 @@ bool TListaMov_application::set_print(int)
case 'M':
default :
#ifdef CONT_SEP
masc = "cg0600a";
masc = "np0600a";
#else
masc = "cg3100a";
#endif
masc = "cg3100a";
_tipo_lista = movimenti;
break;
}

2
src/cg/cg3600a.uml
View File

@ -24,7 +24,7 @@ END
ENDPAGE
#ifdef CONT_SEP
PAGE "Mastrini cotabilità separata" 0 0 0 2
PAGE "Mastrini Contabilità separata" 0 0 0 2
#else
PAGE "Mastrini" 0 0 0 2
#endif

2
src/cg/cg3600b.uml
View File

@ -28,7 +28,7 @@ END
ENDPAGE
#ifdef CONT_SEP
PAGE "Mastrini contabilità separata" 0 0 0 2
PAGE "Mastrini Contabilità separata" 0 0 0 2
#else
PAGE "Mastrini" 0 0 0 2
#endif