From de6cec978131a72b440a38480833319713361c13 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 3 May 2006 12:05:30 +0000 Subject: [PATCH] Patch level : 2.2 406 Files correlati : ve0.exe Ricompilazione Demo : [ ] Commento : Bug 0000638 Elaborando interattivamente un documento non vengono riportate sul documento di destinazione, le informazioni di testata presenti nel documento originale. Sconto e Commessa Segnalato da Gelai e verificato generando un BE/EC01 evadendo un OFP/OFP(2005-1) git-svn-id: svn://10.65.10.50/trunk@13954 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ve/velib06.cpp | 47 +---------------------------------------------- 1 file changed, 1 insertion(+), 46 deletions(-) diff --git a/ve/velib06.cpp b/ve/velib06.cpp index 3389530e7..5106e7efd 100755 --- a/ve/velib06.cpp +++ b/ve/velib06.cpp @@ -2359,51 +2359,6 @@ bool TElabora_mask::elabora() TDocumento& app_doc = ((TDocumento_mask *)_main)->doc(); const long numdoc = field(F_NDOC_ELAB).active() ? get_long(F_NDOC_ELAB) : app_doc.get_long(DOC_NDOC); const bool update_header = get_bool(F_UPDATE_HEADER); - -/* TDocumento* newdoc = new TDocumento(get(F_PROVV_ELAB)[0], get_int(F_ANNO_ELAB), get(F_CODNUM_ELAB), numdoc); - TDocumento& d = *newdoc; - - if (numdoc <= 0) - { - TDocumento::copy_data(d.head(), app_doc.head()); - d.put(DOC_TIPODOC, get(F_TIPODOC_ELAB)); - d.put(DOC_STATO, get(F_STATODOC_ELAB)); - - const TDate datadoc = d.get_date(DOC_DATADOC); - const TDate datainsc = d.get_date(DOC_DATAINSC); - const bool equal = !datainsc.ok() || datadoc == datainsc; - - d.put(DOC_DATADOC, get(F_DATADOC_ELAB)); - if (equal) - d.zero(DOC_DATAINSC); - - const TTipo_documento & t = d.tipo(); - - if (t.mov_mag()) - d.put(DOC_CAUSMAG, t.caus_mov()); - else - d.zero(DOC_CAUSMAG); - } - - if (update_header) - { - const TString16 tipo_doc(app_doc.get(DOC_TIPODOC)); - const TString16 caus_mag(app_doc.get(DOC_CAUSMAG)); - const long movmag = app_doc.get_long(DOC_MOVMAG); - const TDate datadoc = app_doc.get_date(DOC_DATADOC); - const TDate datainsc = app_doc.get_date(DOC_DATAINSC); - const char stato = app_doc.stato(); - - TDocumento::copy_data(app_doc.head(), d.head()); - - app_doc.put(DOC_TIPODOC, tipo_doc); - app_doc.put(DOC_CAUSMAG, caus_mag); - app_doc.put(DOC_MOVMAG, movmag); - app_doc.put(DOC_DATADOC, datadoc); - app_doc.put(DOC_DATAINSC, datainsc); - app_doc.put(DOC_STATO, stato); - } */ - const bool from_elab = !get_bool(F_TYPE); TElaborazione * e = curr_elab(); @@ -2470,7 +2425,6 @@ bool TElabora_mask::elabora() } else { - out.add(app_doc); _tree.build_doc_list(in); char provv = get(F_PROVV_ELAB)[0]; int anno = get_int(F_ANNO_ELAB); @@ -2501,6 +2455,7 @@ bool TElabora_mask::elabora() app_doc.put(DOC_DATAINSC, datainsc); app_doc.put(DOC_STATO, stato); } + out.add(app_doc); if (e->elabora(in, out, TDate(TODAY), TRUE)) { if (out[0] != app_doc)