diff --git a/app/build.gradle b/app/build.gradle
index bdba4f18..407b1238 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 133
-    def appVersionName = '1.12.4'
+    def appVersionCode = 134
+    def appVersionName = '1.12.5'
 
     signingConfigs {
         release {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java
index 976394c3..44e5338c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java
@@ -16,12 +16,12 @@ public class UtilityExceptions {
 
 
     public static void defaultException(Context context, Exception ex, Dialog progressDialog){
-        progressDialog.dismiss();
+        if(progressDialog != null) progressDialog.dismiss();
         defaultException(context, ex);
     }
 
     public static void defaultException(Context context, Exception ex, Dialog progressDialog, boolean sendMail){
-        progressDialog.dismiss();
+        if(progressDialog != null) progressDialog.dismiss();
         defaultException(context, ex, sendMail);
     }
     public static void defaultException(Context context, Exception ex){
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java
index 776f6ef7..3b3c89cf 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java
@@ -139,6 +139,17 @@ public class MainListVenditaAdapter extends SectionedRecyclerViewAdapter<MainLis
 
         holder.binding.venditaMainListGroupItemContainerDetailOrd.setText(ordine.getRifOrd());
 
+
+
+        if(!UtilityString.isNullOrEmpty(mDataset.get(itemPosition).getDescrizioneVettore())) {
+            holder.binding.venditaMainListGroupItemContainerVettoreLayout.setVisibility(View.VISIBLE);
+            holder.binding.venditaMainListGroupItemContainerVettore.setText(mDataset.get(itemPosition).getDescrizioneVettore());
+        } else {
+            holder.binding.venditaMainListGroupItemContainerVettoreLayout.setVisibility(View.GONE);
+            holder.binding.venditaMainListGroupItemContainerVettore.setText(null);
+        }
+
+
         holder.binding.setCheckboxValue(ordine.selected);
 
         holder.binding.getRoot().setOnClickListener(v -> {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java
index 8f4d1246..640db048 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java
@@ -138,7 +138,8 @@ public class VenditaHelper {
                         .setData(x.getDataOrdS())
                         .setGestione(x.getGestione())
                         .setNumero(x.getNumOrd())
-                        .setDataConsegna(x.getDataConsS()))
+                        .setDataConsegna(x.getDataConsS())
+                        .setIdViaggio(x.getIdViaggio()))
                 .toList();
 
         OrdiniVenditaRESTConsumerService service = RESTBuilder.getService(OrdiniVenditaRESTConsumerService.class, 90);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/GetPickingListDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/GetPickingListDTO.java
index 83a09e78..67dcf99e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/GetPickingListDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/GetPickingListDTO.java
@@ -9,6 +9,7 @@ public class GetPickingListDTO {
     private Integer numero;
     private String gestione;
     private String dataConsegna;
+    private Integer idViaggio;
 
     public String getData() {
         return data;
@@ -46,4 +47,12 @@ public class GetPickingListDTO {
         return this;
     }
 
+    public Integer getIdViaggio() {
+        return idViaggio;
+    }
+
+    public GetPickingListDTO setIdViaggio(Integer idViaggio) {
+        this.idViaggio = idViaggio;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
index c50d4c26..cbb33237 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
@@ -1194,7 +1194,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
 
                 if(dto.getQtaDaEvadere() != null && dto.getQtaDaEvadere().floatValue() > 0 && dto.getQtaCnf() != null && dto.getQtaCnf().floatValue() > 0) {
                     if(useQtaDaEvadere && (dto.getQtaDaEvadere() != null && dto.getQtaDaEvadere().floatValue() > 0)) {
-                        dto.setNumCnf(dto.getQtaDaEvadere().divide(dto.getQtaCnf()).intValue());
+                        dto.setNumCnf(dto.getQtaDaEvadere().divide(dto.getQtaCnf(), 3, RoundingMode.HALF_EVEN).intValue());
                     } else {
                         dto.setNumCnf((dto.getQtaTot().compareTo(dto.getQtaDaEvadere()) < 0 ? dto.getQtaTot() : dto.getQtaDaEvadere()).divide(dto.getQtaCnf(), RoundingMode.HALF_UP).intValue());
                         if(dto.getNumCnf() == 0) dto.setNumCnf(1);
diff --git a/app/src/main/res/drawable/ic_black_truck.png b/app/src/main/res/drawable/ic_black_truck.png
new file mode 100644
index 00000000..91c170d0
Binary files /dev/null and b/app/src/main/res/drawable/ic_black_truck.png differ
diff --git a/app/src/main/res/layout/vendita_main_list_group_model.xml b/app/src/main/res/layout/vendita_main_list_group_model.xml
index 20fc1109..9f670cb3 100644
--- a/app/src/main/res/layout/vendita_main_list_group_model.xml
+++ b/app/src/main/res/layout/vendita_main_list_group_model.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+<layout>
+
     <data>
+
         <import type="it.integry.integrywmsnative.R" />
+
         <variable
             name="checkboxValue"
             type="it.integry.integrywmsnative.core.di.BindableBoolean" />
-        
-        
+
 
     </data>
 
@@ -22,12 +24,12 @@
             android:id="@+id/vendita_main_list_group_item_container_root"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingStart="2dp"
-            android:paddingEnd="8dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
             android:layout_toEndOf="@id/empty_view"
-            android:background="@color/full_white">
+            android:background="@color/full_white"
+            android:paddingStart="2dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="8dp"
+            android:paddingBottom="8dp">
 
 
             <androidx.appcompat.widget.AppCompatCheckBox
@@ -36,53 +38,90 @@
                 android:layout_height="wrap_content"
                 android:background="@android:color/transparent" />
 
-            <RelativeLayout
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
-                android:layout_toEndOf="@id/vendita_main_list_group_item_container_checkBox">
+                android:layout_toEndOf="@id/vendita_main_list_group_item_container_checkBox"
+                android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/vendita_main_list_group_item_container_testata_data_cons"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Cons 07 nov 2018"
-                    android:layout_alignParentEnd="true"
-                    android:textColor="#000" />
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
 
-                <TextView
-                    android:id="@+id/vendita_main_list_group_item_container_testata_ord"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Ord. Ven. 39 del 27 ott 2017"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:textColor="#000"
-                    android:layout_alignParentStart="true"
-                    android:layout_toStartOf="@id/vendita_main_list_group_item_container_testata_data_cons"/>
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/vendita_main_list_group_item_container_testata_ord"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentStart="true"
+                        android:layout_toStartOf="@id/vendita_main_list_group_item_container_testata_data_cons"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:textColor="#000"
+                        tools:text="Ord. Ven. 39 del 27 ott 2017" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/vendita_main_list_group_item_container_testata_data_cons"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:textColor="#000"
+                        tools:text="Cons 07 nov 2018" />
+
+                </RelativeLayout>
 
 
-                <TextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/vendita_main_list_group_item_container_detail_ord"
+                    style="@style/AppTheme.NewMaterial.Text.Small"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:maxLines="1"
                     android:ellipsize="end"
+                    android:maxLines="1"
                     android:paddingEnd="6dp"
-                    android:text="TextView"
-                    android:layout_below="@+id/vendita_main_list_group_item_container_testata_ord" />
+                    tools:text="Destinatario - Indirizzo" />
 
-            </RelativeLayout>
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/vendita_main_list_group_item_container_vettore_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="18dp"
+                        android:layout_height="18dp"
+                        android:src="@drawable/ic_black_truck"
+                        android:adjustViewBounds="true"
+                        android:tint="@color/gray_600"
+                        android:layout_marginEnd="4dp"/>
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/vendita_main_list_group_item_container_vettore"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:paddingEnd="6dp"
+                        tools:text="Vettore: Ragione sociale" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
         </RelativeLayout>
 
         <View
             android:id="@+id/empty_view"
-            android:layout_marginTop="2dp"
-            android:layout_marginBottom="2dp"
             android:layout_width="8dp"
             android:layout_height="wrap_content"
             android:layout_alignTop="@id/vendita_main_list_group_item_container_root"
-            android:layout_alignBottom="@id/vendita_main_list_group_item_container_root"/>
+            android:layout_alignBottom="@id/vendita_main_list_group_item_container_root"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp" />
 
 
     </RelativeLayout>
diff --git a/ext_sources/ICONS/icons8-camion-96.png b/ext_sources/ICONS/icons8-camion-96.png
new file mode 100644
index 00000000..91c170d0
Binary files /dev/null and b/ext_sources/ICONS/icons8-camion-96.png differ