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

Patch level : 12.0 614

Browse Source 
Files correlati     :
Commento            : Ricarico modifiche già caricate
This commit is contained in:
Sirio Builder 2018-07-31 17:21:52 +02:00
parent 64cff24bf2
commit ed7ccda9be
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pr/pr0500a.uml
View File

@ -24,7 +24,7 @@ BEGIN
INPUT CODAGE F_CODAGE INPUT CODAGE F_CODAGE
DISPLAY "Codice@8R" CODAGE DISPLAY "Codice@8R" CODAGE
DISPLAY "Descrizione@50" RAGSOC DISPLAY "Descrizione@50" RAGSOC
DISPLAY "Capo Zona@5" CAPO DISPLAY "Capo Zona@5" CODCAPO
OUTPUT F_CODAGE CODAGE OUTPUT F_CODAGE CODAGE
OUTPUT F_RAGSOC RAGSOC OUTPUT F_RAGSOC RAGSOC
CHECKTYPE REQUIRED CHECKTYPE REQUIRED

8
src/ve/ve1300.cpp
View File

@ -1086,7 +1086,7 @@ public:
class TReport_doc_app : public TSkeleton_application class TReport_doc_app : public TSkeleton_application
{ {
enum TOutput_mode { out_preview, out_print, out_mail, out_signed_mail, out_pdf, out_signed_pdf }; enum TOutput_mode { out_preview, out_print, out_mail, out_signed_mail, out_pdf, out_signed_pdf, out_disk};
TReport_doc_mask* _msk; TReport_doc_mask* _msk;
@ -1402,7 +1402,7 @@ bool TReport_doc_app::print_loop(TRecordset& doc, TOutput_mode mode, bool final_
TToken_string to, cc; TToken_string to, cc;
const bool send_mail = mail_requested && get_mail_address(to, cc); const bool send_mail = mail_requested && get_mail_address(to, cc);
const bool paperless = send_mail || mode == out_pdf || mode == out_signed_pdf; const bool paperless = send_mail || mode == out_pdf || mode == out_signed_pdf || mode == out_disk;
// Tenta di costruirsi il nome del report: se non stampo su carta cerco di usare un profilo con sfondo // Tenta di costruirsi il nome del report: se non stampo su carta cerco di usare un profilo con sfondo
TFilename profilo; TFilename profilo;
@ -1533,11 +1533,12 @@ bool TReport_doc_app::print_loop(TRecordset& doc, TOutput_mode mode, bool final_
case out_preview: book.preview(); break; case out_preview: book.preview(); break;
case out_pdf: case out_pdf:
case out_signed_pdf: case out_signed_pdf:
case out_disk:
{ {
TFilename pdf; pdf.tempdir(); TFilename pdf; pdf.tempdir();
pdf << SLASH << _anno << '_' << _codnum << '_' << _ndoc; pdf << SLASH << _anno << '_' << _codnum << '_' << _ndoc;
pdf.ext("pdf"); pdf.ext("pdf");
if (book.export_pdf(pdf, mode == out_signed_pdf)) if (book.export_pdf(pdf, mode == out_signed_pdf) && mode != out_disk)
xvt_sys_goto_url(pdf, "open"); xvt_sys_goto_url(pdf, "open");
} }
break; break;
@ -1636,6 +1637,7 @@ TReport_doc_app::TOutput_mode TReport_doc_app::key2mode(KEY k) const
case 'E': mode = out_mail; break; case 'E': mode = out_mail; break;
case 'e': mode = out_signed_mail; break; case 'e': mode = out_signed_mail; break;
case 'P': mode = out_pdf; break; case 'P': mode = out_pdf; break;
case 'X': mode = out_disk; break;
case 'p': mode = out_signed_pdf; break; case 'p': mode = out_signed_pdf; break;
case 'S': case 'S':
default : mode = out_print; break; default : mode = out_print; break;