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

Patch level :4.0 714

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :commit telefonico dalla calabria


git-svn-id: svn://10.65.10.50/trunk@15376 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2007-06-01 08:17:27 +00:00
parent 85981a9b26
commit 0db857073d
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ve/velib.h
View File

@ -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);

1
ve/velib03a.cpp
View File

@ -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
}

4
ve/velib04d.cpp
View File

@ -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