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

Patch level : 10.0 290

Browse Source 
Files correlati     : pe0.exe
Ricompilazione Demo : [ ]
Commento            :

Aggiunta colonna prezzo di vendita


git-svn-id: svn://10.65.10.50/trunk@18818 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2009-05-05 15:31:56 +00:00
parent b20fa21420
commit 7506d2214f
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pe/pe0400.cpp
View File

@ -464,7 +464,11 @@ bool TGestione_preventivo_msk::pe_codart_handler(TMask_field& f, KEY k)
if (codart.full()) if (codart.full())
{ {
const TArticolo_giacenza & art = cached_article(codart); const TArticolo_giacenza & art = cached_article(codart);
TString80 k = art.get(ANAMAG_PERCRIC); const real ric = art.get(ANAMAG_PERCRIC);
TString80 k;
if (ric != ZERO)
k = ric.string();
if (k.blank()) if (k.blank())
{ {

13
pe/pe0500.cpp
View File

@ -138,13 +138,12 @@ void TGenerazione_ordine::post_process_output(TLista_documenti& doc_out)
if (level != 0) if (level != 0)
{ {
const TString & k = row.get(RDOC_K); const TString & p = row.get(RDOC_PREZZOV);
TString ge;
real perc; row.put(RDOC_PREZZO, p);
real importo = row.importo(true, false);
const real importo = row.importo(true, false);
if (scontoexpr2perc(k, false, ge, perc))
importo *= (2 - perc);
total += importo; total += importo;
} }
else else
@ -155,7 +154,7 @@ void TGenerazione_ordine::post_process_output(TLista_documenti& doc_out)
const real price = total / qta; const real price = total / qta;
TCurrency_documento c(price, doc, true); TCurrency_documento c(price, doc, true);
row.put(RDOC_PREZZO, c.get_value()); row.put(RDOC_PREZZO, c.get_num());
} }
total = ZERO; total = ZERO;
} }

25
pe/prev.src
View File

@ -174,18 +174,19 @@ Col(9) = FR_UMQTA
Col(10) = FR_QTA Col(10) = FR_QTA
Col(11) = FR_LORDO Col(11) = FR_LORDO
Col(12) = FR_PREZZO Col(12) = FR_PREZZO
Col(13) = FR_SCONTO Col(13) = FR_JOLLY3|Prezzo di vendita|18
Col(14) = FR_JOLLY2|K|25 Col(14) = FR_SCONTO
Col(15) = FR_PERCPROV Col(15) = FR_JOLLY2|K|25
Col(16) = FR_IMPFISUN Col(16) = FR_PERCPROV
Col(17) = FR_IMPFISSO Col(17) = FR_IMPFISUN
Col(18) = FR_PERCPROV1 Col(18) = FR_IMPFISSO
Col(19) = FR_CODIVA Col(19) = FR_PERCPROV1
Col(20) = FR_ADDIVA Col(20) = FR_CODIVA
Col(21) = FR_CAUS Col(21) = FR_ADDIVA
Col(22) = FR_CODMAGC Col(22) = FR_CAUS
Col(23) = FR_CODDEPC Col(23) = FR_CODMAGC
Col(24) = FR_TIPORIGA Col(43) = FR_CODDEPC
Col(25) = FR_TIPORIGA
[RIGHE] [RIGHE]