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

Iniziata chiusura partite; modificati sheet con bottone

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@1135 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
villa 1995-03-16 10:17:21 +00:00
parent 11f28d4df5
commit 911467bab7
10 changed files with 506 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cg/cg2100.cpp
View File

@ -112,6 +112,18 @@ TMask* TPrimanota_application::load_mask(int n)
TSheet_field& cg = (TSheet_field&)m->field(F_SHEETCG); TSheet_field& cg = (TSheet_field&)m->field(F_SHEETCG);
cg.set_notify(cg_notify); cg.set_notify(cg_notify);
TMask& cgm = cg.sheet_mask(); TMask& cgm = cg.sheet_mask();
if (n == 1) // movimento non IVA
{
cgm.set_handler(100, showpartite_handler); // bottoncino riga
m->set_handler(S_TOTDOC, totdoc_handler);
m->set_handler(S_SPESE, speserimb_handler);
m->set_handler(S_ALSPESE, altrespese_handler);
m->set_handler(S_ABBATT, abbatt_handler);
m->set_handler(S_ABBPASS, abbpass_handler);
m->set_handler(S_RITPROF, ritprof_handler);
m->set_handler(S_DIFFCAMB, diffcamb_handler);
}
cgm.set_handler(101, dareavere_handler); cgm.set_handler(101, dareavere_handler);
cgm.set_handler(102, dareavere_handler); cgm.set_handler(102, dareavere_handler);
cgm.set_handler(105, cg_conto_handler); cgm.set_handler(105, cg_conto_handler);
@ -289,8 +301,20 @@ bool TPrimanota_application::read_caus(const char* cod, int year)
if (nriga == 1) m->set(F_DESCR, desc); if (nriga == 1) m->set(F_DESCR, desc);
if (iva == nessuna_iva) if (iva == nessuna_iva)
{ {
const int pos = set_cgs_row(-1,zero,tc,desc,' '); char tipr = ' ';
// non si cagano gli importi totali
if (nriga < 8) continue;
switch(nriga)
{
case 8: tipr = 'P'; break;
case 9: tipr = 'A'; break;
case 10: tipr = 'G'; break;
case 11: tipr = 'R'; break;
}
const int pos = set_cgs_row(-1,zero,tc,desc,tipr);
if (sezione > ' ') if (sezione > ' ')
cgs().disable_cell(pos, sezione == 'A' ? 0 : 1); cgs().disable_cell(pos, sezione == 'A' ? 0 : 1);
} }
@ -904,9 +928,9 @@ void TPrimanota_application::genera_incasso(const char* causimm)
TMask m("cg2100i"); TMask m("cg2100i");
if (iva() == iva_acquisti) m.set_caption("Movimento di TPagamento immediato"); if (iva() == iva_acquisti) m.set_caption("Movimento di TPagamento immediato");
m.set_handler(F_DATAREG, datareg_handler); m.set_handler(F_DATAREG, datareg_handler);
m.set_handler(F_DATACOMP, datacomp_handler); m.set_handler(F_DATACOMP, datacomp_handler);
m.set_handler(F_TOTALE, incasso_handler); m.set_handler(F_TOTALE, incasso_handler);
TCausale caus(causimm); // Causale da usare TCausale caus(causimm); // Causale da usare

27
cg/cg2100.h
View File

@ -101,4 +101,31 @@
#define I_CONTO4 233 #define I_CONTO4 233
#define I_SOTTOCONTO4 234 #define I_SOTTOCONTO4 234
// importi saldaconto
#define S_TOTDOC 401
#define S_SPESE 402
#define S_ABBATT 403
#define S_ABBPASS 404
#define S_RITPROF 405
#define S_ALSPESE 406
#define S_DIFFCAMB 407
// copie 2a pag.
#define K_CODDITTA 501
#define K_RAGSOC 502
#define K_DATAREG 503
#define K_NUMREG 504
#define K_CODCAUS 505
#define K_DESCRCAUS 506
#define K_DOCUMENTO 507
#define K_TIPODOC 508
#define K_PROTIVA 509
#define K_PROVVISORIO 510
#define K_DESCR 511
#define K_DATADOC 512
#define K_NUMDOC 513
#define K_ANNOES 514
#define K_DATACOMP 515
#endif #endif

181
cg/cg2100b.uml
View File

