diff --git a/ca/ca3800.uml b/ca/ca3800.uml index bfc99a8ad..27dd47803 100755 --- a/ca/ca3800.uml +++ b/ca/ca3800.uml @@ -79,16 +79,23 @@ END BOOLEAN F_FASI BEGIN PROMPT 2 7 "Esplodere Fasi" + MESSAGE FALSE CLEAR,F_FASE + MESSAGE TRUE ENABLE,F_FASE +END + +STRING F_FASE 10 +BEGIN + PROMPT 20 7 "Fase " END BOOLEAN F_VITAINTERA BEGIN - PROMPT 20 7 "Includere esercizi successivi (vita intera)" + PROMPT 2 8 "Includere esercizi successivi (vita intera)" END RADIOBUTTON F_TIPOSTIMA 1 22 BEGIN - PROMPT 2 8 "Tipo di stima" + PROMPT 40 8 "Tipo di stima" FLAGS "Z" ITEM "T|Tempo" ITEM "C|Costi" diff --git a/ca/ca3883.cpp b/ca/ca3883.cpp index 8e2be3ae4..24ee0e9d8 100755 --- a/ca/ca3883.cpp +++ b/ca/ca3883.cpp @@ -623,9 +623,14 @@ void TPrint_saldana_recordset::requery() TString query; query = "USE SALDANA"; - //stampa standard non a vita intera per la 3800 - if (_tipo == 8 && !_vitaintera) - query << "\nTO ANNO=" << _anno; + if (_tipo == 8) + { + if (_use_fasi && _fase.full()) + query << " SELECT FASE=\"" << _fase << "\""; + //stampa standard non a vita intera per la 3800 + if (!_vitaintera) + query << "\nTO ANNO=" << _anno; + } TISAM_recordset saldana(query); @@ -832,6 +837,7 @@ void TPrint_saldana_recordset::set_filter(const TMask& msk) _tipostima = msk.get(F_TIPOSTIMA)[0]; _vitaintera = msk.get_bool(F_VITAINTERA); _use_fasi = msk.get_bool(F_FASI); + _fase = msk.get(F_FASE); _depth = msk.get_int(F_DEPTH); } } diff --git a/ca/ca3883.h b/ca/ca3883.h index 65a00527f..19dbe44e2 100755 --- a/ca/ca3883.h +++ b/ca/ca3883.h @@ -65,6 +65,7 @@ class TPrint_saldana_recordset : public TRecordset int _depth; bool _vitaintera, _use_fasi; char _tipostima; + TString16 _fase; protected: virtual int tipo() const { return _tipo; } diff --git a/ca/ca3883a.h b/ca/ca3883a.h index b96db2689..25254e43b 100755 --- a/ca/ca3883a.h +++ b/ca/ca3883a.h @@ -12,6 +12,7 @@ #define F_VITAINTERA 109 #define F_FASI 110 #define F_DEPTH 111 +#define F_FASE 112 //campi generati dai piani dei conti #define F_PRE0 320