From 14dabdddec08422a4e09b92ce15c8c12bc1c7633 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 31 Jul 2019 16:46:43 +0200 Subject: [PATCH] -> v1.6.14(75) --- .idea/caches/build_file_checksums.ser | Bin 964 -> 964 bytes app/build.gradle | 4 ++-- .../VenditaOrdineInevasoViewModel.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 8a90b21a5fa523d1d632ac721bd6ad7cc8fa2ced..7842948d9b3f4c9234e717f9f46fc0b9425db641 100644 GIT binary patch delta 65 zcmV-H0KWgk2gC=Em;^|FBd4*PZUK`=0zn2KdSzmAVUtk;C6hG*5(E%oaB!1f0v8Yx XExA%dJL@&Rs6aO9Dk18#vjPzT+KCn# delta 54 zcmV-60LlNv2gC=Em;^pZhR?B_ZUK`^0zH!o0zm{2VQ_GhUji2pI7t*WmzE$|^E20K MhN5{Kv$Fyb0S-VC)c^nh diff --git a/app/build.gradle b/app/build.gradle index eb5cd312..5e2d8c36 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 74 - def appVersionName = '1.6.13' + def appVersionCode = 75 + def appVersionName = '1.6.14' signingConfigs { release { 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 d75ab5d0..343337dc 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 @@ -1318,7 +1318,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO qtaDto.setNumCnf(ean128Model.Count); } - if (ean128Model.NetWeightKg != null && ean128Model.NetWeightKg > 0) { + if (ean128Model.NetWeightKg != null && ean128Model.NetWeightKg > 0 && !mtbAart.isFlagQtaCnfFissa()) { qtaDto.setQtaTot(new BigDecimal(ean128Model.NetWeightKg)); } else { qtaDto.setQtaTot(qtaDto.getQtaCnf().multiply(new BigDecimal(qtaDto.getNumCnf())));