@ -28,6 +28,7 @@ STRING F_RAGSOC 50
BEGIN BEGIN
PROMPT 17 1 "Ragione " PROMPT 17 1 "Ragione "
FLAGS "D" FLAGS "D"
MESSAGE COPY,K_RAGSOC
END END
NUMBER F_NUMREG 7 NUMBER F_NUMREG 7
@ -36,6 +37,7 @@ BEGIN
FIELD NUMREG FIELD NUMREG
FLAGS "RD" FLAGS "RD"
KEY 1 KEY 1
MESSAGE COPY,K_NUMREG
END END
DATE F_DATAREG DATE F_DATAREG
@ -59,6 +61,7 @@ NUMBER F_ANNOES 4
BEGIN BEGIN
PROMPT 56 4 "Esercizio " PROMPT 56 4 "Esercizio "
FIELD ANNOES FIELD ANNOES
MESSAGE COPY,K_ANNOES
FLAGS "DZ" FLAGS "DZ"
END END
@ -78,7 +81,8 @@ BEGIN
OUTPUT F_DESCRCAUS DESCR OUTPUT F_DESCRCAUS DESCR
OUTPUT F_TIPODOC TIPODOC OUTPUT F_TIPODOC TIPODOC
CHECKTYPE NORMAL CHECKTYPE NORMAL
ADD RUN cg0 -4 ADD RUN cg0 -4
MESSAGE COPY,K_CODCAUS
END END
STRING F_DESCRCAUS 50 STRING F_DESCRCAUS 50
@ -89,7 +93,8 @@ BEGIN
INPUT DESCR F_DESCRCAUS INPUT DESCR F_DESCRCAUS
DISPLAY "Descrizione@50" DESCR DISPLAY "Descrizione@50" DESCR
DISPLAY "Codice" CODCAUS DISPLAY "Codice" CODCAUS
COPY OUTPUT F_CODCAUS COPY OUTPUT F_CODCAUS
MESSAGE COPY,K_DESCRCAUS
END END
LIST F_PROVVISORIO 1 25 LIST F_PROVVISORIO 1 25
@ -99,14 +104,16 @@ BEGIN
FIELD PROVVIS FIELD PROVVIS
ITEM " |No (movimento normale)" ITEM " |No (movimento normale)"
ITEM "P|Si (cancellabile)" ITEM "P|Si (cancellabile)"
ITEM "N|Si (non cancellabile)" ITEM "N|Si (non cancellabile)"
MESSAGE COPY,K_PROVVISORIO
END END
STRING F_TIPODOC 2 STRING F_TIPODOC 2
BEGIN BEGIN
PROMPT 60 6 "Tipo documento " PROMPT 60 6 "Tipo documento "
FIELD TIPODOC FIELD TIPODOC
FLAGS "D" FLAGS "D"
MESSAGE COPY,K_TIPODOC
END END
DATE F_DATADOC DATE F_DATADOC
@ -115,7 +122,8 @@ BEGIN
HELP "Data del documento generante il movimento" HELP "Data del documento generante il movimento"
FIELD DATADOC FIELD DATADOC
WARNING "Specificare una data del documento non superiore a quella dell'operazione" WARNING "Specificare una data del documento non superiore a quella dell'operazione"
VALIDATE DATE_CMP_FUNC <= F_DATAREG VALIDATE DATE_CMP_FUNC <= F_DATAREG
MESSAGE COPY,K_DATADOC
END END
STRING F_NUMDOC 7 STRING F_NUMDOC 7
@ -124,6 +132,7 @@ BEGIN
HELP "Numero del documento generante il movimento" HELP "Numero del documento generante il movimento"
FIELD NUMDOC FIELD NUMDOC
WARNING "La causale impone di specificare il numero documento" WARNING "La causale impone di specificare il numero documento"
MESSAGE COPY,K_NUMDOC
END END
NUMBER F_ANNOIVA 4 NUMBER F_ANNOIVA 4
@ -192,10 +201,169 @@ BEGIN
GROUP 3 GROUP 3
END END
NUMBER S_TOTDOC 15 0
BEGIN
PROMPT 1 10 "Totale documento "
HELP ""
FLAGS "R"
PICTURE "."
END
GROUPBOX DLG_NULL 78 7
BEGIN
PROMPT 0 11 "Voci di spesa"
END
NUMBER S_SPESE 15 0
BEGIN
PROMPT 1 12 "Spese e rimborsi "
HELP ""
FLAGS "R"
PICTURE "."
END
NUMBER S_ALSPESE 15 0
BEGIN
PROMPT 39 12 "Altre spese "
HELP ""
FLAGS "R"
PICTURE "."
END
NUMBER S_ABBATT 15 0
BEGIN
PROMPT 1 14 "Abbuoni attivi "
HELP ""
FLAGS "R"
PICTURE "."
END
NUMBER S_ABBPASS 15 0
BEGIN
PROMPT 39 14 "Abbuoni passivi "
HELP ""
FLAGS "R"
PICTURE "."
END
NUMBER S_RITPROF 15 0
BEGIN
PROMPT 1 16 "Ritenuta prof. "
HELP ""
FLAGS "R"
PICTURE "."
END
NUMBER S_DIFFCAMB 15 0
BEGIN
PROMPT 39 16 "Diff. cambio "
HELP ""
FLAGS "R"
PICTURE "."
END
ENDPAGE
PAGE "OPERAZIONE DI PRIMA NOTA" -1 -1 77 20
GROUPBOX DLG_NULL 78 3
BEGIN
PROMPT 1 0 "@BMovimento di sola contabilita'"
END
NUMBER K_CODDITTA 5
BEGIN
PROMPT 3 1 "Ditta "
FLAGS "D"
END
STRING K_RAGSOC 50
BEGIN
PROMPT 17 1 "Ragione "
FLAGS "D"
END
NUMBER K_NUMREG 7
BEGIN
PROMPT 56 3 "Operazione n. "
FIELD NUMREG
FLAGS "RD"
KEY 1
END
DATE K_DATAREG
BEGIN
PROMPT 1 3 "Data operazione "
HELP "Data in cui viene effettuata l'operazione"
FLAGS "D"
END
DATE K_DATACOMP
BEGIN
PROMPT 1 4 "Data di competenza "
HELP "Data di competenza dell'operazione"
FLAGS "D"
END
NUMBER K_ANNOES 4
BEGIN
PROMPT 56 4 "Esercizio "
FIELD ANNOES
FLAGS "D"
END
STRING K_CODCAUS 3
BEGIN
PROMPT 1 5 "Causale "
HELP "Codice della causale generante l'operazione"
FLAGS "D"
END
STRING K_DESCRCAUS 50
BEGIN
PROMPT 25 5 ""
HELP "Descrizione della causale generante l'operazione"
FLAGS "D"
END
LIST K_PROVVISORIO 1 25
BEGIN
PROMPT 1 6 "Movimento provvisorio "
HELP "Indicare se si tratta di movimento provvisorio"
ITEM " |No (movimento normale)"
ITEM "P|Si (cancellabile)"
ITEM "N|Si (non cancellabile)"
FLAGS "D"
END
STRING K_TIPODOC 2
BEGIN
PROMPT 60 6 "Tipo documento "
FIELD TIPODOC
FLAGS "D"
END
DATE K_DATADOC
BEGIN
PROMPT 1 7 "Data del documento "
HELP "Data del documento generante il movimento"
FLAGS "D"
END
STRING K_NUMDOC 7
BEGIN
PROMPT 56 7 "Documento n. "
HELP "Numero del documento generante il movimento"
FLAGS "D"
END
SPREADSHEET F_SHEETCG SPREADSHEET F_SHEETCG
BEGIN BEGIN
PROMPT 0 10 "" PROMPT 0 8 ""
ITEM "Dare@15" ITEM "Dare@15"
ITEM "Avere@15" ITEM "Avere@15"
ITEM "C/F@1" ITEM "C/F@1"
@ -234,3 +402,4 @@ ENDMASK
#include "cg21cg.uml" #include "cg21cg.uml"
z

