From b6213bd83b7de47e3c08c7ad123131ba2163ee3e Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 23 Jun 2010 09:52:18 +0000 Subject: [PATCH] Patch level : 10.0 Files correlati : ve1100a.msk ve1300a.msk ve1.exe Ricompilazione Demo : [ ] Commento : Separate definitivamente le maschere di stampa documenti normale (ve1100a) ed avanzata (ve1300a) git-svn-id: svn://10.65.10.50/trunk@20625 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ve/ve1100.cpp | 14 +-- ve/ve1100.h | 5 +- ve/ve1100a.uml | 167 +++++------------------------ ve/ve1300.cpp | 41 +++----- ve/ve1300a.h | 20 ++++ ve/ve1300a.uml | 279 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 342 insertions(+), 184 deletions(-) create mode 100755 ve/ve1300a.h create mode 100755 ve/ve1300a.uml diff --git a/ve/ve1100.cpp b/ve/ve1100.cpp index e8d71b6ad..dbd2442e8 100755 --- a/ve/ve1100.cpp +++ b/ve/ve1100.cpp @@ -1398,10 +1398,7 @@ void TStampaDoc_application::print_selected(KEY k) if (k == 'A') pr.set_printtype(screenvis); else - { - //if (pr.printtype() != acrobatprinter) - pr.set_printtype(winprinter); - } + pr.set_printtype(winprinter); } pr.open(); @@ -2002,11 +1999,6 @@ bool TStampaDoc_application::create() _selection_mask->set_handler(F_DA_DATADOC, date2num_handler); _selection_mask->set_handler(F_A_DATADOC, date2num_handler); _selection_mask->set_handler(F_A_NDOC, range_handler); - - _selection_mask->disable(DLG_EMAIL); - _selection_mask->disable(DLG_SIGNMAIL); - _selection_mask->disable(DLG_PDF); - _selection_mask->disable(DLG_SIGNPDF); } else { @@ -2022,9 +2014,9 @@ bool TStampaDoc_application::create() _selection_mask->set_handler(BUT_ANN, reset_button); _selection_mask->sfield(F_SHEETNUMS).sheet_mask().set_handler(102, tipodoc_handler); - TButton_tool& ap = (TButton_tool&)_selection_mask->field(DLG_PREVIEW); - ap.set_exit_key('A'); } + TButton_tool& ap = (TButton_tool&)_selection_mask->field(DLG_PREVIEW); + ap.set_exit_key('A'); if (argc>3) { // lettura dei parametri iniziali dalla linea di comando diff --git a/ve/ve1100.h b/ve/ve1100.h index fb9bf71cc..6a4129d32 100755 --- a/ve/ve1100.h +++ b/ve/ve1100.h @@ -10,11 +10,8 @@ #define F_DA_DATADOC 128 #define F_A_DATADOC 129 -#define F_TIPOST 130 +#define F_TIPOST 130 -#define F_TIPOCFD 131 -#define F_DA_CLIFO 132 -#define F_A_CLIFO 133 #define F_TIPOCF 110 #define F_CODFR 111 diff --git a/ve/ve1100a.uml b/ve/ve1100a.uml index 8ccf8f405..74bde929c 100755 --- a/ve/ve1100a.uml +++ b/ve/ve1100a.uml @@ -2,69 +2,7 @@ TOOLBAR "" 0 0 0 2 -BUTTON DLG_PRINT 10 2 -BEGIN - PROMPT 1 1 "~Stampa" - MESSAGE EXIT,K_ENTER -END - -BUTTON DLG_SETPRINT 10 2 -BEGIN - PROMPT 2 1 "~Imposta" -END - -BUTTON DLG_PREVIEW 10 2 -BEGIN - PROMPT 3 1 "~Anteprima" - PICTURE TOOL_PREVIEW - MESSAGE EXIT,65 -END - -BUTTON DLG_NULL 10 2 -BEGIN - PROMPT 4 1 "" - PICTURE 0 -END - -BUTTON DLG_EMAIL 10 2 -BEGIN - PROMPT 5 1 "Mail" - PICTURE TOOL_EMAIL - MESSAGE EXIT,69 - FLAGS "D" -END - -BUTTON DLG_SIGNMAIL 10 2 -BEGIN - PROMPT 6 1 "Firmata" - PICTURE TOOL_SIGNMAIL - MESSAGE EXIT,101 - FLAGS "D" -END - -BUTTON DLG_NULL 10 2 -BEGIN - PROMPT 7 1 "" - PICTURE 0 -END - -BUTTON DLG_PDF 10 2 -BEGIN - PROMPT 8 1 "Pdf" - PICTURE TOOL_PDF - MESSAGE EXIT,80 - FLAGS "D" -END - -BUTTON DLG_SIGNPDF 10 2 -BEGIN - PROMPT 9 1 "Firmato" - PICTURE TOOL_SIGNPDF - MESSAGE EXIT,112 - FLAGS "D" -END - -#include +#include ENDPAGE @@ -107,9 +45,8 @@ END RADIOBUTTON F_DATA_O_NUM 68 BEGIN PROMPT 1 4 "Selezione per " - ITEM "N|Numero documento" MESSAGE SHOW,1@|HIDE,2@|HIDE,3@ - ITEM "D|Data documento" MESSAGE SHOW,2@|HIDE,1@|HIDE,3@ - ITEM "C|Cliente/Forntore" MESSAGE SHOW,3@|HIDE,1@|HIDE,2@ + ITEM "N|Numero documento" MESSAGE SHOW,1@|HIDE,2@|HIDE,3@ + ITEM "D|Data documento" MESSAGE SHOW,2@|HIDE,1@|HIDE,3@ FLAG "P" END @@ -119,21 +56,9 @@ BEGIN GROUP 1 END -GROUPBOX DLG_NULL 68 5 +NUMBER F_DA_NDOC 7 BEGIN - PROMPT 1 9 "Selezione per data" - GROUP 2 -END - -GROUPBOX DLG_NULL 68 5 -BEGIN - PROMPT 1 9 "Selezione per cliente" - GROUP 3 -END - -NUMBER F_DA_NDOC 7 0 -BEGIN - PROMPT 2 10 "Dal numero " + PROMPT 2 10 "Dal " USE 33 JOIN 20 INTO CODCF=CODCF TIPOCF=TIPOCF JOIN 13 TO 20 INTO COM=COMCF @@ -146,14 +71,13 @@ BEGIN DISPLAY "Cliente/Fornitore@40" 20->RAGSOC DISPLAY "Comune@20" 13->DENCOM OUTPUT F_DA_NDOC NDOC - // OUTPUT F_DA_DATADOC DATADOC GROUP 1 ADD RUN ve0 -0 END -NUMBER F_A_NDOC 7 0 +NUMBER F_A_NDOC 7 BEGIN - PROMPT 2 12 "Al numero " + PROMPT 2 12 "Al " USE 33 JOIN 20 INTO CODCF=CODCF TIPOCF=TIPOCF JOIN 13 TO 20 INTO COM=COMCF @@ -161,20 +85,22 @@ BEGIN INPUT ANNO F_ANNO SELECT INPUT CODNUM F_CODNUM SELECT INPUT NDOC F_A_NDOC - DISPLAY "Data@10" DATADOC - DISPLAY "Numero@7" NDOC - DISPLAY "Cliente/Fornitore@40" 20->RAGSOC - DISPLAY "Comune@20" 13->DENCOM + COPY DISPLAY F_DA_NDOC OUTPUT F_A_NDOC NDOC WARNING "Il numero documento deve essere superiore al limite inferiore" - // OUTPUT F_A_DATADOC DATADOC GROUP 1 ADD RUN ve0 -0 END +GROUPBOX DLG_NULL 68 5 +BEGIN + PROMPT 1 9 "Selezione per data" + GROUP 2 +END + DATE F_DA_DATADOC BEGIN - PROMPT 2 10 "Dalla data " + PROMPT 2 10 "Dal " USE 33 KEY 3 SELECT (PROVV==#F_PROVV) && (ANNO==#F_ANNO) && (CODNUM==#F_CODNUM) JOIN 20 INTO CODCF=CODCF TIPOCF=TIPOCF JOIN 13 TO 20 INTO COM=COMCF @@ -186,7 +112,6 @@ BEGIN DISPLAY "Numero@7" NDOC DISPLAY "Cliente/Fornitore@40" 20->RAGSOC DISPLAY "Comune@20" 13->DENCOM - // COPY DISPLAY F_DA_NDOC OUTPUT F_DA_NDOC NDOC OUTPUT F_DA_DATADOC DATADOC GROUP 2 @@ -194,58 +119,20 @@ END DATE F_A_DATADOC BEGIN - PROMPT 2 12 "Alla data " - USE 33 KEY 3 SELECT (PROVV==#F_PROVV) && (ANNO==#F_ANNO) && (CODNUM==#F_CODNUM) - JOIN 20 INTO CODCF=CODCF TIPOCF=TIPOCF - JOIN 13 TO 20 INTO COM=COMCF - INPUT DATADOC F_A_DATADOC - INPUT PROVV F_PROVV - INPUT ANNO F_ANNO - INPUT CODNUM F_CODNUM - DISPLAY "Data@10" DATADOC - DISPLAY "Numero@7" NDOC - DISPLAY "Cliente/Fornitore@40" 20->RAGSOC - DISPLAY "Comune@20" 13->DENCOM - OUTPUT F_A_NDOC NDOC - OUTPUT F_A_DATADOC DATADOC - GROUP 2 + PROMPT 2 12 "Al " + USE LF_DOC KEY 3 SELECT (PROVV==#F_PROVV) && (ANNO==#F_ANNO) && (CODNUM==#F_CODNUM) + JOIN LF_CLIFO INTO CODCF=CODCF TIPOCF=TIPOCF + JOIN LF_COMUNI TO LF_CLIFO INTO COM=COMCF + INPUT DATADOC F_A_DATADOC + INPUT PROVV F_PROVV + INPUT ANNO F_ANNO + INPUT CODNUM F_CODNUM + COPY DISPLAY F_DA_DATADOC + OUTPUT F_A_NDOC NDOC + OUTPUT F_A_DATADOC DATADOC + GROUP 2 END -LIST F_TIPOCFD 1 12 -BEGIN - PROMPT 2 10 "Tipo " - ITEM "C|Cliente" - ITEM "F|Fornitore" - GROUP 3 -END - -NUMBER F_DA_CLIFO 7 0 -BEGIN - PROMPT 2 12 "Dal Cli/For" - USE 20 - JOIN 13 TO 20 INTO COM==COMCF - INPUT TIPOCF F_TIPOCFD SELECT - INPUT CODCF F_DA_CLIFO - DISPLAY "Codice@7" CODCF - DISPLAY "Ragione Sociale@50" RAGSOC - DISPLAY "Comune@20" 13->DENCOM - OUTPUT F_DA_CLIFO CODCF - GROUP 3 -END - -NUMBER F_A_CLIFO 7 0 -BEGIN - PROMPT 30 12 "Al Cli/For " - USE 20 - JOIN 13 TO 20 INTO COM==COMCF - INPUT TIPOCF F_TIPOCFD SELECT - INPUT CODCF F_A_CLIFO - DISPLAY "Codice@7" CODCF - DISPLAY "Ragione Sociale@50" RAGSOC - DISPLAY "Comune@20" 13->DENCOM - OUTPUT F_A_CLIFO CODCF - GROUP 3 -END RADIOBUTTON F_TIPOST 68 BEGIN diff --git a/ve/ve1300.cpp b/ve/ve1300.cpp index 8669976bc..68d2e1ebc 100755 --- a/ve/ve1300.cpp +++ b/ve/ve1300.cpp @@ -1,5 +1,5 @@ #include "velib05.h" -#include "ve1100.h" +#include "ve1300a.h" #include #include @@ -199,23 +199,6 @@ TDoc_recordset::TDoc_recordset(const TRecordset& doc, const TString& old_query) } _doc->set_riga_conai(); - /*const bool has_conai = (_doc->tipo().add_conai() && _doc->clifor().vendite().get_bool(CFV_CONAIASS)); - if (has_conai) // || _doc->rows() == 0) - { - const int n = _doc->new_row().get_int(RDOC_NRIGA); - TRiga_documento& r = (*_doc)[n]; - r.put(RDOC_TIPORIGA, "05"); // Crea ua riga descrizione fittizia - - if (has_conai) - { - TString conai = ini_get_sMy master called you whore - tring(CONFIG_DITTA, "ve", "DESCCONAIASS", TR("Contributo CONAI assolto")); - if (conai.blank()) // se la variabile e' vuota ma scritta sull ini non stampa nulla - conai = TR("Contributo CONAI assolto"); - r.put(RDOC_DESCR, conai); - } - }*/ - // Posiziona correttamente anche il cursore principale *cursor() = 0L; } @@ -910,7 +893,7 @@ bool TReport_doc_mask::on_field_event(TOperable_field& o, TField_event e, long j return true; } -TReport_doc_mask::TReport_doc_mask() : TAutomask("ve1100a") +TReport_doc_mask::TReport_doc_mask() : TAutomask("ve1300a") { hide(F_PROVV); @@ -1070,19 +1053,19 @@ void TReport_doc_app::add_ndoc_filter(TString& query, bool from) const void TReport_doc_app::add_filter(TString& query, bool from) const { - const char tipost = _msk->get(F_DATA_O_NUM)[0]; + const char tipost = _msk->get(F_ORDERING)[0]; switch (tipost) { - case 'D' : - add_data_filter(query, from); - break; - case 'C' : - add_cli_filter(query, from); - break; - default : + case 'D' : + add_data_filter(query, from); + break; + case 'C' : + add_cli_filter(query, from); + break; + default : add_ndoc_filter(query, from); - break; + break; } } @@ -1418,7 +1401,7 @@ void TReport_doc_app::main_loop() if (a > 6) // Stampa da riga di comando { - _msk->set(F_DATA_O_NUM, "N"); // Stampa per numero documento + _msk->set(F_ORDERING, "N"); // Stampa per numero documento _msk->set(F_ANNO, argv(3)); _msk->set(F_PROVV, argv(4)); diff --git a/ve/ve1300a.h b/ve/ve1300a.h new file mode 100755 index 000000000..ee70119c0 --- /dev/null +++ b/ve/ve1300a.h @@ -0,0 +1,20 @@ +#define F_CODNUM 121 +#define F_ANNO 122 +#define F_PROVV 123 +#define F_NCOPIE 124 + +#define F_ORDERING 125 + +#define F_DA_NDOC 126 +#define F_A_NDOC 127 + +#define F_DA_DATADOC 128 +#define F_A_DATADOC 129 +#define F_TIPOST 130 + +#define F_TIPOCFD 131 +#define F_DA_CLIFO 132 +#define F_A_CLIFO 133 +#define F_DA_RAGSOC 134 +#define F_A_RAGSOC 135 + diff --git a/ve/ve1300a.uml b/ve/ve1300a.uml new file mode 100755 index 000000000..570e711d7 --- /dev/null +++ b/ve/ve1300a.uml @@ -0,0 +1,279 @@ +#include "ve1300a.h" + +TOOLBAR "" 0 0 0 2 + +BUTTON DLG_PRINT 10 2 +BEGIN + PROMPT 1 1 "~Stampa" + MESSAGE EXIT,K_ENTER +END + +BUTTON DLG_SETPRINT 10 2 +BEGIN + PROMPT 2 1 "~Imposta" +END + +BUTTON DLG_PREVIEW 10 2 +BEGIN + PROMPT 3 1 "~Anteprima" + PICTURE TOOL_PREVIEW + MESSAGE EXIT,65 +END + +BUTTON DLG_NULL 10 2 +BEGIN + PROMPT 4 1 "" + PICTURE 0 +END + +BUTTON DLG_EMAIL 10 2 +BEGIN + PROMPT 5 1 "Mail" + PICTURE TOOL_EMAIL + MESSAGE EXIT,69 + FLAGS "D" +END + +BUTTON DLG_SIGNMAIL 10 2 +BEGIN + PROMPT 6 1 "Firmata" + PICTURE TOOL_SIGNMAIL + MESSAGE EXIT,101 + FLAGS "D" +END + +BUTTON DLG_NULL 10 2 +BEGIN + PROMPT 7 1 "" + PICTURE 0 +END + +BUTTON DLG_PDF 10 2 +BEGIN + PROMPT 8 1 "Pdf" + PICTURE TOOL_PDF + MESSAGE EXIT,80 + FLAGS "D" +END + +BUTTON DLG_SIGNPDF 10 2 +BEGIN + PROMPT 9 1 "Firmato" + PICTURE TOOL_SIGNPDF + MESSAGE EXIT,112 + FLAGS "D" +END + +#include + +ENDPAGE + +PAGE "Stampa Documenti Vendita" 0 0 0 0 + +STRING F_CODNUM 4 4 +BEGIN + PROMPT 1 1 "Codice numerazione " + FLAG "UP" + USE %NUM + INPUT CODTAB F_CODNUM + DISPLAY "Cod. Num." CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT F_CODNUM CODTAB + CHECKTYPE NORMAL +END + +NUMBER F_ANNO 4 0 +BEGIN + PROMPT 38 1 "Anno " + FLAG "AP" + CHECKTYPE REQUIRED +END + +LIST F_PROVV 12 +BEGIN + PROMPT 1 2 "Tipo numerazione " + ITEM "D|Definitiva" + ITEM "P|Provvisoria" + FLAG "P" +END + +NUMBER F_NCOPIE 2 +BEGIN + PROMPT 38 2 "Numero copie " + FLAG "UP" + WARNING "Il numero di copie deve essere positivo" +END + +RADIOBUTTON F_ORDERING 68 +BEGIN + PROMPT 1 4 "Selezione per " + ITEM "N|Numero documento" MESSAGE SHOW,1@|HIDE,2@|HIDE,3@ + ITEM "D|Data documento" MESSAGE SHOW,2@|HIDE,1@|HIDE,3@ + ITEM "C|Cliente/Fornitore" MESSAGE SHOW,3@|HIDE,1@|HIDE,2@ + FLAG "P" +END + +GROUPBOX DLG_NULL 68 5 +BEGIN + PROMPT 1 9 "Selezione per numero" + GROUP 1 +END + +NUMBER F_DA_NDOC 7 +BEGIN + PROMPT 2 10 "Dal " + USE 33 + JOIN 20 INTO CODCF=CODCF TIPOCF=TIPOCF + JOIN 13 TO 20 INTO COM=COMCF + INPUT PROVV F_PROVV SELECT + INPUT ANNO F_ANNO SELECT + INPUT CODNUM F_CODNUM SELECT + INPUT NDOC F_DA_NDOC + DISPLAY "Data@10" DATADOC + DISPLAY "Numero@7" NDOC + DISPLAY "Cliente/Fornitore@40" 20->RAGSOC + DISPLAY "Comune@20" 13->DENCOM + OUTPUT F_DA_NDOC NDOC + GROUP 1 + ADD RUN ve0 -0 +END + +NUMBER F_A_NDOC 7 +BEGIN + PROMPT 2 12 "Al " + USE 33 + JOIN 20 INTO CODCF=CODCF TIPOCF=TIPOCF + JOIN 13 TO 20 INTO COM=COMCF + INPUT PROVV F_PROVV SELECT + INPUT ANNO F_ANNO SELECT + INPUT CODNUM F_CODNUM SELECT + INPUT NDOC F_A_NDOC + COPY DISPLAY F_DA_NDOC + OUTPUT F_A_NDOC NDOC + WARNING "Il numero documento deve essere superiore al limite inferiore" + GROUP 1 + ADD RUN ve0 -0 +END + +GROUPBOX DLG_NULL 68 5 +BEGIN + PROMPT 1 9 "Selezione per data" + GROUP 2 +END + +DATE F_DA_DATADOC +BEGIN + PROMPT 2 10 "Dal " + USE 33 KEY 3 SELECT (PROVV==#F_PROVV) && (ANNO==#F_ANNO) && (CODNUM==#F_CODNUM) + JOIN 20 INTO CODCF=CODCF TIPOCF=TIPOCF + JOIN 13 TO 20 INTO COM=COMCF + INPUT DATADOC F_DA_DATADOC + INPUT PROVV F_PROVV + INPUT ANNO F_ANNO + INPUT CODNUM F_CODNUM + DISPLAY "Data@10" DATADOC + DISPLAY "Numero@7" NDOC + DISPLAY "Cliente/Fornitore@40" 20->RAGSOC + DISPLAY "Comune@20" 13->DENCOM + OUTPUT F_DA_NDOC NDOC + OUTPUT F_DA_DATADOC DATADOC + GROUP 2 +END + +DATE F_A_DATADOC +BEGIN + PROMPT 2 12 "Al " + USE LF_DOC KEY 3 SELECT (PROVV==#F_PROVV) && (ANNO==#F_ANNO) && (CODNUM==#F_CODNUM) + JOIN LF_CLIFO INTO CODCF=CODCF TIPOCF=TIPOCF + JOIN LF_COMUNI TO LF_CLIFO INTO COM=COMCF + INPUT DATADOC F_A_DATADOC + INPUT PROVV F_PROVV + INPUT ANNO F_ANNO + INPUT CODNUM F_CODNUM + COPY DISPLAY F_DA_DATADOC + OUTPUT F_A_NDOC NDOC + OUTPUT F_A_DATADOC DATADOC + GROUP 2 +END + +GROUPBOX DLG_NULL 68 5 +BEGIN + PROMPT 1 9 "Selezione per Cliente/Fornitore" + GROUP 3 +END + +LIST F_TIPOCFD 1 12 +BEGIN + PROMPT 2 10 "Tipo " + ITEM "C|Cliente" + ITEM "F|Fornitore" + GROUP 3 +END + +NUMBER F_DA_CLIFO 7 +BEGIN + PROMPT 2 11 "Dal " + USE LF_CLIFO + JOIN LF_COMUNI INTO COM==COMCF + INPUT TIPOCF F_TIPOCFD SELECT + INPUT CODCF F_DA_CLIFO + DISPLAY "Codice@7" CODCF + DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Comune@20" 13->DENCOM + OUTPUT F_DA_CLIFO CODCF + OUTPUT F_DA_RAGSOC RAGSOC + CHECKTYPE SEARCH + GROUP 3 +END + +STRING F_DA_RAGSOC 50 45 +BEGIN + PROMPT 18 11 "" + USE LF_CLIFO KEY 2 + JOIN LF_COMUNI INTO COM==COMCF + INPUT TIPOCF F_TIPOCFD SELECT + INPUT RAGSOC F_DA_RAGSOC + DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Codice@7" CODCF + DISPLAY "Comune@20" 13->DENCOM + COPY OUTPUT F_DA_CLIFO + CHECKTYPE SEARCH + GROUP 3 +END + +NUMBER F_A_CLIFO 7 +BEGIN + PROMPT 2 12 "Al " + COPY USE F_DA_CLIFO + INPUT TIPOCF F_TIPOCFD SELECT + INPUT CODCF F_A_CLIFO + COPY DISPLAY F_DA_CLIFO + OUTPUT F_A_CLIFO CODCF + OUTPUT F_A_RAGSOC RAGSOC + CHECKTYPE SEARCH + GROUP 3 +END + +STRING F_A_RAGSOC 50 45 +BEGIN + PROMPT 18 12 "" + COPY USE F_DA_RAGSOC + INPUT TIPOCF F_TIPOCFD SELECT + INPUT RAGSOC F_A_RAGSOC + COPY DISPLAY F_DA_RAGSOC + COPY OUTPUT F_A_CLIFO + CHECKTYPE SEARCH + GROUP 3 +END + +RADIOBUTTON F_TIPOST 68 +BEGIN + PROMPT 1 14 "Stampa" + ITEM "D|Definitiva (Solo i documenti non stampati in definitiva)" + ITEM "P|Provvisoria (Tutti i documenti selezionati senza cambio stato)" + FLAG "P" +END + +ENDPAGE + +ENDMASK