From c702ddcb7e00be9b510b598a5541d121901bfb5c Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 21 Dec 2012 06:55:53 +0000 Subject: [PATCH] Correzioni su giacenza git-svn-id: svn://10.65.10.50/branches/R_10_00@22769 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/lv2900.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lv/lv2900.cpp b/lv/lv2900.cpp index 955fa81b9..5b37646be 100755 --- a/lv/lv2900.cpp +++ b/lv/lv2900.cpp @@ -56,7 +56,8 @@ TObject* TBuoni_cache::key2obj(const char* key) adata.addmonth(); const long codcf = chiave.get_long(); - const TDate datadausare = ini_get_bool(CONFIG_DITTA, "lv", "DataBcon") ? datagen : datadoc; + const bool data_odierna = ini_get_bool(CONFIG_DITTA, "lv", "DataBcon"); + const TDate datadausare = data_odierna ? datagen : datadoc; if(_ndoc == 0) { @@ -106,8 +107,8 @@ TObject* TBuoni_cache::key2obj(const char* key) const long codcab = clifo.get_long(CLI_CODCAB); const TString80 iban = clifo.get(CLI_IBAN); - //reupero la cuasale di magazzino di testata - const TString16 causmag = cache().get("%TIP", _tipodoc, "S9"); + //reupero la causale di magazzino di testata + const TString8 causmag = cache().get("%TIP", _tipodoc, "S9"); //recupero i dati di interesse dal file CFVEN const TRectype& cfven = cache().get(LF_CFVEN, key); @@ -179,18 +180,20 @@ TObject* TBuoni_cache::key2obj(const char* key) if (cont.get(LVCONDV_CODNUM).empty()) { - doc = new TDocumento('D', datadoc.year(), _codnum, ++_ndoc); + //doc = new TDocumento('D', datadoc.year(), _codnum, ++_ndoc); + doc = new TDocumento('D', datadausare.year(), _codnum, ++_ndoc); doc->put(DOC_TIPODOC, _tipodoc); } else { - doc = new TDocumento('D', datadoc.year(), cont.get(LVCONDV_CODNUM), ++_ndoc); + //doc = new TDocumento('D', datadoc.year(), cont.get(LVCONDV_CODNUM), ++_ndoc); + doc = new TDocumento('D', datadausare.year(), cont.get(LVCONDV_CODNUM), ++_ndoc); doc->put(DOC_TIPODOC, cont.get(LVCONDV_TPDOC)); } doc->put(DOC_STATO, _stato); - if(ini_get_bool(CONFIG_DITTA, "lv", "DataBcon")) + if (data_odierna) { doc->put(DOC_DATADOC, datagen); //modifica 18/03/2010 richiesta da Diana2000 per i clienti che consegnano tutti i giorni