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

Patch level :

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :


git-svn-id: svn://10.65.10.50/branches/R_10_00@21407 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2011-01-10 11:01:34 +00:00
parent 83bf8d8d8c
commit e53691a6a4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ve/ve1300.cpp
View File

@ -302,7 +302,7 @@ protected:
public: public:
bool print(const TRecordset& doc, TReport_book& book, bool def, word copies, bool print(const TRecordset& doc, TReport_book& book, bool def, word copies,
bool alleg, bool arc, bool signature); bool alleg, bool arc, bool signature, word printed_copies = 0);
int extra_copies() const { return _extra_copies; } int extra_copies() const { return _extra_copies; }
TReport_doc(const char* name); TReport_doc(const char* name);
@ -359,7 +359,7 @@ int TReport_doc::set_printed_status(TDocumento& doc) const
return err; return err;
} }
bool TReport_doc::print(const TRecordset& doc, TReport_book& book, bool definitive, word copie, bool can_allegate, bool arc, bool signature) bool TReport_doc::print(const TRecordset& doc, TReport_book& book, bool definitive, word copie, bool can_allegate, bool arc, bool signature, word printed_copies)
{ {
bool printed = true; bool printed = true;
@ -372,7 +372,7 @@ bool TReport_doc::print(const TRecordset& doc, TReport_book& book, bool definiti
{ {
for (int c = 1; c <= copie; c++) for (int c = 1; c <= copie; c++)
{ {
set_copy(c, copie); set_copy(c + printed_copies, copie + printed_copies);
// Tenta di stampare gli allegati solo sull'ultima copia definitiva // Tenta di stampare gli allegati solo sull'ultima copia definitiva
if (c == copie && can_allegate) if (c == copie && can_allegate)
{ {
@ -982,7 +982,7 @@ protected:
const TString& get_mail_address() const; const TString& get_mail_address() const;
virtual bool get_next_mail(TToken_string& to, TToken_string& cc, TToken_string& ccn, virtual bool get_next_mail(TToken_string& to, TToken_string& cc, TToken_string& ccn,
TString& subj, TString& text, TToken_string& attach, short& ui) const ; TString& subj, TString& text, TToken_string& attach, short& ui) const ;
void print_extra_copies(TReport_doc& report, const TRecordset& doc, TReport_book& book) const; void print_extra_copies(TReport_doc& report, const TRecordset& doc, TReport_book& book, word printed_copies) const;
bool nome_report(const TRecordset& doc, int quale, TFilename& profilo) const; bool nome_report(const TRecordset& doc, int quale, TFilename& profilo) const;
public: public:
@ -1117,11 +1117,11 @@ bool TReport_doc_app::destroy()
} }
void TReport_doc_app::print_extra_copies(TReport_doc& report, const TRecordset& doc, void TReport_doc_app::print_extra_copies(TReport_doc& report, const TRecordset& doc,
TReport_book& book) const TReport_book& book, word printed_copies) const
{ {
const int extra_copies = report.extra_copies(); const int extra_copies = report.extra_copies();
if (extra_copies > 0) if (extra_copies > 0)
report.print(doc, book, false, extra_copies, false, false, false); report.print(doc, book, false, extra_copies, false, false, false, printed_copies);
} }
// Quale 0=standard,1=aggiuntivo,2=mail // Quale 0=standard,1=aggiuntivo,2=mail
@ -1238,7 +1238,7 @@ bool TReport_doc_app::print_loop(TRecordset& doc, TOutput_mode mode, bool is_def
if (!report.print(doc, book, is_definitive, copies, true, arc, signature)) if (!report.print(doc, book, is_definitive, copies, true, arc, signature))
break; break;
if (!paperless) if (!paperless)
print_extra_copies(report, doc, book); print_extra_copies(report, doc, book, copies);
} }
} //if(profilo.custom_path()... } //if(profilo.custom_path()...
else else
@ -1268,7 +1268,7 @@ bool TReport_doc_app::print_loop(TRecordset& doc, TOutput_mode mode, bool is_def
{ {
allegato.print(doc, book, false, copies, false, arc, signature); allegato.print(doc, book, false, copies, false, arc, signature);
if (!paperless) if (!paperless)
print_extra_copies(allegato, doc, book); print_extra_copies(allegato, doc, book, copies);
} }
} }