From ad8661dafd3df18b533326e316b1705f6f27026a Mon Sep 17 00:00:00 2001 From: luca83 Date: Thu, 23 Jul 2009 15:24:26 +0000 Subject: [PATCH] Patch level : 10.0 patch 362 Files correlati : lv2.exe lvbollac.msk lvbolaca.msk lvbolacr.msk Ricompilazione Demo : [ ] Commento : Aggiunta la gestione dei campi virtuali data di prevista consegna e data conteggio git-svn-id: svn://10.65.10.50/trunk@19130 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/lv2400.cpp | 3 +++ lv/lv2600.cpp | 4 ++++ lv/lvbolaca.src | 2 ++ lv/lvbolacr.src | 2 +- lv/lvbollac.src | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lv/lv2400.cpp b/lv/lv2400.cpp index 089f5559c..a8fd0caeb 100755 --- a/lv/lv2400.cpp +++ b/lv/lv2400.cpp @@ -109,6 +109,7 @@ bool TGenera_documenti_app::crea_documento(const TISAM_recordset& plan) { //recupero i dati di interesse dalla maschera const TDate datadoc = _msk->get_date(F_DTDOC); + const TDate datagen(TODAY); //per ogni planning recupero i dati di interesse dal planning const long codcli = plan.get(LVRCONSPLAN_CODCF).as_int(); @@ -170,6 +171,8 @@ bool TGenera_documenti_app::crea_documento(const TISAM_recordset& plan) doc.put(DOC_CODCF, codcli); doc.put(DOC_CODCONT, codcont); doc.put(DOC_CODINDSP, codind); + doc.put("DATAGEN", datagen); + doc.put("DATAPRCO", dtcons); const long ndoc = doc.get_long(DOC_NDOC); diff --git a/lv/lv2600.cpp b/lv/lv2600.cpp index 20c38bd3c..5ae5e42b0 100755 --- a/lv/lv2600.cpp +++ b/lv/lv2600.cpp @@ -83,6 +83,7 @@ TObject* TAcquisizione_cache::key2obj(const char* key) { TToken_string chiave(key); const TDate datadoc = chiave.get(); + const TDate datagen(TODAY); const long codcf = chiave.get_long(); TString query = "USE DOC KEY 2\n"; @@ -103,6 +104,7 @@ TObject* TAcquisizione_cache::key2obj(const char* key) doc->put(DOC_DATADOC, datadoc); doc->put(DOC_TIPOCF, 'C'); doc->put(DOC_CODCF, codcf); + doc->put("DATAGEN", datagen); } return doc; } @@ -284,6 +286,8 @@ void TAcquisizione_lavanderie_app::elabora_file(const TString& file, bool new_fi { const TRectype& anamag = cache().get(LF_ANAMAG, codart); + doc.put("DATACON", datadoc); + TRiga_documento& rdoc = doc.new_row("22"); rdoc.put(RDOC_CODART, codart); rdoc.put(RDOC_DESCR, anamag.get(ANAMAG_DESCR)); diff --git a/lv/lvbolaca.src b/lv/lvbolaca.src index d553f24de..9c97cc5e6 100755 --- a/lv/lvbolaca.src +++ b/lv/lvbolaca.src @@ -180,6 +180,8 @@ LVCODCF = S_NORMALE //4041 LVRICALT = S_NORMALE //4041 LVCODCONT = S_NORMALE //4041 LVRAGSOC = S_NORMALE //4041 +LVDATAPRCO = S_NORMALE //4041 +LVDATACON = S_NORMALE //4041 LVCODCAU = S_NORMALE //4041 LVDESCAU = S_NORMALE //4041 BLANK = S_DISABILITATO //4000 diff --git a/lv/lvbolacr.src b/lv/lvbolacr.src index 389613a86..4c77c8ec6 100755 --- a/lv/lvbolacr.src +++ b/lv/lvbolacr.src @@ -179,7 +179,7 @@ LVTIPOCF = S_NORMALE //4041 LVCODCF = S_NORMALE //4041 LVRICALT = S_NORMALE //4041 LVCODCONT = S_NORMALE //4041 -LVRAGSOC = S_NORMALE //4041 +LVDATACON = S_NORMALE //4041 LVCODCAU = S_NORMALE //4041 LVDESCAU = S_NORMALE //4041 BLANK = S_DISABILITATO //4000 diff --git a/lv/lvbollac.src b/lv/lvbollac.src index 36cc38bcf..37371a264 100755 --- a/lv/lvbollac.src +++ b/lv/lvbollac.src @@ -180,6 +180,8 @@ LVCODCF = S_NORMALE //4041 LVRICALT = S_NORMALE //4041 LVCODCONT = S_NORMALE //4041 LVRAGSOC = S_NORMALE //4041 +LVDATAPRCO = S_NORMALE //4041 +LVDATACON = S_NORMALE //4041 LVCODCAU = S_NORMALE //4041 LVDESCAU = S_NORMALE //4041 BLANK = S_DISABILITATO //4000