From fd9a67ea4c6cef65ab66990a74bb12be796add5f Mon Sep 17 00:00:00 2001 From: villa Date: Mon, 14 Aug 1995 10:19:17 +0000 Subject: [PATCH] Aggiornati parametri ditta git-svn-id: svn://10.65.10.50/trunk@1708 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg5100.cpp | 7 ++++ cg/cg5100a.h | 7 +++- cg/cg5100a.uml | 104 ++++++++++++++++++++++++++++++++++++------------- 3 files changed, 89 insertions(+), 29 deletions(-) diff --git a/cg/cg5100.cpp b/cg/cg5100.cpp index f3201dc1e..67ebd76e1 100755 --- a/cg/cg5100.cpp +++ b/cg/cg5100.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "cg5100a.h" class TParametri_ditta : public TConfig_application @@ -158,6 +159,12 @@ bool TParametri_ditta::preprocess_config (TMask& mask, TConfig& config) const bool movempty = mov.empty(); mask.enable(CHK_ANCFCM, movempty); mask.enable(CHK_PCTCCM, movempty); + + // check auth for Saldaconto + if (!has_module(SCAUT, CHK_DONGLE)) + // disable saldaconting + mask.disable(-GROUP_SALDACONTO); + return TRUE; } diff --git a/cg/cg5100a.h b/cg/cg5100a.h index dc8260181..06d5bb369 100755 --- a/cg/cg5100a.h +++ b/cg/cg5100a.h @@ -55,4 +55,9 @@ #define FLD_DESLIN 154 #define FLD_DESLIC 155 #define CHK_GEST74 156 -#define CHK_INTRTR 157 \ No newline at end of file +#define CHK_INTRTR 157 +#define CHK_DTCFPG 158 +#define CHK_RIFPRO 159 + +// gruppi +#define GROUP_SALDACONTO 1@ \ No newline at end of file diff --git a/cg/cg5100a.uml b/cg/cg5100a.uml index c77a4fbf0..1aa0c7e1c 100755 --- a/cg/cg5100a.uml +++ b/cg/cg5100a.uml @@ -105,31 +105,79 @@ END BOOLEAN CHK_GESSAL BEGIN PROMPT 4 14 "Gestione saldaconto " - HELP "Indicare se attivare la gestione del saldaconto clienti/fornitori" + HELP "Indicare se attivare la gestione del saldaconto clienti/fornitori" + MESSAGE TRUE ENABLE,CHK_GESVAL + MESSAGE TRUE ENABLE,CHK_NRCLIDX + MESSAGE TRUE ENABLE,CHK_NRFORDX + MESSAGE TRUE ENABLE,CHK_DTCFPG + MESSAGE TRUE ENABLE,CHK_RIFPRO + MESSAGE TRUE ENABLE,FLD_CODLIN + MESSAGE FALSE DISABLE,CHK_GESVAL + MESSAGE FALSE DISABLE,CHK_NRCLIDX + MESSAGE FALSE DISABLE,CHK_NRFORDX + MESSAGE FALSE DISABLE,CHK_DTCFPG + MESSAGE FALSE DISABLE,CHK_RIFPRO + MESSAGE FALSE DISABLE,FLD_CODLIN FIELD GesSal + GROUP GROUP_SALDACONTO END BOOLEAN CHK_GESVAL BEGIN - PROMPT 4 15 "Gestione Valuta" + PROMPT 48 14 "Gestione Valuta" HELP "Indicare se gestire i movimenti prima nota in valuta" FIELD GesVal + GROUP GROUP_SALDACONTO END BOOLEAN CHK_NRCLIDX BEGIN - PROMPT 4 16 "N. Rif. allineato a destra per clienti" + PROMPT 4 15 "N. Rif. allineato a destra per clienti" HELP "Indicare se allineare a destra il num. di rif. delle partite nel saldaconto" FIELD NrCliDx + GROUP GROUP_SALDACONTO END BOOLEAN CHK_NRFORDX BEGIN - PROMPT 4 17 "N. Rif. allineato a destra per fornitori" + PROMPT 48 15 "e per fornitori" HELP "Indicare se allineare a destra il num. di rif. delle partite nel saldaconto" FIELD NrForDx + GROUP GROUP_SALDACONTO END +BOOLEAN CHK_DTCFPG +BEGIN + PROMPT 4 16 "Dettaglio riga C/F sui pagamenti" + HELP "Indicare se si desidera il dettaglio riga clienti/fornitori in gestione pagamenti" + FIELD DtCfPg + GROUP GROUP_SALDACONTO +END + +BOOLEAN CHK_RIFPRO +BEGIN + PROMPT 4 17 "Riferimento numero protocollo o documento" + HELP "Indicare se si desidera il numero protocollo/documento come riferimento" + FIELD RifPro + GROUP GROUP_SALDACONTO +END + +STRING FLD_CODLIN 3 +BEGIN + PROMPT 48 17 "Codice lingua" + HELP "Lingua di riferimento per rendiconti contabili" + FIELD CodLin + USE %LNG KEY 2 + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + INPUT CODTAB FLD_CODLIN + OUTPUT FLD_CODLIN CODTAB +// OUTPUT FLD_DESLIN S0 + CHECKTYPE NORMAL + GROUP GROUP_SALDACONTO +END + + ENDPAGE @@ -170,31 +218,31 @@ BEGIN END -STRING FLD_CODLIN 1 -BEGIN - PROMPT 1 3 "Codice lingua " - HELP "Lingua utilizzata" - USE %LNG - INPUT CODTAB FLD_CODLIN - DISPLAY "Codice" CODTAB - DISPLAY "Descrizione@50" S0 - OUTPUT FLD_CODLIN CODTAB - OUTPUT FLD_DESLIN S0 - CHECKTYPE NORMAL - FIELD CodLin -END +//STRING FLD_CODLIN 1 +//BEGIN +// PROMPT 1 3 "Codice lingua " +// HELP "Lingua utilizzata" +// USE %LNG +// INPUT CODTAB FLD_CODLIN +// DISPLAY "Codice" CODTAB +// DISPLAY "Descrizione@50" S0 +// OUTPUT FLD_CODLIN CODTAB +// OUTPUT FLD_DESLIN S0 +// CHECKTYPE NORMAL +// FIELD CodLin +// END -STRING FLD_DESLIN 50 35 -BEGIN - PROMPT 40 3 "" - HELP "Lingua utilizzata" - USE %LNG KEY 2 - INPUT S0 FLD_DESLIN - DISPLAY "Descrizione@50" S0 - DISPLAY "Codice" CODTAB - COPY OUTPUT FLD_CODLIN - CHECKTYPE NORMAL -END +// STRING FLD_DESLIN 50 35 +//BEGIN +// PROMPT 40 3 "" +// HELP "Lingua utilizzata" +// USE %LNG KEY 2 +// INPUT S0 FLD_DESLIN +// DISPLAY "Descrizione@50" S0 +// DISPLAY "Codice" CODTAB +// COPY OUTPUT FLD_CODLIN +// CHECKTYPE NORMAL +//END STRING FLD_COCACH 3