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

Patch level : 12.0 732

Browse Source 
Files correlati     : cg3.exe
Commento            :

Corretta stampa e visualizzazione mastrini per competenza IVA
This commit is contained in:
AlexBonazzi 2019-03-15 23:19:20 +01:00
parent 2ce184ed81
commit 10fdb3bf5f
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cg/cg3200.cpp
View File

@ -573,6 +573,9 @@ bool TMastrini_application::almeno_un_record()
rmov.put(RMV_CONTO, _conto); rmov.put(RMV_CONTO, _conto);
rmov.put(RMV_SOTTOCONTO, _sottoc); rmov.put(RMV_SOTTOCONTO, _sottoc);
TCursor cur(&rel, "", 2, &rmov, &rmov); TCursor cur(&rel, "", 2, &rmov, &rmov);
TDate fine = _data_fine;
if (_data_liq_iva)
fine.addmonth();
const long items = cur.items(); const long items = cur.items();
cur.freeze(); cur.freeze();
for (cur = 0L; cur.pos() < items; ++cur) for (cur = 0L; cur.pos() < items; ++cur)
@ -580,7 +583,7 @@ bool TMastrini_application::almeno_un_record()
const int annoes = rmov.get_int (RMV_ANNOES); const int annoes = rmov.get_int (RMV_ANNOES);
const TString4 provvis (mov.get(MOV_PROVVIS)); const TString4 provvis (mov.get(MOV_PROVVIS));
const TDate datareg = get_filter_date(mov, rmov); const TDate datareg = get_filter_date(mov, rmov);
if ( ((annoes==_annomsk) || (_annomsk==0)) && ((datareg>=_data_ini) && (datareg<=_data_fine)) && (_stampa_mov_prov || provvis.blank())) if ( ((annoes==_annomsk) || (_annomsk==0)) && ((datareg>=_data_ini) && (datareg<=fine)) && (_stampa_mov_prov || provvis.blank()))
{ {
trovato = true; trovato = true;
break; break;
@ -1436,16 +1439,7 @@ bool TMastrini_application::preprocess_page(int file, int counter)
{ {
_sezione = rmov.get(RMV_SEZIONE); _sezione = rmov.get(RMV_SEZIONE);
_datareg = get_filter_date(mov, rmov.curr()); _datareg = get_filter_date(mov, rmov.curr());
_datareg_stampa = mov.get(MOV_DATAREG);
if (_data_liq_iva)
_datareg_stampa = _datareg;
else
{
if (_annomsk == 0)
_datareg_stampa = _datareg;
else
_datareg_stampa = mov.get(MOV_DATAREG);
}
const TString4 provvis = mov.get(MOV_PROVVIS); const TString4 provvis = mov.get(MOV_PROVVIS);

4
src/cg/cg3600.cpp
View File

@ -506,9 +506,11 @@ void TMastrino::read(const TBill& conto,
continue; continue;
} }
const TDate data = TDate(rmov_datareg);
TRiga_mastrino* r = new TRiga_mastrino(riga_mastrino, TRiga_mastrino* r = new TRiga_mastrino(riga_mastrino,
rmov().recno(), mov().recno(), rmov().recno(), mov().recno(),
_pdare_per, _pavere_per, data_corrente); _pdare_per, _pavere_per, data);
_riga.append(r); _riga.append(r);
} }
} }