diff --git a/src/fp/fp0400.cpp b/src/fp/fp0400.cpp index cf07ef122..8a53f5f48 100644 --- a/src/fp/fp0400.cpp +++ b/src/fp/fp0400.cpp @@ -126,7 +126,6 @@ void TPassive_mask::fill() aggiungi_riga(clifo, sf, sf_err); } - sf.force_update(); sf.show(); sf_err.force_update(); @@ -167,7 +166,7 @@ void TPassive_mask::aggiungi_riga(TLocalisamfile& clifo, TSheet_field& sf, TShee const TString paa_piva = fp_db().sq_get("P_IVA"); const TString paa_codpaese = fp_db().sq_get("COD_PAESE"); const TString paa_codsdi = fp_db().sq_get("COD_SDI"); - TString prot = fp_db().sq_get("TIPO_PROT"); + TString prot = fp_db().sq_get("TIPO_PROT"); TToken_string& row = sf.row(-1); @@ -183,7 +182,9 @@ void TPassive_mask::aggiungi_riga(TLocalisamfile& clifo, TSheet_field& sf, TShee row.add(fp_db().sq_get_int("ANNO"), 1); row.add(fp_db().sq_get("TIPO_SDI")); row.add(fp_db().sq_get("NUM_DOC")); - row.add(fp_db().sq_get("DATA_DOC")); + // Trasformo formato data da yyyy-mm-gg a italiano + TDate date_t(fp_db().sq_get_date("DATA_DOC")); + row.add(date_t.stringa()); row.add(fp_db().sq_get("TOT_DOC")); // Dopo aver fatto le ricerche se lo trovo lo segno e lo aggiungo, se no coloro la cella diff --git a/src/fp/fp0400a.uml b/src/fp/fp0400a.uml index 2d7f77fa8..9e800ede2 100644 --- a/src/fp/fp0400a.uml +++ b/src/fp/fp0400a.uml @@ -64,8 +64,8 @@ BEGIN PROMPT 0 2 "" ITEM "" ITEM "Anno" - ITEM "Tipo SDI@4" - ITEM "Num.\nDoc.@11" + ITEM "Tipo SDI@6" + ITEM "Num.\nDoc.@20" ITEM "Data\nDoc.@10" ITEM "Totale\nDoc." ITEM "Salvato in\nFP PRO@7" @@ -166,7 +166,7 @@ BEGIN FLAGS "D" END -NUMBER S_NDOC 11 +STRING S_NDOC 20 BEGIN PROMPT 1 2 "Numero Doc. " FLAGS "D" @@ -300,7 +300,7 @@ STRING S_RAGXML 50 HELP "Ragione sociale scritta nell'xml" END -STRING S_NPROT 22 +STRING S_NPROT 32 BEGIN PROMPT 1 9 "Numero Protocollo" HELP "Numero Protocollo" diff --git a/src/xvtdb/xvtdb.cpp b/src/xvtdb/xvtdb.cpp index 885548f15..50682d293 100644 --- a/src/xvtdb/xvtdb.cpp +++ b/src/xvtdb/xvtdb.cpp @@ -541,8 +541,8 @@ const char* TXvt_recordset::get_date(const char * field) try { SADateTime app = _RCS(_recset)->Field(field).asDateTime(); - static char date[8]; - sprintf_s(date, sizeof(date), "%d%d%d", app.GetYear(), app.GetMonth(), app.GetDay()); + static char date[9]; + sprintf_s(date, sizeof(date), "%04d%02d%02d", app.GetYear(), app.GetMonth(), app.GetDay()); return date; } catch (SAException &x)