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

Patch level : 12.0 998

Browse Source 
Files correlati     : cg4.exe
Commento            :

Corretta inizializazione flage di agenzia di viaggio
This commit is contained in:
Alessandro Bonazzi 2020-09-26 15:36:06 +02:00
parent 2f86d64529
commit 5512c4a9eb
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/cg/cg4400.cpp
View File

@ -1068,7 +1068,6 @@ int TStampa_registri_app::riga_rmoviva(const bool fattrit)
const TString4 codiva = iva.get(RMI_CODIVA);
_riga_rmi.add_riga(iva);
const bool splitpay = mov.get_char(MOV_TIPO) == 'C' && is_split_payment(mov);
const bool liqdiff = !splitpay && mov.get_bool(MOV_LIQDIFF) && is_IVA_diff(mov);
const tipo_movimento tm = (tipo_movimento) mov.get_int(MOV_TIPOMOV);
@ -2074,18 +2073,18 @@ bool TStampa_registri_app::print_IVAxCassa(int da_month, int a_month)
const TRectype& rec = id.cursor()->curr();
for (bool ok = id.move_first(); ok; ok = id.move_next())
{
const TString4 codiva = rec.get("CODIVA");
const real importo = rec.get("IMPORTO");
const real imponibile = rec.get("IMPONIBILE");
const real imposta = rec.get("IMPOSTA");
const int tipodiff = rec.get_int("TIPODIFF");
const TString4 codiva = rec.get(ID_CODIVA);
const real importo = rec.get(ID_IMPORTO);
const real imponibile = rec.get(ID_IMPONIBILE);
const real imposta = rec.get(ID_IMPOSTA);
const int tipodiff = rec.get_int(ID_TIPODIFF);
TString80 rs = id.get("CLIFO.RAGSOC").as_string();
rs.strip_double_spaces();
TParagraph_string clifo(rs, 27);
riga.reset();
riga.put(rec.get_date("DATAREGP").string(brief, '/'), 0);
riga.put(rec.get_date(ID_DATAREGP).string(brief, '/'), 0);
riga.put(format("%6ld", id.get("MOV.PROTIVA").as_int()), 8);
riga.put(rec.get_date(MOV_DATAREG).string(brief, '/'), 15);
riga.put(id.get("MOV.NUMDOC").as_string(), 24);
@ -2095,9 +2094,9 @@ bool TStampa_registri_app::print_IVAxCassa(int da_month, int a_month)
riga.put(id.get("MOV.TIPODOC").as_string(), 68);
print_real(riga, importo, 70);
print_real(riga, imponibile, 85);
riga.put(rec.get("CODIVA"), 102);
riga.put(rec.get(ID_CODIVA), 102);
print_real(riga, imposta, 107);
riga.put(rec.get_int("NUMPRO") >= 999 ? "X" : "", 123);
riga.put(rec.get_int(ID_NUMPRO) >= 999 ? "X" : "", 123);
if (_tipo_stampa == prova)
riga.put(format("%6ld", rec.get_long(MOV_NUMREG)), 125);
pr.print(riga);
@ -2240,6 +2239,7 @@ bool TStampa_registri_app::preprocess_print(int file, int counter)
if (file == LF_MOV)
{
long items = _cur->items();
if (!items)
return false;
_iva_array.destroy();
@ -2251,6 +2251,7 @@ bool TStampa_registri_app::preprocess_print(int file, int counter)
_esiste_riga_iva = false;
_auto_intraf = false;
_intesta_liq = false;
get_dati_ditta();
set_print_zero();
}
return true;
@ -2354,7 +2355,7 @@ bool TStampa_registri_app::preprocess_page(int file, int counter)
const bool liqdiff = !splitpay && mov.get_bool(MOV_LIQDIFF) && is_IVA_diff(mov.curr());
const tipo_movimento tm = (tipo_movimento)mov.get_int(MOV_TIPOMOV);
const bool IVAxcassa= !splitpay && !liqdiff && !_isviaggio && tm > tm_nessuno && is_IVAxCassa(mov.curr());
const bool IVAxcassa = !splitpay && !liqdiff && !_isviaggio && tm > tm_nessuno && is_IVAxCassa(mov.curr());
const TString80 descrcau = caus.get(CAU_DESCR);
@ -2794,7 +2795,7 @@ int TStampa_registri_app::stampa_intestazione()
int r = 1;
TString riga(_stampa_width);
get_dati_ditta();
// get_dati_ditta();
riga.format(FR("Ditta %ld %s %s %s %s %s"), get_firm(),
(const char*)_ragsoc, (const char*)_viafis,
(const char*)_cap, (const char*)_comunefis,