149
cg/cg2102.cpp
View File

@ -87,6 +87,18 @@ real TPrimanota_application::totale_documento()
return tot; return tot;
} }
bool TPrimanota_application::showpartite_handler(TMask_field& f, KEY k)
{
if (k == K_SPACE)
{
warning_box("TRULLALLERO TRULLALLA\', LA PARTITA ECCOLA QUA!");
}
return TRUE;
}
// Determina se un codice sospeso o no // Determina se un codice sospeso o no
// Certified 90% // Certified 90%
bool TPrimanota_application::suspended_handler(TMask_field& f, KEY k) bool TPrimanota_application::suspended_handler(TMask_field& f, KEY k)
@ -294,6 +306,12 @@ void TPrimanota_application::disable_cgs_cells(int n, char tipo)
case 'D': // IVA Detraibile case 'D': // IVA Detraibile
case 'F': // Ritenute Fiscali case 'F': // Ritenute Fiscali
case 'N': case 'N':
case 'G': // vedi enum TipoConto per i prossimi 6
case 'A':
case 'P':
case 'R':
case 'L':
case 'C':
case 'S': // Ritenute Sociali case 'S': // Ritenute Sociali
case 'T': // Totale documento case 'T': // Totale documento
last = 3; // IVA Non detraibile last = 3; // IVA Non detraibile
@ -1484,6 +1502,22 @@ void TPrimanota_application::add_cgs_tot(TMask& m)
} }
//void TPrimanota_application::add_cgs_tot_noiva(TMask& m)
//{
// // Prendo il conto dalla prima riga della causale
// TBill bill;
// causale().bill(1, bill);
// char tipo = app().clifo();
// real tot(m.get(S_TOTDOC));
//
// const int pos = type2pos('Z');
//
// // Creazione/Aggiornamento riga totale
// set_cgs_row(pos, real2imp(tot, 'Z'), bill, m.get(F_DESCR), 'Z');
// calcola_saldo();
//}
// Handler of the F_CLIENTE & F_FORNITORE field on the modify mask // Handler of the F_CLIENTE & F_FORNITORE field on the modify mask
// Certified 99% // Certified 99%
bool TPrimanota_application::clifo_handler(TMask_field& f, KEY key) bool TPrimanota_application::clifo_handler(TMask_field& f, KEY key)
@ -1628,6 +1662,18 @@ bool TPrimanota_application::totale_handler(TMask_field& f, KEY key)
return ok; return ok;
} }
bool TPrimanota_application::totdoc_handler(TMask_field& f, KEY key)
{
bool ok = TRUE;
if (key == K_TAB && f.focusdirty())
{
// app().add_cgs_tot_noiva(f.mask());
}
if (key == K_ENTER && f.get().empty())
ok = f.yesno_box("Totale documento nullo: continuare ugualmente?");
return ok;
}
void TPrimanota_application::add_cgs_rit(bool fiscali) void TPrimanota_application::add_cgs_rit(bool fiscali)
{ {
@ -1651,6 +1697,65 @@ void TPrimanota_application::add_cgs_rit(bool fiscali)
} }
} }
void TPrimanota_application::add_cgs_row_noniva(TipoConto t)
{
// aggiunge riga IVA relativa al tipo conto passato
// determina numero riga e legge importo
// schiaffa e aggiorna
real imp = 0.0;
int row = -1;
switch (t)
{
case asp:
t = spr; // accorpiamo con le spese per ora
case spr:
imp = real(curr_mask().get(S_SPESE));
imp += real(curr_mask().get(S_ALSPESE));
row = 10;
break;
case aba:
imp = real(curr_mask().get(S_ABBATT));
row = 9;
break;
case abp:
imp = real(curr_mask().get(S_ABBPASS));
row = 8;
break;
case rpf:
imp = real(curr_mask().get(S_RITPROF));
row = 11;
break;
case dfc:
imp = real(curr_mask().get(S_DIFFCAMB));
// row 0 (sconosciuto) for now
row = 0;
break;
}
char tipo = (char)t;
if (row != -1)
{
int pos = type2pos(tipo);
if (pos < 0)
{
TBill conto; if (row != 0) causale().bill(row, conto);
const TString80 desc(row == 0 ? "" : causale().desc_agg(row));
set_cgs_row(-1, real2imp(imp, tipo), conto, desc, tipo);
}
else
{
if (imp.is_zero())
reset_cgs_row(pos);
else
set_cgs_imp(pos, real2imp(imp, tipo));
}
}
}
// Handler of the F_PROTIVA // Handler of the F_PROTIVA
bool TPrimanota_application::protiva_handler(TMask_field& f, KEY key) bool TPrimanota_application::protiva_handler(TMask_field& f, KEY key)
{ {
@ -1684,7 +1789,49 @@ bool TPrimanota_application::ritsoc_handler(TMask_field& f, KEY key)
if (key == K_TAB && f.focusdirty()) if (key == K_TAB && f.focusdirty())
app().add_cgs_rit(FALSE); app().add_cgs_rit(FALSE);
return TRUE; return TRUE;
} }
bool TPrimanota_application::speserimb_handler(TMask_field& f, KEY k)
{
if (k == K_TAB && f.focusdirty())
app().add_cgs_row_noniva(spr);
return TRUE;
}
bool TPrimanota_application::altrespese_handler(TMask_field& f, KEY k)
{
if (k == K_TAB && f.focusdirty())
app().add_cgs_row_noniva(asp);
return TRUE;
}
bool TPrimanota_application::abbatt_handler(TMask_field& f, KEY k)
{
if (k == K_TAB && f.focusdirty())
app().add_cgs_row_noniva(aba);
return TRUE;
}
bool TPrimanota_application::abbpass_handler(TMask_field& f, KEY k)
{
if (k == K_TAB && f.focusdirty())
app().add_cgs_row_noniva(abp);
return TRUE;
}
bool TPrimanota_application::ritprof_handler(TMask_field& f, KEY k)
{
if (k == K_TAB && f.focusdirty())
app().add_cgs_row_noniva(rpf);
return TRUE;
}
bool TPrimanota_application::diffcamb_handler(TMask_field& f, KEY k)
{
if (k == K_TAB && f.focusdirty())
app().add_cgs_row_noniva(dfc);
return TRUE;
}
bool TPrimanota_application::cambio_handler(TMask_field& f, KEY key) bool TPrimanota_application::cambio_handler(TMask_field& f, KEY key)
{ {

10
cg/cg2102.h
View File

@ -64,6 +64,13 @@ class TPrimanota_application : public TRelation_application
TBill _conto_ricavo; // Conto di ricavo del clifo TBill _conto_ricavo; // Conto di ricavo del clifo
TArray* _pag_rows; TArray* _pag_rows;
static bool showpartite_handler(TMask_field& f, KEY k);
static bool speserimb_handler(TMask_field& f, KEY k);
static bool altrespese_handler(TMask_field& f, KEY k);
static bool abbatt_handler(TMask_field& f, KEY k);
static bool abbpass_handler(TMask_field& f, KEY k);
static bool ritprof_handler(TMask_field& f, KEY k);
static bool diffcamb_handler(TMask_field& f, KEY k);
static bool suspended_handler(TMask_field& f, KEY k); static bool suspended_handler(TMask_field& f, KEY k);
static bool num_handler(TMask_field& f, KEY key); static bool num_handler(TMask_field& f, KEY key);
static bool caus_query_handler(TMask_field& f, KEY key); static bool caus_query_handler(TMask_field& f, KEY key);
@ -75,6 +82,7 @@ class TPrimanota_application : public TRelation_application
static bool protiva_handler(TMask_field& f, KEY key); static bool protiva_handler(TMask_field& f, KEY key);
static bool clifo_handler(TMask_field& f, KEY key); static bool clifo_handler(TMask_field& f, KEY key);
static bool totale_handler(TMask_field& f, KEY key); static bool totale_handler(TMask_field& f, KEY key);
static bool totdoc_handler(TMask_field& f, KEY key);
static bool ritfis_handler(TMask_field& f, KEY key); static bool ritfis_handler(TMask_field& f, KEY key);
static bool ritsoc_handler(TMask_field& f, KEY key); static bool ritsoc_handler(TMask_field& f, KEY key);
static bool main_codiva_handler(TMask_field& f, KEY key); static bool main_codiva_handler(TMask_field& f, KEY key);
@ -186,7 +194,9 @@ protected:
int set_cgs_row(int n, const TImporto& importo, TBill& conto, const char* desc, char tipo); int set_cgs_row(int n, const TImporto& importo, TBill& conto, const char* desc, char tipo);
void disable_cgs_cells(int n, char tipo); void disable_cgs_cells(int n, char tipo);
void add_cgs_tot(TMask& m); void add_cgs_tot(TMask& m);
// void add_cgs_tot_noiva(TMask& m);
void add_cgs_rit(bool fisc); void add_cgs_rit(bool fisc);
void add_cgs_row_noniva(TipoConto t);
void generazione_righe_cg(int r); void generazione_righe_cg(int r);
void reset_cgs_row(int n) { reset_sheet_row(cgs(), n); } void reset_cgs_row(int n) { reset_sheet_row(cgs(), n); }

11
cg/cg2103.h
View File

@ -19,6 +19,17 @@ enum TipoIVA
iva_generica = 9 iva_generica = 9
}; };
enum TipoConto
{
spr = 'G', // spese e rimborsi
aba = 'A', // abbattimenti attivi
abp = 'P', // abbattimenti passivi
rpf = 'R', // ritenute professionali
asp = 'L', // altre spese
dfc = 'C', // differenza cambio
tot = 'Z'
};
const char* iva2name(TipoIVA i); const char* iva2name(TipoIVA i);
class TRegistro : public TObject class TRegistro : public TObject

