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@23504 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
bonazzi 2017-01-09 22:00:26 +00:00
parent 89bc17b040
commit 25fa8d82c0
12 changed files with 13052 additions and 13052 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cg/cg1500.cpp
View File

@ -80,9 +80,6 @@ class TStampa_bilanci : public TPrintapp
TParagraph_string* _d; TParagraph_string* _d;
const char* _buff; const char* _buff;
bool _noseparator; // Usa separatore delle migliaia o no? bool _noseparator; // Usa separatore delle migliaia o no?
#ifdef CONT_SEP
bool _fl_cont_sep;
#endif
TString _cofi,_cap,_paiva,_ragsoc,_comunefis,_provfis,_viafis; TString _cofi,_cap,_paiva,_ragsoc,_comunefis,_provfis,_viafis;
TString _descr_dare, _descr_avere, _gc_corr_dare, _gc_corr_avere, _descr; TString _descr_dare, _descr_avere, _gc_corr_dare, _gc_corr_avere, _descr;
@ -943,11 +940,10 @@ bool TStampa_bilanci::bil_sez_contr()
if (_tipo_stampa == 1) //bil. a sez. contrapposte per data limite if (_tipo_stampa == 1) //bil. a sez. contrapposte per data limite
{ {
#ifdef CONT_SEP #ifdef CONT_SEP
if (_fl_cont_sep)
movimentato = sld.saldo_cont_sep(g, c, s, _annoes, _datalim, indbil_conto, _cont_sep, _stampa_mov_prov) ; movimentato = sld.saldo_cont_sep(g, c, s, _annoes, _datalim, indbil_conto, _cont_sep, _stampa_mov_prov) ;
else #else
#endif
movimentato = sld.data_limite_bilancio(_bilancio, g, c, s, _dataini, _datalim, indbil_conto, _stampa_mov_prov); movimentato = sld.data_limite_bilancio(_bilancio, g, c, s, _dataini, _datalim, indbil_conto, _stampa_mov_prov);
#endif
} }
else else
{ {
@ -1117,11 +1113,10 @@ bool TStampa_bilanci::ricerca_sottoc_clifo(int g,int c, bool compensa, int indbi
if (_tipo_stampa == 1) //bil. a sez. contrapposte per data limite if (_tipo_stampa == 1) //bil. a sez. contrapposte per data limite
{ {
#ifdef CONT_SEP #ifdef CONT_SEP
if (_fl_cont_sep)
movimentato = sld.saldo_cont_sep(g, c, s, _annoes, _datalim, indbil_conto, _cont_sep, _stampa_mov_prov); movimentato = sld.saldo_cont_sep(g, c, s, _annoes, _datalim, indbil_conto, _cont_sep, _stampa_mov_prov);
else #else
#endif
movimentato = sld.data_limite_bilancio(_bilancio,g,c,s,_dataini,_datalim,indbil_conto,_stampa_mov_prov); movimentato = sld.data_limite_bilancio(_bilancio,g,c,s,_dataini,_datalim,indbil_conto,_stampa_mov_prov);
#endif
} }
else else
if (_tipo_stampa == 2) //bil. a sez. contrapposte all'ultima immissione es. in corso if (_tipo_stampa == 2) //bil. a sez. contrapposte all'ultima immissione es. in corso
@ -3795,7 +3790,6 @@ bool TStampa_bilanci::set_print(int)
_hide_clifo = m.get_bool(F_HIDE_CLIFO); _hide_clifo = m.get_bool(F_HIDE_CLIFO);
_noseparator = m.get_bool(F_SEPARATOR); _noseparator = m.get_bool(F_SEPARATOR);
#ifdef CONT_SEP #ifdef CONT_SEP
_fl_cont_sep = m.get_bool(F_ST_CONTSEP);
_cont_sep = m.get(F_CONTSEP); _cont_sep = m.get(F_CONTSEP);
#endif #endif
@ -4086,7 +4080,11 @@ void TStampa_bilanci::preprocess_header()
} }
} }
#ifdef CONT_SEP
int np0300(int argc, char* argv[])
#else
int cg1500(int argc, char* argv[]) int cg1500(int argc, char* argv[])
#endif
{ {
TStampa_bilanci a; TStampa_bilanci a;
a.run(argc, argv, TR("Stampa bilanci")); a.run(argc, argv, TR("Stampa bilanci"));

3
src/cg/cg1500.h
View File

@ -35,8 +35,7 @@
#define F_A_DESCRIZIONE 139 #define F_A_DESCRIZIONE 139
#define F_PRINT_FULL_CODE 140 #define F_PRINT_FULL_CODE 140
#ifdef CONT_SEP #ifdef CONT_SEP
#define F_ST_CONTSEP 141 #define F_CONTSEP 14
#define F_CONTSEP 142
#endif #endif
#endif // __CG1500_H #endif // __CG1500_H

24
src/cg/cg1500a.uml
View File

@ -4,7 +4,11 @@ TOOLBAR "topbar" 0 0 0 2
#include <printbar.h> #include <printbar.h>
ENDPAGE ENDPAGE
#ifdef CONT_SEP
PAGE "Stampa bilancio Contabilità separata" -1 -1 76 16
#else
PAGE "Stampa bilancio" -1 -1 76 16 PAGE "Stampa bilancio" -1 -1 76 16
#endif
NUMBER F_CODDITTA 5 NUMBER F_CODDITTA 5
BEGIN BEGIN
@ -79,13 +83,13 @@ BEGIN
ITEM "1|Per date limite" ITEM "1|Per date limite"
MESSAGE SHOW,F_DATALIM|SHOW,F_TOTALI|SHOW,F_CODICI|SHOW,F_SALDO MESSAGE SHOW,F_DATALIM|SHOW,F_TOTALI|SHOW,F_CODICI|SHOW,F_SALDO
#ifdef CONT_SEP #ifdef CONT_SEP
MESSAGE SHOW,F_ST_CONTSEP MESSAGE SHOW,F_CONTSEP
#endif #endif
ITEM "2|All'ultima immissione" ITEM "2|All'ultima immissione"
MESSAGE HIDE,F_DATALIM|RESET,F_DATALIM MESSAGE HIDE,F_DATALIM|RESET,F_DATALIM
MESSAGE SHOW,F_TOTALI|SHOW,F_CODICI|SHOW,F_SALDO MESSAGE SHOW,F_TOTALI|SHOW,F_CODICI|SHOW,F_SALDO
#ifdef CONT_SEP #ifdef CONT_SEP
MESSAGE HIDE,F_ST_CONTSEP MESSAGE HIDE,F_CONTSEP
#endif #endif
END END
@ -97,13 +101,13 @@ BEGIN
ITEM "1|Per date limite" ITEM "1|Per date limite"
MESSAGE SHOW,F_VERIFICA|SHOW,F_MODULO|SHOW,F_STAMPAMPROV MESSAGE SHOW,F_VERIFICA|SHOW,F_MODULO|SHOW,F_STAMPAMPROV
#ifdef CONT_SEP #ifdef CONT_SEP
MESSAGE SHOW,F_ST_CONTSEP MESSAGE SHOW,F_CONTSEP
#endif #endif
ITEM "2|All'ultima immissione" ITEM "2|All'ultima immissione"
MESSAGE SHOW,F_VERIFICA|SHOW,F_MODULO|SHOW,F_STAMPAMPROV MESSAGE SHOW,F_VERIFICA|SHOW,F_MODULO|SHOW,F_STAMPAMPROV
MESSAGE COPY,F_STAMPA MESSAGE COPY,F_STAMPA
#ifdef CONT_SEP #ifdef CONT_SEP
MESSAGE HIDE,F_ST_CONTSEP MESSAGE HIDE,F_CONTSEP
#endif #endif
END END
@ -185,23 +189,15 @@ BEGIN
END END
#ifdef CONT_SEP #ifdef CONT_SEP
BOOLEAN F_ST_CONTSEP
BEGIN
PROMPT 2 14 "Bilancio a contabilità separata"
MODULE NP
MESSAGE FALSE HIDE,F_CONTSEP
MESSAGE TRUE SHOW,F_CONTSEP
END
STRING F_CONTSEP 6 STRING F_CONTSEP 6
BEGIN BEGIN
PROMPT 40 14 "Contabilità separata " PROMPT 2 14 "Contabilità separata "
USE &NPENT USE &NPENT
INPUT CODTAB F_CONTSEP INPUT CODTAB F_CONTSEP
DISPLAY "Codice@6" CODTAB DISPLAY "Codice@6" CODTAB
DISPLAY "Descrizione@50" S0 DISPLAY "Descrizione@50" S0
OUTPUT F_CONTSEP CODTAB OUTPUT F_CONTSEP CODTAB
CHECKTYPE NORMAL CHECKTYPE REQUIRED
MODULE NP MODULE NP
END END
#endif #endif

15
src/cg/cg3100.cpp
View File

@ -40,6 +40,9 @@ class TListaMov_application : public TPrintapp
TBit_array _err; TBit_array _err;
TDate _data_ini, _data_fin, _datareg, _data_prec, _datacomp; TDate _data_ini, _data_fin, _datareg, _data_prec, _datacomp;
TString _descr, _descr_doc, _descr_causale; TString _descr, _descr_doc, _descr_causale;
#ifdef CONT_SEP
TString _descr_cs;
#endif
TString _tipo_ini, _causale, _app; TString _tipo_ini, _causale, _app;
TString4 _causale_ini, _causale_fin, _registro,_registro_ini, _registro_fin; TString4 _causale_ini, _causale_fin, _registro,_registro_ini, _registro_fin;
TString _tipoatt, _tipo_elenco,_tipo_clifo_prec,_tipoelsucc; TString _tipoatt, _tipo_elenco,_tipo_clifo_prec,_tipoelsucc;
@ -761,6 +764,7 @@ void TListaMov_application::set_page(int file, int count)
const TRectype& rec = current_cursor()->curr(LF_RMOV); const TRectype& rec = current_cursor()->curr(LF_RMOV);
set_row(_nr,"@3n",FLD(LF_RMOV,RMV_NUMRIG)); set_row(_nr,"@3n",FLD(LF_RMOV,RMV_NUMRIG));
set_row(_nr,"@30g@22s",FLD(LF_RMOV,RMV_DESCR)); set_row(_nr,"@30g@22s",FLD(LF_RMOV,RMV_DESCR));
set_row(_nr,"@54g@3,rn",FLD(LF_RMOV,RMV_GRUPPO)); set_row(_nr,"@54g@3,rn",FLD(LF_RMOV,RMV_GRUPPO));
set_row(_nr,"@58g@3,rn",FLD(LF_RMOV,RMV_CONTO)); set_row(_nr,"@58g@3,rn",FLD(LF_RMOV,RMV_CONTO));
@ -781,6 +785,10 @@ void TListaMov_application::set_page(int file, int count)
set_row (_n, "@37g@36s",FLD(LF_MOV,MOV_DESCR)); set_row (_n, "@37g@36s",FLD(LF_MOV,MOV_DESCR));
set_row (_n, FR("@75gdoc. @7s"),FLD(LF_MOV,MOV_NUMDOC)); set_row (_n, FR("@75gdoc. @7s"),FLD(LF_MOV,MOV_NUMDOC));
set_row (_n, FR("@88gdel@92g@d"), FLD(LF_MOV,MOV_DATADOC)); set_row (_n, FR("@88gdel@92g@d"), FLD(LF_MOV,MOV_DATADOC));
#ifdef CONT_SEP
set_row (_n, "@37g@36s", &_descr_cs);
#endif
current_cursor()->curr(LF_MOV).get_int(MOV_ANNOES); // qui verificare current_cursor()->curr(LF_MOV).get_int(MOV_ANNOES); // qui verificare
TDate data = current_cursor()->curr(LF_MOV).get_date(MOV_DATAREG); TDate data = current_cursor()->curr(LF_MOV).get_date(MOV_DATAREG);
TDate dcomp = current_cursor()->curr(LF_MOV).get_date(MOV_DATACOMP); TDate dcomp = current_cursor()->curr(LF_MOV).get_date(MOV_DATACOMP);
@ -875,6 +883,9 @@ bool TListaMov_application::preprocess_page(int file,int counter)
_mov_di_sola_iva = !cur->is_first_match(LF_RMOV); _mov_di_sola_iva = !cur->is_first_match(LF_RMOV);
_descr_doc = DescrDoc(_tipodoc); _descr_doc = DescrDoc(_tipodoc);
#ifdef CONT_SEP
_descr_cs = cache().get("&NPENT", curmov.get(MOV_CONTSEP), "S0");
#endif
TRectype da (LF_MOV); TRectype da (LF_MOV);
TRectype a (LF_MOV); TRectype a (LF_MOV);
@ -2471,7 +2482,11 @@ TListaMov_application::TListaMov_application(char tipost)
: _err(80),_tipoc(tipost) : _err(80),_tipoc(tipost)
{ } { }
#ifdef CONT_SEP
int np0600(int argc, char* argv[])
#else
int cg3100(int argc, char* argv[]) int cg3100(int argc, char* argv[])
#endif
{ {
const char tipo = argc > 2 ? toupper(*argv[2]) : 'M'; const char tipo = argc > 2 ? toupper(*argv[2]) : 'M';
TListaMov_application a(tipo); TListaMov_application a(tipo);

4
src/cg/cg3100a.uml
View File

@ -4,7 +4,11 @@ TOOLBAR "topbar" 0 0 0 2
#include <printbar.h> #include <printbar.h>
ENDPAGE ENDPAGE
#ifdef CONT_SEP
PAGE "Lista Movimenti Contabilità separata" 0 2 0 0
#else
PAGE "Lista Movimenti" 0 2 0 0 PAGE "Lista Movimenti" 0 2 0 0
#endif
NUMBER F_CODDITTA 5 NUMBER F_CODDITTA 5
BEGIN BEGIN

4
src/cg/cg3100b.uml
View File

@ -6,7 +6,11 @@ TOOLBAR "topbar" 0 0 0 2
ENDPAGE ENDPAGE
#ifdef CONT_SEP
PAGE "Lista Fatture Contabilità separata" 0 2 0 0
#else
PAGE "Lista Fatture" 0 2 0 0 PAGE "Lista Fatture" 0 2 0 0
#endif
NUMBER F_CODDITTA 5 NUMBER F_CODDITTA 5
BEGIN BEGIN

12
src/cg/cg3200.cpp
View File

@ -97,9 +97,7 @@ 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 TString _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;
@ -1487,7 +1485,6 @@ bool TMastrini_application::preprocess_page(int file, int counter)
_descrizionemov = mov.get(MOV_DESCR); _descrizionemov = mov.get(MOV_DESCR);
#ifdef CONT_SEP #ifdef CONT_SEP
if (_cont_sep )
_descrizionemov << " " << cache().get("&NPENT", mov.get(MOV_CONTSEP), "S0"); _descrizionemov << " " << cache().get("&NPENT", mov.get(MOV_CONTSEP), "S0");
#endif #endif
@ -2290,9 +2287,6 @@ 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);
#endif
TEsercizi_contabili esc; TEsercizi_contabili esc;
@ -3734,7 +3728,11 @@ bool TMastrini_application::user_destroy()
return TRUE; return TRUE;
} }
#ifdef CONT_SEP
int np0400(int argc, char* argv[])
#else
int cg3200(int argc, char* argv[]) int cg3200(int argc, char* argv[])
#endif
{ {
TMastrini_application a; TMastrini_application a;
a.run(argc, argv, TR("Stampa Mastrini")); a.run(argc, argv, TR("Stampa Mastrini"));

2
src/cg/cg3200.h
View File

@ -44,7 +44,7 @@
#define F_STAMPAMOVPROV 116 #define F_STAMPAMOVPROV 116
#define F_NOT_STAMPA_CONT 117 #define F_NOT_STAMPA_CONT 117
#ifdef CONT_SEP #ifdef CONT_SEP
#define F_ST_CONTSEP 118 #define F_CONTSEP 118
#endif #endif
#define F_SEPARATOR 150 #define F_SEPARATOR 150

12
src/cg/cg3200a.uml
View File

@ -6,7 +6,11 @@ TOOLBAR "topbar" 0 0 0 2
ENDPAGE ENDPAGE
#ifdef CONT_SEP
PAGE "Stampa Mastrini Contabilità separata" -1 -1 76 16
#else
PAGE "Stampa Mastrini" 0 0 0 2 PAGE "Stampa Mastrini" 0 0 0 2
#endif
NUMBER F_CODDITTA 5 NUMBER F_CODDITTA 5
BEGIN BEGIN
@ -505,14 +509,6 @@ BEGIN
GROUP 8 GROUP 8
END END
#ifdef CONT_SEP
BOOLEAN F_ST_CONTSEP
BEGIN
PROMPT 1 19 "Stampa contabilità separata"
MODULE NP
END
#endif
BUTTON F_MEMORIZZA 18 2 BUTTON F_MEMORIZZA 18 2
BEGIN BEGIN
PROMPT -11 -1 "~Memorizza scelte" PROMPT -11 -1 "~Memorizza scelte"

20
src/cg/cg3600.cpp
View File

@ -1638,9 +1638,6 @@ class TMastrini_grid : public TGrid_field
COLOR _mas_back, _mas_fore; COLOR _mas_back, _mas_fore;
COLOR _con_back, _con_fore; COLOR _con_back, _con_fore;
bool _primanoting; bool _primanoting;
#ifdef CONT_SEP
bool _contsep;
#endif
protected: // TGrid_field protected: // TGrid_field
virtual bool on_record(long rec); virtual bool on_record(long rec);
@ -1666,9 +1663,6 @@ public:
void save_colors(); void save_colors();
void load_colors(); void load_colors();
void set_colors(); void set_colors();
#ifdef CONT_SEP
void set_contsep(bool cs) { _contsep = cs; }
#endif
TMastrini_grid(TMask* m); TMastrini_grid(TMask* m);
virtual ~TMastrini_grid() { } virtual ~TMastrini_grid() { }
@ -1676,9 +1670,6 @@ public:
TMastrini_grid::TMastrini_grid(TMask* m) TMastrini_grid::TMastrini_grid(TMask* m)
: TGrid_field(m), _causali(LF_CAUSALI, CAU_DESCR), _primanoting(false) : TGrid_field(m), _causali(LF_CAUSALI, CAU_DESCR), _primanoting(false)
#ifdef CONT_SEP
, _contsep(false)
#endif
{ {
load_colors(); load_colors();
} }
@ -1795,12 +1786,10 @@ void TMastrini_grid::cell_request(long rec, short id, TGrid_cell& cell)
} }
} }
#ifdef CONT_SEP #ifdef CONT_SEP
if (_contsep)
{
const TString16 cs = mov.get(MOV_CONTSEP); const TString16 cs = mov.get(MOV_CONTSEP);
if (cs.full()) if (cs.full())
descr << "\n" << cache().get("&NPENT", cs, "S0"); descr << "\n" << cache().get("&NPENT", cs, "S0");
}
#endif #endif
cell.set(descr); cell.set(descr);
} }
@ -2616,9 +2605,6 @@ void TQuery_mask::do_query()
conto.set(*_gm, F_GRUPPO, F_CONTO, F_SOTTOCONTO, 0, F_DESSOTTOC); conto.set(*_gm, F_GRUPPO, F_CONTO, F_SOTTOCONTO, 0, F_DESSOTTOC);
TMastrini_grid& gf = _gm->grid(); TMastrini_grid& gf = _gm->grid();
#ifdef CONT_SEP
gf.set_contsep(get_bool(F_ST_CONTSEP));
#endif
gf.read(conto, annoes, da_data, a_data, da_caus, a_caus, provv); gf.read(conto, annoes, da_data, a_data, da_caus, a_caus, provv);
gf.select(get_bool(F_END) ? gf.items() -1 : 0); gf.select(get_bool(F_END) ? gf.items() -1 : 0);
@ -2688,7 +2674,11 @@ void TMastrini_video::main_loop()
// Main // Main
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
#ifdef CONT_SEP
int np0500(int argc, char* argv[])
#else
int cg3600(int argc, char* argv[]) int cg3600(int argc, char* argv[])
#endif
{ {
TMastrini_video mv; TMastrini_video mv;
mv.run(argc, argv, TR("Mastrini")); mv.run(argc, argv, TR("Mastrini"));

12
src/cg/cg3600a.uml
View File

@ -23,7 +23,11 @@ END
ENDPAGE ENDPAGE
#ifdef CONT_SEP
PAGE "Mastrini cotabilità separata" 0 0 0 2
#else
PAGE "Mastrini" 0 0 0 2 PAGE "Mastrini" 0 0 0 2
#endif
GROUPBOX DLG_NULL 76 3 GROUPBOX DLG_NULL 76 3
BEGIN BEGIN
@ -374,14 +378,6 @@ BEGIN
GROUP 5 GROUP 5
END END
#ifdef CONT_SEP
BOOLEAN F_ST_CONTSEP
BEGIN
PROMPT 2 18 "Visualizzare contabilità separata"
MODULE NP
END
#endif
ENDPAGE ENDPAGE
ENDMASK ENDMASK

4
src/cg/cg3600b.uml
View File

@ -27,7 +27,11 @@ END
ENDPAGE ENDPAGE
#ifdef CONT_SEP
PAGE "Mastrini contabilità separata" 0 0 0 2
#else
PAGE "Mastrini" 0 0 0 2 PAGE "Mastrini" 0 0 0 2
#endif
NUMBER F_GRUPPO 3 NUMBER F_GRUPPO 3
BEGIN BEGIN