From 8e52b23e0d76e49f53dd612dc910418e00b34c89 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 27 Aug 2008 11:13:47 +0000 Subject: [PATCH] Patch level : 10.0 109 Files correlati : Ricompilazione Demo : [ ] Commento : Riportata la versione 3.2 1208 git-svn-id: svn://10.65.10.50/trunk@17102 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- mg/anamag.h | 1 + mg/mg4200.cpp | 2 ++ mg/mglib02a.cpp | 19 +++++++------------ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/mg/anamag.h b/mg/anamag.h index cd9e61dc7..6bd197769 100755 --- a/mg/anamag.h +++ b/mg/anamag.h @@ -70,6 +70,7 @@ #define ANAMAG_GOLEM "GOLEM" #define ANAMAG_REPARTO "REPARTO" #define ANAMAG_STAGIONE "STAGIONE" +#define ANAMAG_LIVPERART "LIVPERART" #define NULL_CODART "_****_" diff --git a/mg/mg4200.cpp b/mg/mg4200.cpp index cc019bbcb..793d8a781 100755 --- a/mg/mg4200.cpp +++ b/mg/mg4200.cpp @@ -296,7 +296,9 @@ TStampainv_mask::TStampainv_mask() if (prassid.get_bool("GES", NULL, A_LISTINI)) field(F_CATVENLISTINO).enable(prassid.get_bool("GESLISCV")); else + { field(F_CATVENLISTINO).disable(); field(F_CODLISTINO).disable(); + } if (prassid.get_bool("CHK_USER", "ve", 1)) { diff --git a/mg/mglib02a.cpp b/mg/mglib02a.cpp index d056153ba..ab560f784 100755 --- a/mg/mglib02a.cpp +++ b/mg/mglib02a.cpp @@ -272,6 +272,10 @@ bool TMov_mag::add_explrows() const else message_box(FR("Movimento di magazzino %ld:\nimpossibile esplodere l'articolo %s"), get_long(MOVMAG_NUMREG),(const char *)codart); } + else + if (b[r].get_char(RMOVMAG_TIPORIGA) == riga_automatica) + b.destroy_row(r,TRUE); + } } // ciclo righe return added; @@ -417,21 +421,12 @@ void TMov_mag::mark_current_lines(const bool as_deleted) { _annoes = get(MOVMAG_ANNOES); _datacomp = get_date(MOVMAG_DATACOMP); + + const TRecord_array& b = body(); + lines_to_add.destroy(); lines_to_subtract.destroy(); - /* Vecchio modo che si pianta se manca qualche riga - const int nrows = rows(); // lasciare la riga qui perchè comporta il caricamento del body - for (int i = 1; i<= nrows; i++) - { - if (as_deleted) - line_deleted(line2key(i), line2data(i)); - else - line_inserted(line2key(i), line2data(i)); - } -*/ - - const TRecord_array& b = body(); for (int i = b.last_row(); i > 0; i = b.pred_row(i)) { TLine_movmag& data = line2data(i);