From 639be21ab58ff2f3550d886907f329347c92043a Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 8 Apr 2021 18:17:17 +0200 Subject: [PATCH 1/2] Revert su ricalcolo qta_cnf in caso di peso variabile --- .../input_quantity_v2/DialogInputQuantityV2ViewModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java index 5a5c2e37..f4df7bb5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java @@ -304,10 +304,10 @@ public class DialogInputQuantityV2ViewModel { // return; } - if (!this.blockedQtaCnf.get() && !this.mtbAart.get().isFlagQtaCnfFissaBoolean() && this.internalQtaTot != null) - this.internalQtaCnf = UtilityBigDecimal.divide(internalQtaTot, newValue); - else if (!this.blockedQtaTot.get() && this.internalQtaCnf != null) + if (!this.blockedQtaTot.get() && this.internalQtaCnf != null) this.internalQtaTot = UtilityBigDecimal.multiply(newValue, this.internalQtaCnf); + else if (!this.blockedQtaCnf.get() && !this.mtbAart.get().isFlagQtaCnfFissaBoolean() && this.internalQtaTot != null) + this.internalQtaCnf = UtilityBigDecimal.divide(internalQtaTot, newValue); this.mListener.onDataChanged(); } From aa75a77913eba2cafe7d2311daeea73a748fc501 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 8 Apr 2021 18:18:24 +0200 Subject: [PATCH 2/2] -> v1.16.20 (202) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 20804a63..1498433e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 201 - def appVersionName = '1.16.19' + def appVersionCode = 202 + def appVersionName = '1.16.20' signingConfigs { release {