From 0db857073d0b1b48ed3cb73a9b849e4b07ff6da6 Mon Sep 17 00:00:00 2001 From: luca Date: Fri, 1 Jun 2007 08:17:27 +0000 Subject: [PATCH] Patch level :4.0 714 Files correlati : Ricompilazione Demo : [ ] Commento :commit telefonico dalla calabria git-svn-id: svn://10.65.10.50/trunk@15376 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ve/velib.h | 3 ++- ve/velib03a.cpp | 1 + ve/velib04d.cpp | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ve/velib.h b/ve/velib.h index 7211c5018..77311f9db 100755 --- a/ve/velib.h +++ b/ve/velib.h @@ -227,7 +227,7 @@ class TTipo_documento : public TRectype // velib03 char _tipocf; char _tipocr; char _check_qta; - bool _cnt_prezzi, _show_evaded_lines, _load_cont; + bool _cnt_prezzi, _show_evaded_lines, _load_cont, _non_evadere; protected: void add_formula_if_needed(TConfig& profile, TString& variable, const char* varname, const char* formula); @@ -319,6 +319,7 @@ public: const TString& stringa_descrizione_documento() const { return _str_desc_doc; } const TString& stringa_descrizione_riga() const { return _str_desc_rdoc; } bool mostra_righe_evase_in_elaborazione() const { return _show_evaded_lines; } + bool da_evadere() const { return !_non_evadere; } TTipo_documento(const char* tipodoc = NULL); TTipo_documento(const TRectype& rec); diff --git a/ve/velib03a.cpp b/ve/velib03a.cpp index 819e5bcb3..766a68d4f 100755 --- a/ve/velib03a.cpp +++ b/ve/velib03a.cpp @@ -340,6 +340,7 @@ void TTipo_documento::read_formule() _str_desc_doc = prof.get("DESCRIZIONE_DOC"); _str_desc_rdoc = prof.get("DESCRIZIONE_RDOC"); _show_evaded_lines = !prof.get_bool("NASCONDI_RIGHE_EVASE"); // Normalmente mostra anche evase + _non_evadere = prof.get_bool("NON_EVADERE"); // Normalmente mostra anche evase } diff --git a/ve/velib04d.cpp b/ve/velib04d.cpp index c3e9d1869..2122a7362 100755 --- a/ve/velib04d.cpp +++ b/ve/velib04d.cpp @@ -386,6 +386,8 @@ bool TConsegna_ordini::elabora(TLista_documenti& doc_in, TLista_documenti& doc_o if (riga_uguale(2)) campi_riga.add("PREZZO|SCONTO"); } + const bool evadi = outdoc.tipo().da_evadere(); + TAssoc_array scarti; TSheet_field& s = m.sfield(F_ROWS); @@ -397,7 +399,7 @@ bool TConsegna_ordini::elabora(TLista_documenti& doc_in, TLista_documenti& doc_o TRiga_documento& inrec = indoc[r]; const real daeva = row->get(S_QTADAEVADERE - FIRST_FIELD); const bool eva = row->get_char(S_RIGAEVASA-FIRST_FIELD) > ' '; - if (daeva > ZERO || eva) + if (evadi && (daeva > ZERO || eva)) { const char* fqe = inrec.field_qtaevasa(); inrec.add(fqe, daeva); // nuovo modo di incrementare