14
cg/cg21cg.uml
View File

@ -14,6 +14,7 @@ BEGIN
INPUT CODTAB 108 INPUT CODTAB 108
DISPLAY "Codice" CODTAB DISPLAY "Codice" CODTAB
DISPLAY "Descrizione@50" S0 DISPLAY "Descrizione@50" S0
INPUT CODTAB 108
OUTPUT 108 CODTAB OUTPUT 108 CODTAB
OUTPUT 109 S0 OUTPUT 109 S0
CHECKTYPE NORMAL CHECKTYPE NORMAL
@ -359,20 +360,27 @@ END
BUTTON DLG_OK 9 2 BUTTON DLG_OK 9 2
BEGIN BEGIN
PROMPT -13 -1 "" PROMPT -14 -1 ""
END END
BUTTON DLG_CANCEL 9 2 BUTTON DLG_CANCEL 9 2
BEGIN BEGIN
PROMPT -23 -1 "" PROMPT -24 -1 ""
END END
BUTTON DLG_DELREC 9 2 BUTTON DLG_DELREC 9 2
BEGIN BEGIN
PROMPT -33 -1 "Elimina" PROMPT -34 -1 "Elimina"
MESSAGE EXIT,K_DEL MESSAGE EXIT,K_DEL
END END
BUTTON 100 9 2
BEGIN
PROMPT -44 -1 "Partite"
MESSAGE EXIT,K_DEL
END
ENDPAGE ENDPAGE
ENDMASK ENDMASK

