From f8f0c4a0a5e3fdc627acd9c6d5120694f623170d Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 18 May 2010 13:15:10 +0000 Subject: [PATCH] Patch level : 742 Files correlati : vefat.rep vebol.rep Ricompilazione Demo : [ ] Commento : 0001636: 002502 - documenti rep Il vefat.rep attuale (patch 740), ha le intestazioni di riquadro con sfondo trasparente, percui le intestazioni (es.intestatario documento) risultano attraversate da una riga. git-svn-id: svn://10.65.10.50/trunk@20463 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ve/vebol.rep | 4 ++-- ve/vefat.rep | 2 +- ve/velib.h | 33 ++++++++++++++++++--------------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ve/vebol.rep b/ve/vebol.rep index d81a97212..2d5d2b000 100755 --- a/ve/vebol.rep +++ b/ve/vebol.rep @@ -263,10 +263,10 @@ MESSAGE DISABLE,130|ENABLE,11@ - + - + diff --git a/ve/vefat.rep b/ve/vefat.rep index d90a00ee5..394ca119d 100755 --- a/ve/vefat.rep +++ b/ve/vefat.rep @@ -181,7 +181,7 @@ MESSAGE APPEND,26 - + diff --git a/ve/velib.h b/ve/velib.h index 1921785f7..cb46a8bed 100755 --- a/ve/velib.h +++ b/ve/velib.h @@ -779,23 +779,23 @@ public: void calc_provvigione(TProvvigioni_agente & provv, const TString & key, bool first = true, bool generata = true); - char tipo_numerazione() const { return get_char("PROVV"); } - int anno() const { return get_int("ANNO"); } - const TString& numerazione() const { return get("CODNUM"); } - long numero() const { return get_long("NDOC"); } - TDate data() const { return get_date("DATADOC"); } + char tipo_numerazione() const { return get_char(DOC_PROVV); } + int anno() const { return get_int(DOC_ANNO); } + const TString& numerazione() const { return get(DOC_CODNUM); } + long numero() const { return get_long(DOC_NDOC); } + TDate data() const { return get_date(DOC_DATADOC); } bool in_valuta() const; - const TString& valuta() const { return get("CODVAL"); } - real cambio() const { return get_real("CAMBIO"); } - bool tipo_valido() const { return get("TIPODOC").not_empty(); } + const TString& valuta() const { return get(DOC_CODVAL); } + real cambio() const { return get_real(DOC_CAMBIO); } + bool tipo_valido() const { return get(DOC_TIPODOC).full(); } const TTipo_documento& tipo() const; int tipo_riclassificato() const; static const TCodice_numerazione& codice_numerazione(const char * numerazione); const TCodice_numerazione& codice_numerazione() const; - void set_tipo(const char * tipo) { head().put("TIPODOC", tipo);} - bool provvisorio() const { return get_char("PROVV") == 'P'; } - char stato() const { return get_char("STATO"); } - void stato(char s) { put("STATO", s); } + void set_tipo(const char * tipo) { head().put(DOC_TIPODOC, tipo);} + bool provvisorio() const { return get_char(DOC_PROVV) == 'P'; } + char stato() const { return get_char(DOC_STATO); } + void stato(char s) { put(DOC_STATO, s); } const TString & codice_costo() const { return get(DOC_CODCOSTO);} const TString & codice_commessa() const { return get(DOC_CODCMS);} const TString & commessa_principale() const; @@ -807,7 +807,7 @@ public: bool chiuso() const; bool sospeso() const { return !chiuso();} - bool raggruppabile() const { return get_bool("RAGGR"); } + bool raggruppabile() const { return get_bool(DOC_RAGGR); } bool raggruppabile(const TDocumento& doc, TToken_string& campi) const; char tipocf() const {return *(const char *) (*_tipocf);} @@ -862,9 +862,12 @@ public: }; #define FOR_EACH_PHYSICAL_RDOC(__doc, __r, __rdoc) TRiga_documento* __rdoc=NULL; \ - for (int __r = (__doc).body().first_row(); (__doc).body().exist(__r) && (__rdoc=&(__doc)[__r])!=NULL; __r=(__doc).body().succ_row(__r)) + TRecord_array& bodyof##__rdoc = (__doc).body(); \ + for (int __r = bodyof##__rdoc.first_row(); bodyof##__rdoc.exist(__r) && (__rdoc=&(__doc)[__r])!=NULL; __r=bodyof##__rdoc.succ_row(__r)) + #define FOR_EACH_PHYSICAL_RDOC_BACK(__doc, __r, __rdoc) TRiga_documento* __rdoc=NULL; \ - for (int __r = (__doc).body().last_row(); __r>0 && (__rdoc=&(__doc)[__r])!= NULL; __r = (__doc).body().pred_row(__r)) + TRecord_array& bodyof##__rdoc = (__doc).body(); \ + for (int __r = bodyof##__rdoc.last_row(); __r>0 && (__rdoc=&(__doc)[__r])!= NULL; __r = bodyof##__rdoc.pred_row(__r)) class TCurrency_documento : public TCurrency {