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

Patch level : 12.0 438

Browse Source 
Files correlati     : ci1.exe

I codici di assenza non venivano stampati correttamente se si selezionavano le commesse da stampare

git-svn-id: svn://10.65.10.50/branches/R_10_00@24089 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
bonazzi 2017-09-15 18:37:05 +00:00
parent eab45cd0a1
commit c261f3562c
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/ci/ci1300.cpp
View File

@ -109,6 +109,15 @@ void TRil_ore_ris_mask::elabora_risorsa(const TString& curr_risorsa, const int c
rilore_recset.set_var("#TPRA", tiporisorsa);
rilore_recset.set_var("#CODICE", curr_risorsa);
if (!ignore && calc_ore_lav)
{
for (int d = 1; d <= 31; ++d)
{
TString8 fld = "H0."; fld << 200 + d;
rep.field(fld)->set("");
}
}
//aggiunta Adolfica: lista di commesse da considerare separatamente più commessa borraccione..
//..con tutte le altre
TSheet_field& lista = sfield(F_RIGHE);
@ -230,15 +239,19 @@ void TRil_ore_ris_mask::elabora_risorsa(const TString& curr_risorsa, const int c
for (int d = 1; d <= 31; ++d)
{
TString8 fld = "H0."; fld << 200 + d;
TString val = rep.field(fld)->get().as_string();
if (tpass.objptr(d) != NULL)
{
const TString8 tp = tpass.row(d);
if (val.blank())
{
if (tpass.objptr(d) != NULL)
{
const TString8 tp = tpass.row(d);
rep.field(fld)->set(tp);
}
else
rep.field(fld)->set("");
rep.field(fld)->set(tp);
}
else
rep.field(fld)->set("");
}
}
}

2
src/ci/ci2400.cpp
View File

@ -773,7 +773,7 @@ bool TConsuntivazione_msk::load_sheet()
_locked = false;
if (sheet.empty())
{
if (ini_get_bool(CONFIG_DITTA, "ci", "DefaultAuto") &&
if (ini_get_bool(CONFIG_DITTA, "ci", "DefaultAuto") &&
ini_get_bool(CONFIG_DITTA, "ci", "DefaultDisp"))
riempi_sheet_disp(da_data, a_data);
}