diff --git a/ce/ce0400.cpp b/ce/ce0400.cpp index 5b12186ff..dc5a1b2b5 100755 --- a/ce/ce0400.cpp +++ b/ce/ce0400.cpp @@ -3,7 +3,7 @@ class TCespi_config_app : public TConfig_application { protected: - virtual const char* get_mask_name() const { return "ce0400a";} + virtual const char* get_mask_name() const { return "ce0400a"; } public: TCespi_config_app(); diff --git a/ce/ce0400a.h b/ce/ce0400a.h index 1544af561..402178ef8 100755 --- a/ce/ce0400a.h +++ b/ce/ce0400a.h @@ -13,7 +13,9 @@ #define F_DATACONS 110 #define F_ANNOTUIR 111 #define F_AMMPROP 112 +#define F_COLLCOGE 113 +#define F_SHOWCOLL 200 #define F_PLUSMINUS 201 #define F_TIPOSCRIT 202 diff --git a/ce/ce0400a.uml b/ce/ce0400a.uml index bf25bf32d..a805ce63b 100755 --- a/ce/ce0400a.uml +++ b/ce/ce0400a.uml @@ -135,8 +135,15 @@ BEGIN FIELD AMMPROP END -ENDPAGE +BOOLEAN F_COLLCOGE +BEGIN + PROMPT 1 10 "Attiva collegamento a contabilita'" + FIELD COLLCOGE + MESSAGE FALSE 11100,DLG_PAGE + MESSAGE TRUE 11101,DLG_PAGE +END +ENDPAGE PAGE "Collegamento Contabilità" -1 -1 78 10 diff --git a/ce/ce3100.h b/ce/ce3100.h index 088326d20..fb44d849d 100755 --- a/ce/ce3100.h +++ b/ce/ce3100.h @@ -15,6 +15,7 @@ #define FR_LIBROCESPITI 11 #define FR_SITUAZIONE 12 #define FR_DATASTAMPA 13 +#define FR_PAGINA 14 #define FR_CAT 21 #define FR_D_CAT 22 diff --git a/ce/ce3100a.uml b/ce/ce3100a.uml index e7e831ede..e972372d2 100755 --- a/ce/ce3100a.uml +++ b/ce/ce3100a.uml @@ -184,7 +184,7 @@ RADIOBUTTON F_TIPOREGISTRO 30 BEGIN PROMPT 2 9 "Stampa registro" ITEM "1|di Prova" - MESSAGE CLEAR,F_CODREG|DISABLE,F_CODREG + MESSAGE CLEAR,F_CODREG MESSAGE ENABLE, F_AMMORTAMENTI|ENABLE,1@ ITEM "2|Bollato" MESSAGE ENABLE,F_CODREG|"X",F_CALCOLO|CLEAR,1@ diff --git a/ce/cemenu.men b/ce/cemenu.men index 9e818b267..c8e272f0b 100755 --- a/ce/cemenu.men +++ b/ce/cemenu.men @@ -123,7 +123,7 @@ Caption = "Servizi" Picture = Module = 11 Flags = "" -Item_01 = "Cambio esercizio", "ce2 -1", "" +Item_01 = "Cambio esercizio", "ce2 -1", "F" Item_02 = "Riattribuzione percentuali", "", "" - +Item_03 = "Rispristino stampa bollato", "ce2 -4", "F" diff --git a/ce/f142.dir b/ce/f142.dir index f2d8805f0..460da5de0 100755 --- a/ce/f142.dir +++ b/ce/f142.dir @@ -1,3 +1,3 @@ 142 0 -$movce|0|0|291|0|Movimenti cespiti||| +$movce|0|0|301|0|Movimenti cespiti||| diff --git a/ce/f142.trr b/ce/f142.trr index d8d04ca17..d9b23dabf 100755 --- a/ce/f142.trr +++ b/ce/f142.trr @@ -5,7 +5,7 @@ IDMOV|1|11|0|Numero movimento (ZZZZZZZZZZZ) DTMOV|5|8|0|Data movimento cespite IDRET|1|11|0|Numero registrazione originario per rettifiche (ZZZZZZZZZZZ) CODMOV|1|1|0|Codice tipo movimento (TPMOV) -DESC|1|40|0|Descrizione aggiuntiva movimento +DESC|1|50|0|Descrizione aggiuntiva movimento TPDOC|1|2|0|Tipo documento NDOC|1|7|0|Numero documento DTDOC|5|8|0|Data documento