Patch level : 4.0 649

Ricompilazione Demo : [ ]
Commento            :

Riportata la versione 3.1 patch 848


git-svn-id: svn://10.65.10.50/trunk@15015 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2007-03-07 15:09:08 +00:00
parent 5330d72454
commit 34ce592fc4
9 changed files with 137 additions and 57 deletions

View File

@ -51,6 +51,7 @@
#define F_PROTOCOLLO 169
#define F_USA_DCONS 170
#define F_KILLDESC 171
#define F_SCARTI 172
#define H_DOC1 180
#define H_DOC2 181

View File

@ -492,22 +492,29 @@ BEGIN
WARNING "E' necessario specificare un codice di numerazione"
END
BOOLEAN F_ATTIVA_PROVVISORIO
BOOLEAN F_KILLDESC
BEGIN
FLAGS "HG"
MESSAGE FALSE CLEAR,F_PROVVISORIO
MESSAGE TRUE ENABLE,F_PROVVISORIO
PROMPT 45 14 "Non riportare descrizione estesa"
FIELD B10
END
BOOLEAN F_PROVVISORIO
BOOLEAN F_ORDINA
BEGIN
PROMPT 45 13 "Genera documento provvisorio"
// FIELD B5
PROMPT 45 15 "Ordina per codice"
FIELD B7
GROUP 1
END
BOOLEAN F_SCARTI
BEGIN
PROMPT 45 16 "Calcolo automatico degli scarti"
FIELD B11
GROUP 1
END
BOOLEAN F_USA_DCONS
BEGIN
PROMPT 45 14 "Usa data di consegna"
PROMPT 45 15 "Usa data di consegna"
FIELD B9
GROUP 2
END
@ -521,12 +528,6 @@ BEGIN
GROUP 3
END
BOOLEAN F_KILLDESC
BEGIN
PROMPT 45 15 "Non riportare descrizione estesa"
FIELD B10
END
BOOLEAN F_AGGIORNA_TESTATA
BEGIN
PROMPT 2 18 "Aggiorna testata dopo l'elaborazione, se il documento e' vuoto"
@ -540,13 +541,6 @@ BEGIN
GROUP 9
END
BOOLEAN F_ORDINA
BEGIN
PROMPT 50 19 "Ordina per codice"
FIELD B7
GROUP 1
END
ENDPAGE
PAGE "Parametri per raggruppamenti" -1 -1 78 20

View File

@ -76,4 +76,4 @@
#define F_ULTDATAPROV 272
#define F_EMRI 273
#define F_CNTES 274
#define F_ARCHIVE 275

View File

@ -93,6 +93,12 @@ PAGE "Numerazione documenti" -1 -1 60 14
FIELD B5
END
BOOLEAN F_ARCHIVE
BEGIN
PROMPT 2 17 "Archiviazione automatica dei documenti stampati in definitiva"
FIELD B6
END
ENDPAGE
PAGE "Tipi documento validi" -1 -1 60 14
@ -114,6 +120,8 @@ PAGE "Tipi documento validi" -1 -1 60 14
MESSAGE ENABLE,F_EMRI
ITEM "3|Ordine"
MESSAGE CLEAR,F_EMRI
ITEM "4|Scontrino"
MESSAGE ENABLE,F_EMRI
END
STRING F_TIPODOC1 4

View File

@ -22,17 +22,19 @@
#define SPP_TIPORIGA 122
#define SPP_DESCRRIGA 123
#define SPP_TIPORIT 124
#define SPP_CODTRB 125
#define SPp_CODTRB1 126
#define SPP_CDC_V1 125
#define SPP_CDC_V2 126
#define SPP_CDC_V3 127
#define SPP_CDC_V4 128
#define SPP_CDC_V1 130
#define SPP_CDC_V2 131
#define SPP_CDC_V3 132
#define SPP_CDC_V4 133
#define SPP_CDC_A1 130
#define SPP_CDC_A2 131
#define SPP_CDC_A3 132
#define SPP_CDC_A4 133
#define SPP_CDC_A1 140
#define SPP_CDC_A2 141
#define SPP_CDC_A3 142
#define SPP_CDC_A4 143
#ifndef __VETBANAL_H
#include "vetbanal.h"
#endif
#endif

