From e103d28eccd899060d69b5d1a53e572cac7c0e08 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Fri, 25 Oct 2019 14:28:50 +0200 Subject: [PATCH] Patch level : 12.0 894 Files correlati : lv2.exe Commento to : aggiornati i dati di testat dei clienti nelle varie bolle di consegne ritiro pui ito buoni etc IN fatturazione se indicato in configurazione --- src/lv/lv2400.cpp | 60 +++++++---------------------------------------- src/lv/lv2500.cpp | 10 ++++---- src/lv/lv2600.cpp | 53 ++++------------------------------------- src/lv/lv2900.cpp | 49 ++------------------------------------ 4 files changed, 20 insertions(+), 152 deletions(-) diff --git a/src/lv/lv2400.cpp b/src/lv/lv2400.cpp index 1ce6585b0..0337ef37d 100755 --- a/src/lv/lv2400.cpp +++ b/src/lv/lv2400.cpp @@ -440,36 +440,14 @@ bool TGenera_documenti_app::crea_documento_plan(const TISAM_recordset& plan, TLo TToken_string key; key.add('C'); key.add(codcli); - const TRectype& clifo = cache().get(LF_CLIFO, key); - const TString4 codpag = clifo.get(CLI_CODPAG); - const long codabi = clifo.get_long(CLI_CODABI); - const long codcab = clifo.get_long(CLI_CODCAB); - const TString80 iban = clifo.get(CLI_IBAN); - //reupero la cuasale di magazzino di testata const TString8 causmag = cache().get("%TIP", tpdoc, "S9"); - //recupero i dati di interesse dal file CFVEN + //recupero i dati di interesse dal cliente + const TRectype& clifo = cache().get(LF_CLIFO, key); + //recupero i dati di interesse dal file CFVEN const TRectype& cfven = cache().get(LF_CFVEN, key); - const long codabipr = cfven.get_long(CFV_CODABIPR); - const long codcabpr = cfven.get_long(CFV_CODCABPR); - const bool ragdoc = cfven.get_bool(CFV_RAGGDOC); - const int codindsp = cfven.get_int(CFV_CODINDSP); - const TString8 codag1 = cfven.get(CFV_CODAG1); - const TString4 codmez = cfven.get(CFV_CODSPMEZZO); - const TString4 codporto = cfven.get(CFV_CODPORTO); - const TString4 codnote1 = cfven.get(CFV_CODNOTESP1); - const TString4 codnote2 = cfven.get(CFV_CODNOTESP2); - const TString4 codnote = cfven.get(CFV_CODNOTE); - const TString8 codvet1 = cfven.get(CFV_CODVETT1); - const TString8 codvet2 = cfven.get(CFV_CODVETT2); - const TString8 codvet3 = cfven.get(CFV_CODVETT3); - const real speseinc = cfven.get_real(CFV_PERCSPINC); - const TString4 catven = cfven.get(CFV_CATVEN); - const bool addbolli = cfven.get_bool(CFV_ADDBOLLI); - const TString8 codlist = cfven.get(CFV_CODLIST); - const TString4 codzona = cfven.get(CFV_CODZONA); - + if(codaut.empty()) codaut = cfven.get(CFV_CODAG); @@ -529,32 +507,9 @@ bool TGenera_documenti_app::crea_documento_plan(const TISAM_recordset& plan, TLo doc.put(DOC_TIPOCF, 'C'); doc.put(DOC_CODCF, codcli); doc.put(DOC_CODCONT, codcont); - if(codindsp > 0) - doc.put(DOC_CODINDSP, codindsp); - doc.put(DOC_RAGGR, ragdoc); - doc.put(DOC_CODPAG, codpag); - doc.put(DOC_CODABIA, codabi); - doc.put(DOC_CODCABA, codcab); - doc.put(DOC_IBAN, iban); - doc.put(DOC_CODABIP, codabipr); - doc.put(DOC_CODCABP, codcabpr); - doc.put(DOC_CODAG, codaut); - doc.put(DOC_CODAGVIS, codag1); - doc.put(DOC_CODSPMEZZO, codmez); - doc.put(DOC_ZONA, codzona); - doc.put(DOC_CODPORTO, codporto); - doc.put(DOC_CODNOTESP1, codnote1); - doc.put(DOC_CODNOTESP2, codnote2); - doc.put(DOC_CODNOTE, codnote); - doc.put(DOC_CODVETT1, codvet1); - doc.put(DOC_CODVETT2, codvet2); - doc.put(DOC_CODVETT3, codvet3); - doc.put(DOC_CATVEN, catven); - doc.put(DOC_CODLIST, codlist); - doc.put(DOC_CAUSMAG, causmag); - doc.put(DOC_PERCSPINC, speseinc); - doc.put(DOC_ADDBOLLI, addbolli); - doc.put(DOC_SCONTOPERC, sconto); + doc.put(DOC_CAUSMAG, causmag); + doc.put(DOC_SCONTOPERC, sconto); + doc.cli2doc(); doc.put("DATAGEN", datagen); //data generazione del documento doc.put("DATAPRCO", dtcons); //data prevista consegna doc.put("CODITI", coditi); //codice itinerario @@ -1072,6 +1027,7 @@ int TGenera_documenti_app::scansione_ritiri_anticipi(const long codcli, const TD doc.put("CODNUMDG", docgen.get(DOC_CODNUM)); doc.put("NDCODG", docgen.get(DOC_NDOC)); + doc.cli2doc(); doc.rewrite(); } return docritiri.items(); diff --git a/src/lv/lv2500.cpp b/src/lv/lv2500.cpp index 1dfcd12e7..3c613d25c 100755 --- a/src/lv/lv2500.cpp +++ b/src/lv/lv2500.cpp @@ -304,7 +304,7 @@ void TFatturazione_lavanderie::aggiorna_fattura(TDocumento& doc, int codcont) rdoc.put(RDOC_DESCR, cached_article(codart).get(ANAMAG_DESCR)); rdoc.put(RDOC_CHECKED, true); rdoc.put(RDOC_QTA, 0); - rdoc.put(RDOC_QTAGG1, 0); + rdoc.put(RDOC_QTAGG1, 0); rdoc.put(RDOC_UMQTA, cached_article(codart).first_um()); TToken_string key; @@ -2162,7 +2162,8 @@ void TFatturazione_lav_app::main_loop() bool prova = false; const bool use_indsp = ini_get_bool(CONFIG_DITTA, "mg", "MOV_INDSPED"); const bool prezzo_da_contratto = ini_get_int(CONFIG_DITTA, "lv", "Tipopr") == 0; - const bool agghead = prezzo_da_contratto || ini_get_bool(CONFIG_DITTA, "lv", "AggHead"); + const bool aggcli = ini_get_bool(CONFIG_DITTA, "lv", "AggHead"); +// const bool agghead = prezzo_da_contratto || aggcli; const TString4 num_buoni = ini_get_string(CONFIG_DITTA, "lv", "NUM_GEN"); const TString4 tipo_buoni = ini_get_string(CONFIG_DITTA, "lv", "TIPODOC_GEN"); @@ -2396,12 +2397,13 @@ void TFatturazione_lav_app::main_loop() { TDocumento * doc = new TDocumento(recset.cursor()->curr()); - if (agghead && !_solototali && doc->get(DOC_CODNUM) == num_buoni && doc->tipo().codice() == tipo_buoni) + // if (aggcli && !_solototali && doc->get(DOC_CODNUM) == num_buoni && doc->tipo().codice() == tipo_buoni) + if (aggcli && !_solototali) { - bool doc_updated = false; // banche + key.cut(0); key.add(clirec.get(CLI_TIPOCF)); key.add(clirec.get(CLI_CODCF)); diff --git a/src/lv/lv2600.cpp b/src/lv/lv2600.cpp index 86d8592e8..bd2544752 100755 --- a/src/lv/lv2600.cpp +++ b/src/lv/lv2600.cpp @@ -451,33 +451,11 @@ TObject* TAcquisizione_cache::key2obj(const char* key) //recupero i dati di interesse dal cliente const TRectype& clifo = cache().get(LF_CLIFO, key); - const TString4 codpag = clifo.get(CLI_CODPAG); - const long codabi = clifo.get_long(CLI_CODABI); - 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"); //recupero i dati di interesse dal file CFVEN const TRectype& cfven = cache().get(LF_CFVEN, key); - const long codabipr = cfven.get_long(CFV_CODABIPR); - const long codcabpr = cfven.get_long(CFV_CODCABPR); - const bool ragdoc = cfven.get_bool(CFV_RAGGDOC); - const TString8 codag1 = cfven.get(CFV_CODAG1); - const TString4 codmez = cfven.get(CFV_CODSPMEZZO); - const TString4 codporto = cfven.get(CFV_CODPORTO); - const TString4 codnote1 = cfven.get(CFV_CODNOTESP1); - const TString4 codnote2 = cfven.get(CFV_CODNOTESP2); - const TString4 codnote = cfven.get(CFV_CODNOTE); - const TString8 codvet1 = cfven.get(CFV_CODVETT1); - const TString8 codvet2 = cfven.get(CFV_CODVETT2); - const TString8 codvet3 = cfven.get(CFV_CODVETT3); - const real speseinc = cfven.get_real(CFV_PERCSPINC); - const TString4 catven = cfven.get(CFV_CATVEN); - const bool addbolli = cfven.get_bool(CFV_ADDBOLLI); - const TString8 codlist = cfven.get(CFV_CODLIST); - const TString4 codzona = cfven.get(CFV_CODZONA); if(codaut.empty()) codaut = cfven.get(CFV_CODAG); @@ -543,33 +521,10 @@ TObject* TAcquisizione_cache::key2obj(const char* key) doc->put(DOC_TIPOCF, 'C'); doc->put(DOC_CODCF, codcf); doc->put(DOC_CODCONT, codcont); - if(codindsp > 0) - doc->put(DOC_CODINDSP, codindsp); - doc->put(DOC_CODPAG, codpag); - doc->put(DOC_CAUSMAG, causmag); - doc->put(DOC_CODABIA, codabi); - doc->put(DOC_CODCABA, codcab); - doc->put(DOC_IBAN, iban); - doc->put(DOC_CODABIP, codabipr); - doc->put(DOC_CODCABP, codcabpr); - doc->put(DOC_CODAG, codaut); - doc->put(DOC_CODAGVIS, codag1); - doc->put(DOC_CODSPMEZZO, codmez); - doc->put(DOC_ZONA, codzona); - doc->put(DOC_CODPORTO, codporto); - doc->put(DOC_CODNOTESP1, codnote1); - doc->put(DOC_CODNOTESP2, codnote2); - doc->put(DOC_CODNOTE, codnote); - doc->put(DOC_CODVETT1, codvet1); - doc->put(DOC_CODVETT2, codvet2); - doc->put(DOC_CODVETT3, codvet3); - doc->put(DOC_CATVEN, catven); - doc->put(DOC_CODLIST, codlist); - doc->put(DOC_CAUSMAG, causmag); - doc->put(DOC_PERCSPINC, speseinc); - doc->put(DOC_ADDBOLLI, addbolli); - doc->put(DOC_SCONTOPERC, sconto); - doc->put("DATACON", datadoc); //data conteggio + doc->put(DOC_CAUSMAG, causmag); + doc->put(DOC_SCONTOPERC, sconto); + doc->cli2doc(); + doc->put("DATACON", datadoc); //data conteggio doc->put("DATAGEN", datagen); //data generazione del documento doc->put("DATAPRCO", dataprco); //data prevista consegna doc->put("CODITI", coditi); //codice itinerario diff --git a/src/lv/lv2900.cpp b/src/lv/lv2900.cpp index e322be50e..72ed7fcdd 100755 --- a/src/lv/lv2900.cpp +++ b/src/lv/lv2900.cpp @@ -104,32 +104,10 @@ TObject* TBuoni_cache::key2obj(const char* key) //recupero i dati di interesse dal cliente const TRectype& clifo = cache().get(LF_CLIFO, key); const TString4 codpag = clifo.get(CLI_CODPAG); - const long codabi = clifo.get_long(CLI_CODABI); - const long codcab = clifo.get_long(CLI_CODCAB); - const TString80 iban = clifo.get(CLI_IBAN); - //recupero 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); - const long codabipr = cfven.get_long(CFV_CODABIPR); - const long codcabpr = cfven.get_long(CFV_CODCABPR); - const bool ragdoc = cfven.get_bool(CFV_RAGGDOC); - const TString8 codag1 = cfven.get(CFV_CODAG1); - const TString4 codmez = cfven.get(CFV_CODSPMEZZO); - const TString4 codporto = cfven.get(CFV_CODPORTO); - const TString4 codnote1 = cfven.get(CFV_CODNOTESP1); - const TString4 codnote2 = cfven.get(CFV_CODNOTESP2); - const TString4 codnote = cfven.get(CFV_CODNOTE); - const TString8 codvet1 = cfven.get(CFV_CODVETT1); - const TString8 codvet2 = cfven.get(CFV_CODVETT2); - const TString8 codvet3 = cfven.get(CFV_CODVETT3); - const real speseinc = cfven.get_real(CFV_PERCSPINC); - const TString4 catven = cfven.get(CFV_CATVEN); - const bool addbolli = cfven.get_bool(CFV_ADDBOLLI); - const TString8 codlist = cfven.get(CFV_CODLIST); - const TString4 codzona = cfven.get(CFV_CODZONA); if(codaut.empty()) codaut = cfven.get(CFV_CODAG); @@ -212,33 +190,10 @@ TObject* TBuoni_cache::key2obj(const char* key) doc->put(DOC_TIPOCF, 'C'); doc->put(DOC_CODCF, codcf); doc->put(DOC_CODCONT, codcont); - if (codindsp > 0) - doc->put(DOC_CODINDSP, codindsp); - doc->put(DOC_CODPAG, codpag); doc->put(DOC_CAUSMAG, causmag); - doc->put(DOC_CODABIA, codabi); - doc->put(DOC_CODCABA, codcab); - doc->put(DOC_IBAN, iban); - doc->put(DOC_CODABIP, codabipr); - doc->put(DOC_CODCABP, codcabpr); - doc->put(DOC_CODAG, codaut); - doc->put(DOC_CODAGVIS, codag1); - doc->put(DOC_CODSPMEZZO, codmez); - doc->put(DOC_ZONA, codzona); - doc->put(DOC_CODPORTO, codporto); - doc->put(DOC_CODNOTESP1, codnote1); - doc->put(DOC_CODNOTESP2, codnote2); - doc->put(DOC_CODNOTE, codnote); - doc->put(DOC_CODVETT1, codvet1); - doc->put(DOC_CODVETT2, codvet2); - doc->put(DOC_CODVETT3, codvet3); - doc->put(DOC_CATVEN, catven); - doc->put(DOC_CODLIST, codlist); - doc->put(DOC_CAUSMAG, causmag); - doc->put(DOC_PERCSPINC, speseinc); - doc->put(DOC_ADDBOLLI, addbolli); doc->put(DOC_SCONTOPERC, sconto); - doc->put("DATACON", datadoc); //data conteggio + doc->cli2doc(); + doc->put("DATACON", datadoc); //data conteggio doc->put("DATAGEN", datagen); //data generazione del documento doc->put("DATAPRCO", dataprco); //data prevista consegna doc->put("CODITI", coditi); //codice itinerario