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

Patch level : 12.0 828

Browse Source 
Files correlati     : cg5.exe

Issue #47
dopo l'installazione della patch 826, se da visualizzazione liquidazione clicco sul bottone all'estrema sinistra e richiamo il mese, all'uscita mi viene raddoppiato il mese di dicembre
This commit is contained in:
AlexBonazzi 2019-06-19 23:01:20 +02:00
parent 82cc21e3d6
commit 4a8c9d11cd
2 changed files with 90 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/ve1.vcxproj.user Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LocalDebuggerCommandArguments>-3 st_av_lav /uADMIN</LocalDebuggerCommandArguments>
<LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>

34
src/cg/cg5500.cpp
View File

@ -1639,16 +1639,12 @@ void Visliq_app::read_general(TMask& m)
// set sheet
for (int i = step; i < 13; i+=step)
{
TToken_string & t = sh.row(i);
if (!is_month_ok(i))
continue;
if (is_month_ok(i))
{
const int row = (i/step) - 1;
if (!look_lim(i))
{
t.cut(0);
sh.set_row_cell(S_MESE, itoname(i), row);
sh.disable_cell(row, -1);
}
else
@ -1658,11 +1654,11 @@ void Visliq_app::read_general(TMask& m)
const real ris = iva_ven - iva_acq;
const real r1 = _lim->get_real("R1");
const real r5 = _lim->get_real("R5");
const int row = sh.set_row_cell(S_MESE, itoname(i));
const TString debcred1 = ris == ZERO ? "" : (ris > ZERO ? "D" : "C");
real r0 = _lim->get_real("R0");
const TString debcred3 = r0 == ZERO ? "" : (r0 > ZERO ? "D" : "C");
sh.set_row_cell(S_MESE, itoname(i), row);
sh.set_row_cell(S_IVA, abs(r0), row);
sh.set_row_cell(S_DEBCRED3, debcred3, row);
sh.set_row_cell(S_RISULTATO, abs(ris), row);
@ -1707,7 +1703,7 @@ void Visliq_app::read_general(TMask& m)
else
sh.set_row_cell(S_CREDRES, ZERO, row);
sh.set_row_cell(S_DESCR, _lim->get("S3"), row);
// sh.row(row) = (*tt);
}
}
}
sh.force_update();
@ -1720,14 +1716,12 @@ void Visliq_app::read_general(TMask& m)
for (_del->first(); !_del->eof(); _del->next())
{
if (atol(*_del_ditta) != get_firm() ||
atoi(*_del_anno) != _year)
continue;
if (atol(*_del_ditta) == get_firm() && atoi(*_del_anno) == _year)
{
// uso solo deleghe normali (tipo == 1) e acconti (tipo == 7)
int tipod = atoi(*_del_tipo);
if (tipod != 1 && tipod != 7)
continue;
if (tipod == 1 || tipod == 7)
{
// somma versamenti nel mese adeguato
int m = atoi(*_del_mese);
@ -1735,9 +1729,8 @@ void Visliq_app::read_general(TMask& m)
if (m >= 12)
m = tipod == 7 ? 12 : 13;
// supercauto
if (m <= 0)
continue;
if (m > 0)
{
versamenti[m - 1] += _del->get_real("R0");
interessi[m - 1] += _del->get_real("R1");
date[m - 1] = _del->get_date("D0");
@ -1746,14 +1739,15 @@ void Visliq_app::read_general(TMask& m)
b.add(_del->get("S8"), 1);
b.add(_del->get("S9"), 2);
}
}
}
}
// Sheet versamenti
TString nomemese;
sv.destroy();
for (int i = 1; i <= 13; i++)
{
const TString & t = sv.row(i);
if (!is_month_ok(i) && i != 13)
continue;
nomemese = itoname(i == 13 ? 12 : i);