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

Patch level :2.0 467

Browse Source 
Files correlati     :mr2.exe
Ricompilazione Demo : [ ]
Commento            :corretto errore di compilazione (aggiunto il metodo currency2um())


git-svn-id: svn://10.65.10.50/trunk@11099 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2003-05-09 09:58:20 +00:00
parent b5a977f582
commit aa4797126c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mr/mr2100.cpp
View File

@ -1950,7 +1950,6 @@ bool TMatResPlanning::load_gross_requirements()
if (riga.is_articolo())
{
const real qta = riga.qtaresidua();
real prz = riga.prezzo(TRUE,TRUE);
if (qta > ZERO)
{
const TCodice_articolo art = riga.get(RDOC_CODARTMAG);
@ -1959,9 +1958,10 @@ bool TMatResPlanning::load_gross_requirements()
const TString8 imp = noimp ? EMPTY_STRING : riga.get(RDOC_IMPIANTO);
const TString8 lin = nolin ? EMPTY_STRING : riga.get(RDOC_LINEA);
const TCodice_um um = riga.get(RDOC_UMQTA);
TPrice prz(riga.prezzo(TRUE,TRUE));
TQuantita q(art, um, qta);
prz *= q.conv();
q.convert2umbase();
q.currency2umbase(prz);
TMRP_line* line = _articles.find(art, liv, mag, "", imp, lin, 0L);
if (line == NULL)
{
@ -1974,7 +1974,7 @@ bool TMatResPlanning::load_gross_requirements()
long docnum = doc.get_long(DOC_NDOC);
int numriga = riga.get_int(RDOC_NRIGA);
TMRP_docref * docref = new TMRP_docref(doc.get_int(DOC_ANNO), codnum, docnum,
numriga, um, qta, prz);
numriga, um, qta, prz.get_num());
const TMRP_time t(datacons, 0, imp, lin);
line->add_gross_req(t, q.val(), docref);
@ -2160,7 +2160,6 @@ bool TMatResPlanning::load_planned_orders()
if (riga.is_articolo())
{
const real qta = riga.qtaresidua();
real prz = riga.prezzo(TRUE,TRUE);
if (qta > ZERO)
{
const TCodice_articolo art = riga.get(RDOC_CODARTMAG);
@ -2175,15 +2174,16 @@ bool TMatResPlanning::load_planned_orders()
line = _articles.find(art, liv, mag, "", imp, lin, 0L, TRUE);
line->set_description(riga.get(RDOC_DESCR));
}
TPrice prz(riga.prezzo(TRUE,TRUE));
const TCodice_um um = riga.get(RDOC_UMQTA);
TQuantita q(art, um, qta);
prz *= q.conv();
q.convert2umbase();
q.currency2umbase(prz);
TString8 codnum = doc.get(DOC_CODNUM);
long docnum = doc.get_long(DOC_NDOC);
int numriga = riga.get_int(RDOC_NRIGA);
TMRP_docref * docref = new TMRP_docref(doc.get_int(DOC_ANNO), codnum, docnum,
numriga, um, q.val(), prz);
numriga, um, q.val(), prz.get_num());
const TMRP_time t(consegna, 0, imp, lin);
if (has_confirmed_status(doc, a.row(sheetrow)) ||
(codnum != m.get(F_NUM_PROD) && codnum != m.get(F_NUM_FORN)))