Patch level :2.2 2006 399

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :corretti errori di riporto dalla 2.1


git-svn-id: svn://10.65.10.50/trunk@13915 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2006-04-14 13:23:14 +00:00
parent dbf1863ba9
commit bcba34478a
4 changed files with 11 additions and 5 deletions

View File

@ -370,12 +370,15 @@ class TTipo_riga_documento : public TRectype // velib02
TString16 _valore;
TString16 _valres;
TString16 _field_provv;
TString16 _field_qta, _field_qtaevasa; // Veri campi Quantità e Quantità Evasa
int _decrp, _incrp;
TToken_string _search_nums;
int _search_years;
int _max_rows_art;
bool _no_desc;
int _decrp, _incrp;
protected:
void read_formule();
@ -392,6 +395,7 @@ public:
const TString& descrizione() const { return get("S0"); }
char tipo() const { return get_char("S7"); }
bool has_formula(const char* name) { return _formule.get_pos(name) >= 0; }
const TString& imponibile() const { return _imponibile;}
const TString& imposta() const { return _field_imposta;}
@ -489,6 +493,7 @@ public:
void set_original_rdoc_key(const TRectype& orig, int depth = 0);
void reset_original_rdoc_key();
const TRectype* find_original_rdoc() const;
const TRectype* find_original_doc() const;
virtual TRiga_documento& operator =(const TRiga_documento& r) { return copy(r);}
virtual TRectype& operator =(const TRectype & r);
@ -714,7 +719,7 @@ public:
static void set_key(TRectype& rec, char provv, int anno, const char* codnum, long numdoc);
static void copy_data(TRectype& dst, const TRectype& src);
static void copy_data(TRiga_documento& dst, const TRiga_documento& src);
void copy_contents(const TDocumento & src);
void copy_contents(const TDocumento& src, bool copy_header);
void set_fields(TAuto_variable_rectype & rec);
void set_riga_esenzione();

View File

@ -341,7 +341,7 @@ bool TCopia_documento::elabora(TLista_documenti& doc_in, TLista_documenti& doc_o
{
TDocumento& doc_src = doc_in[d];
TDocumento& doc_dest = doc_out[d];
doc_dest.copy_contents(doc_src);
doc_dest.copy_contents(doc_src, false);
doc_dest.put(DOC_DATADOC, data_elab);
}
return TRUE;

View File

@ -94,6 +94,7 @@ public:
bool usa_doc_rif() const { return get_bool("B8"); }
bool usa_data_consegna() const { return get_bool("B9"); }
bool kill_descrizione_estesa() const { return get_bool("B10"); }
bool calcola_scarti() const { return get_bool("B11"); }
int intestazioni_sheet() const { return get_int("I1"); }

View File

@ -2190,7 +2190,7 @@ bool TElabora_mask::on_field_event(TOperable_field& o, TField_event e, long joll
if (e == fe_button)
docrif_search();
break;
case F_NDOC_ELAB:
case F_NDOC_ELAB:
if ((e == fe_modify || e == fe_close) && o.check_type() == CHECK_SEARCH && !o.empty())
{
TToken_string key;