root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :

Browse Source 
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
This commit is contained in:
guy 2011-11-14 12:06:57 +00:00
parent 2b0220ba83
commit 5960748309
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mg/mglib02a.cpp
View File

@ -275,6 +275,7 @@ int TMov_mag::read(TBaseisamfile& f, word op, word lockop)
add_saldi(false); add_saldi(false);
return err; return err;
} }
int TMov_mag::remove(TBaseisamfile& f) const int TMov_mag::remove(TBaseisamfile& f) const
{ {
const int res = TMultiple_rectype::remove(f); const int res = TMultiple_rectype::remove(f);
@ -283,18 +284,15 @@ int TMov_mag::remove(TBaseisamfile& f) const
return res; return res;
} }
void TMov_mag::add_extrarows() const void TMov_mag::add_extrarows() const
{ {
add_autorows(); add_autorows();
add_explrows(); add_explrows();
// if (add_explrows())
// add_autorows();
} }
bool TMov_mag::add_autorows() const bool TMov_mag::add_autorows() const
{ {
bool added=FALSE; bool added = false;
TString8 codmag; TString8 codmag;
// aggiunge le righe automatiche // aggiunge le righe automatiche
@ -303,12 +301,9 @@ bool TMov_mag::add_autorows() const
TRecord_array & b = body(); TRecord_array & b = body();
TRectype & row = b[r]; TRectype & row = b[r];
const TCausale_magazzino& cau = causale(r); const TCausale_magazzino& cau = causale(r);
const TString& codcaus = cau.caus_collegata(); const TString8 codcaus = cau.caus_collegata();
if (codcaus.full())
if (codcaus.not_empty()) {
{
const TCausale_magazzino& cau_coll = cached_causale_magazzino(codcaus);
if (!row.get_bool(RMOVMAG_ESPLOSA)) if (!row.get_bool(RMOVMAG_ESPLOSA))
{ {
// deve esserci una riga collegata // deve esserci una riga collegata
@ -319,7 +314,10 @@ bool TMov_mag::add_autorows() const
codmag = codmag_rauto(r); codmag = codmag_rauto(r);
if (codmag.empty()) if (codmag.empty())
{
const TCausale_magazzino& cau_coll = cached_causale_magazzino(codcaus);
codmag = cau_coll.default_magdep(); codmag = cau_coll.default_magdep();
}
if (codmag.not_empty()) if (codmag.not_empty())
linea_auto->put(RMOVMAG_CODMAG, codmag); linea_auto->put(RMOVMAG_CODMAG, codmag);
const char * prezzo = prezzo_rauto(r); const char * prezzo = prezzo_rauto(r);