From 5960748309ec4c3166818c2ce62759962f2b7236 Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 14 Nov 2011 12:06:57 +0000 Subject: [PATCH] Patch level : Files correlati : Ricompilazione Demo : [ ] Commento : Corretto salvataggio causale collegata in righe generate di magazzino git-svn-id: svn://10.65.10.50/branches/R_10_00@22487 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- mg/mglib02a.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/mg/mglib02a.cpp b/mg/mglib02a.cpp index a9006d4d4..88dbf1967 100755 --- a/mg/mglib02a.cpp +++ b/mg/mglib02a.cpp @@ -275,6 +275,7 @@ int TMov_mag::read(TBaseisamfile& f, word op, word lockop) add_saldi(false); return err; } + int TMov_mag::remove(TBaseisamfile& f) const { const int res = TMultiple_rectype::remove(f); @@ -283,18 +284,15 @@ int TMov_mag::remove(TBaseisamfile& f) const return res; } - void TMov_mag::add_extrarows() const { add_autorows(); add_explrows(); -// if (add_explrows()) -// add_autorows(); } bool TMov_mag::add_autorows() const { - bool added=FALSE; + bool added = false; TString8 codmag; // aggiunge le righe automatiche @@ -303,12 +301,9 @@ bool TMov_mag::add_autorows() const TRecord_array & b = body(); TRectype & row = b[r]; const TCausale_magazzino& cau = causale(r); - const TString& codcaus = cau.caus_collegata(); - - if (codcaus.not_empty()) - { - const TCausale_magazzino& cau_coll = cached_causale_magazzino(codcaus); - + const TString8 codcaus = cau.caus_collegata(); + if (codcaus.full()) + { if (!row.get_bool(RMOVMAG_ESPLOSA)) { // deve esserci una riga collegata @@ -319,7 +314,10 @@ bool TMov_mag::add_autorows() const codmag = codmag_rauto(r); if (codmag.empty()) + { + const TCausale_magazzino& cau_coll = cached_causale_magazzino(codcaus); codmag = cau_coll.default_magdep(); + } if (codmag.not_empty()) linea_auto->put(RMOVMAG_CODMAG, codmag); const char * prezzo = prezzo_rauto(r);