View File

@ -328,8 +328,65 @@ BEGIN
ADD RUN CG0 -0
END
ENDPAGE
STRING F_TIPORIGA 4
BEGIN
PROMPT 2 18 "Tipo riga "
FIELD S8
FLAGS "U"
USE %TRI SELECT S7=="S"
INPUT CODTAB F_TIPORIGA
DISPLAY "Codice" CODTAB
DISPLAY "Descrizione@50" S0
OUTPUT F_TIPORIGA CODTAB
OUTPUT F_DESCRRIGA S0
CHECKTYPE REQUIRED
END
STRING F_DESCRRIGA 50
BEGIN
PROMPT 17 19 ""
USE %TRI KEY 2 SELECT S7=="S"
INPUT S0 F_DESCRRIGA
COPY DISPLAY F_TIPORIGA
COPY OUTPUT F_TIPORIGA
END
LISTBOX F_TIPORIT 17
BEGIN
PROMPT 2 20 "Tipo ritenuta "
FIELD S9
ITEM " |Spesa normale"
ITEM "F|Ritenuta fiscale"
ITEM "S|Ritenuta Sociale"
END
STRING F_CODTRB 4
BEGIN
PROMPT 2 21 "Cod. tributo "
FIELD S10
FLAG "U"
USE %TRB
INPUT CODTAB F_CODTRB
DISPLAY "Codice " CODTAB
DISPLAY "Descrizione@50" S0
OUTPUT F_CODTRB CODTAB
OUTPUT F_CODTRB1 S0
CHECKTYPE NORMAL
END
STRING F_CODTRB1 50
BEGIN
PROMPT 25 21 ""
USE %TRB KEY 2
INPUT S0 F_CODTRB1
DISPLAY "Descrizione@50" S0
DISPLAY "Codice " CODTAB
OUTPUT F_CODTRB CODTAB
OUTPUT F_CODTRB1 S0
CHECKTYPE NORMAL
END
ENDPAGE
PAGE "Analitica" 11 60 14
GROUPBOX DLG_NULL 78 4
@ -340,14 +397,14 @@ END
STRING DLG_NULL 8
BEGIN
PROMPT 2 1 "Codice "
PROMPT 2 1 "Codice "
GROUP 10
FLAGS "D"
END
STRING DLG_NULL 50
BEGIN
PROMPT 2 2 "Descrizione "
PROMPT 2 2 "Descrizione "
GROUP 20
FLAGS "D"
END

View File

@ -27,10 +27,12 @@
#define F_FATCOM 127
#define F_PSTAMPA2 130
#define F_NCOPIE2 131
#define F_SCONTRINO 132
#define F_STATOF_INS 150
#define F_STATOF_ST 151
#define F_STATOBLC 152
#define F_STATOCHI 153
#define F_STATOI_MOD_1 201
#define F_STATOI_MOD_2 202
@ -102,4 +104,4 @@
#define F_IVA_NS 505
#define F_GOLEM 511
#define F_ADDROW 512
#define F_ADDROW 512

View File

