From 6225ba8207e53555d09e22d9db72021953cd4192 Mon Sep 17 00:00:00 2001
From: ValerioC <v.castellana@integry.it>
Date: Mon, 11 Apr 2022 13:17:56 +0200
Subject: [PATCH 1/3] corretta gestione flag per ordinare in automatico
 articoli in acquisti pv

---
 .../integry/integrywmsnative/core/settings/DBSettingsModel.java | 2 +-
 .../pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index 42bbb18e..520cbb78 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -336,7 +336,7 @@ public class DBSettingsModel {
     }
 
 
-    public boolean getFlagOrdinaArticoliOnScan() {
+    public boolean isFlagOrdinaArticoliOnScan() {
         return flagOrdinaArticoliOnScan;
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java
index e6da19e0..d7961f9c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java
@@ -192,7 +192,7 @@ public class PVOrdineAcquistoEditViewModel {
     }
 
     private boolean isAutoOrderOnScan() {
-        return SettingsManager.iDB().getFlagOrdinaNuoviArticoliInGriglia();
+        return SettingsManager.iDB().isFlagOrdinaArticoliOnScan();
     }
 
     private void getNewArticoli(int idGrigla, RunnableArgs<List<ArticoloGriglia>> onSuccess, RunnableArgs<Exception> onError) {

From 371514157c6d0b57c4b6102a7713dba1d3559217 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 11 Apr 2022 19:16:42 +0200
Subject: [PATCH 2/3] Fix su peso tipo collo al posto della tara

---
 .../order_detail/ProdRientroMerceOrderDetailFragment.java       | 2 +-
 .../view/dialogs/input_lu_prod/DialogInputLUProdView.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
index b3d0c409..59c2bef7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
@@ -260,7 +260,7 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
 
 
                 DialogInputLUProdView
-                        .newInstance(mConnectedBluetoothDevice.toSimpleDeviceInterface(), dialogInputLUProdDTO, resultDTO -> {
+                        .newInstance(mConnectedBluetoothDevice != null ? mConnectedBluetoothDevice.toSimpleDeviceInterface() : null, dialogInputLUProdDTO, resultDTO -> {
                             ProdRientroMerceOrderDetailPickedQuantityDTO pickedQuantityDTO = new ProdRientroMerceOrderDetailPickedQuantityDTO()
                                     .setNumCnf(resultDTO.getNumCnf())
                                     .setPesoCollo(resultDTO.getPesoCollo())
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java
index 50707e25..28720aa8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java
@@ -177,7 +177,7 @@ public class DialogInputLUProdView extends BaseDialogFragment implements DialogI
         });
 
         UtilityObservable.addPropertyChanged(this.currentMtbTCol, (value) -> {
-            this.currentTaraPed.set(value.getOriginalModel().getTaraKg());
+            this.currentTaraPed.set(value.getOriginalModel().getPesoKg());
         });
 
         UtilityObservable.addPropertyChanged(this.selectedLineaProd, (value) -> {

From d2249e031aacd6ddae8c0f483c1d6351f1d168f4 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 11 Apr 2022 19:17:21 +0200
Subject: [PATCH 3/3] -> v1.25.1 (278)

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

diff --git a/app/build.gradle b/app/build.gradle
index 72479f10..2efeb1b9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 277
-    def appVersionName = '1.25.0'
+    def appVersionCode = 278
+    def appVersionName = '1.25.1'
 
     signingConfigs {
         release {