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

Merge branch 'R12.00.1244' of http://10.65.20.33/sirio/CAMPO/campo into R12.00.1244

Browse Source
This commit is contained in:
New_Macchina_Compilatrice 2023-02-28 11:46:14 +01:00
commit 91beb5053e
4 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ve/ve1100.cpp
View File

@ -1399,7 +1399,7 @@ void TStampaDoc_application::print_selected(KEY k)
if (_interattivo) if (_interattivo)
{ {
if (k == 'A') if (k == K_VISUALIZE)
pr.set_printtype(screenvis); pr.set_printtype(screenvis);
else else
pr.set_printtype(winprinter); pr.set_printtype(winprinter);
@ -2023,8 +2023,8 @@ bool TStampaDoc_application::create()
_selection_mask->sfield(F_SHEETNUMS).sheet_mask().set_handler(102, tipodoc_handler); _selection_mask->sfield(F_SHEETNUMS).sheet_mask().set_handler(102, tipodoc_handler);
} }
TButton_tool& ap = (TButton_tool&)_selection_mask->field(DLG_PREVIEW); // TButton_tool& ap = (TButton_tool&)_selection_mask->field(DLG_PREVIEW);
ap.set_exit_key('A'); // ap.set_exit_key('A');
if (argc>3) if (argc>3)
{ // lettura dei parametri iniziali dalla linea di comando { // lettura dei parametri iniziali dalla linea di comando

22
src/ve/ve1700.cpp
View File

@ -165,7 +165,7 @@ bool TStampa_lista_docs_mask::on_field_event(TOperable_field& o, TField_event e,
TToken_string & row = s.row(s.selected()); TToken_string & row = s.row(s.selected());
TArray_sheet as(-1,-1,70,20,TR("Tipi documento"),HR("Codice|Descrizione@50")); //costruisce uno sheet di selezione dei tipi doc TArray_sheet as(-1,-1,70,20,TR("Tipi documento"),HR("Codice|Descrizione@50")); //costruisce uno sheet di selezione dei tipi doc
const TCodice_numerazione& cn = cached_numerazione(row.get(1)); const TCodice_numerazione& cn = cached_numerazione(row.get(0));
for (int t = cn.ntipi_doc()-1; t >= 0; t--) for (int t = cn.ntipi_doc()-1; t >= 0; t--)
{ {
const TString4 tipodoc = cn.tipo_doc(t); const TString4 tipodoc = cn.tipo_doc(t);
@ -206,7 +206,7 @@ TStampa_lista_docs_mask::TStampa_lista_docs_mask()
" |CODCF|RAGSOC", TR("Selezione Clienti/Fornitori"), " |CODCF|RAGSOC", TR("Selezione Clienti/Fornitori"),
HR("@1|Codice@6R|Descrizione@50"), 0, 1) HR("@1|Codice@6R|Descrizione@50"), 0, 1)
{ {
((TButton_tool&)field(DLG_PREVIEW)).set_exit_key('A'); // ((TButton_tool&)field(DLG_PREVIEW)).set_exit_key('A');
} }
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
@ -336,7 +336,7 @@ TCursor* TLista_documenti_recordset::cursor() const
TString from_num("ZZZZ"); TString from_num("ZZZZ");
TString to_num; TString to_num;
for (int j=0; j<rows; j++) for (int j = 0; j < rows; j++)
{ {
TToken_string& riga = sf.row(j); TToken_string& riga = sf.row(j);
@ -348,11 +348,11 @@ TCursor* TLista_documenti_recordset::cursor() const
if (str.full()) if (str.full())
{ {
::add_term(docfilter, DOC_CODNUM, "==", stringify(str)); if (from_num > str)
if (from_num > str)
from_num = str; from_num = str;
if (to_num < str) if (to_num < str)
to_num = str; to_num = str;
::add_term(docfilter, DOC_CODNUM, "==", stringify(str));
} }
str = riga.get(); str = riga.get();
if (str.full()) if (str.full())
@ -459,8 +459,9 @@ void TListaDoc_application::main_loop()
TLista_documenti_report report(&m); TLista_documenti_report report(&m);
m.set(F_REPORT, "ve17001"); m.set(F_REPORT, "ve17001");
KEY k;
while (m.run() != K_QUIT) while ((k = m.run()) != K_QUIT)
{ {
TReport_book book; TReport_book book;
TFilename report_name = m.get(F_REPORT); TFilename report_name = m.get(F_REPORT);
@ -469,8 +470,13 @@ void TListaDoc_application::main_loop()
report_name = "ve17001"; report_name = "ve17001";
report.load(report_name); report.load(report_name);
book.add(report); book.add(report);
if (book.pages() > 0) if (book.pages() > 0)
book.print_or_preview(); {
if (k == K_VISUALIZE)
book.preview();
else
book.print_or_preview();
}
} }
} }

4
src/ve/ve1800.cpp
View File

@ -22,8 +22,8 @@ void TListaFido_app::main_loop()
TDocument_report report; TDocument_report report;
m.set(F_REPORT, "ve18001"); m.set(F_REPORT, "ve18001");
((TButton_tool&)m.field(DLG_PREVIEW)).set_exit_key(K_VISUALIZE); // ((TButton_tool&)m.field(DLG_PREVIEW)).set_exit_key(K_VISUALIZE);
((TButton_tool&)m.field(DLG_PRINT)).set_exit_key(K_PRINT); // ((TButton_tool&)m.field(DLG_PRINT)).set_exit_key(K_PRINT);
m.show(F_DADATA, ini_get_bool(CONFIG_STUDIO, "Main", "MYGOD")); m.show(F_DADATA, ini_get_bool(CONFIG_STUDIO, "Main", "MYGOD"));
m.set(F_ADATA, today); m.set(F_ADATA, today);
m.set(F_GIORNIRISK, ini_get_int(CONFIG_DITTA, "ve", "FIDO_RISKDAYS")); m.set(F_GIORNIRISK, ini_get_int(CONFIG_DITTA, "ve", "FIDO_RISKDAYS"));

6
src/ve/ve1900.cpp
View File

@ -22,8 +22,8 @@ void TMetodiPagamentoClienti_app::main_loop()
TDocument_report report; TDocument_report report;
m.set(F_REPORT, "ve19001"); m.set(F_REPORT, "ve19001");
((TButton_tool&)m.field(DLG_PREVIEW)).set_exit_key('A'); // ((TButton_tool&)m.field(DLG_PREVIEW)).set_exit_key('A');
((TButton_tool&)m.field(DLG_PRINT)).set_exit_key('P'); // ((TButton_tool&)m.field(DLG_PRINT)).set_exit_key('P');
KEY k; KEY k;
@ -44,7 +44,7 @@ void TMetodiPagamentoClienti_app::main_loop()
book.add(report); book.add(report);
if (book.pages() > 0) if (book.pages() > 0)
if (k == 'A') if (k == K_VISUALIZE)
book.preview(); book.preview();
else else
book.print(); book.print();