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

Patch level : 12.0

Browse Source 
Files correlati     :
Commento:
continuare modifica cespiti
This commit is contained in:
smen 2022-07-15 17:22:20 +02:00
parent 1af2cbc3d5
commit 2f92c4df5d
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ce/ce0400.cpp
View File

@ -25,7 +25,8 @@ bool TConfig_mask::on_field_event(TOperable_field& f, TField_event e, long jolly
{
switch (f.dlg())
{
/* case F_ESERCORR:
/*
case F_ESERCORR:
if (e == fe_init)
{
const TEsercizio & esc = esercizi().esercizio(f.get_int());
@ -35,7 +36,8 @@ bool TConfig_mask::on_field_event(TOperable_field& f, TField_event e, long jolly
if (!covid_19)
reset(F_SOSPAMM);
}
break; */
*/
break;
case F_NAME_USER:
if (e == fe_button)
{

20
src/ce/ce2101.cpp
View File

@ -1035,7 +1035,7 @@ const TString& TCespite::ammini_get(const char* pstar) const
const TDitta_cespiti& dc = ditta_cespiti();
const TRectype* pcatdi = NULL;
const TRectype* pcac = NULL;
const bool sospamm = _sosp_covid && dc.esercizio_corrente() == 2020;
const bool sospamm = _sosp_covid && dc.esercizio_corrente() >= 2020;
// L'utente fa le sue scelte: ma saranno sensate e coerenti?
int scelte = _ammini.get_int(AMMCE_SCELTE);
@ -1102,13 +1102,21 @@ const TString& TCespite::ammini_get(const char* pstar) const
break;
case tc_immateriale:
// if (scelte == 2 || (_tipo_sit != 1 && sospamm))
if (scelte == 2)
val = catdi_get(pcatdi, CATDI_PFNORVN, _tipo_sit);
else
val = pcac->get("R13");
break;
if (sospamm)
val = "0.00";
else
{
if (scelte == 2)
val = catdi_get(pcatdi, CATDI_PFNORVN, _tipo_sit);
else
val = pcac->get("R13");
}
break;
case tc_pluriennale:
// if (scelte == 2 || (_tipo_sit != 1 && sospamm))
if (sospamm)
val = "0.00";
if (scelte == 2)
val = catdi_get(pcatdi, CATDI_PFNORVN, _tipo_sit);
else