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

Patch level :

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
Correzioni varie ed eventuali


git-svn-id: svn://10.65.10.50/branches/R_10_00@22393 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2011-07-12 15:43:24 +00:00
parent 7a187457cf
commit a438b82a35
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lv/lv3100.cpp
View File

@ -732,7 +732,6 @@ bool TGestione_bolle_msk::lv_codart_handler(TMask_field& f, KEY k)
default: break;
}
//if (ok && (k == K_ENTER || k == K_TAB))
if (ok && f.to_check(k))
{
TMask& msk = f.mask();
@ -864,7 +863,23 @@ bool TGestione_bolle_msk::lv_codart_handler(TMask_field& f, KEY k)
trvlst = true;
}
rdoc.put(RDOC_PREZZO, prezzo);
msk.set(FR_PREZZO, prezzo);
}
else
{
real prezzo;
const int tplis = cont.get_int(LVCONDV_TIPOLIS); //tipo listino
if (tplis == 0)
prezzo = rcont.get_real(LVRCONDV_PREZZO);
else
{
const TRectype& anamag = cache().get(LF_ANAMAG,codart);
prezzo = anamag.get_real(ANAMAG_COSTSTD);
}
rdoc.put(RDOC_PREZZO, prezzo);
msk.set(FR_PREZZO, prezzo);
}
//controllo se si vuole aggiungere un eventuale nuovo articolo al contratto
if (cont.get_int(LVCONDV_CODCONT) <= 0)
@ -1129,6 +1144,19 @@ bool TGestione_bolle_msk::lv_causale_handler(TMask_field& f, KEY k)
msk.field(FR_QTA).set("");
msk.field(FR_QTA).disable();
}
real prezzo;
if(cau.is_rotto())
{
prezzo = rcont.get_real(LVRCONDV_PREZDAN);
if(prezzo > ZERO)
msk.field(FR_PREZZO).set(prezzo.string());
}
else
{
prezzo = rcont.get_real(LVRCONDV_PREZZO);
msk.field(FR_PREZZO).set(prezzo.string());
}
}
}
return true;
@ -1226,10 +1254,10 @@ void TGestione_bolle_msk::user_set_handler( short fieldid, int index)
{
switch(index)
{
case 4101: set_field_handler(fieldid, lv_data_handler); break;
case 4102: set_field_handler(fieldid, lv_contratto_handler); break;
case 4103: set_field_handler(fieldid, lv_bolla_handler); break;
case 4105: set_field_handler(fieldid, lv_dataprco_handler); break;
case 4101: set_field_handler(fieldid, lv_data_handler); break;
case 4102: set_field_handler(fieldid, lv_contratto_handler); break;
case 4103: set_field_handler(fieldid, lv_bolla_handler); break;
case 4105: set_field_handler(fieldid, lv_dataprco_handler); break;
default : TDocumento_mask::user_set_handler(fieldid, index); break;
}
}