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

Patch level : 12.0 310 314

Browse Source 
Files correlati     : 

Modifica CRPA

Separata la contabilità separata dalla contabilitòà.

git-svn-id: svn://10.65.10.50/branches/R_10_00@23443 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
bonazzi 2016-12-13 13:52:34 +00:00
parent be0fe75ec4
commit 9fa6307e6e
6 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cg/cg3200.cpp
View File

@ -97,7 +97,9 @@ class TMastrini_application : public TPrintapp
TString _descrizione,_sezione,_numdoc,_descrizionemov,_numrivd,_descr; TString _descrizione,_sezione,_numdoc,_descrizionemov,_numrivd,_descr;
TString _dataregs, _datadocs; TString _dataregs, _datadocs;
int _gruppocontr,_contocontr,_nummast,_pagina; int _gruppocontr,_contocontr,_nummast,_pagina;
#ifdef CONT_SEP
bool _cont_sep; bool _cont_sep;
#endif
long _sottocontocontr; long _sottocontocontr;
bool _stampaprogre,_stampatotiva,_stampatot,_stampa_mov_prov, _stampa_cont; bool _stampaprogre,_stampatotiva,_stampatot,_stampa_mov_prov, _stampa_cont;
@ -1484,8 +1486,10 @@ bool TMastrini_application::preprocess_page(int file, int counter)
descrizione_causale(); descrizione_causale();
_descrizionemov = mov.get(MOV_DESCR); _descrizionemov = mov.get(MOV_DESCR);
#ifdef CONT_SEP
if (_cont_sep ) if (_cont_sep )
_descrizionemov << " " << cache().get("&NPENT", mov.get(MOV_CONTSEP), "S0"); _descrizionemov << " " << cache().get("&NPENT", mov.get(MOV_CONTSEP), "S0");
#endif
_numgio = atol(mov.get(MOV_NUMGIO)); _numgio = atol(mov.get(MOV_NUMGIO));
@ -2286,7 +2290,9 @@ bool TMastrini_application::set_print(int m)
_nummast = _msk->get_int(F_NUMMAST); _nummast = _msk->get_int(F_NUMMAST);
_data_ini = _msk->get_date(F_DATAINI); _data_ini = _msk->get_date(F_DATAINI);
_data_fine = _msk->get_date(F_DATAFINE); _data_fine = _msk->get_date(F_DATAFINE);
#ifdef CONT_SEP
_cont_sep = _msk->get_bool(F_ST_CONTSEP); _cont_sep = _msk->get_bool(F_ST_CONTSEP);
#endif
TEsercizi_contabili esc; TEsercizi_contabili esc;

2
src/cg/cg3200a.uml
View File

@ -505,11 +505,13 @@ BEGIN
GROUP 8 GROUP 8
END END
#ifdef CONT_SEP
BOOLEAN F_ST_CONTSEP BOOLEAN F_ST_CONTSEP
BEGIN BEGIN
PROMPT 1 19 "Stampa contabilità separata" PROMPT 1 19 "Stampa contabilità separata"
MODULE NP MODULE NP
END END
#endif
BUTTON F_MEMORIZZA 18 2 BUTTON F_MEMORIZZA 18 2
BEGIN BEGIN

2
src/cg/cg3400a.h
View File

@ -16,5 +16,7 @@
#define STAMPA_LEN 110 #define STAMPA_LEN 110
#define F_CODDITTA 111 #define F_CODDITTA 111
#define F_RAGSOC 112 #define F_RAGSOC 112
#ifdef CONT_SEP
#define F_ST_CONTSEP 113 #define F_ST_CONTSEP 113
#endif

6
src/cg/cg3400a.uml
View File

@ -95,11 +95,13 @@ BEGIN
MESSAGE FALSE ENABLE,DATA_DA MESSAGE FALSE ENABLE,DATA_DA
END END
BOOLEAN F_ST_CONTSEP #ifdef CONT_SEP
BOOLEAN STAMPA_CS
BEGIN BEGIN
PROMPT 1 10 "Stampa contabilità separata" PROMPT 1 10 "Stampa codice di contabilità separata"
MODULE NP MODULE NP
END END
#endif
ENDPAGE ENDPAGE

4
src/cg/cg3600.h
View File

@ -26,8 +26,12 @@
#define F_ACAUSALE 115 #define F_ACAUSALE 115
#define F_ADESCAUS 116 #define F_ADESCAUS 116
#define F_PROVVIS 117 #define F_PROVVIS 117
#ifdef CONT_SEP
#define F_ST_CONTSEP 118 #define F_ST_CONTSEP 118
#define F_END 119 #define F_END 119
#else
#define F_END 118
#endif
#define F_MASTRINI 200 #define F_MASTRINI 200
#define F_TOTRIG_SAL 201 #define F_TOTRIG_SAL 201

2
src/cg/cg3600a.uml
View File

@ -374,11 +374,13 @@ BEGIN
GROUP 5 GROUP 5
END END
#ifdef CONT_SEP
BOOLEAN F_ST_CONTSEP BOOLEAN F_ST_CONTSEP
BEGIN BEGIN
PROMPT 2 18 "Visualizzare contabilità separata" PROMPT 2 18 "Visualizzare contabilità separata"
MODULE NP MODULE NP
END END
#endif
ENDPAGE ENDPAGE