Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Giuseppe Scorrano 2022-04-11 19:16:46 +02:00
commit 2522e67705
2 changed files with 2 additions and 2 deletions

View File

@ -336,7 +336,7 @@ public class DBSettingsModel {
} }
public boolean getFlagOrdinaArticoliOnScan() { public boolean isFlagOrdinaArticoliOnScan() {
return flagOrdinaArticoliOnScan; return flagOrdinaArticoliOnScan;
} }

View File

@ -192,7 +192,7 @@ public class PVOrdineAcquistoEditViewModel {
} }
private boolean isAutoOrderOnScan() { private boolean isAutoOrderOnScan() {
return SettingsManager.iDB().getFlagOrdinaNuoviArticoliInGriglia(); return SettingsManager.iDB().isFlagOrdinaArticoliOnScan();
} }
private void getNewArticoli(int idGrigla, RunnableArgs<List<ArticoloGriglia>> onSuccess, RunnableArgs<Exception> onError) { private void getNewArticoli(int idGrigla, RunnableArgs<List<ArticoloGriglia>> onSuccess, RunnableArgs<Exception> onError) {