Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflict merge commit

Browse Source
This commit is contained in:
Valerio Castellana
2019-10-29 16:50:47 +01:00
parent fdc8d19bda
commit 4ef25e1e56
5 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
View File

@@ -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() {

2
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
View File

@@ -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;