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

Patch level : 12.00 1270

Browse Source 
Files correlati     : cg4.exe
Commento            :
IL credito dii fine anno veniva sommato male
This commit is contained in:
Alessandro Bonazzi 2023-06-28 14:40:21 +02:00
parent e26e6bb27b
commit c77be1b582
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cg/cg4304.cpp
View File

@ -2491,8 +2491,10 @@ void TLiquidazione_app::set_grand_2000(_DescrItem& d, int &rw)
if (_month == 12) if (_month == 12)
print_importo(rw++, TR("IMPORTO A CREDITO"), iva); print_importo(rw++, TR("IMPORTO A CREDITO"), iva);
else else
if (_isannual && d._r20 > ZERO) // if (_isannual && d._r20 > ZERO)
print_importo(rw++, TR("CREDITO RIPORTATO NELL'ANNO SUCCESSIVO"), -d._r20); // print_importo(rw++, TR("CREDITO RIPORTATO NELL'ANNO SUCCESSIVO"), -d._r20);
if (_isannual)
print_importo(rw++, TR("CREDITO RIPORTATO NELL'ANNO SUCCESSIVO"), iva + d._r20);
if (_is_visliq) if (_is_visliq)
rw++; rw++;
} }

10
src/cg/cg5500.cpp
View File

@ -1626,7 +1626,6 @@ void Visliq_app::write_del(const int month, const int tipodel,const char * codab
} }
} }
void Visliq_app::read_general(TMask& m) void Visliq_app::read_general(TMask& m)
{ {
TString8 abi; TString8 abi;
@ -1653,6 +1652,7 @@ void Visliq_app::read_general(TMask& m)
cr_res -= cr_util; cr_res -= cr_util;
int last_month = freq_ver_IVA() == "M" ? 14 : 16; int last_month = freq_ver_IVA() == "M" ? 14 : 16;
real credito_util;
// set sheet // set sheet
for (int i = step; i < last_month; i+=step) for (int i = step; i < last_month; i+=step)
@ -1676,6 +1676,9 @@ void Visliq_app::read_general(TMask& m)
const real r5 = _lim->get_real("R5"); const real r5 = _lim->get_real("R5");
const TString debcred1 = ris == ZERO ? "" : (ris > ZERO ? "D" : "C"); const TString debcred1 = ris == ZERO ? "" : (ris > ZERO ? "D" : "C");
real r0 = _lim->get_real("R0"); real r0 = _lim->get_real("R0");
if (m == 13)
r0 -= credito_util;
const TString debcred3 = r0 == ZERO ? "" : (r0 > ZERO ? "D" : "C"); const TString debcred3 = r0 == ZERO ? "" : (r0 > ZERO ? "D" : "C");
sh.set_row_cell(S_MESE, itoname(m), row); sh.set_row_cell(S_MESE, itoname(m), row);
@ -1703,6 +1706,11 @@ void Visliq_app::read_general(TMask& m)
sh.set_row_cell(S_DATAAUT, dautf24, row); sh.set_row_cell(S_DATAAUT, dautf24, row);
} }
if (m < 13)
{
credito_util += criva;
credito_util += autf24;
}
sh.enable_cell(row, sh.cid2index(S_DATAAUT), enable_date); sh.enable_cell(row, sh.cid2index(S_DATAAUT), enable_date);
if (compensabile) if (compensabile)
{ {