diff --git a/ve/velib04d.cpp b/ve/velib04d.cpp index 31e7ad980..6164f5082 100755 --- a/ve/velib04d.cpp +++ b/ve/velib04d.cpp @@ -341,8 +341,16 @@ bool TConsegna_ordini::elabora(TLista_documenti& doc_in, TLista_documenti& doc_o const TString& articolo = params().get("ARTICOLO"); m.doc2mask(indoc, articolo); +// if (articolo.full()) +// params().set("QUANTITA", ZERO); if (articolo.full()) - params().set("QUANTITA", ZERO); + { + m.show(F_QTA); + m.set(F_QTA, params().get("QUANTITA")); + } + else + m.hide(F_QTA); + ok = m.run() == K_ENTER; if (ok) { @@ -554,7 +562,7 @@ bool TConsegna_ordini::elabora(TLista_documenti& doc_in, TLista_documenti& doc_o const TString4 um(inrec.get(RDOC_UMQTA)); const real qta = inrec.articolo().convert_to_um(daeva, params().get("UM"), um); - params().set("QUANTITA", qta + params().get_real("QUANTITA")); + params().set("QUANTITA", params().get_real("QUANTITA") - qta); } bool elaborata = false; diff --git a/ve/velib04d.h b/ve/velib04d.h index 3c0f3c432..7fbe912bd 100755 --- a/ve/velib04d.h +++ b/ve/velib04d.h @@ -33,4 +33,5 @@ #define F_RAGFOR 214 #define F_CODVAL 215 #define F_CAMBIO 216 +#define F_QTA 217 #define F_ROWS 250 diff --git a/ve/velib04d.uml b/ve/velib04d.uml index aa580e267..ba851601d 100755 --- a/ve/velib04d.uml +++ b/ve/velib04d.uml @@ -159,6 +159,12 @@ BEGIN FLAGS "D" END +NUMBER F_QTA 13 5 +BEGIN + PROMPT 52 7 "Qta' " + FLAGS "D" +END + SPREADSHEET F_ROWS BEGIN PROMPT 0 8 "" diff --git a/ve/velib06.cpp b/ve/velib06.cpp index 092ba2d85..864e84df5 100755 --- a/ve/velib06.cpp +++ b/ve/velib06.cpp @@ -3212,7 +3212,7 @@ bool TElabora_mask::elabora() set(F_NUMDOCRIF_ELAB, ""); ((TDocumento_mask *)_main)->set_focus_field(F_SHEET); } - if (e->tipo() == _consegna_ordini) + /* if (e->tipo() == _consegna_ordini) { TParametri_elaborazione& p = e->params(); if (p.get("ARTICOLO").not_empty()) @@ -3225,7 +3225,7 @@ bool TElabora_mask::elabora() set(F_QTA, qta); } } - } + } */ // delete newdoc;