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

Correzioni su giacenza

Browse Source 
git-svn-id: svn://10.65.10.50/branches/R_10_00@22769 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2012-12-21 06:55:53 +00:00
parent e3d49e6239
commit c702ddcb7e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lv/lv2900.cpp
View File

@ -56,7 +56,8 @@ TObject* TBuoni_cache::key2obj(const char* key)
adata.addmonth(); adata.addmonth();
const long codcf = chiave.get_long(); 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) if(_ndoc == 0)
{ {
@ -106,8 +107,8 @@ TObject* TBuoni_cache::key2obj(const char* key)
const long codcab = clifo.get_long(CLI_CODCAB); const long codcab = clifo.get_long(CLI_CODCAB);
const TString80 iban = clifo.get(CLI_IBAN); const TString80 iban = clifo.get(CLI_IBAN);
//reupero la cuasale di magazzino di testata //reupero la causale di magazzino di testata
const TString16 causmag = cache().get("%TIP", _tipodoc, "S9"); const TString8 causmag = cache().get("%TIP", _tipodoc, "S9");
//recupero i dati di interesse dal file CFVEN //recupero i dati di interesse dal file CFVEN
const TRectype& cfven = cache().get(LF_CFVEN, key); 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()) 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); doc->put(DOC_TIPODOC, _tipodoc);
} }
else 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_TIPODOC, cont.get(LVCONDV_TPDOC));
} }
doc->put(DOC_STATO, _stato); doc->put(DOC_STATO, _stato);
if(ini_get_bool(CONFIG_DITTA, "lv", "DataBcon")) if (data_odierna)
{ {
doc->put(DOC_DATADOC, datagen); doc->put(DOC_DATADOC, datagen);
//modifica 18/03/2010 richiesta da Diana2000 per i clienti che consegnano tutti i giorni //modifica 18/03/2010 richiesta da Diana2000 per i clienti che consegnano tutti i giorni