diff --git a/ha/ha0600.cpp b/ha/ha0600.cpp
index 98abe69d3..d90d36955 100644
--- a/ha/ha0600.cpp
+++ b/ha/ha0600.cpp
@@ -8,6 +8,7 @@
 #include <clifo.h>
 #include <multirel.h>
 #include "../mg/anamag.h"
+#include "../db/dblib.h"
 
 ///////////////////////////////////////////////////////////
 // TCodcorr_msk
@@ -16,7 +17,7 @@
 class TCodcorr_msk : public TAutomask
 {
   char _mode;
-  TString8 _code;
+  TCodice_articolo _code;
   bool _dirty;
 
 private:
@@ -42,7 +43,7 @@ bool TCodcorr_msk::save()
   TSheet_field& sf = sfield(_mode == 'A' ? F_ARTICOLI : F_CLIENTI);
   TFast_isamfile multirel(LF_MULTIREL);
 
-  TString8 code, codalt;
+  TCodice_articolo code, codalt;
   TString80 descr, data;
 
   FOR_EACH_SHEET_ROW(sf, r, row)
@@ -118,8 +119,8 @@ bool TCodcorr_msk::load_articles()
   for (bool ok = multirel.move_first(); ok; ok = multirel.move_next())
   {
     TToken_string& row = sf.row(-1);
-    TString8 cod = multirel.get(MULTI_SECOND).as_string().left(5);
-    row.add(cod);                                       // Codice articolo
+    TCodice_articolo cod = multirel.get(MULTI_SECOND).as_string();
+    row = cod;                                       // Codice articolo
     row.add(cache().get(LF_ANAMAG, cod, ANAMAG_DESCR)); // Descrizione articolo
     
     // Spezza il campo DATA in codice alternativo [1,6] e descrizione [7,36]
@@ -204,7 +205,7 @@ bool TCodcorr_msk::load()
     _code = get(F_ARTICOLO);   // Legge codice articolo 
     if (_code.full())          
     {
-      _mode = 'C';             // Imposta modalità lista 'A'rticoli
+      _mode = 'C';             // Imposta modalità lista 'C'lienti
       done = load_customers(); // Carica clienti dell'articolo _code
     }
   }
diff --git a/ha/ha0600a.uml b/ha/ha0600a.uml
index e4d93625d..766b24bd6 100644
--- a/ha/ha0600a.uml
+++ b/ha/ha0600a.uml
@@ -14,7 +14,7 @@ ENDPAGE
 
 PAGE "Articoli corrispondenti" -1 -1 78 23
 
-RADIOBUTTON F_TIPO 1 12
+RADIOBUTTON F_TIPO 1 15
 BEGIN
   PROMPT 1 0 "@bSelezione"
   ITEM "C|Cliente" 
@@ -25,7 +25,7 @@ END
 
 NUMBER F_CLIENTE 6
 BEGIN
-  PROMPT 15 1 ""
+  PROMPT 18 1 ""
   USE LF_CLIFO
   INPUT TIPOCF "C"
   INPUT CODCF F_CLIENTE
@@ -41,7 +41,7 @@ END
 
 STRING F_RAGSOC 50
 BEGIN
-  PROMPT 15 2 ""
+  PROMPT 18 2 ""
   USE LF_CLIFO KEY 2
   INPUT TIPOCF "C"
   INPUT RAGSOC F_RAGSOC
@@ -53,12 +53,12 @@ BEGIN
   GROUP 1
 END
 
-STRING F_ARTICOLO 5
+STRING F_ARTICOLO 20
 BEGIN
-  PROMPT 15 1 ""
+  PROMPT 18 1 ""
   USE LF_ANAMAG SELECT USER1!=""
   INPUT CODART F_ARTICOLO 
-  DISPLAY "Codice" CODART
+  DISPLAY "Codice@20" CODART
   DISPLAY "Descrizione@50" DESCR
   DISPLAY "Fascia" USER4
   OUTPUT F_ARTICOLO CODART
@@ -70,7 +70,7 @@ END
 
 STRING F_DESCART 50
 BEGIN
-  PROMPT 15 2 ""
+  PROMPT 18 2 ""
   USE LF_ANAMAG KEY 2
   INPUT DESCR F_DESCART
   DISPLAY "Descrizione@50" DESCR
@@ -84,7 +84,7 @@ END
 SPREADHEET F_ARTICOLI 
 BEGIN
   PROMPT 1 4 ""
-  ITEM "Codice\nArticolo@8"
+  ITEM "Codice\nArticolo@20"
   ITEM "Descrizione@50"
   ITEM "Codice\nAlt.@6"
   ITEM "Descrizione@30"
@@ -107,12 +107,12 @@ ENDMASK
 
 PAGE "Articolo" -1 -1 65 5
 
-STRING A_CODART 5
+STRING A_CODART 20
 BEGIN
   PROMPT 1 1 "Articolo    "
   USE LF_ANAMAG SELECT USER1!=""
   INPUT CODART A_CODART
-  DISPLAY "Codice" CODART
+  DISPLAY "Codice@20" CODART
   DISPLAY "Descrizione@50" DESCR
   DISPLAY "Fascia" USER4
   OUTPUT A_CODART CODART
@@ -137,7 +137,7 @@ END
 STRING A_CODALT 6
 BEGIN
   PROMPT 1 3 "Alternativo "
-  COPY USE A_CODART
+  USE LF_ANAMAG SELECT LEN(CODART)<=6
   INPUT CODART A_CODALT
   COPY DISPLAY A_CODART
   OUTPUT A_CODALT CODART
diff --git a/ha/hacnv300.cpp b/ha/hacnv300.cpp
index b4be87baa..eed031101 100755
--- a/ha/hacnv300.cpp
+++ b/ha/hacnv300.cpp
@@ -95,8 +95,9 @@ void THardy_scadenze::conto2billcampo(const TString& hd_tipoc, const TString& hd
 bool THardy_scadenze::trasferisci()
 {
   TString query = "SELECT * FROM dbo.Scadenze WHERE Esercizio=";
-  query << _anno;
-  query << " AND dbo.Scadenze.FlStato=0 ORDER BY dbo.Scadenze.Esercizio, dbo.Scadenze.Protocollo ";
+  query << _anno
+        << " AND dbo.Scadenze.FlStato=0" 
+        << " ORDER BY dbo.Scadenze.IdContoTp, dbo.Scadenze.Esercizio, dbo.Scadenze.Protocollo ";
 
   TRecordset& recset = create_recordset(query);
   THardy_iterator hi(this);