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

Modifiche per Enrica; ignoro il perche' di tutti questi files

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@1594 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
villa 1995-07-13 12:38:04 +00:00
parent e1a11db75e
commit 5be54e7198
6 changed files with 5258 additions and 5254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cg/cg0400.cpp
View File

@ -737,7 +737,7 @@ void CG0400_application::prospetto_pagina(TGen_array& gen, TIva_array& iva)
/*
set_row(r++, "ALTRI DATI RELATIVI ALLA DICHIARAZIONE@54gImponibile@74gImposta@91gDetrazione");
r++;
*/
*/
r+=2;
st_riga = FALSE;
@ -1013,7 +1013,7 @@ void CG0400_application::preprocess_header()
/*
set_header (soh++, "Riepilogo progressivi IVA del periodo %s %d Cod. Att. %s %s", itom(_mese), _anno, (const char*) _cod_att, (const char*) descr);
set_header (soh++, (const char *) sep);
*/
*/
if (_st_inizio_anno)
{
if (_prima_pagina)

6
cg/cg4301.cpp
View File

@ -147,7 +147,7 @@ bool TLiquidazione_app::update_firm(int month, bool recalc)
look_lim(liq_month(month), TRUE);
if (_isregis && _lim->get_bool("B1") && _month != 13)
if (_isfinal && _lim->get_bool("B1") && _month != 13)
return TRUE;
TConfig cnf(CONFIG_DITTA, "cg");
@ -1578,6 +1578,8 @@ void TLiquidazione_app::write_liq(int month, const char* codatts)
TString s7 = _lim->get("S7");
TString s0 = _lim->get("S0");
TString s1 = _lim->get("S1");
bool wasb0 = _lim->get_bool("B0");
bool wasb1 = _lim->get_bool("B1");
_lim->zero();
_lim->put("CODTAB", codtab);
@ -1586,6 +1588,8 @@ void TLiquidazione_app::write_liq(int month, const char* codatts)
_lim->put("S0", s0);
_lim->put("S1", s1);
_lim->put("S7", s7);
_lim->put("B0", wasb0 ? "X" : "");
_lim->put("B1", wasb1 ? "X" : "");
/*
* versamenti effettuati: si conteggiano in R0,

10
cg/classpim.cpp
View File

@ -89,11 +89,11 @@ bool classify_pim(TRectype& pimr, real& imp, real& iva, tiporec& t)
break;
case acq_beni_riv:
/*
found = (tipomov == 2 && tipodet != 9 &&
(tipocr == 1 || (tipocr == 5 && tipodet == 3)));
found &= tipoiva != "NS" && tipoiva != "NI" && tipoiva != "ES";
found &= (ricl ? TRUE : tipodet == 3);
*/
found = (tipomov == 2 && tipodet != 9 &&
(tipocr == 1 || (tipocr == 5 && tipodet == 3)));
found &= tipoiva != "NS" && tipoiva != "NI" && tipoiva != "ES";
found &= (ricl ? TRUE : tipodet == 3);
*/
found = (tipomov == 2 && (tipocr == 1 || tipocr == 5));
if (found)
{