From 4ef25e1e568bee53f59215f9e432f2748d894687 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Tue, 29 Oct 2019 16:50:47 +0100 Subject: [PATCH] conflict merge commit --- .idea/caches/build_file_checksums.ser | Bin 1082 -> 1022 bytes .idea/misc.xml | 41 +++++++++++++++++- app/build.gradle | 4 +- .../gest/vendita/MainVenditaFragment.java | 8 ++++ .../VenditaOrdineInevasoViewModel.java | 2 +- 5 files changed, 51 insertions(+), 4 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 5e187d9200cb7617cd3d4a63ebd45c8922813ff7..6f38cf6ba3d0275a5a0c27e8c67b70224bcf14c7 100644 GIT binary patch delta 164 zcmV;V09*gM2>u6b6iJhb#rBKaAi}ITmvW%KLD}>>3|8C?D#@{bN~#KumKj63j-|>{(yqjPtGnj S!UnwUDNN8ylaK?b0zY^~pFWcS delta 184 zcmV;p07w7+2f7H5mj!M9P;ZHmoFb9GDgh6X>YgaDDlD6}&#g!lrk?B}6qfLG03u|0 zZeeX{V_$P&aBp&Hc4cyDUvPGlp#v9_d;=1bngMZ>NCGzqXpThjt~QmulL-Pp1Q20x zaFd|}7Z5VIv`2NtWW9<^I6Q1uUt^R00!AbtKp@{PP)D8Db;#cZ4)Kh104qZ}Tvc;r ma&uf(VQgh`X>UW5$^s}1j{vd+>3|8C?D#@{lT-t!0+4u!no7w4 diff --git a/.idea/misc.xml b/.idea/misc.xml index b6ea2b11..10118312 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,45 @@ - + + + + + diff --git a/app/build.gradle b/app/build.gradle index 22c06d21..519e6f6d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 90 - def appVersionName = '1.8.3' + def appVersionCode = 92 + def appVersionName = '1.8.5' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java index 05e46535..cb4690ef 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java @@ -297,6 +297,14 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS } } + @Override + public void onResume() { + super.onResume(); + if(mRenderedOrderList != null && mRenderedOrderList.size() > 0) { + mHelper.deselectAll(mRenderedOrderList); + } + } + @Override public void onFilterClick() { 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 e9eb0ab2..85a6fda9 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 @@ -1144,7 +1144,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO dto.setShouldAskDataScad(true); } - batchLotEnabled = tmpPickData.getMtbPartitaMag().getFlagStato().equalsIgnoreCase("A"); + batchLotEnabled = tmpPickData.getMtbPartitaMag().getFlagStato() == null || tmpPickData.getMtbPartitaMag().getFlagStato().equalsIgnoreCase("A"); } boolean useQtaDaEvadere;