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

Modificato criterio di raggruppamento per le righe IVA

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@674 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
nik 1994-11-21 12:08:13 +00:00
parent 291320b3bf
commit 493fce0e90
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cg/cglib03.cpp
View File

@ -13,7 +13,7 @@ bool TRigaiva_array::add_riga(const real& imponibile, const real& imposta, const
for (int i = 0; i < items(); i++)
{
TRigaiva& r = (TRigaiva&)(*this)[i];
if (r._codiva==codiva && tipodet==r._tipodet)
if (r._codiva==codiva && tipodet==r._tipodet && tipocr==r._tipocr)
{
found = TRUE;
r._imponibile += imponibile;
@ -51,7 +51,7 @@ bool TRiga_array::add_riga(const real& imponibile, const real& imposta, const ch
add(r);
}
return found;
}
}
bool TDociva_array::add_riga(const char* _descrdociva, const real& _importo,const int _natdoc)
{
@ -62,13 +62,13 @@ bool TDociva_array::add_riga(const char* _descrdociva, const real& _importo,cons
if (r._descrdoc==_descrdociva)
{
found = TRUE;
if ((r._ndoc == 1)||(r._ndoc == 2)||(r._ndoc == 3)||(r._ndoc == 4))
if ((r._ndoc == 1)||(r._ndoc == 2)||(r._ndoc == 9))//||(r._ndoc == 4))
r._totdociva += _importo;
}
}
if (!found)
{
if ((_natdoc == 1)||(_natdoc == 2)||(_natdoc == 3)||(_natdoc == 4))
if ((_natdoc == 1)||(_natdoc == 2)||(_natdoc == 9))//||(_natdoc == 4))
{
TDociva* r = new TDociva(_descrdociva,_importo,_natdoc);
add(r);