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

Patch level : 12.0 594

Browse Source 
Files correlati     : cg3.exe cg3100a.msk cg3100b.msk np0.exe  np0.exe np0300a.msk np0400a.msk np0500a.msk np0500b.msk np0600a.msk np0600b.msk

Ricompilato cg3 e le maschere della lista movimenti per il problema Sicart.
aggiuta scelta contabilità separata nei mastini della contabilità separata. Riferimento CRPA.
This commit is contained in:
AlexBonazzi 2018-06-23 22:12:42 +02:00
parent f18caed741
commit d5e47465ef
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/cg/cg3600.cpp
View File

@ -379,7 +379,15 @@ void TMastrino::read(const TBill& conto,
TRectype darow(rmov_rec), arow(rmov_rec); TRectype darow(rmov_rec), arow(rmov_rec);
darow.put(RMV_DATAREG, inizio_esercizio); darow.put(RMV_DATAREG, inizio_esercizio);
arow.put(RMV_DATAREG, max_data_reg); arow.put(RMV_DATAREG, max_data_reg);
TCursor cur(&rel(), "", 2, &darow, &arow);
TString filter;
#ifdef CONT_SEP
TString cont_sep = app().query_mask().get(F_CONTSEP);
if (cont_sep.full())
filter << "23->CONTSEP==\"" << cont_sep << "\"";
#endif
TCursor cur(&rel(), filter, 2, &darow, &arow);
const TRecnotype totrows = cur.items(); const TRecnotype totrows = cur.items();
cur.freeze(); cur.freeze();
@ -2243,8 +2251,12 @@ TMastrino_set::TMastrino_set(TMastrini_grid& g)
add_field(_datefld,-101, 10); // Data comp add_field(_datefld,-101, 10); // Data comp
add_field(_alfafld, 102, 1); // Movimento di competenza? add_field(_alfafld, 102, 1); // Movimento di competenza?
add_field(_alfafld, 103, 25); // Causale add_field(_alfafld, 103, 25); // Causale
add_field(_alfafld, 104, 50); // Descrizione #ifdef CONT_SEP
add_field(_realfld, 105, 13); // Dare add_field(_alfafld, 104, 100); // Descrizione
#else
add_field(_alfafld, 104, 50); // Descrizione
#endif
add_field(_realfld, 105, 13); // Dare
add_field(_realfld, 106, 13); // Avere add_field(_realfld, 106, 13); // Avere
add_field(_alfafld, 107, 7); // Num doc add_field(_alfafld, 107, 7); // Num doc
add_field(_longfld,-107, 7); // Num prot add_field(_longfld,-107, 7); // Num prot
@ -2287,7 +2299,11 @@ public:
TGrid_mask::TGrid_mask() TGrid_mask::TGrid_mask()
: _grid(NULL) : _grid(NULL)
{ {
read_mask("cg3600b", 0, 0); #ifdef CONT_SEP
read_mask("np0500b", 0, 0);
#else
read_mask("cg3600b", 0, 0);
#endif
set_handler(DLG_LINK, link_handler); set_handler(DLG_LINK, link_handler);
set_handler(DLG_NEWREC, new_handler); set_handler(DLG_NEWREC, new_handler);
set_handler(DLG_EDIT, edit_handler); set_handler(DLG_EDIT, edit_handler);