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

Patch level : 12.0 1028

Browse Source 
Files correlati     : tf0.exe

Commento :

Modificato l'aggiornamento del database del trasferimento fatture. Non modificava i campi esistenti ma creava solo i campi nuovi.
Aggiornata la funzione che carica la natura IVA.
This commit is contained in:
Alessandro Bonazzi 2021-01-22 00:48:01 +01:00
parent 47e8eaaa43
commit 22c4abfcb7
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tf/tf0100.cpp
View File

@ -553,7 +553,7 @@ void TTrFa_app::log(int severity, const char* msg)
} }
} }
bool TTrFa_app::show_log() bool TTrFa_app::display_log()
{ {
bool ok = true; bool ok = true;
if (_log) if (_log)
@ -610,7 +610,6 @@ bool TTrFa_app::create_table(TScanner& tff, const TString& table)
break; break;
if (xvt_slist_find_str(fields, var) == NULL) if (xvt_slist_find_str(fields, var) == NULL)
{ {
modified = true; modified = true;
} }
else else
@ -1595,7 +1594,7 @@ bool TTrFa_app::is_new_natura(const TString& natura)
bool TTrFa_app::check_new_codici_fp(const TSheet_field& sheet) bool TTrFa_app::check_new_codici_fp(const TSheet_field& sheet)
{ {
const TDate start = fp_settings().get_date_start_new_fatt(); const TDate start = get_date_start_new_fatt();
FOR_EACH_SHEET_ROW(sheet, nr, row) FOR_EACH_SHEET_ROW(sheet, nr, row)
{ {
const TString tipodoc = row->get(cid2index(A_TIPODOCAE)); const TString tipodoc = row->get(cid2index(A_TIPODOCAE));

31
src/tf/tf0400.cpp
View File

@ -284,7 +284,10 @@ void TSpe_check_msk::fill_no_filter()
row.add(rset.get("25.IMPONIBILE").as_string(), s.cid2index(A_IMPONIBILE)); row.add(rset.get("25.IMPONIBILE").as_string(), s.cid2index(A_IMPONIBILE));
row.add(rset.get("25.IMPOSTA").as_string(), s.cid2index(A_IMPOSTA)); row.add(rset.get("25.IMPOSTA").as_string(), s.cid2index(A_IMPOSTA));
// NATURA // NATURA
row.add(natura(rset.get("25.CODIVA").as_string()), s.cid2index(A_NATURA));
TCodiceIVA iva(rset.get("25.CODIVA").as_string());
row.add(iva.natura(), s.cid2index(A_NATURA));
// DETR // DETR
row.add(find_detraib(rset.get("25.TIPODET").as_string()), s.cid2index(A_DETRAIB)); row.add(find_detraib(rset.get("25.TIPODET").as_string()), s.cid2index(A_DETRAIB));
@ -376,8 +379,14 @@ void TSpe_check_msk::fill_diff()
row.add(rset.get("IMPONIBILE").as_string(), s.cid2index(A_IMPONIBILE)); row.add(rset.get("IMPONIBILE").as_string(), s.cid2index(A_IMPONIBILE));
row.add(rset.get("IMPOSTA").as_string(), s.cid2index(A_IMPOSTA)); row.add(rset.get("IMPOSTA").as_string(), s.cid2index(A_IMPOSTA));
// NATURA // NATURA
nat.cut(0) << rset.get("NATURA").as_string(); nat = rset.get("NATURA").as_string();
row.add(nat.full() ? nat : natura(rset.get("CODIVA").as_string()), s.cid2index(A_NATURA)); if (nat.blank())
{
TCodiceIVA civa(rset.get("CODIVA").as_string());
nat = civa.natura();
}
row.add(nat, s.cid2index(A_NATURA));
// DETR // DETR
row.add(find_detraib(rset.get("TIPODET").as_string()), s.cid2index(A_DETRAIB)); row.add(find_detraib(rset.get("TIPODET").as_string()), s.cid2index(A_DETRAIB));
@ -460,7 +469,10 @@ void TSpe_check_msk::find_homeland(TToken_string& row, TString numreg, TString c
row.add(imponibile, s.cid2index(A_IMPONIBILE)); row.add(imponibile, s.cid2index(A_IMPONIBILE));
row.add(imposta, s.cid2index(A_IMPOSTA)); row.add(imposta, s.cid2index(A_IMPOSTA));
// NATURA // NATURA
row.add(natura(rec_rmov.get("CODIVA")), s.cid2index(A_NATURA));
TCodiceIVA iva(rec_rmov.get("CODIVA"));
row.add(iva.natura(), s.cid2index(A_NATURA));
// DETR // DETR
row.add(find_detraib(rec_rmov.get("TIPODET")), s.cid2index(A_DETRAIB)); row.add(find_detraib(rec_rmov.get("TIPODET")), s.cid2index(A_DETRAIB));
@ -549,8 +561,15 @@ void TSpe_check_msk::fill_cust()
row.add(rset.get("IMPONIBILE").as_string(), s.cid2index(A_IMPONIBILE)); row.add(rset.get("IMPONIBILE").as_string(), s.cid2index(A_IMPONIBILE));
row.add(rset.get("IMPOSTA").as_string(), s.cid2index(A_IMPOSTA)); row.add(rset.get("IMPOSTA").as_string(), s.cid2index(A_IMPOSTA));
// NATURA // NATURA
nat.cut(0) << rset.get("NATURA").as_string(); nat = rset.get("NATURA").as_string();
row.add(nat.full() ? nat : natura(rset.get("CODIVA").as_string()), s.cid2index(A_NATURA)); if (nat.blank())
{
TCodiceIVA civa(rset.get("CODIVA").as_string());
nat = civa.natura();
}
row.add(nat, s.cid2index(A_NATURA));
// DETR // DETR
row.add(find_detraib(rset.get("TIPODET").as_string()), s.cid2index(A_DETRAIB)); row.add(find_detraib(rset.get("TIPODET").as_string()), s.cid2index(A_DETRAIB));