@ -1,6 +1,6 @@
#include "vetbtip.h"
TOOLBAR "" 0 20 60 2
TOOLBAR "" 0 -2 0 2
#include "toolbar.h"
@ -11,7 +11,7 @@ PAGE "Tipi documento" -1 -1 60 14
GROUPBOX DLG_NULL 78 3
BEGIN
PROMPT 1 0 ""
FLAG "R"
FLAGS "R"
END
STRING F_CODTAB 4
@ -26,7 +26,7 @@ BEGIN
OUTPUT F_CODTAB CODTAB
OUTPUT F_DESNUM S0
KEY 1
FLAG "UZ"
FLAGS "UZ"
END
STRING F_DESNUM 50
@ -54,16 +54,17 @@ LIST F_TIPO 24
BEGIN
PROMPT 2 4 "Tipo documento "
FIELD I1
ITEM "0|Altro" MESSAGE ENABLE,2@
ITEM "1|Bolla" MESSAGE CLEAR,2@
ITEM "2|Fattura" MESSAGE ENABLE,2@
ITEM "3|Ordine" MESSAGE CLEAR,2@
ITEM "0|Altro" MESSAGE ENABLE,2@|ENABLE,F_LORDO
ITEM "1|Bolla" MESSAGE CLEAR,2@|ENABLE,F_LORDO
ITEM "2|Fattura" MESSAGE ENABLE,2@|ENABLE,F_LORDO
ITEM "3|Ordine" MESSAGE CLEAR,2@|ENABLE,F_LORDO
ITEM "4|Scontrino" MESSAGE ENABLE,2@|DISABLE,F_LORDO|"X",F_LORDO
END
STRING F_PROFILO 8
BEGIN
PROMPT 2 5 "Profilo documento "
FIELD S4
FIELD S4[1,8]
CHECKTYPE REQUIRED
END
@ -92,7 +93,7 @@ STRING F_PSTAMPA2 8
BEGIN
PROMPT 2 8 "Profilo stampa aggiuntivo "
FIELD S5[9,16]
GROUP 4
GROUP 4
END
NUMBER F_NCOPIE2 3
@ -101,7 +102,7 @@ BEGIN
FIELD I2
FLAGS "U"
WARNING "Il numero di copie deve essere positivo"
GROUP 4
GROUP 4
END
STRING F_CODCAUS 3
@ -116,6 +117,7 @@ BEGIN
OUTPUT F_DESCAUS DESCR
CHECKTYPE NORMAL
FLAG "U"
GROUP 2
ADD RUN CG0 -4
END
@ -129,6 +131,7 @@ BEGIN
OUTPUT F_DESCAUS DESCR
OUTPUT F_CODCAUS CODCAUS
CHECKTYPE NORMAL
GROUP 2
END
STRING F_CODCAUSANT 3
@ -334,7 +337,7 @@ END
STRING F_STATOF_ST 1
BEGIN
PROMPT 29 1 "Stampa definitiva "
PROMPT 22 1 "Stampa definitiva "
FIELD S2[2,2]
COPY USE F_STATOF_INS
INPUT CODTAB F_STATOF_ST
@ -347,7 +350,7 @@ END
STRING F_STATOBLC 1
BEGIN
PROMPT 62 1 "Bloccato "
PROMPT 45 1 "Bloccato "
FIELD S2[3,3]
COPY USE F_STATOF_INS
INPUT CODTAB F_STATOBLC
@ -358,6 +361,18 @@ BEGIN
WARNING "Stato assente"
END
STRING F_STATOCHI 1
BEGIN
PROMPT 62 1 "Chiuso "
FIELD S2[4,4]
COPY USE F_STATOF_INS
INPUT CODTAB F_STATOBLC
COPY DISPLAY F_STATOF_INS
OUTPUT F_STATOBLC CODTAB
CHECKYTPE NORMAL
FLAGS "U"
WARNING "Stato assente"
END
GROUPBOX DLG_NULL 75 6
BEGIN

View File

@ -41,16 +41,17 @@ PAGE "Tipo di riga" -1 -1 60 14
LIST F_TPR 16
BEGIN
PROMPT 2 8 "Tipo "
ITEMS "M|Merce"
ITEMS "S|Spese"
ITEMS "P|Prestazioni"
ITEMS "R|Risorse"
ITEMS "A|Attrezzature"
ITEMS "C|Sconti"
ITEMS "O|Omaggi"
ITEMS "D|Descrizioni"
FIELD S7
PROMPT 2 8 "Tipo "
ITEMS "M|<M>erce"
ITEMS "S|<S>pese"
ITEMS "P|<P>restazioni"
ITEMS "R|Risorse"
ITEMS "A|Attrezzature"
ITEMS "C|S<c>onti"
ITEMS "O|<O>maggi"
ITEMS "D|<D>escrizioni"
ITEMS "T|Re<T>tifiche"
FIELD S7
END
BOOLEAN F_FORMFEED