Patch level : Patch NO PATCH

Files correlati     : lv3 lv3400a.msk
Ricompilazione Demo : [ ]
Commento            :
funziona a video no su terminale


git-svn-id: svn://10.65.10.50/trunk@19667 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2009-11-24 13:43:36 +00:00
parent 2c36f0c761
commit 577c4772f1
2 changed files with 38 additions and 28 deletions

View File

@ -227,13 +227,13 @@ void TEvasione_ter_msk::precarica_righe()
TRiga_documento& row = doc[i];
TBuono_prelievo_row rdoc(row);
TDate dataeva = rdoc.dataeva();
/*TDate dataeva = rdoc.dataeva();
if (!dataeva.ok())
dataeva = oggi;
dataeva = oggi;*/
TString80 codart = rdoc.codart();
TQuantita_riga* qr = _ra.quantita(codart, dataeva, true);
TQuantita_riga* qr = _ra.quantita(codart, oggi, true);
qr->set_nriga(i);
qr->set_evaso(rdoc.evaso());
qr->set_qta_da_con(rdoc.qta_dacons());
@ -420,7 +420,7 @@ void TEvasione_ter_msk::genera_buono()
if (doc.rows() > 0)
{
err = doc.write();
const TString4 stato = cache().get("%TIP", ini_get_string(CONFIG_DITTA, "lv", "TIPODOC_PRE", NULL, 0), "S2").mid(1,1);
const TString4 stato = cache().get("%TIP", ini_get_string(CONFIG_DITTA, "lv", "TIPODOC_PRE", NULL, 0), "S2").mid(2,1);
bpre.put(DOC_STATO, stato);
bpre.rewrite();
}
@ -562,10 +562,11 @@ void TEvasione_ter_msk::registra()
movmag.write(movi);
}
//
void TEvasione_ter_msk::riempi_sheet()
{
TSheet_field& sheet = sfield(F_TRIGHE);
sheet.destroy();
//sheet.destroy();
FOR_EACH_ASSOC_OBJECT(_ra, obj, key, itm)
{
@ -573,12 +574,11 @@ void TEvasione_ter_msk::riempi_sheet()
TQuantita_riga& qr = *(TQuantita_riga*)itm;
if(!qr.get_evaso())
{
TToken_string riga = sheet.row(-1);
riga.add("", 0);
riga.add(chiave.get(0), 1);
riga.add(qr.get_qta_da_con(), 2);
riga.add(qr.get_qta_con(), 3);
{
TToken_string& riga = sheet.row(-1);
riga.add(chiave.get(0), 0);
riga.add(qr.get_qta_da_con(), 1);
riga.add(qr.get_qta_con(), 2);
}
}
sheet.force_update();
@ -718,17 +718,19 @@ bool TEvasione_ter_msk::on_field_event(TOperable_field& f, TField_event e, long
if (e == fe_button)
{
evadi();
if (controlla())
genera_buono();
return false;
}
break;
case DLG_PREVIEW:
if (e == fe_button)
{
show(F_TBARCODE);
show(F_TPACCHI);
show(F_TQTAPACCO);
show(F_TQTACON);
show(F_TQTADACON);
hide(F_TBARCODE);
hide(F_TPACCHI);
hide(F_TQTAPACCO);
hide(F_TQTACON);
hide(F_TQTADACON);
show(F_TRIGHE);
riempi_sheet();
@ -745,7 +747,10 @@ bool TEvasione_ter_msk::on_field_event(TOperable_field& f, TField_event e, long
{
if(yesno_box(TR("Si desidera considerare evase tutte le righe?"
"(in caso contrario le righe evase parzialmente verranno spezzate su due righe)")))
{
evadi();
genera_buono();
}
else
{
spezza_riga();
@ -784,6 +789,14 @@ bool TEvasione_ter_msk::on_field_event(TOperable_field& f, TField_event e, long
if (e == fe_modify)
if (!f.empty())
{
hide(F_TCODNUM);
hide(F_TTPDOC);
hide(F_TDESCR);
hide(F_TANNO);
hide(F_TDATAPRCO);
update();
show(F_TCODCF);
show(F_TRAGSOC);
show(F_TBARCODE);
@ -792,11 +805,6 @@ bool TEvasione_ter_msk::on_field_event(TOperable_field& f, TField_event e, long
show(F_TQTACON);
show(F_TQTADACON);
hide(F_TCODNUM);
hide(F_TTPDOC);
hide(F_TANNO);
hide(F_TDATAPRCO);
precarica_righe();
}
else
@ -855,6 +863,8 @@ TEvasione_ter_msk::TEvasione_ter_msk():TAutomask("lv3400a")
const TRectype& tpdoc = cache().get("%NUM", ini_get_string(CONFIG_DITTA, "lv", "TIPODOC_PRE", NULL, 0));
set(F_TDESCR, tpdoc.get("S0"));
_ndoc = 0;
TDate data(TODAY);
TEsercizi_contabili es;
int annoes = es.date2esc(data);

View File

@ -54,25 +54,25 @@ PAGE "Evasione Buoni di prelievo" -1 -1 27 10
STRING F_TCODNUM 4
BEGIN
PROMPT 0 0 ""
PROMPT 0 1 ""
FLAGS "D"
END
STRING F_TTPDOC 4
BEGIN
PROMPT 5 0 ""
PROMPT 5 1 ""
FLAGS "D"
END
STRING F_TDESCR 50 10
BEGIN
PROMPT 10 0 ""
PROMPT 10 1 ""
FLAGS "D"
END
NUMBER F_TNDOC 6
BEGIN
PROMPT 0 1 "Numero Doc. "
PROMPT 0 2 "Numero Doc. "
USE LF_DOC SELECT (STATO==2)
JOIN LF_CLIFO TO LF_DOC INTO TIPOCF==TIPOCF CODCF==CODCF
INPUT PROVV "D"
@ -91,18 +91,18 @@ END
DATE F_TDATADOC
BEGIN
PROMPT 0 2 "Data Doc. "
PROMPT 0 3 "Data Doc. "
END
NUMBER F_TANNO 4
BEGIN
PROMPT 0 3 "Anno Esercizio "
PROMPT 0 4 "Anno Esercizio "
FLAGS "D"
END
DATE F_TDATAPRCO
BEGIN
PROMPT 0 4 "Prev Con. "
PROMPT 0 5 "Prev Con. "
END
NUMBER F_TCODCF 6