90
cg/cg5500.cpp
View File

@ -171,7 +171,7 @@ void Visliq_app::build_nomiditte()
else fr = lia.get("S7"); else fr = lia.get("S7");
} }
else continue; else continue;
TToken_string* d = new TToken_string(64); TToken_string* d = new TToken_string(64);
// add record // add record
@ -333,11 +333,11 @@ bool Visliq_app::sel_mese_sh1 (TMask_field& f, KEY k)
TMask& sm = sh.sheet_mask(); TMask& sm = sh.sheet_mask();
sm.field(103).set(tt.get(2)); sm.field(102).set(tt.get(2));
sm.field(104).set(tt.get(3)); sm.field(103).set(tt.get(3));
sm.field(105).set(tt.get(4)); sm.field(104).set(tt.get(4));
sm.field(106).set(tt.get(5)); sm.field(105).set(tt.get(5));
sm.field(107).set(tt.get(6)); sm.field(106).set(tt.get(6));
return TRUE; return TRUE;
} }
@ -439,8 +439,8 @@ bool Visliq_app::vis_all()
// qui occorre modificare le deleghe // qui occorre modificare le deleghe
sv.set_notify(vers_action); sv.set_notify(vers_action);
sh.sheet_mask().set_handler(101,sel_mese_sh1); sh.sheet_mask().set_handler(100,sel_mese_sh1);
sv.sheet_mask().set_handler(101,sel_mese_sh2); sv.sheet_mask().set_handler(100,sel_mese_sh2);
// fill the mask in // fill the mask in
read_general(m); read_general(m);
@ -916,11 +916,11 @@ void Visliq_app::recalc_next_liq(int start_month, TSheet_field* sl, TSheet_field
int sr0 = (_lim->get_real("R0")).sign(); int sr0 = (_lim->get_real("R0")).sign();
int sr5 = (_lim->get_real("R5")).sign(); int sr5 = (_lim->get_real("R5")).sign();
t.add(abs(_lim->get_real("R0")).string(),2); t.add(abs(_lim->get_real("R0")).string(),1);
t.add(sr0 == 0 ? "" : (sr0 > 0 ? "D" : "C"), 3); t.add(sr0 == 0 ? "" : (sr0 > 0 ? "D" : "C"), 2);
t.add((_lim->get_real("R1")).string(),4); t.add((_lim->get_real("R1")).string(),3);
t.add(abs(_lim->get_real("R5")).string(),5); t.add(abs(_lim->get_real("R5")).string(),4);
t.add(sr5 == 0 ? "" : (sr5 > 0 ? "D" : "C"),6); t.add(sr5 == 0 ? "" : (sr5 > 0 ? "D" : "C"),5);
sl->force_update(row); sl->force_update(row);
} }
@ -995,7 +995,6 @@ void Visliq_app::read_general(TMask& m)
if (sh.items() < i) tt = new TToken_string(80); if (sh.items() < i) tt = new TToken_string(80);
else tt = &(sh.row(i-1)); else tt = &(sh.row(i-1));
tt->add(""); // questo e' il bottone
tt->add(itoname(i)); tt->add(itoname(i));
tt->add(abs(_lim->get_real("R0")).string()); tt->add(abs(_lim->get_real("R0")).string());
@ -1054,7 +1053,6 @@ void Visliq_app::read_general(TMask& m)
if (i == 12) nomemese << " acconto"; if (i == 12) nomemese << " acconto";
if (i == 13) nomemese << " saldo"; if (i == 13) nomemese << " saldo";
tt->add(""); // questo e' il bottone
tt->add(nomemese); // mese tt->add(nomemese); // mese
tt->add(date[i-1].string()); // data vers. tt->add(date[i-1].string()); // data vers.
tt->add(banche[i-1].get(0)); // azienda tt->add(banche[i-1].get(0)); // azienda
@ -1113,22 +1111,22 @@ void Visliq_app::write_general(TMask& m)
TToken_string& tt_vn = sv.row(row); TToken_string& tt_vn = sv.row(row);
// traduci contenuto righe in real pila // traduci contenuto righe in real pila
real orett(tt_lo.get(5)); real orett(tt_lo.get(4));
real nrett(tt_ln.get(5)); real nrett(tt_ln.get(4));
real orimb(tt_lo.get(4)); real orimb(tt_lo.get(3));
real nrimb(tt_ln.get(4)); real nrimb(tt_ln.get(3));
real overs(tt_vo.get(6)); real overs(tt_vo.get(5));
real nvers(tt_vn.get(6)); real nvers(tt_vn.get(5));
TDate odate(tt_vn.get(2)); TDate odate(tt_vn.get(1));
TDate ndate(tt_vn.get(2)); TDate ndate(tt_vn.get(1));
TString odbcr(tt_lo.get(6)); TString odbcr(tt_lo.get(5));
TString ndbcr(tt_ln.get(6)); TString ndbcr(tt_ln.get(5));
TString oabi (tt_vo.get(3)); TString oabi (tt_vo.get(2));
TString nabi (tt_vn.get(3)); TString nabi (tt_vn.get(2));
TString ocab (tt_vo.get(4)); TString ocab (tt_vo.get(3));
TString ncab (tt_vn.get(4)); TString ncab (tt_vn.get(3));
TString ocon (tt_vo.get(5)); TString ocon (tt_vo.get(4));
TString ncon (tt_vn.get(5)); TString ncon (tt_vn.get(4));
if (odbcr == "C") orett = -orett; if (odbcr == "C") orett = -orett;
if (ndbcr == "C") nrett = -nrett; if (ndbcr == "C") nrett = -nrett;
@ -1136,16 +1134,16 @@ void Visliq_app::write_general(TMask& m)
// acconto (si considerera' solo a dicembre) // acconto (si considerera' solo a dicembre)
TToken_string& vo = (TToken_string&)_vers_rows[_freqviva == "M" ? 11 : 3]; TToken_string& vo = (TToken_string&)_vers_rows[_freqviva == "M" ? 11 : 3];
TToken_string& vn = sv.row(_freqviva == "M" ? 11 : 3); TToken_string& vn = sv.row(_freqviva == "M" ? 11 : 3);
real oacct (vo.get(6)); real oacct (vo.get(5));
real nacct (vn.get(6)); real nacct (vn.get(5));
TDate aodate(vn.get(2)); TDate aodate(vn.get(1));
TDate andate(vn.get(2)); TDate andate(vn.get(1));
TString aoabi (vo.get(3)); TString aoabi (vo.get(2));
TString anabi (vn.get(3)); TString anabi (vn.get(2));
TString aocab (vo.get(4)); TString aocab (vo.get(3));
TString ancab (vn.get(4)); TString ancab (vn.get(3));
TString aocon (vo.get(5)); TString aocon (vo.get(4));
TString ancon (vn.get(5)); TString ancon (vn.get(4));
if (!look_lim(i)) if (!look_lim(i))
// blocca riporto crediti e debiti // blocca riporto crediti e debiti
@ -1323,11 +1321,11 @@ void Visliq_app::write_general(TMask& m)
int sr0 = (_lim->get_real("R0")).sign(); int sr0 = (_lim->get_real("R0")).sign();
int sr5 = (_lim->get_real("R5")).sign(); int sr5 = (_lim->get_real("R5")).sign();
tt_ln.add(abs(_lim->get_real("R0")).string(),2); tt_ln.add(abs(_lim->get_real("R0")).string(),1);
tt_ln.add(sr0 == 0 ? "" : (sr0 > 0 ? "D" : "C"), 3); tt_ln.add(sr0 == 0 ? "" : (sr0 > 0 ? "D" : "C"), 2);
tt_ln.add((_lim->get_real("R1")).string(),4); tt_ln.add((_lim->get_real("R1")).string(),3);
tt_ln.add(abs(_lim->get_real("R5")).string(),5); tt_ln.add(abs(_lim->get_real("R5")).string(),4);
tt_ln.add(sr5 == 0 ? "" : (sr5 > 0 ? "D" : "C"),6); tt_ln.add(sr5 == 0 ? "" : (sr5 > 0 ? "D" : "C"),5);
sh.force_update(row); sh.force_update(row);

