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

Patch level :4.0 567

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :corretti errori di riporto


git-svn-id: svn://10.65.10.50/trunk@14641 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2006-12-15 09:26:08 +00:00
parent 7717de7d08
commit c05dfd5cb2
2 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ve/velib03.cpp
View File

@ -2,6 +2,11 @@
#include <modaut.h> #include <modaut.h>
#include <utility.h> #include <utility.h>
#include "../cg/cg2103.h"
#include "../db/dblib.h"
#include "../pr/prlib.h"
#include "../sv/svlib01.h"
#include "veini.h" #include "veini.h"
#include "velib.h" #include "velib.h"
#include "sconti.h" #include "sconti.h"
@ -10,14 +15,6 @@
#include <clifo.h> #include <clifo.h>
#include <cfven.h> #include <cfven.h>
#include "../cg/cg2103.h"
#include "../cg/cglib01.h"
#include "../mg/mglib.h"
#include "../mg/anamag.h"
#include "../mg/movmag.h"
#include "../pr/prlib.h"
#include "../sv/svlib01.h"
#include "../db/dblib.h"
// calcola il prezzo per le spese // calcola il prezzo per le spese
void sppr_calc(const TRectype & rec, const TString & valuta_doc, const real & cambio, real & prezzo, exchange_type controeuro) void sppr_calc(const TRectype & rec, const TString & valuta_doc, const real & cambio, real & prezzo, exchange_type controeuro)

56
ve/velib06.cpp
View File

@ -1199,9 +1199,7 @@ void TDocumento_mask::update_giacenza()
if (causmag.full() && c.scarica_alternativi()) if (causmag.full() && c.scarica_alternativi())
{ {
const TRectype art = cache().get(LF_ANAMAG, codart); const TString& alt = cache().get(LF_ANAMAG, codart, ANAMAG_CODARTALT);
const TString & alt = art.get(ANAMAG_CODARTALT);
if (alt.full()) if (alt.full())
codart = alt; codart = alt;
} }
@ -1209,38 +1207,38 @@ void TDocumento_mask::update_giacenza()
real giac, disp; real giac, disp;
if (codart.full()) if (codart.full())
{ {
TString16 codmag = row.get(sf.cid2index(FR_CODMAG)); TString8 codmag = row.get(sf.cid2index(FR_CODMAG));
if (codmag.full()) if (codmag.full())
{
const TString4 coddep = row.get(sf.cid2index(FR_CODDEP));
if (coddep.full())
codmag << coddep;
}
else
{ // Cerca di determinare il magazzino di default, se manca sulla riga
if (causmag.full())
{ {
const TString4 coddep = row.get(sf.cid2index(FR_CODDEP)); const TCausale_magazzino c(causmag);
if (coddep.full())
codmag << coddep;
}
else
{ // Cerca di determinare il magazzino di default, se manca sulla riga
if (causmag.full())
{
const TCausale_magazzino c(causmag);
if (c.has_default_mag()) if (c.has_default_mag())
{ {
codmag = c.default_mag(); codmag = c.default_mag();
if (c.has_default_dep()) if (c.has_default_dep())
codmag << c.default_dep(); codmag << c.default_dep();
}
} }
} }
}
TString16 livello; TString16 livello;
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
const char* liv = row.get(sf.cid2index(FR_LIV1+i)); const char* liv = row.get(sf.cid2index(FR_LIV1+i));
if (*liv > ' ') if (*liv > ' ')
livello << liv; livello << liv;
else else
break; break;
} }
const TString8 annoes = get(F_ANNO); const TString8 annoes = get(F_ANNO);
TArticolo_giacenza art(codart); TArticolo_giacenza art(codart);