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

Patch level : 12.0 762

Browse Source 
Files correlati     : fp
Commento            :
- Corretta abilitazione bottoni
- Cambiato ordine data ordinamento fp0400 con default "ricezione"
-
This commit is contained in:
Sirio Builder 2019-04-08 11:19:21 +02:00
parent c08c290f80
commit c35d53f678
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fp/fp0300.cpp
View File

@ -158,9 +158,9 @@ void TPA_mask::fill()
enable(DLG_FINDREC); enable(DLG_FINDREC);
enable(DLG_PRINT); enable(DLG_PRINT);
#else #else
enable(DLG_OK, filter_selected != "X" && filter_selected != "P"); enable(DLG_OK, filter_selected.empty() || filter_selected == "E");
enable(DLG_SAVEREC, (fp_settings().is_f8() && filter_selected == "X") || filter_selected == "P"); enable(DLG_SAVEREC, (fp_settings().is_f8() && filter_selected == "X") || filter_selected == "D");
enable(DLG_FINDREC, filter_selected == "P"); enable(DLG_FINDREC, filter_selected == "D");
enable(DLG_PRINT, _enable_chiave_fixer && filter_selected == "X"); enable(DLG_PRINT, _enable_chiave_fixer && filter_selected == "X");
#endif #endif

2
src/fp/fp0400.cpp
View File

@ -124,7 +124,7 @@ void TPassive_mask::fill()
"WHERE P7_DATA >= \'" << dal.date2ansi() << "\' AND P7_DATA <= \'" << al.date2ansi() << "\'" << prots_query << "\n" << "WHERE P7_DATA >= \'" << dal.date2ansi() << "\' AND P7_DATA <= \'" << al.date2ansi() << "\'" << prots_query << "\n" <<
"GROUP BY YEAR(P7_DATA), P7_TIPODOC, P7_NUMERO, P7_DATA, PZ_DATAORARIC, PQ_IMPTOTDOC, PZ_NUMREGCONT, PZ_DATAREGCONT, P2_ANADENOMIN, P2_ANANOME, P2_ANACOGNOME, P2_FISCIVACOD, P2_CODFISCALE, P2_FISCIVAPAESE,\n" << "GROUP BY YEAR(P7_DATA), P7_TIPODOC, P7_NUMERO, P7_DATA, PZ_DATAORARIC, PQ_IMPTOTDOC, PZ_NUMREGCONT, PZ_DATAREGCONT, P2_ANADENOMIN, P2_ANANOME, P2_ANACOGNOME, P2_FISCIVACOD, P2_CODFISCALE, P2_FISCIVAPAESE,\n" <<
"P1_CODDEST, PU_PEC, P1_KEYPRGINVIO, P1_KEYHEADERFATT, P1_KEYBODYFATT, PZ_TIPOPROT, PZ_NUMPROT, PZ_ANNOPROT, PZ_TIPOCF, PZ_CLIFOR\n" << "P1_CODDEST, PU_PEC, P1_KEYPRGINVIO, P1_KEYHEADERFATT, P1_KEYBODYFATT, PZ_TIPOPROT, PZ_NUMPROT, PZ_ANNOPROT, PZ_TIPOCF, PZ_CLIFOR\n" <<
"ORDER BY " << (ordin == "R"? "PZ_DATAORARIC" : "P7_DATA") << " " << (verso_ord == "C"? "ASC" : "DESC"); "ORDER BY " << (ordin == "D"? "P7_DATA" : "PZ_DATAORARIC") << " " << (verso_ord == "C"? "ASC" : "DESC");
fp_db().sq_set_exec(query, false); fp_db().sq_set_exec(query, false);
_list_fatt_err.clear(); _list_fatt_err.clear();

4
src/fp/fp0400a.uml
View File

@ -60,8 +60,8 @@ END
RADIOBUTTON F_FATTORD 20 20 RADIOBUTTON F_FATTORD 20 20
BEGIN BEGIN
PROMPT 1 5 "Ordinamento fatture per " PROMPT 1 5 "Ordinamento fatture per "
ITEM "|Data Documento" ITEM "|Data Ricezione"
ITEM "R|Data Ricezione" ITEM "D|Data Documento"
FLAGS "" FLAGS ""
END END