54
cg/cg5500b.uml
View File

@ -55,7 +55,6 @@ END
SPREADSHEET F_VISLIQ1 0 11 SPREADSHEET F_VISLIQ1 0 11
BEGIN BEGIN
PROMPT 1 7 "Liquidazione" PROMPT 1 7 "Liquidazione"
ITEM "V@1F#109"
ITEM "Mese@10" ITEM "Mese@10"
ITEM "Risultato@15" ITEM "Risultato@15"
ITEM "D/C" ITEM "D/C"
@ -88,7 +87,6 @@ END
SPREADSHEET F_VISLIQ2 0 11 SPREADSHEET F_VISLIQ2 0 11
BEGIN BEGIN
PROMPT 1 5 "Versamenti" PROMPT 1 5 "Versamenti"
ITEM "V@1F#109"
ITEM "Mese@15" ITEM "Mese@15"
ITEM "Data@10" ITEM "Data@10"
ITEM "Azienda@5" ITEM "Azienda@5"
@ -103,53 +101,53 @@ ENDMASK
PAGE "Prospetto mensile" -1 -1 50 10 PAGE "Prospetto mensile" -1 -1 50 10
STRING 102 20 STRING 101 20
BEGIN BEGIN
PROMPT 1 2 "Mese " PROMPT 1 2 "Mese "
FLAGS "D" FLAGS "D"
END END
NUMBER 103 15 0 NUMBER 102 15 0
BEGIN BEGIN
PROMPT 1 3 "Risultato " PROMPT 1 3 "Risultato "
FLAGS "DR" FLAGS "DR"
PICTURE "." PICTURE "."
END END
LIST 104 1 8 LIST 103 1 8
BEGIN BEGIN
PROMPT 1 4 "Importo a " PROMPT 1 4 "Importo a "
ITEM " | " ITEM " | "
ITEM "D|Debito" ITEM "D|Debito"
ITEM "C|Credito" ITEM "C|Credito"
INPUT 105 INPUT 104
OUTPUT 105 OUTPUT 104
FLAGS "D" FLAGS "D"
END END
NUMBER 105 15 NUMBER 104 15
BEGIN BEGIN
PROMPT 22 5 "IVA a rimborso " PROMPT 22 5 "IVA a rimborso "
FLAGS "R" FLAGS "R"
PICTURE "." PICTURE "."
END END
NUMBER 106 15 NUMBER 105 15
BEGIN BEGIN
PROMPT 22 6 "Debito/Credito " PROMPT 22 6 "Debito/Credito "
FLAGS "R" FLAGS "R"
PICTURE "." PICTURE "."
END END
LIST 107 1 8 LIST 106 1 8
BEGIN BEGIN
PROMPT 1 7 "Importo a " PROMPT 1 7 "Importo a "
ITEM " | " ITEM " | "
ITEM "D|Debito" ITEM "D|Debito"
ITEM "C|Credito" ITEM "C|Credito"
INPUT 105 INPUT 104
OUTPUT 105 OUTPUT 104
END END
BUTTON DLG_OK 10 2 BUTTON DLG_OK 10 2
@ -162,7 +160,7 @@ BEGIN
PROMPT -23 -1 "" PROMPT -23 -1 ""
END END
BUTTON 101 10 2 BUTTON 100 10 2
BEGIN BEGIN
PROMPT -33 -1 "Dettaglio" PROMPT -33 -1 "Dettaglio"
END END
@ -172,48 +170,48 @@ ENDMASK
PAGE "Prospetto versamenti" -1 -1 50 12 PAGE "Prospetto versamenti" -1 -1 50 12
STRING 102 20 STRING 101 20
BEGIN BEGIN
PROMPT 1 2 "Mese " PROMPT 1 2 "Mese "
FLAGS "D" FLAGS "D"
END END
DATE 103 DATE 102
BEGIN BEGIN
PROMPT 1 5 "Data " PROMPT 1 5 "Data "
END END
NUMBER 104 5 NUMBER 103 5
BEGIN BEGIN
PROMPT 4 8 "Codice ABI " PROMPT 4 8 "Codice ABI "
HELP "Codice ABI banca di appoggio" HELP "Codice ABI banca di appoggio"
FIELD S7 FIELD S7
FLAGS "RZ" FLAGS "RZ"
USE %BAN USE %BAN
INPUT CODTAB[1,5] 104 INPUT CODTAB[1,5] 103
INPUT CODTAB[6,10] 105 INPUT CODTAB[6,10] 104
DISPLAY "Codice ABI" CODTAB[1,5] DISPLAY "Codice ABI" CODTAB[1,5]
DISPLAY "Codice CAB" CODTAB[6,10] DISPLAY "Codice CAB" CODTAB[6,10]
DISPLAY "Descrizione @50" S0 DISPLAY "Descrizione @50" S0
OUTPUT 104 CODTAB[1,5] OUTPUT 103 CODTAB[1,5]
OUTPUT 105 CODTAB[6,10] OUTPUT 104 CODTAB[6,10]
CHECKTYPE NORMAL CHECKTYPE NORMAL
END END
NUMBER 105 5 NUMBER 104 5
BEGIN BEGIN
PROMPT 40 8 "Codice CAB " PROMPT 40 8 "Codice CAB "
HELP "Codice CAB banca di appoggio" HELP "Codice CAB banca di appoggio"
FIELD S8 FIELD S8
FLAGS "RZ" FLAGS "RZ"
COPY ALL 104 COPY ALL 103
CHECKTYPE NORMAL CHECKTYPE NORMAL
WARNING "Banca assente" WARNING "Banca assente"
END END
NUMBER 106 3 NUMBER 105 3
BEGIN BEGIN
PROMPT 4 9 "Concessione " PROMPT 4 9 "Concessione "
HELP "Codice Concessione del Comune di residenza fiscale" HELP "Codice Concessione del Comune di residenza fiscale"
@ -222,7 +220,7 @@ BEGIN
END END
NUMBER 107 15 0 NUMBER 106 15 0
BEGIN BEGIN
PROMPT 1 4 "Versamenti " PROMPT 1 4 "Versamenti "
FLAGS "R" FLAGS "R"
@ -230,14 +228,14 @@ BEGIN
END END
/* /*
LIST 108 1 8 LIST 107 1 8
BEGIN BEGIN
PROMPT 1 9 "Importo a " PROMPT 1 9 "Importo a "
ITEM " | " ITEM " | "
ITEM "D|Debito" ITEM "D|Debito"
ITEM "C|Credito" ITEM "C|Credito"
INPUT 105 INPUT 104
OUTPUT 105 OUTPUT 104
END END
*/ */
@ -251,7 +249,7 @@ BEGIN
PROMPT -23 -1 "" PROMPT -23 -1 ""
END END
BUTTON 101 10 2 BUTTON 100 10 2
BEGIN BEGIN
PROMPT -33 -1 "Dettaglio" PROMPT -33 -1 "Dettaglio"
END END

