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

Patch level : 12.0 1236

Browse Source 
Files correlati     : cg5.exe

Commento :
Aggiunto controllo per evitare crediti negativi
Sistemato il salvataggio dei dati di dicembre e 13a
This commit is contained in:
Alessandro Bonazzi 2023-01-24 23:13:58 +01:00
parent 00d649f14e
commit 92a1e8b26f
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/cg/cg5500.cpp
View File

@ -483,19 +483,27 @@ bool Visliq_app::check_date(TMask_field& f, KEY k)
{ {
const TDate d(f.get()); const TDate d(f.get());
const int row = f.mask().get_sheet()->selected(); const int row = f.mask().get_sheet()->selected();
const bool mensile = app()._freqviva == "M";
int m = row + 1;
int year = app().year();
if (d.year() != app().year()) if (!mensile)
return f.error_box(FR("L'anno deve essere %d"), app().year());
if (app()._freqviva == "M")
{ {
if (d.month() != row + 1) m *= 3;
return f.error_box(FR("Il mese deve essere %s"), itom(row + 1)); if (m > 12)
m = 13;
} }
else
if (m == 13)
{ {
if (d.month() != (row + 1) * 3) year++;
return f.error_box(FR("Il mese deve essere %s"), itom((row + 1) * 3)); m = 2;
} }
if (d.year() != year)
return f.error_box(FR("L'anno deve essere %d"), year);
if (d.month() != m)
return f.error_box(FR("Il mese deve essere %s"), itom(m));
} }
return true; return true;
} }
@ -1619,6 +1627,7 @@ void Visliq_app::read_general(TMask& m)
TString4 cnc; TString4 cnc;
const int step = _freqviva == "M" ? 1 : 3; const int step = _freqviva == "M" ? 1 : 3;
const bool compensabile = _lia->get("S9") == "CM"; const bool compensabile = _lia->get("S9") == "CM";
TSheet_field& sh = m.sfield(F_VISLIQ1); TSheet_field& sh = m.sfield(F_VISLIQ1);
TSheet_field& sv = m.sfield(F_VISLIQ2); TSheet_field& sv = m.sfield(F_VISLIQ2);
@ -1826,7 +1835,7 @@ void Visliq_app::write_general(TMask& m)
for (int i = step; i < last_month; i += step) for (int i = step; i < last_month; i += step)
{ {
int m = (i > 12) ? 12 : i; int m = (i > 12) ? 13 : i;
// this is a true bordel // this is a true bordel
const int row = (i/step) - 1; const int row = (i/step) - 1;
@ -1890,7 +1899,7 @@ void Visliq_app::write_general(TMask& m)
// crea/aggiorna le deleghe // crea/aggiorna le deleghe
if (nvers != overs || nint != oint || ndate != odate || nabi != oabi || ncab != ocab || ncon != ocon || osta != nsta) if (nvers != overs || nint != oint || ndate != odate || nabi != oabi || ncab != ocab || ncon != ocon || osta != nsta)
write_del(m, i == 12 ? 7 : 1, nabi, ncab, ncon, ndate, nvers, nint, nsta); write_del(m, i == 12 ? 7 : 1, nabi, ncab, ncon, ndate, nvers, nint, nsta);
was_lim = look_lim(m); was_lim = look_lim(m);
if (!was_lim) if (!was_lim)
carry = false; // blocca riporto crediti e debiti carry = false; // blocca riporto crediti e debiti