From 8b80dcef14b629d3d4bb447f56667e3d46d2c102 Mon Sep 17 00:00:00 2001 From: luca83 Date: Thu, 28 Jan 2010 18:23:38 +0000 Subject: [PATCH] Patch level : 10.0 patch 599 Files correlati : lv2 lv3 Ricompilazione Demo : [ ] Commento : Corretto caricamento magazzini associati alle causali git-svn-id: svn://10.65.10.50/trunk@20015 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/lv2400.cpp | 4 ++-- lv/lv2600.cpp | 6 +++--- lv/lv2900.cpp | 4 ++-- lv/lv3100.cpp | 4 ++-- lv/lv3200.cpp | 4 ++-- lv/lv3300.cpp | 4 ++-- lv/lv3400.cpp | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lv/lv2400.cpp b/lv/lv2400.cpp index b2e0717c5..a69703e01 100755 --- a/lv/lv2400.cpp +++ b/lv/lv2400.cpp @@ -461,12 +461,12 @@ void TGenera_documenti_app::crea_riga(const TString& codart, const char modpas, TString8 magazzinoc; if(rit.get("S10").full()) - magazzino = rit.get("S10").mid(0,5); + magazzino = con.get("S10").mid(0,5); else magazzino << ini_get_string(CONFIG_DITTA, "lv", "CODMAG") << ini_get_string(CONFIG_DITTA, "lv", "CODMAGN"); if(con.get("S10").full()) - magazzinoc = con.get("S10").mid(0,5); + magazzinoc = rit.get("S10").mid(0,5); else magazzinoc << ini_get_string(CONFIG_DITTA, "lv", "CODMAG") << ini_get_string(CONFIG_DITTA, "lv", "CODMAGC"); diff --git a/lv/lv2600.cpp b/lv/lv2600.cpp index be0102c65..73e2cf139 100755 --- a/lv/lv2600.cpp +++ b/lv/lv2600.cpp @@ -859,7 +859,7 @@ void TAcquisizione_lavanderie_app::genera_documenti(TLog_report& rep, TAssoc_arr TLaundry_contract cont(codcf, codindsp, datadoc); const TString8 codcont = cont.get(LVCONDV_CODCONT); const TRectype rcont = cont.row(codart); - const TString4 causale = rcont.get(LVRCONDV_CAUSMAG).full() ? rcont.get(LVRCONDV_CAUSMAG) : ini_get_string(CONFIG_DITTA, "lv", "CAUSLAV"); + const TString4 causale = rcont.get(LVRCONDV_CAUSLAV).full() ? rcont.get(LVRCONDV_CAUSLAV) : ini_get_string(CONFIG_DITTA, "lv", "CAUSLAV"); TDate oggi(TODAY); @@ -897,12 +897,12 @@ void TAcquisizione_lavanderie_app::genera_documenti(TLog_report& rep, TAssoc_arr TString8 magazzinoc; if(rit.get("S10").full()) - magazzino = rit.get("S10").mid(0,5); + magazzino = con.get("S10").mid(0,5); else magazzino << ini_get_string(CONFIG_DITTA, "lv", "CODMAG") << ini_get_string(CONFIG_DITTA, "lv", "CODMAGN"); if(con.get("S10").full()) - magazzinoc = con.get("S10").mid(0,5); + magazzinoc = rit.get("S10").mid(0,5); else magazzinoc << ini_get_string(CONFIG_DITTA, "lv", "CODMAG") << ini_get_string(CONFIG_DITTA, "lv", "CODMAGC"); diff --git a/lv/lv2900.cpp b/lv/lv2900.cpp index 16aa1d70f..b59bb2f9f 100755 --- a/lv/lv2900.cpp +++ b/lv/lv2900.cpp @@ -678,12 +678,12 @@ bool TConta_pulito_msk::genera_documenti(const TFilename& file, TAssoc_array& do TString8 magazzinoc; if(rit.get("S10").full()) - magazzino = rit.get("S10").mid(0,5); + magazzino = con.get("S10").mid(0,5); else magazzino << ini_get_string(CONFIG_DITTA, "lv", "CODMAG") << ini_get_string(CONFIG_DITTA, "lv", "CODMAGN"); if(con.get("S10").full()) - magazzinoc = con.get("S10").mid(0,5); + magazzinoc = rit.get("S10").mid(0,5); else magazzinoc << ini_get_string(CONFIG_DITTA, "lv", "CODMAG") << ini_get_string(CONFIG_DITTA, "lv", "CODMAGC"); diff --git a/lv/lv3100.cpp b/lv/lv3100.cpp index eaa75eb50..c52f1a2a5 100755 --- a/lv/lv3100.cpp +++ b/lv/lv3100.cpp @@ -470,12 +470,12 @@ bool TGestione_bolle_msk::lv_bolla_handler(TMask_field& f, KEY k) TString8 magazzinoc; if(rit.get("S10").full()) - magazzino = rit.get("S10").mid(0,5); + magazzino = con.get("S10").mid(0,5); else magazzino << ini_get_string(CONFIG_DITTA, "lv", "CODMAG") << ini_get_string(CONFIG_DITTA, "lv", "CODMAGN"); if(con.get("S10").full()) - magazzinoc = con.get("S10").mid(0,5); + magazzinoc = rit.get("S10").mid(0,5); else magazzinoc << ini_get_string(CONFIG_DITTA, "lv", "CODMAG") << ini_get_string(CONFIG_DITTA, "lv", "CODMAGC"); diff --git a/lv/lv3200.cpp b/lv/lv3200.cpp index 2deeb007a..2605a5a99 100755 --- a/lv/lv3200.cpp +++ b/lv/lv3200.cpp @@ -592,12 +592,12 @@ void TEvasione_msk::genera_documento() TString8 magazzinoc; if(rit.get("S10").full()) - magazzino = rit.get("S10").mid(0,5); + magazzino = con.get("S10").mid(0,5); else magazzino << ini_get_string(CONFIG_DITTA, "lv", "CODMAG") << ini_get_string(CONFIG_DITTA, "lv", "CODMAGN"); if(con.get("S10").full()) - magazzinoc = con.get("S10").mid(0,5); + magazzinoc = rit.get("S10").mid(0,5); else magazzinoc << ini_get_string(CONFIG_DITTA, "lv", "CODMAG") << ini_get_string(CONFIG_DITTA, "lv", "CODMAGC"); diff --git a/lv/lv3300.cpp b/lv/lv3300.cpp index 5e772505d..3a492a18f 100755 --- a/lv/lv3300.cpp +++ b/lv/lv3300.cpp @@ -465,12 +465,12 @@ bool TGestione_buoni_msk::set_righe_buono_handler(TMask_field& f, KEY k) TString8 magazzinoc; if(rit.get("S10").full()) - magazzino = rit.get("S10").mid(0,5); + magazzino = con.get("S10").mid(0,5); else magazzino << ini_get_string(CONFIG_DITTA, "lv", "CODMAG") << ini_get_string(CONFIG_DITTA, "lv", "CODMAGN"); if(con.get("S10").full()) - magazzinoc = con.get("S10").mid(0,5); + magazzinoc = rit.get("S10").mid(0,5); else magazzinoc << ini_get_string(CONFIG_DITTA, "lv", "CODMAG") << ini_get_string(CONFIG_DITTA, "lv", "CODMAGC"); diff --git a/lv/lv3400.cpp b/lv/lv3400.cpp index 96ccd5c97..90ccf1d00 100755 --- a/lv/lv3400.cpp +++ b/lv/lv3400.cpp @@ -558,12 +558,12 @@ void TEvasione_ter_msk::genera_buono() TString8 magazzinoc; if(rit.get("S10").full()) - magazzino = rit.get("S10").mid(0,5); + magazzino = con.get("S10").mid(0,5); else magazzino << ini_get_string(CONFIG_DITTA, "lv", "CODMAG") << ini_get_string(CONFIG_DITTA, "lv", "CODMAGN"); if(con.get("S10").full()) - magazzinoc = con.get("S10").mid(0,5); + magazzinoc = rit.get("S10").mid(0,5); else magazzinoc << ini_get_string(CONFIG_DITTA, "lv", "CODMAG") << ini_get_string(CONFIG_DITTA, "lv", "CODMAGC");