Corretto errore 002715

git-svn-id: svn://10.65.10.50/trunk@2023 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1995-10-26 16:12:14 +00:00
parent 1bc97f38e6
commit 2820219d0a
2 changed files with 82 additions and 79 deletions

View File

@ -4,14 +4,14 @@ TOOLBAR "" 0 19 0 3
BUTTON DLG_ATT 9 1
BEGIN
PROMPT -16 -3 "Attivita'"
MESSAGE K_F6
PROMPT -16 -3 "Attivita'"
MESSAGE K_F6
END
BUTTON DLG_ULC 9 1
BEGIN
PROMPT -26 -3 "U.Locali"
MESSAGE K_F5
PROMPT -26 -3 "U.Locali"
MESSAGE K_F5
END
BUTTON DLG_SOC 9 1
@ -33,77 +33,77 @@ PAGE "Ditte 1/4" -1 -1 77 18
NUMBER FLD_GD1_CODDITTA 5
BEGIN
PROMPT 1 1 "Codice "
FIELD LF_NDITTE->CODDITTA
FLAGS "RG"
KEY 1
USE LF_NDITTE KEY 1
INPUT CODDITTA FLD_GD1_CODDITTA
DISPLAY "Codice" CODDITTA
DISPLAY "Cognome - Nome o Ragione sociale@50" RAGSOC
OUTPUT FLD_GD1_CODDITTA CODDITTA
OUTPUT FLD_GD1_CODDITTAH CODDITTA
OUTPUT FLD_GD1_RAGSOC RAGSOC
OUTPUT FLD_GD1_RAGSOCH RAGSOC
HELP "Codice della ditta"
CHECKTYPE REQUIRED
MESSAGE COPY,1@|COPY,FLD_GD1_CODDITTAH
PROMPT 1 1 "Codice "
FIELD LF_NDITTE->CODDITTA
FLAGS "RG"
KEY 1
USE LF_NDITTE KEY 1
INPUT CODDITTA FLD_GD1_CODDITTA
DISPLAY "Codice" CODDITTA
DISPLAY "Cognome - Nome o Ragione sociale@50" RAGSOC
OUTPUT FLD_GD1_CODDITTA CODDITTA
OUTPUT FLD_GD1_CODDITTAH CODDITTA
OUTPUT FLD_GD1_RAGSOC RAGSOC
OUTPUT FLD_GD1_RAGSOCH RAGSOC
HELP "Codice della ditta"
CHECKTYPE REQUIRED
MESSAGE COPY,1@|COPY,FLD_GD1_CODDITTAH
END
NUMBER FLD_GD1_CODDITTAH 5
BEGIN
PROMPT 1 1 "Codice "
KEY 1
HELP "Codice della ditta"
FIELD LF_NDITTE->CODDITTA
FLAGS "RG"
USE LF_NDITTE KEY 3
INPUT TIPOA FLD_GD1_TIPOA SELECT
INPUT CODANAGR FLD_GD1_CODANAGR SELECT
INPUT CODDITTA FLD_GD1_CODDITTAH
COPY DISPLAY FLD_GD1_CODDITTA
PROMPT 1 1 "Codice "
KEY 1
HELP "Codice della ditta"
FIELD LF_NDITTE->CODDITTA
FLAGS "RG"
USE LF_NDITTE KEY 3
INPUT TIPOA FLD_GD1_TIPOA SELECT
INPUT CODANAGR FLD_GD1_CODANAGR SELECT
INPUT CODDITTA FLD_GD1_CODDITTAH
COPY DISPLAY FLD_GD1_CODDITTA
COPY OUTPUT FLD_GD1_CODDITTA
CHECKTYPE REQUIRED
MESSAGE COPY,1@|COPY,FLD_GD1_CODDITTA
CHECKTYPE REQUIRED
MESSAGE COPY,1@|COPY,FLD_GD1_CODDITTA
END
STRING FLD_GD1_RAGSOC 50
BEGIN
PROMPT 1 2 "Ragione sociale "
FIELD LF_NDITTE->RAGSOC
KEY 2
USE LF_NDITTE KEY 2
INPUT RAGSOC FLD_GD1_RAGSOC
DISPLAY "Cognome - Nome o Ragione sociale@50" RAGSOC
DISPLAY "Codice" CODDITTA
COPY OUTPUT FLD_GD1_CODDITTA
PROMPT 1 2 "Ragione sociale "
FIELD LF_NDITTE->RAGSOC
KEY 2
USE LF_NDITTE KEY 2
INPUT RAGSOC FLD_GD1_RAGSOC
DISPLAY "Cognome - Nome o Ragione sociale@50" RAGSOC
DISPLAY "Codice" CODDITTA
COPY OUTPUT FLD_GD1_CODDITTA
HELP "Ragione sociale della ditta"
WARNING "La ragione sociale e' obbligatoria"
CHECKTYPE REQUIRED
FLAGS "G"
MESSAGE COPY,2@|COPY,FLD_GD1_RAGSOCH
CHECKTYPE REQUIRED
FLAGS "G"
MESSAGE COPY,2@|COPY,FLD_GD1_RAGSOCH
END
STRING FLD_GD1_RAGSOCH 50
BEGIN
PROMPT 1 2 "Ragione sociale "
FIELD LF_NDITTE->RAGSOC
KEY 2
USE LF_NDITTE KEY 2 SELECT (TIPOA==#FLD_GD1_TIPOA) && (CODANAGR==#FLD_GD1_CODANAGR)
COPY INPUT FLD_GD1_RAGSOC
COPY DISPLAY FLD_GD1_RAGSOC
COPY OUTPUT FLD_GD1_RAGSOC
PROMPT 1 2 "Ragione sociale "
FIELD LF_NDITTE->RAGSOC
KEY 2
USE LF_NDITTE KEY 2 SELECT (TIPOA==#FLD_GD1_TIPOA) && (CODANAGR==#FLD_GD1_CODANAGR)
COPY INPUT FLD_GD1_RAGSOC
COPY DISPLAY FLD_GD1_RAGSOC
COPY OUTPUT FLD_GD1_RAGSOC
HELP "Ragione sociale della ditta"
WARNING "La ragione sociale e' obbligatoria"
CHECKTYPE REQUIRED
MESSAGE COPY,2@|COPY,FLD_GD1_RAGSOC
CHECKTYPE REQUIRED
MESSAGE COPY,2@|COPY,FLD_GD1_RAGSOC
FLAGS "HG"
END
GROUPBOX DLG_NULL 76 4
BEGIN
PROMPT 0 0 ""
FLAGS "R"
FLAGS "R"
END
GROUPBOX DLG_NULL 76 4
@ -137,7 +137,7 @@ BEGIN
HELP "Codice della anagrafica di riferimento"
CHECKTYPE REQUIRED
WARNING "Anagrafica assente"
ADD RUN ba4 -1
ADD RUN ba4 -1 #FLD_GD1_TIPOA
END
STRING FLD_GD1_CODANAGR_ANAGR_RAGSOC 50
@ -153,7 +153,7 @@ BEGIN
OUTPUT FLD_GD1_TIPOA TIPOA
OUTPUT FLD_GD1_CODANAGR CODANAGR
OUTPUT FLD_GD1_CODANAGR_ANAGR_RAGSOC RAGSOC
ADD RUN ba4 -1
ADD RUN ba4 -1 #FLD_GD1_TIPOA
END
GROUPBOX DLG_NULL 76 4
@ -230,7 +230,7 @@ PAGE "Ditte 2/4" -1 -1 77 18
GROUPBOX DLG_NULL 76 4
BEGIN
PROMPT 0 0 ""
FLAGS "R"
FLAGS "R"
END
NUMBER DLG_NULL 5
@ -281,7 +281,7 @@ BEGIN
FIELD LF_NDITTE->NISCRAA
FLAGS "R"
HELP "Numero di iscrizione all'albo"
GROUP 3
GROUP 3
END
DATE FLD_GD1_DATAISCRAA
@ -292,7 +292,7 @@ BEGIN
HELP "Data di iscrizione all'albo"
WARNING "Data non coerente"
VALIDATE DATE_CMP_FUNC >= FLD_GD2_DINIZIOATT
GROUP 3
GROUP 3
END
STRING FLD_GD1_COMAA 4
@ -311,7 +311,7 @@ BEGIN
CHECKTYPE NORMAL
WARNING "Comune assente"
ADD RUN ba4 -0
GROUP 3
GROUP 3
END
STRING FLD_GD1_CAPAA 5
@ -320,7 +320,7 @@ BEGIN
FIELD LF_NDITTE->CAPAA
FLAGS "RZ"
HELP "CAP del comune in cui e' iscritta all'albo"
GROUP 3
GROUP 3
END
STRING FLD_GD1_COMAA_COMUNI_DESCR 50
@ -334,7 +334,7 @@ BEGIN
OUTPUT FLD_GD1_COMAA_COMUNI_DESCR DENCOM
OUTPUT FLD_GD1_CAPAA CAPCOM
ADD RUN ba4 -0
GROUP 3
GROUP 3
END
BOOLEAN CHK_GD1_CONTORD
@ -372,7 +372,7 @@ PAGE "Ditte 3/4" -1 -1 77 18
GROUPBOX DLG_NULL 76 4
BEGIN
PROMPT 0 0 ""
FLAGS "R"
FLAGS "R"
END
NUMBER DLG_NULL 5
@ -561,7 +561,7 @@ PAGE "Ditte 4/4" -1 -1 77 18
GROUPBOX DLG_NULL 76 4
BEGIN
PROMPT 0 0 ""
FLAGS "R"
FLAGS "R"
END
NUMBER DLG_NULL 5
@ -602,7 +602,7 @@ BEGIN
PROMPT 17 5 ""
HELP "Nome del firmatario degli atti"
USE LF_ANAG KEY 2
INPUT TIPOA "F"
INPUT TIPOA "F"
INPUT RAGSOC FLD_GD3_FIRMAT_ANAGR_RAGSOC
DISPLAY "Nome@50" RAGSOC
DISPLAY "Tipo" TIPOA
@ -659,20 +659,20 @@ BEGIN
PROMPT 1 8 "Carica "
FIELD LF_NDITTE->CARRAPP
HELP "Codice della carica del rappresentante legale"
ITEMS " |Nessun rappresentante"
MESSAGE RESET,4@|DISABLE,4@
ITEMS "1|Rappresentante legale"
MESSAGE ENABLE,4@
ITEMS "2|Curatore fallimentare"
MESSAGE ENABLE,4@
ITEMS "3|Liquidatore"
MESSAGE ENABLE,4@
ITEMS "4|Socio amministratore"
MESSAGE ENABLE,4@
ITEMS "5|Erede"
MESSAGE ENABLE,4@
ITEMS "6|Curatore di eredita'"
MESSAGE ENABLE,4@
ITEMS " |Nessun rappresentante"
MESSAGE RESET,4@|DISABLE,4@
ITEMS "1|Rappresentante legale"
MESSAGE ENABLE,4@
ITEMS "2|Curatore fallimentare"
MESSAGE ENABLE,4@
ITEMS "3|Liquidatore"
MESSAGE ENABLE,4@
ITEMS "4|Socio amministratore"
MESSAGE ENABLE,4@
ITEMS "5|Erede"
MESSAGE ENABLE,4@
ITEMS "6|Curatore di eredita'"
MESSAGE ENABLE,4@
END
DATE FLD_GD3_DECCARRAPP

View File

@ -1592,8 +1592,11 @@ bool TBrowse::do_insert()
app << _fld->mask().get(id);
while (isspace(*f)) ++f;
while (isdigit(*f)) ++f;
app << ' ';
}
if (*f)
app << ' ' << *f;
else
break;
}
else
app << *f;
}