root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'R_10_00' of http://10.65.20.17:7990/scm/campo/campo into R_10_00

Browse Source
This commit is contained in:
AlexBonazzi 2018-06-26 23:38:35 +02:00
commit 8f72f35ef0
3 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ve/velib.h
View File

@ -318,6 +318,8 @@ public:
const TString & caus_mov() const {return get("S9"); } // Causale di magazzino const TString & caus_mov() const {return get("S9"); } // Causale di magazzino
const TString & caus_anticipo() const {return get("S10"); } const TString & caus_anticipo() const {return get("S10"); }
const TString & tipi_iva_validi() const {return get("S11"); } const TString & tipi_iva_validi() const {return get("S11"); }
// Ritorna il ripo documento in formato SDI (TD01, TD02 ..)
const TString & tipo_doc_sdi() const { return get("S12"); }
const char stato_finale_inserimento() const {return get("S2")[0]; } const char stato_finale_inserimento() const {return get("S2")[0]; }
const char stato_finale_stampa() const {return get("S2")[1]; } const char stato_finale_stampa() const {return get("S2")[1]; }
const char stato_bloccato() const {return get("S2")[2]; } const char stato_bloccato() const {return get("S2")[2]; }
@ -349,6 +351,7 @@ public:
bool fattura_commerciale() const { return get_bool("B9"); } bool fattura_commerciale() const { return get_bool("B9"); }
bool allega_documenti() const { return get_bool("B10"); } bool allega_documenti() const { return get_bool("B10"); }
bool auto_add() const { return get_bool("B11"); } bool auto_add() const { return get_bool("B11"); }
bool invio_xml() const { return get_bool("B12"); }
const TString& stringa_descrizione_documento() const { return _str_desc_doc; } const TString& stringa_descrizione_documento() const { return _str_desc_doc; }
const TString& stringa_descrizione_riga() const { return _str_desc_rdoc; } const TString& stringa_descrizione_riga() const { return _str_desc_rdoc; }

2
src/ve/vetbtip.h
View File

@ -1,6 +1,8 @@
#define F_CODTAB 101 #define F_CODTAB 101
#define FT_DESNUM 102 #define FT_DESNUM 102
#define F_PROFILO 103 #define F_PROFILO 103
#define F_TIPO_SDI 134
#define F_ESPORTA_FP 135
#define F_PSTAMPA 104 #define F_PSTAMPA 104
#define F_CODCAUS 105 #define F_CODCAUS 105
#define F_DESCAUS 106 #define F_DESCAUS 106

71
src/ve/vetbtip.uml
View File

