diff --git a/src/or/or1100a.h b/src/or/or1100a.h
index 3d1898674..85f224d50 100755
--- a/src/or/or1100a.h
+++ b/src/or/or1100a.h
@@ -58,6 +58,10 @@
 #define F_OPZ_RESIDUO     158
 #define F_OPZ_GIACENZA    159
 #define F_FORCE_EVASE     160
+#define F_DESFROM         161
+#define F_DESTO           162
+#define F_DESAGEFROM      163
+#define F_DESAGETO        164
 
 #define GR_CLIFO      1
 #define GR_NUM        2
diff --git a/src/or/or1100a.uml b/src/or/or1100a.uml
index 3782a7e51..9a3257204 100755
--- a/src/or/or1100a.uml
+++ b/src/or/or1100a.uml
@@ -108,7 +108,7 @@ BEGIN
   GROUP GR_DATA
 END
 
-GROUPBOX DLG_NULL 30 4
+GROUPBOX DLG_NULL 73 5
 BEGIN
   PROMPT 2 7 "Cliente"
   GROUP GR_CLIFO
@@ -131,24 +131,52 @@ BEGIN
   DISPLAY "Codice@6R" CODCF
   DISPLAY "Ragione sociale@50" RAGSOC
   OUTPUT F_CFFROM CODCF
+  OUTPUT F_DESFROM RAGSOC
+  CHECKTYPE NORMAL
+  GROUP GR_TUTTI GR_CLIFO
+END
+
+STRING F_DESFROM 50
+BEGIN
+  PROMPT 18 9 ""
+  USE LF_CLIFO KEY 2
+  INPUT TIPOCF F_TIPOCF SELECT
+  INPUT RAGSOC F_CFFROM
+  DISPLAY "Ragione sociale@70" RAGSOC
+  DISPLAY "Codice@6R" CODCF
+  COPY OUTPUT F_CFFROM
   CHECKTYPE NORMAL
   GROUP GR_TUTTI GR_CLIFO
 END
 
 NUMBER F_CFTO 6
 BEGIN
-  PROMPT 19 9 "Al  "
+  PROMPT 3 10 "Al  "
   USE LF_CLIFO KEY 1
   INPUT TIPOCF F_TIPOCF SELECT
   INPUT CODCF F_CFTO
   DISPLAY "Codice@6R" CODCF
   DISPLAY "Ragione sociale@50" RAGSOC
   OUTPUT F_CFTO CODCF
+  OUTPUT F_DESTO RAGSOC
   CHECKTYPE NORMAL
   GROUP GR_TUTTI GR_CLIFO
 END
 
-GROUPBOX DLG_NULL 30 4
+STRING F_DESTO 50
+BEGIN
+  PROMPT 18 10 ""
+  USE LF_CLIFO KEY 2
+  INPUT TIPOCF F_TIPOCF SELECT
+  INPUT RAGSOC F_DESTO
+  DISPLAY "Ragione sociale@70" RAGSOC
+  DISPLAY "Codice@6R" CODCF
+  COPY OUTPUT F_CFTO
+  CHECKTYPE NORMAL
+  GROUP GR_TUTTI GR_CLIFO
+END
+
+GROUPBOX DLG_NULL 73 4
 BEGIN
   PROMPT 2 7 "Agente"
   GROUP GR_TUTTI GR_AGE
@@ -156,58 +184,86 @@ END
 
 STRING F_AGEFROM 6
 BEGIN
-  PROMPT 3 8 "Dal                 "
+  PROMPT 3 8 "Dal "
   FLAGS "U"
   USE LF_AGENTI
   INPUT CODAGE F_AGEFROM
   DISPLAY "Codice" CODAGE
   DISPLAY "Descr@50" RAGSOC
   OUTPUT F_AGEFROM CODAGE
+	OUTPUT F_DESAGEFROM RAGSOC
+  GROUP GR_TUTTI GR_AGE
+END
+
+STRING F_DESAGEFROM 50
+BEGIN
+  PROMPT 18 8 ""
+  USE LF_AGENTI KEY 2
+  INPUT RAGSOC F_DESAGEFROM
+  DISPLAY "Ragione sociale@70" RAGSOC
+  DISPLAY "Codice@6R" CODAGE
+  COPY OUTPUT F_AGEFROM
+  CHECKTYPE NORMAL
   GROUP GR_TUTTI GR_AGE
 END
 
 STRING F_AGETO 6
 BEGIN
-  PROMPT 3 9 "Al                  "
+  PROMPT 3 9 "Al  "
   FLAGS "U"
   COPY USE F_AGEFROM
   INPUT CODAGE F_AGETO
   COPY DISPLAY F_AGEFROM
   OUTPUT F_AGETO CODAGE
+	OUTPUT F_DESAGETO RAGSOC
   GROUP GR_TUTTI GR_AGE
 END
 
-GROUPBOX DLG_NULL 40 4
+STRING F_DESAGETO 50
 BEGIN
-  PROMPT 35 7 "Data consegna"
+  PROMPT 18 9 ""
+  COPY USE F_DESAGEFROM
+  INPUT RAGSOC F_DESAGETO
+  DISPLAY "Ragione sociale@70" RAGSOC
+  DISPLAY "Codice@6R" CODAGE
+  COPY OUTPUT F_AGETO
+  CHECKTYPE NORMAL
+  GROUP GR_TUTTI GR_AGE
+END
+
+GROUPBOX DLG_NULL 30 4
+BEGIN
+  PROMPT 2 12 "Data consegna"
 END
 
 DATE F_CONSFROM
 BEGIN
