From b7d3cb18b995f6b5770bcf571343d21a258faed5 Mon Sep 17 00:00:00 2001
From: ValerioC <v.castellana@integry.it>
Date: Thu, 11 May 2023 15:29:23 +0200
Subject: [PATCH 1/3] corretto appVersionName

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6bf136ee..b4c7a1a5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'com.google.gms.google-services'
 android {
 
     def appVersionCode = 377
-    def appVersionName = '1.33.06   '
+    def appVersionName = '1.33.06'
 
     signingConfigs {
         release {

From 09347651760bbf5bd35f15e4b0295e0ec91069f4 Mon Sep 17 00:00:00 2001
From: ValerioC <v.castellana@integry.it>
Date: Fri, 12 May 2023 10:18:16 +0200
Subject: [PATCH 2/3] [CARELLI - ORDINI ACQUISTO] - corretta gestione merce da
 ricevere per rispecchiare il nuovo servizio (ora riceve le qta invece che le
 confezioni)

---
 .../core/data_store/db/entity/ArticoloOrdine.java             | 2 +-
 app/src/main/res/layout/dialog_pv_edit_articolo.xml           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java
index 75439e1a..1c126a18 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java
@@ -259,7 +259,7 @@ public class ArticoloOrdine {
     }
 
     public float getCnfDaRic() {
-        return qtaCnf > 0.f ? merceDaRic * qtaCnf : 0;
+        return qtaCnf > 0.f ? merceDaRic / qtaCnf : 0;
     }
 
     public int checkQtaProposta() {
diff --git a/app/src/main/res/layout/dialog_pv_edit_articolo.xml b/app/src/main/res/layout/dialog_pv_edit_articolo.xml
index a0cdec6c..cce298cc 100644
--- a/app/src/main/res/layout/dialog_pv_edit_articolo.xml
+++ b/app/src/main/res/layout/dialog_pv_edit_articolo.xml
@@ -254,7 +254,7 @@
                         style="@style/AppTheme.NewMaterial.Text.Medium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{UtilityNumber.decimalToString(view.articolo.merceDaRic)}"
+                        android:text="@{UtilityNumber.decimalToString(view.articolo.getCnfDaRic())}"
                         android:textColor="@android:color/black"
                         android:textStyle="bold"
                         tools:text="1" />
@@ -285,7 +285,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="0dp"
-                        android:text="@{UtilityNumber.decimalToString(view.articolo.getCnfDaRic())}"
+                        android:text="@{UtilityNumber.decimalToString(view.articolo.merceDaRic)}"
                         android:textColor="@android:color/black"
                         android:textStyle="bold" />
 

From 4f9fe14f7ec41c3df2fc78294205265082c43b4d Mon Sep 17 00:00:00 2001
From: ValerioC <v.castellana@integry.it>
Date: Fri, 12 May 2023 10:19:01 +0200
Subject: [PATCH 3/3] -> v1.33.07 (378)

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b4c7a1a5..2a66f360 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 377
-    def appVersionName = '1.33.06'
+    def appVersionCode = 378
+    def appVersionName = '1.33.07'
 
     signingConfigs {
         release {