@ -82,14 +82,33 @@ BEGIN
CHECKTYPE REQUIRED CHECKTYPE REQUIRED
END END
LIST F_TIPO_SDI 35
BEGIN
PROMPT 2 5 "Tipo documento SDI "
FIELD S12
ITEM "|"
ITEM "TD01|TD01 Fattura" MESSAGE ENABLE,F_NOTACREDDEB|""
ITEM "TD02|TD02 Acconto/Anticipo su fattura" MESSAGE ENABLE,F_NOTACREDDEB|""
ITEM "TD03|TD03 Acconto/Anticipo su parcella" MESSAGE ENABLE,F_NOTACREDDEB|""
ITEM "TD04|TD04 Nota di credito" MESSAGE ENABLE,F_NOTACREDDEB|"X"
ITEM "TD05|TD05 Nota di debito" MESSAGE ENABLE,F_NOTACREDDEB|"X"
ITEM "TD06|TD06 parcella" MESSAGE ENABLE,F_NOTACREDDEB|""
END
BOOLEAN F_ESPORTA_FP
BEGIN
PROMPT 65 5 "Invio XML"
FIELD B12
END
GROUPBOX DLG_NULL 78 5 GROUPBOX DLG_NULL 78 5
BEGIN BEGIN
PROMPT 1 5 "@bProfili di stampa" PROMPT 1 6 "@bProfili di stampa"
END END
STRING F_PSTAMPA 8 STRING F_PSTAMPA 8
BEGIN BEGIN
PROMPT 2 6 "Profilo stampa principale " PROMPT 2 7 "Profilo stampa principale "
FIELD S5[1,8] FIELD S5[1,8]
MESSAGE EMPTY CLEAR,4@ MESSAGE EMPTY CLEAR,4@
MESSAGE ENABLE,4@ MESSAGE ENABLE,4@
@ -97,27 +116,27 @@ END
NUMBER FT_NCOPIE 3 NUMBER FT_NCOPIE 3
BEGIN BEGIN
PROMPT 42 6 "Numero di copie " PROMPT 42 7 "Numero di copie "
FIELD I0 FIELD I0
FLAGS "U" FLAGS "U"
END END
STRING F_PMAIL 8 STRING F_PMAIL 8
BEGIN BEGIN
PROMPT 2 7 "Profilo per invio e-mail " PROMPT 2 8 "Profilo per invio e-mail "
FIELD S5[17,24] FIELD S5[17,24]
END END
STRING F_PSTAMPA2 8 STRING F_PSTAMPA2 8
BEGIN BEGIN
PROMPT 2 8 "Profilo stampa aggiuntivo " PROMPT 2 9 "Profilo stampa aggiuntivo "
FIELD S5[9,16] FIELD S5[9,16]
GROUP 4 GROUP 4
END END
NUMBER F_NCOPIE2 3 NUMBER F_NCOPIE2 3
BEGIN BEGIN
PROMPT 42 8 "Numero di copie " PROMPT 42 9 "Numero di copie "
FIELD I2 FIELD I2
FLAGS "U" FLAGS "U"
WARNING "Il numero di copie deve essere positivo" WARNING "Il numero di copie deve essere positivo"
@ -126,7 +145,7 @@ END
STRING F_CODCAUS 3 STRING F_CODCAUS 3
BEGIN BEGIN
PROMPT 2 10 "Causale contabile " PROMPT 2 11 "Causale contabile "
FIELD S6 FIELD S6
USE LF_CAUSALI USE LF_CAUSALI
INPUT CODCAUS F_CODCAUS INPUT CODCAUS F_CODCAUS
@ -142,7 +161,7 @@ END
STRING F_DESCAUS 50 STRING F_DESCAUS 50
BEGIN BEGIN
PROMPT 26 10 "" PROMPT 26 11 ""
USE LF_CAUSALI KEY 2 USE LF_CAUSALI KEY 2
INPUT DESCR F_DESCAUS INPUT DESCR F_DESCAUS
DISPLAY "Descrizione@50" DESCR DISPLAY "Descrizione@50" DESCR
@ -155,7 +174,7 @@ END
STRING F_CODCAUSANT 3 STRING F_CODCAUSANT 3
BEGIN BEGIN
PROMPT 2 11 "Causale anticipo " PROMPT 2 12 "Causale anticipo "
FIELD S10 FIELD S10
USE LF_CAUSALI SELECT REG =="" USE LF_CAUSALI SELECT REG ==""
INPUT CODCAUS F_CODCAUSANT INPUT CODCAUS F_CODCAUSANT
@ -170,7 +189,7 @@ END
STRING F_DESCAUSANT 50 STRING F_DESCAUSANT 50
BEGIN BEGIN
PROMPT 26 11 "" PROMPT 26 12 ""
USE LF_CAUSALI KEY 2 USE LF_CAUSALI KEY 2
INPUT DESCR F_DESCAUSANT INPUT DESCR F_DESCAUSANT
DISPLAY "Descrizione@50" DESCR DISPLAY "Descrizione@50" DESCR
@ -183,13 +202,13 @@ END
BOOLEAN F_NOTACREDDEB BOOLEAN F_NOTACREDDEB
BEGIN BEGIN
PROMPT 2 12 "Nota di credito/debito" PROMPT 2 13 "Nota di credito/debito"
FIELD B7 FIELD B7
END END
BOOLEAN F_LORDO BOOLEAN F_LORDO
BEGIN BEGIN
PROMPT 40 12 "Calcolo importi al lordo" PROMPT 40 13 "Calcolo importi al lordo"
FIELD B8 FIELD B8
MESSAGE TRUE CLEAR,F_FATCOM MESSAGE TRUE CLEAR,F_FATCOM
MESSAGE FALSE ENABLE,F_FATCOM MESSAGE FALSE ENABLE,F_FATCOM
@ -197,19 +216,19 @@ END
BOOLEAN F_SPESEAUT BOOLEAN F_SPESEAUT
BEGIN BEGIN
PROMPT 2 13 "Addebito automatico spese cliente" PROMPT 2 14 "Addebito automatico spese cliente"
FIELD B0 FIELD B0
END END
BOOLEAN F_FATCOM BOOLEAN F_FATCOM
BEGIN BEGIN
PROMPT 40 13 "Calcolo fattura commerciale" PROMPT 40 14 "Calcolo fattura commerciale"
FIELD B9 FIELD B9
END END
BOOLEAN F_MOVMAG BOOLEAN F_MOVMAG
BEGIN BEGIN
PROMPT 2 14 "Mov. magazzino" PROMPT 2 15 "Mov. magazzino"
FIELD B1 FIELD B1
MESSAGE FALSE CLEAR,1@ MESSAGE FALSE CLEAR,1@
MESSAGE TRUE ENABLE,1@ MESSAGE TRUE ENABLE,1@
@ -219,7 +238,7 @@ END
STRING F_STATO_MOV_I 1 STRING F_STATO_MOV_I 1
BEGIN BEGIN
PROMPT 24 14 "dallo stato " PROMPT 24 15 "dallo stato "
FIELD S7 FIELD S7
USE %STD USE %STD
INPUT CODTAB F_STATO_MOV_I INPUT CODTAB F_STATO_MOV_I
@ -234,7 +253,7 @@ END
STRING F_STATO_MOV_F 1 STRING F_STATO_MOV_F 1
BEGIN BEGIN
PROMPT 42 14 "allo stato " PROMPT 42 15 "allo stato "
FIELD S8 FIELD S8
COPY USE F_STATO_MOV_I COPY USE F_STATO_MOV_I
INPUT CODTAB F_STATO_MOV_F INPUT CODTAB F_STATO_MOV_F
@ -249,14 +268,14 @@ END
BOOLEAN F_SCARES BOOLEAN F_SCARES
BEGIN BEGIN
PROMPT 58 14 "Scarica il residuo" PROMPT 58 15 "Scarica il residuo"
FIELD B4 FIELD B4
GROUP 1 GROUP 1
END END
STRING F_CAUS_MAG 5 STRING F_CAUS_MAG 5
BEGIN BEGIN
PROMPT 2 15 "Causale magazzino " PROMPT 2 16 "Causale magazzino "
FIELD S9 FIELD S9
USE %CAU USE %CAU
INPUT CODTAB F_CAUS_MAG INPUT CODTAB F_CAUS_MAG
@ -272,7 +291,7 @@ END
STRING F_DESCAUS_MAG 50 48 STRING F_DESCAUS_MAG 50 48
BEGIN BEGIN
PROMPT 28 15 "" PROMPT 28 16 ""
USE %CAU KEY 2 USE %CAU KEY 2
INPUT S0 F_DESCAUS_MAG INPUT S0 F_DESCAUS_MAG
DISPLAY "Descrizione@50" S0 DISPLAY "Descrizione@50" S0
@ -285,19 +304,19 @@ END
BOOLEAN F_STATV BOOLEAN F_STATV
BEGIN BEGIN
PROMPT 2 16 "Attivo per le statistiche di vendita" PROMPT 2 17 "Attivo per le statistiche di vendita"
FIELD B2 FIELD B2
END END
BOOLEAN F_CLIFO_OPT BOOLEAN F_CLIFO_OPT
BEGIN BEGIN
PROMPT 44 16 "Cliente/Fornitore non obbligatorio" PROMPT 44 17 "Cliente/Fornitore non obbligatorio"
FIELD B5 FIELD B5
END END
BOOLEAN FT_PROVV BOOLEAN FT_PROVV
BEGIN BEGIN
PROMPT 2 17 "Attivo per le provvigioni" PROMPT 2 18 "Attivo per le provvigioni"
FIELD B3 FIELD B3
MESSAGE FALSE CLEAR,3@ MESSAGE FALSE CLEAR,3@
MESSAGE TRUE ENABLE,3@ MESSAGE TRUE ENABLE,3@
@ -305,7 +324,7 @@ END
STRING F_STATO_PROVV 1 STRING F_STATO_PROVV 1
BEGIN BEGIN
PROMPT 44 17 "Stato " PROMPT 44 18 "Stato "
FIELD S3[1,1] FIELD S3[1,1]
USE %STD USE %STD
INPUT CODTAB F_STATO_PROVV INPUT CODTAB F_STATO_PROVV
@ -320,13 +339,13 @@ END
BOOLEAN F_CONAI BOOLEAN F_CONAI
BEGIN BEGIN
PROMPT 2 18 "Addebito CONAI" PROMPT 2 19 "Addebito CONAI"
FIELD B6 FIELD B6
END END
BOOLEAN F_QUADRO BOOLEAN F_QUADRO
BEGIN BEGIN
PROMPT 44 18 "Ordine quadro" PROMPT 44 19 "Ordine quadro"
FIELD B12 FIELD B12
END END