diff --git a/ve/bolacq.src b/ve/bolacq.src
index e37a52603..41499e505 100755
--- a/ve/bolacq.src
+++ b/ve/bolacq.src
@@ -49,6 +49,8 @@ COMCF = S_DISABILITATO //100
DENCOM = S_DISABILITATO //100
STATOCF = S_DISABILITATO //100
DESSTATOCF = S_DISABILITATO //100
+CONTR122 = S_NORMALE //100
+CONTSEP = S_NORMALE //100
CODVAL1 = S_NORMALE //200
CODVAL2 = S_NORMALE //200
NOME_VAL1 = S_NORMALE //200
diff --git a/ve/bollac.src b/ve/bollac.src
index 5be18276c..ecc6b0411 100755
--- a/ve/bollac.src
+++ b/ve/bollac.src
@@ -47,6 +47,8 @@ COMCF = S_DISABILITATO //100
DENCOM = S_DISABILITATO //100
STATOCF = S_DISABILITATO //100
DESSTATOCF = S_DISABILITATO //100
+CONTR122 = S_NORMALE //100
+CONTSEP = S_NORMALE //100
CODVAL1 = S_NORMALE //200
CODVAL2 = S_NORMALE //200
NOME_VAL1 = S_NORMALE //200
diff --git a/ve/f33.dir b/ve/f33.dir
index db0c3bc54..60a212954 100755
--- a/ve/f33.dir
+++ b/ve/f33.dir
@@ -1,3 +1,3 @@
33
0
-$doc|0|0|584|0|Documenti di vendita|||
+$doc|0|0|608|0|Documenti di vendita|||
diff --git a/ve/f33.trr b/ve/f33.trr
index a925c4d26..b605ff121 100755
--- a/ve/f33.trr
+++ b/ve/f33.trr
@@ -1,5 +1,5 @@
33
-89
+91
CODNUM|1|4|0|Codice della numerazione
ANNO|2|4|0|Anno
PROVV|1|1|0|Tipo numerazione
rovvisorio efinitivo
@@ -89,6 +89,8 @@ DATACOMP|5|8|0|Data inizio competenza in analitica
DATAFCOMP|5|8|0|Data fine competenza in analitica
CUP|1|15|0|Codice Unico di Progetto
CIG|1|10|0|Codice Identificativo di Gara
+CONTRATTO|1|18|0|Contratto con importo > 3000 Euro
+CONTSEP|1|6|0|Contabilita' separata
4
PROVV+ANNO+CODNUM+NDOC|
TIPOCF+CODCF+PROVV+ANNO+DATADOC+CODNUM+NDOC|X
diff --git a/ve/fatacq.src b/ve/fatacq.src
index c3b5850fa..768099851 100755
--- a/ve/fatacq.src
+++ b/ve/fatacq.src
@@ -46,6 +46,8 @@ COMCF = S_DISABILITATO //100
DENCOM = S_DISABILITATO //100
STATOCF = S_DISABILITATO //100
DESSTATOCF = S_DISABILITATO //100
+CONTR122 = S_NORMALE //100
+CONTSEP = S_NORMALE //100
CODVAL1 = S_NORMALE //200
CODVAL2 = S_NORMALE //200
NOME_VAL1 = S_NORMALE //200
diff --git a/ve/fatturaa.src b/ve/fatturaa.src
index 3bcfc21e8..bdd090001 100755
--- a/ve/fatturaa.src
+++ b/ve/fatturaa.src
@@ -47,6 +47,8 @@ COMCF = S_DISABILITATO //100
DENCOM = S_DISABILITATO //100
STATOCF = S_DISABILITATO //100
DESSTATOCF = S_DISABILITATO //100
+CONTR122 = S_NORMALE //100
+CONTSEP = S_NORMALE //100
CODVAL1 = S_NORMALE //200
CODVAL2 = S_NORMALE //200
NOME_VAL1 = S_NORMALE //200
diff --git a/ve/fatturac.src b/ve/fatturac.src
index a8a81089c..8f7e4cad6 100755
--- a/ve/fatturac.src
+++ b/ve/fatturac.src
@@ -43,6 +43,8 @@ COMCF = S_DISABILITATO //100
DENCOM = S_DISABILITATO //100
STATOCF = S_DISABILITATO //100
DESSTATOCF = S_DISABILITATO //100
+CONTR122 = S_NORMALE //100
+CONTSEP = S_NORMALE //100
CODVAL1 = S_NORMALE //200
CODVAL2 = S_NORMALE //200
NOME_VAL1 = S_NORMALE //200
diff --git a/ve/ordinec.src b/ve/ordinec.src
index 0426ddafd..9833cba07 100755
--- a/ve/ordinec.src
+++ b/ve/ordinec.src
@@ -54,6 +54,8 @@ COMCF = S_DISABILITATO //100
DENCOM = S_DISABILITATO //100
STATOCF = S_DISABILITATO //100
DESSTATOCF = S_DISABILITATO //100
+CONTR122 = S_NORMALE //100
+CONTSEP = S_NORMALE //100
CODVAL1 = S_NORMALE //200
CODVAL2 = S_NORMALE //200
NOME_VAL1 = S_NORMALE //200
diff --git a/ve/ordinef.src b/ve/ordinef.src
index 72e5a9aba..0ad88e077 100755
--- a/ve/ordinef.src
+++ b/ve/ordinef.src
@@ -53,6 +53,8 @@ COMCF = S_DISABILITATO //100
DENCOM = S_DISABILITATO //100
STATOCF = S_DISABILITATO //100
DESSTATOCF = S_DISABILITATO //100
+CONTR122 = S_NORMALE //100
+CONTSEP = S_NORMALE //100
CODVAL1 = S_NORMALE //200
CODVAL2 = S_NORMALE //200
NOME_VAL1 = S_NORMALE //200
diff --git a/ve/ve0300.cpp b/ve/ve0300.cpp
index 7185a6945..42119cc4d 100755
--- a/ve/ve0300.cpp
+++ b/ve/ve0300.cpp
@@ -1114,7 +1114,7 @@ void TMask_generator::intestazione_pagina( const char* def_title)
_m->flag( "D" );
_m->end( );
- _m->control( T_STRINGA, DLG_NULL, 6 );
+ _m->control( T_NUMERO, DLG_NULL, 6 );
_m->begin( );
if ( _pro->get( "TIPOCF", "MAIN" ) == "C" )
_m->prompt( 2, 4, "Cliente " );
@@ -1350,7 +1350,7 @@ void TMask_generator::genera_testata_1()
_m->flag( "DG" );
_m->end( );
- _m->control( T_STRINGA, F_CODCF, 6 );
+ _m->control( T_NUMERO, F_CODCF, 6 );
_m->begin( );
if ( tipo_cf == 'C' )
{
diff --git a/ve/ve0300a.src b/ve/ve0300a.src
index f4ea402f2..c9e555b41 100755
--- a/ve/ve0300a.src
+++ b/ve/ve0300a.src
@@ -244,6 +244,39 @@ TYPE=T_STRINGA
PROMPT=""
SIZE=50
+[CONTR122]
+TYPE=T_STRINGA
+GROUP=100
+SIZE=18
+X=2
+Y=8
+MSKID=F_CONTR122
+PROMPT="Contratto Legge 122 "
+FLAG=U
+FIELDNAME=CONTRATTO
+USE=&CGCON
+INPUT=CODTAB[1,1] F_TIPOCF SE~CODTAB[2,7] F_CODCF SE~CODTAB[8,25] F_CONTR122
+DISPLAY="Contratto" CODTAB[8,]~"Descrizione@50" S0
+OUTPUT=F_CONTR122 CODTAB[8,]
+HELP=Inserire un codice contratto di importo non inferiore a 3000 Euro
+SPECIAL=ADD RUN cg7 -2 &CON~MO CG,FE
+
+[CONTSEP]
+TYPE=T_STRINGA
+GROUP=100
+SIZE=6
+X=47
+Y=8
+MSKID=F_CONTSEP
+PROMPT="Contabilità separata "
+FLAG=U
+FIELDNAME=CONTSEP
+USE=&NPENT
+INPUT=CODTAB F_CONTSEP
+DISPLAY="Codice@6" CODTAB~"Descrizione@50" S0
+OUTPUT=F_CONTSEP CODTAB
+SPECIAL=ADD RUN np0 -0 &ENT~MO NP
+
[ORDDA]
GROUP=150
X=2
diff --git a/ve/velib04b.cpp b/ve/velib04b.cpp
index ce6553864..4b62bd3f1 100755
--- a/ve/velib04b.cpp
+++ b/ve/velib04b.cpp
@@ -1417,6 +1417,8 @@ error_type TContabilizzazione::compile_head_mov(TDocumento& doc)
mov_rec.put(MOV_DCODNUM, doc.get(DOC_CODNUM));
mov_rec.put(MOV_DNDOC, doc.get(DOC_NDOC));
mov_rec.put(MOV_LIQDIFF, doc.get(DOC_LIQDIFF));
+ mov_rec.put(MOV_CONTRATTO, doc.get(DOC_CONTRATTO));
+ mov_rec.put(MOV_CONTSEP, doc.get(DOC_CONTSEP));
return _error;
}
@@ -1600,6 +1602,8 @@ error_type TContabilizzazione::compile_head_mov_re(TDocumento& doc)
mov_rec.put(MOV_DCODNUM, doc.get(DOC_CODNUM));
mov_rec.put(MOV_DNDOC, doc.get(DOC_NDOC));
mov_rec.put(MOV_LIQDIFF, doc.get(DOC_LIQDIFF));
+ mov_rec.put(MOV_CONTRATTO, doc.get(DOC_CONTRATTO));
+ mov_rec.put(MOV_CONTSEP, doc.get(DOC_CONTSEP));
return _error;
@@ -3141,6 +3145,7 @@ error_type TContabilizzazione::compile_head_anticipo(TDocumento& doc)
head.put(MOV_DANNO, doc.get(DOC_ANNO));
head.put(MOV_DCODNUM, doc.get(DOC_CODNUM));
head.put(MOV_DNDOC, doc.get(DOC_NDOC));
+ head.put(MOV_CONTSEP, doc.get(DOC_CONTSEP));
return no_error;
}
diff --git a/ve/veuml.h b/ve/veuml.h
index 2ff072d85..c4baa3cf8 100755
--- a/ve/veuml.h
+++ b/ve/veuml.h
@@ -118,6 +118,8 @@
#define F_CODABIP1 222
#define F_CODCABP1 223
#define F_PROGBNP1 224
+#define F_CONTR122 225
+#define F_CONTSEP 226
#define F_CDC1 251
#define F_CDC12 262