54
cg/cg5500c.uml
View File

@ -54,7 +54,6 @@ END
SPREADSHEET F_VISLIQ1 0 5 SPREADSHEET F_VISLIQ1 0 5
BEGIN BEGIN
PROMPT 1 7 "Liquidazione" PROMPT 1 7 "Liquidazione"
ITEM "V@1F#109"
ITEM "Mese@10" ITEM "Mese@10"
ITEM "Risultato@15" ITEM "Risultato@15"
ITEM "D/C" ITEM "D/C"
@ -66,7 +65,6 @@ END
SPREADSHEET F_VISLIQ2 0 5 SPREADSHEET F_VISLIQ2 0 5
BEGIN BEGIN
PROMPT 1 12 "Versamenti" PROMPT 1 12 "Versamenti"
ITEM "V@1F#109"
ITEM "Mese@10" ITEM "Mese@10"
ITEM "Data@10" ITEM "Data@10"
ITEM "Azienda@5" ITEM "Azienda@5"
@ -81,53 +79,53 @@ ENDMASK
PAGE "Prospetto mensile" -1 -1 50 10 PAGE "Prospetto mensile" -1 -1 50 10
STRING 102 20 STRING 101 20
BEGIN BEGIN
PROMPT 1 2 "Mese " PROMPT 1 2 "Mese "
FLAGS "D" FLAGS "D"
END END
NUMBER 103 15 0 NUMBER 102 15 0
BEGIN BEGIN
PROMPT 1 3 "Risultato " PROMPT 1 3 "Risultato "
FLAGS "DR" FLAGS "DR"
PICTURE "." PICTURE "."
END END
LIST 104 1 8 LIST 103 1 8
BEGIN BEGIN
PROMPT 1 4 "Importo a " PROMPT 1 4 "Importo a "
ITEM " | " ITEM " | "
ITEM "D|Debito" ITEM "D|Debito"
ITEM "C|Credito" ITEM "C|Credito"
INPUT 105 INPUT 104
OUTPUT 105 OUTPUT 104
FLAGS "D" FLAGS "D"
END END
NUMBER 105 15 NUMBER 104 15
BEGIN BEGIN
PROMPT 22 5 "IVA a rimborso " PROMPT 22 5 "IVA a rimborso "
FLAGS "R" FLAGS "R"
PICTURE "." PICTURE "."
END END
NUMBER 106 15 NUMBER 105 15
BEGIN BEGIN
PROMPT 22 6 "Debito/Credito " PROMPT 22 6 "Debito/Credito "
FLAGS "R" FLAGS "R"
PICTURE "." PICTURE "."
END END
LIST 107 1 8 LIST 106 1 8
BEGIN BEGIN
PROMPT 1 7 "Importo a " PROMPT 1 7 "Importo a "
ITEM " | " ITEM " | "
ITEM "D|Debito" ITEM "D|Debito"
ITEM "C|Credito" ITEM "C|Credito"
INPUT 105 INPUT 104
OUTPUT 105 OUTPUT 104
END END
BUTTON DLG_OK 10 2 BUTTON DLG_OK 10 2
@ -140,7 +138,7 @@ BEGIN
PROMPT -23 -1 "" PROMPT -23 -1 ""
END END
BUTTON 101 10 2 BUTTON 100 10 2
BEGIN BEGIN
PROMPT -33 -1 "Dettaglio" PROMPT -33 -1 "Dettaglio"
END END
@ -150,48 +148,48 @@ ENDMASK
PAGE "Prospetto versamenti" -1 -1 50 12 PAGE "Prospetto versamenti" -1 -1 50 12
STRING 102 20 STRING 101 20
BEGIN BEGIN
PROMPT 1 2 "Mese " PROMPT 1 2 "Mese "
FLAGS "D" FLAGS "D"
END END
DATE 103 DATE 102
BEGIN BEGIN
PROMPT 1 5 "Data " PROMPT 1 5 "Data "
END END
NUMBER 104 5 NUMBER 103 5
BEGIN BEGIN
PROMPT 4 8 "Codice ABI " PROMPT 4 8 "Codice ABI "
HELP "Codice ABI banca di appoggio" HELP "Codice ABI banca di appoggio"
FIELD S7 FIELD S7
FLAGS "RZ" FLAGS "RZ"
USE %BAN USE %BAN
INPUT CODTAB[1,5] 104 INPUT CODTAB[1,5] 103
INPUT CODTAB[6,10] 105 INPUT CODTAB[6,10] 104
DISPLAY "Codice ABI" CODTAB[1,5] DISPLAY "Codice ABI" CODTAB[1,5]
DISPLAY "Codice CAB" CODTAB[6,10] DISPLAY "Codice CAB" CODTAB[6,10]
DISPLAY "Descrizione @50" S0 DISPLAY "Descrizione @50" S0
OUTPUT 104 CODTAB[1,5] OUTPUT 103 CODTAB[1,5]
OUTPUT 105 CODTAB[6,10] OUTPUT 104 CODTAB[6,10]
CHECKTYPE NORMAL CHECKTYPE NORMAL
END END
NUMBER 105 5 NUMBER 104 5
BEGIN BEGIN
PROMPT 40 8 "Codice CAB " PROMPT 40 8 "Codice CAB "
HELP "Codice CAB banca di appoggio" HELP "Codice CAB banca di appoggio"
FIELD S8 FIELD S8
FLAGS "RZ" FLAGS "RZ"
COPY ALL 104 COPY ALL 103
CHECKTYPE NORMAL CHECKTYPE NORMAL
WARNING "Banca assente" WARNING "Banca assente"
END END
NUMBER 106 3 NUMBER 105 3
BEGIN BEGIN
PROMPT 4 9 "Concessione " PROMPT 4 9 "Concessione "
HELP "Codice Concessione del Comune di residenza fiscale" HELP "Codice Concessione del Comune di residenza fiscale"
@ -200,7 +198,7 @@ BEGIN
END END
NUMBER 107 15 0 NUMBER 106 15 0
BEGIN BEGIN
PROMPT 1 4 "Versamenti " PROMPT 1 4 "Versamenti "
FLAGS "R" FLAGS "R"
@ -208,13 +206,13 @@ BEGIN
END END
/* /*
LIST 108 1 8 LIST 107 1 8
BEGIN BEGIN
PROMPT 1 9 "Importo a " PROMPT 1 9 "Importo a "
ITEM "D|Debito" ITEM "D|Debito"
ITEM "C|Credito" ITEM "C|Credito"
INPUT 105 INPUT 104
OUTPUT 105 OUTPUT 104
END END
*/ */
@ -228,7 +226,7 @@ BEGIN
PROMPT -23 -1 "" PROMPT -23 -1 ""
END END
BUTTON 101 10 2 BUTTON 100 10 2
BEGIN BEGIN
PROMPT -33 -1 "Dettaglio" PROMPT -33 -1 "Dettaglio"
END END