diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java index 6d68a2ed..e9abf04a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java @@ -69,6 +69,7 @@ public class DBSettingsModel { private boolean flagCanAddUnknownBarcodesAccettazioneBolla = false; private boolean flagEnableFastPickAccettazioneBolla = false; private boolean flagDisableMandatoryTracciabilitaAccettazioneBolla = false; + private boolean flagAllowULRecoverAccettazioneBolla = true; private boolean flagOverflowQuantityWarning = false; public boolean isFlagSpedizioneEnableFakeGiacenza() { @@ -549,6 +550,15 @@ public class DBSettingsModel { return this; } + public boolean isFlagAllowULRecoverAccettazioneBolla() { + return flagAllowULRecoverAccettazioneBolla; + } + + public DBSettingsModel setFlagAllowULRecoverAccettazioneBolla(boolean flagAllowULRecoverAccettazioneBolla) { + this.flagAllowULRecoverAccettazioneBolla = flagAllowULRecoverAccettazioneBolla; + return this; + } + public boolean isFlagOverflowQuantityWarning() { return flagOverflowQuantityWarning; } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java index af634578..97fe2c86 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java @@ -471,6 +471,12 @@ public class SettingsManager { .setKeySection("FLAG_DISABLE_MANDATORY_TRACCIABILITA") .setSetter(dbSettingsModelIstance::setFlagDisableMandatoryTracciabilitaAccettazioneBolla) .setDefaultValue(false)); + stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class) + .setGestName("PICKING") + .setSection("ACCETTAZIONE_BOLLA") + .setKeySection("FLAG_ALLOW_UL_RECOVER") + .setSetter(dbSettingsModelIstance::setFlagAllowULRecoverAccettazioneBolla) + .setDefaultValue(true)); stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class) .setGestName("PICKING") .setSection("SPEDIZIONE") diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java index 77194fa8..b812bea1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java @@ -212,7 +212,6 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac } - private void initFab() { fabPopupMenu = new PopupMenu(this, this.mBindings.accettazioneOrdineInevasoFab, (Gravity.END | Gravity.BOTTOM), @@ -222,6 +221,8 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac fabPopupMenu.setForceShowIcon(true); fabPopupMenu.getMenuInflater().inflate(R.menu.accettazione_ordine_inevaso_fab_menu, fabPopupMenu.getMenu()); + fabPopupMenu.getMenu().findItem(R.id.show_created_ul).setVisible(SettingsManager.iDB().isFlagAllowULRecoverAccettazioneBolla()); + fabPopupMenu.setOnMenuItemClickListener(item -> { int itemId = item.getItemId(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java index 2667cf38..df254bd2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java @@ -250,7 +250,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter super.onStart(); SqlMtbColt document = this.viewModel.getDocument(); if (document == null) { - Toast.makeText(this, "Nesusn documento selezionato!", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, "Nessun documento selezionato!", Toast.LENGTH_SHORT).show(); closeEdit(); return; }