-  PROMPT 36 8 "Dal                        "
+  PROMPT 3 13 "Dal            "
+	FLAGS "B"
 END
 
 DATE F_CONSTO
 BEGIN
-  PROMPT 36 9 "Al                         "
+  PROMPT 3 14 "Al             "
+	FLAGS "B"
 END
 
 
 BOOLEAN F_DETTAGLIO
 BEGIN
-  PROMPT 3 11 "Dettaglio righe"
+  PROMPT 37 13 "Dettaglio righe"
 END
 
 BOOLEAN F_DETAIL_BY_CLI
 BEGIN
-  PROMPT 37 11 "Ordina per cliente"
+  PROMPT 37 14 "Ordina per cliente"
   FLAGS "D"
   GROUP GR_TUTTI
 END
 
 LIST F_STATOORD 6
 BEGIN
-  PROMPT 3 12 "Tipo ordini         "
+  PROMPT 3 16 "Tipo ordini         "
   ITEM "T|Tutti"
   ITEM "E|Evasi"
   ITEM "A|Aperti"
@@ -215,7 +271,7 @@ END
 
 BOOLEAN F_DETAIL_BY_DOC
 BEGIN
-  PROMPT 37 12 "Dettaglio per documento"
+  PROMPT 37 16 "Dettaglio per documento"
 //  FLAGS "D"
 //  MESSAGE TRUE DISABLE,GR_DETAILART@
 //  MESSAGE FALSE ENABLE,GR_DETAILART@
@@ -224,7 +280,7 @@ END
 
 LIST F_STATORORD 6
 BEGIN
-  PROMPT 3 13 "Tipo righe ordini   "
+  PROMPT 3 17 "Tipo righe ordini   "
   FLAGS "D"
   GROUP GR_DETAIL
   ITEM "T|Tutte"
@@ -237,7 +293,7 @@ END
 
 NUMBER F_DETAIL_LEV 1
 BEGIN
-  PROMPT 37 13 "Livello dettaglio      "
+  PROMPT 37 17 "Livello dettaglio      "
   FLAGS "D"
   GROUP GR_DETAILART
   USE FCG
@@ -250,13 +306,13 @@ END
 
 BOOLEAN F_FORCE_EVASE
 BEGIN
-  PROMPT 3 14 "Stampa righe evase con residuo"
+  PROMPT 3 18 "Stampa righe evase con residuo"
   FLAGS "D" 
 END
 
 LIST F_RAGG_PER_ART 12
 BEGIN
-  PROMPT 37 14 "Periodo raggruppamento "
+  PROMPT 37 18 "Periodo raggruppamento "
   ITEM "0|Giornaliero"
   ITEM "1|1 mese"
   ITEM "2|2 mesi"
@@ -268,12 +324,12 @@ END
 
 GROUPBOX DLG_NULL 30 4
 BEGIN
-  PROMPT 2 15 "Articolo"
+  PROMPT 2 19 "Articolo"
 END
 
 STRING F_ARTFROM 20
 BEGIN
-  PROMPT 3 16 "Dal   "
+  PROMPT 3 20 "Dal   "
   FLAGS "DU"
   USE LF_ANAMAG
   INPUT CODART F_ARTFROM
@@ -286,7 +342,7 @@ END
 
 STRING F_ARTTO 20
 BEGIN
-  PROMPT 3 17 "Al    "
+  PROMPT 3 21 "Al    "
   FLAGS "DU"
   USE LF_ANAMAG
   INPUT CODART F_ARTTO
@@ -299,38 +355,38 @@ END
 
 BOOLEAN F_DETAIL_MAG
 BEGIN
-  PROMPT 37 16 "Dettaglia magazzini"
+  PROMPT 37 20 "Dettaglia magazzini"
   FLAGS "D"
   GROUP GR_DETAILART
 END
 
 BOOLEAN F_DETAIL_DEP
 BEGIN
-  PROMPT 37 17 "Dettaglia depositi"
+  PROMPT 37 21 "Dettaglia depositi"
   FLAGS "D"
   GROUP GR_DETAILART
 END
 
 BOOLEAN F_OPZ_VALORE
 BEGIN
-  PROMPT 3 19 "Visualizza colonne valori"
+  PROMPT 3 23 "Visualizza colonne valori"
 END
 
 BOOLEAN F_OPZ_PREZZO
 BEGIN
-  PROMPT 3 20 "Visualizza colonna prezzo"
+  PROMPT 3 24 "Visualizza colonna prezzo"
   GROUP GR_DETAIL GR_ART
 END
 
 BOOLEAN F_OPZ_RESIDUO
 BEGIN
-  PROMPT 37 19 "Visualizza colonna residuo"
+  PROMPT 37 23 "Visualizza colonna residuo"
   GROUP GR_DETAIL GR_ART
 END
 
 BOOLEAN F_OPZ_GIACENZA
 BEGIN
-  PROMPT 37 20 "Visualizza colonna giacenza"
+  PROMPT 37 24 "Visualizza colonna giacenza"
   GROUP GR_DETAIL GR_ART
 END