diff --git a/src/ve/ve1.cpp b/src/ve/ve1.cpp index 2f0c3773f..73b1eb7ec 100755 --- a/src/ve/ve1.cpp +++ b/src/ve/ve1.cpp @@ -10,9 +10,11 @@ int main(int argc, char **argv) case 1 : ve1200(argc, argv); break; //stampa scoperto, lista bolle case 2 : ve1300(argc, argv); break; //stampa report documenti case 3 : ve1400(argc, argv); break; //stampa tabelle vendita ed utilita' varie - case 4 : ve1500(argc, argv); break; //stampa di controllo documenti contabilizzati - case 5 : ve1600(argc, argv); break; //stampa di controllo bolle fatturate - case 6 : ve1700(argc, argv); break; //Lista documento con report + case 4 : ve1500(argc, argv); break; //stampa di controllo documenti contabilizzati + case 5 : ve1600(argc, argv); break; //stampa di controllo bolle fatturate + case 6 : ve1700(argc, argv); break; //Lista documento con report + case 7 : ve1800(argc, argv); break; //Fido + default: ve1100(argc, argv); break; //stampa documenti di vendita } return 0; diff --git a/src/ve/ve1.h b/src/ve/ve1.h index d2604b6bd..73d0bc55c 100755 --- a/src/ve/ve1.h +++ b/src/ve/ve1.h @@ -8,6 +8,7 @@ int ve1400(int argc, char* argv[]); int ve1500(int argc, char* argv[]); int ve1600(int argc, char* argv[]); int ve1700(int argc, char* argv[]); +int ve1800(int argc, char* argv[]); #endif // __VE1_H diff --git a/src/ve/ve1300.alx b/src/ve/ve1300.alx index 1ffa31283..ce9a86a9f 100755 --- a/src/ve/ve1300.alx +++ b/src/ve/ve1300.alx @@ -57,3 +57,33 @@ : MESSAGE_ADD_ROW ( s1 s2 s3 -- ) DOC_ADD_ROW \ user defined word in ve1.exe ; + +: SALDO_CONTABILE ( codcf -- ) + 1 + SWAP + UTILIZZO + ; + +: ESPOSTO_SALDACONTO ( codcf -- ) + 2 + SWAP + UTILIZZO + ; + +: ESPOSTO_CONTABILE ( codcf -- ) + 3 + SWAP + UTILIZZO + ; + +: SALDO_DOCUMENTI ( codcf -- ) + 4 + SWAP + UTILIZZO + ; + +: UTILIZZO_TOTALE ( codcf -- ) + 7 + SWAP + UTILIZZO + ; \ No newline at end of file diff --git a/src/ve/ve1500.h b/src/ve/ve1500.h index 01f34e355..fa792aeba 100755 --- a/src/ve/ve1500.h +++ b/src/ve/ve1500.h @@ -4,3 +4,5 @@ #define F_ESERCIZIO 103 #define F_DATAINIZIO 104 #define F_DATAFINE 105 + + diff --git a/src/ve/ve17001.rep b/src/ve/ve17001.rep index 5cae82a67..1d7c59ca1 100644 --- a/src/ve/ve17001.rep +++ b/src/ve/ve17001.rep @@ -1,5 +1,5 @@ - + Lista documenti
diff --git a/src/ve/ve17002.rep b/src/ve/ve17002.rep index 4c49314a7..fdc1ec6b5 100644 --- a/src/ve/ve17002.rep +++ b/src/ve/ve17002.rep @@ -1,5 +1,5 @@ - + Lista documenti con dettaglio
diff --git a/src/ve/ve1800.cpp b/src/ve/ve1800.cpp new file mode 100644 index 000000000..65c28df98 --- /dev/null +++ b/src/ve/ve1800.cpp @@ -0,0 +1,84 @@ +#include +#include +#include +#include + +#include "velib07.h" + +#include "ve1.h" +#include "ve1800a.h" +#include +#include + +class TListaFido_app : public TKlarkKent_app +{ +protected: + virtual void main_loop(); +}; + +void TListaFido_app::main_loop() +{ + TMask m("ve1800a"); + TDocument_report report; + + m.set(F_REPORT, "ve18001"); + ((TButton_tool&)m.field(DLG_PREVIEW)).set_exit_key('A'); + ((TButton_tool&)m.field(DLG_PRINT)).set_exit_key('P'); + + KEY k; + + while ((k = m.run()) != K_QUIT) + { + TReport_book book; + TFilename report_name = m.get(F_REPORT); + + if (report_name.blank()) + report_name = "ve18001"; + report.load(report_name); + + TISAM_recordset * recset = (TISAM_recordset*)report.recordset(); + + if (m.get_bool(F_CONFIDO)) + { + + TString query = recset->query_text(); + int pos = query.find("\n"); + + if (pos > 0) + { + query.insert(" SELECT FIDO>0", pos); + recset->set(query); + recset->requery(); + } + } + + long cod_fr = m.get_long(F_CODFR); + long cod_to = m.get_long(F_CODTO); + + report.set_var("#CODFR", cod_fr); + report.set_var("#CODTO", cod_to); + recset->set_var("#CODFR", cod_fr); + recset->set_var("#CODTO", cod_to); + + TDate al = m.get_date(F_ADATA); + + if (al.ok()) + report.set_datafido(al); + + book.add(report); + if (book.pages() > 0) + if (k == 'A') + book.preview(); + else + book.print(); + } +} + + + +int ve1800(int argc, char* argv[]) +{ + TListaFido_app app; + app.run(argc, argv, TR("Stampa Report Fido")); + return 0; +} \ No newline at end of file diff --git a/src/ve/ve18001.rep b/src/ve/ve18001.rep new file mode 100644 index 000000000..007b851f7 --- /dev/null +++ b/src/ve/ve18001.rep @@ -0,0 +1,98 @@ + + + Lista documenti con fido + + + + + +