diff --git a/ve/velib.h b/ve/velib.h index 5d015a4fe..10eb0b051 100755 --- a/ve/velib.h +++ b/ve/velib.h @@ -563,7 +563,7 @@ public: bool sola_descrizione() const; void forza_sola_descrizione(); - const TToken_string & get_rdoc_key(); + const TToken_string & get_rdoc_key() const ; const TToken_string & get_original_rdoc_key(); void set_original_rdoc_key(const TRectype& orig, int depth = 0); void reset_original_rdoc_key(); diff --git a/ve/velib02.cpp b/ve/velib02.cpp index 055f6797b..80ec25010 100755 --- a/ve/velib02.cpp +++ b/ve/velib02.cpp @@ -1384,7 +1384,7 @@ const TToken_string & TRiga_documento::get_original_rdoc_key() return key; } -const TToken_string & TRiga_documento::get_rdoc_key() +const TToken_string & TRiga_documento::get_rdoc_key() const { TToken_string & key = get_tmp_string(32); diff --git a/ve/velib04.cpp b/ve/velib04.cpp index 51eb3c937..99106e8ca 100755 --- a/ve/velib04.cpp +++ b/ve/velib04.cpp @@ -613,7 +613,7 @@ bool TCopia_documento::elabora(TLista_documenti& doc_in, TLista_documenti& doc_o doc_src.put(DOC_STATO, stato_finale_doc_iniziale()); } post_process_input(doc_in); - post_process_output(doc_out); + post_process(doc_out, doc_in); return TRUE; } diff --git a/ve/velib04.h b/ve/velib04.h index 0750cdd74..fefb05dd4 100755 --- a/ve/velib04.h +++ b/ve/velib04.h @@ -156,8 +156,8 @@ class TElaborazione : public TRectype // velib04 protected: int read(const char* cod); virtual void pre_process_input(TLista_documenti& doc_in) {} - virtual void post_process_input(TLista_documenti& doc_out) {} - virtual void post_process_output(TLista_documenti& doc_out) {} + virtual void post_process_input(TLista_documenti& doc_in) {} + virtual void post_process(TLista_documenti& doc_out, TLista_documenti& doc_in) {} public: enum { _max_tipi_doc_elab = 10 }; diff --git a/ve/velib04b.cpp b/ve/velib04b.cpp index 3cc19f237..d2a0e8dae 100755 --- a/ve/velib04b.cpp +++ b/ve/velib04b.cpp @@ -4346,7 +4346,7 @@ bool TContabilizzazione::elabora(TLista_documenti& doc_in, TLista_documenti& doc delete _viswin; _viswin = NULL; post_process_input(doc_in); - post_process_output(doc_out); + post_process(doc_out, doc_in); return _can_write; // Se non ha riscontrato errori per nessun documento, _can_write = true } diff --git a/ve/velib04c.cpp b/ve/velib04c.cpp index 41fe1e5b0..5c9a4bda1 100755 --- a/ve/velib04c.cpp +++ b/ve/velib04c.cpp @@ -712,7 +712,7 @@ bool TGenerazione_effetti::elabora(TLista_documenti& doc_in, TLista_documenti& d display_error(doc); } post_process_input(doc_in); - post_process_output(doc_out); + post_process(doc_out, doc_in); return _can_write; } diff --git a/ve/velib04d.cpp b/ve/velib04d.cpp index 4e03a5d1e..13bfe213b 100755 --- a/ve/velib04d.cpp +++ b/ve/velib04d.cpp @@ -703,7 +703,7 @@ bool TConsegna_ordini::elabora(TLista_documenti& doc_in, TLista_documenti& doc_o indoc.stato(stato_finale_doc_iniziale()[0]); } post_process_input(doc_in); - post_process_output(doc_out); + post_process(doc_out, doc_in); } return ok; } diff --git a/ve/velib04e.cpp b/ve/velib04e.cpp index 0f5e8274d..8db1ddb8b 100755 --- a/ve/velib04e.cpp +++ b/ve/velib04e.cpp @@ -301,6 +301,6 @@ bool TConsuntivazione_produzione::elabora(TLista_documenti& doc_in, TLista_docum book.add(log); book.preview(); post_process_input(doc_in); - post_process_output(doc_out); + post_process(doc_out, doc_in); return done; } \ No newline at end of file diff --git a/ve/velib04f.cpp b/ve/velib04f.cpp index 7724a84d7..4c633183f 100755 --- a/ve/velib04f.cpp +++ b/ve/velib04f.cpp @@ -809,7 +809,7 @@ bool TContabilizzazione_analitica::elabora(TLista_documenti& doc_in, TLista_docu if (_total_docs > 0) { post_process_input(doc_in); - post_process_output(doc_out); + post_process(doc_out, doc_in); } if (v.run() == K_CTRL+'S') // Ho premuto Stampa