Finish v1.24.3(271)

-> v1.24.3 (271)
Merge remote-tracking branch 'origin/develop' into develop
2022-03-23 16:48:09 +01:00 · 2022-03-23 16:48:04 +01:00 · 2022-03-23 16:47:27 +01:00 · 2022-03-23 16:47:22 +01:00 · 2022-03-22 10:12:21 +01:00 · 2022-03-22 10:12:21 +01:00
749 changed files with 38338 additions and 15983 deletions
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -0,0 +1 @@
+/saveactions_settings.xml
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,24 +1,12 @@
 <component name="ProjectCodeStyleConfiguration">
  <code_scheme name="Project" version="173">
    <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
    </JetCodeStyleSettings>
    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
      <arrangement>
        <rules>
          <section>
@@ -127,5 +115,8 @@
        </rules>
      </arrangement>
    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
  </code_scheme>
 </component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
--- a/.idea/dbnavigator.xml
+++ b/.idea/dbnavigator.xml
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <runningDeviceTargetsSelectedWithDialog>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="20119B1E55" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetsSelectedWithDialog>
+  </component>
+</project>
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
--- a/.idea/runConfigurations/app_base.xml
+++ b/.idea/runConfigurations/app_base.xml
@@ -1,19 +1,21 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="app_base" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS_Native.app" />
+    <module name="WMS.app" />
    <option name="DEPLOY" value="true" />
    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
    <option name="DEPLOY_AS_INSTANT" value="false" />
    <option name="ARTIFACT_NAME" value="" />
    <option name="PM_INSTALL_OPTIONS" value="" />
    <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS.dynamic_vgalimenti" />
    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
    <option name="MODE" value="default_activity" />
    <option name="CLEAR_LOGCAT" value="true" />
    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
    <option name="FORCE_STOP_RUNNING_APP" value="true" />
+    <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
@@ -44,7 +46,7 @@
      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
      <option name="STARTUP_PROFILING_ENABLED" value="false" />
      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Callstack Sample" />
      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
    </Profilers>
--- a/.idea/runConfigurations/app_frudis.xml
+++ b/.idea/runConfigurations/app_frudis.xml
@@ -1,59 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="app_frudis" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS_Native.app" />
-    <option name="DEPLOY" value="true" />
-    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
-    <option name="DEPLOY_AS_INSTANT" value="false" />
-    <option name="ARTIFACT_NAME" value="" />
-    <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
-    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-    <option name="MODE" value="default_activity" />
-    <option name="CLEAR_LOGCAT" value="true" />
-    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-    <option name="FORCE_STOP_RUNNING_APP" value="true" />
-    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-    <option name="DEBUGGER_TYPE" value="Auto" />
-    <Auto>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Auto>
-    <Hybrid>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Hybrid>
-    <Java />
-    <Native>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Native>
-    <Profilers>
-      <option name="ADVANCED_PROFILING_ENABLED" value="true" />
-      <option name="STARTUP_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
-      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
-      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
-    </Profilers>
-    <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="" />
-    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
-    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
-    <method v="2">
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</component>
--- a/.idea/runConfigurations/app_gramm.xml
+++ b/.idea/runConfigurations/app_gramm.xml
@@ -1,59 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="app_gramm" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS_Native.app" />
-    <option name="DEPLOY" value="true" />
-    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
-    <option name="DEPLOY_AS_INSTANT" value="false" />
-    <option name="ARTIFACT_NAME" value="" />
-    <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
-    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-    <option name="MODE" value="default_activity" />
-    <option name="CLEAR_LOGCAT" value="true" />
-    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="false" />
-    <option name="FORCE_STOP_RUNNING_APP" value="true" />
-    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-    <option name="DEBUGGER_TYPE" value="Auto" />
-    <Auto>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Auto>
-    <Hybrid>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Hybrid>
-    <Java />
-    <Native>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Native>
-    <Profilers>
-      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
-      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
-      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
-    </Profilers>
-    <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="" />
-    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
-    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
-    <method v="2">
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</component>
--- a/.idea/runConfigurations/app_ime.xml
+++ b/.idea/runConfigurations/app_ime.xml
@@ -1,59 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="app_ime" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS_Native.app" />
-    <option name="DEPLOY" value="true" />
-    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
-    <option name="DEPLOY_AS_INSTANT" value="false" />
-    <option name="ARTIFACT_NAME" value="" />
-    <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
-    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-    <option name="MODE" value="default_activity" />
-    <option name="CLEAR_LOGCAT" value="true" />
-    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="false" />
-    <option name="FORCE_STOP_RUNNING_APP" value="true" />
-    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-    <option name="DEBUGGER_TYPE" value="Auto" />
-    <Auto>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Auto>
-    <Hybrid>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Hybrid>
-    <Java />
-    <Native>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Native>
-    <Profilers>
-      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
-      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
-      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
-    </Profilers>
-    <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="" />
-    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
-    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
-    <method v="2">
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</component>
--- a/.idea/runConfigurations/app_saporiveri.xml
+++ b/.idea/runConfigurations/app_saporiveri.xml
@@ -1,59 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="app_saporiveri" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS_Native.app" />
-    <option name="DEPLOY" value="true" />
-    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
-    <option name="DEPLOY_AS_INSTANT" value="false" />
-    <option name="ARTIFACT_NAME" value="" />
-    <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri_pv,dynamic_vgalimenti" />
-    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-    <option name="MODE" value="default_activity" />
-    <option name="CLEAR_LOGCAT" value="true" />
-    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-    <option name="FORCE_STOP_RUNNING_APP" value="true" />
-    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-    <option name="DEBUGGER_TYPE" value="Auto" />
-    <Auto>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Auto>
-    <Hybrid>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Hybrid>
-    <Java />
-    <Native>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Native>
-    <Profilers>
-      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
-      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
-      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
-    </Profilers>
-    <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="" />
-    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
-    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
-    <method v="2">
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</component>
--- a/.idea/runConfigurations/app_saporiveri_pv.xml
+++ b/.idea/runConfigurations/app_saporiveri_pv.xml
@@ -1,59 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="app_saporiveri_pv" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS_Native.app" />
-    <option name="DEPLOY" value="true" />
-    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
-    <option name="DEPLOY_AS_INSTANT" value="false" />
-    <option name="ARTIFACT_NAME" value="" />
-    <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_vgalimenti" />
-    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-    <option name="MODE" value="default_activity" />
-    <option name="CLEAR_LOGCAT" value="true" />
-    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-    <option name="FORCE_STOP_RUNNING_APP" value="true" />
-    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-    <option name="DEBUGGER_TYPE" value="Auto" />
-    <Auto>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Auto>
-    <Hybrid>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Hybrid>
-    <Java />
-    <Native>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Native>
-    <Profilers>
-      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
-      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
-      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
-    </Profilers>
-    <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="" />
-    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
-    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
-    <method v="2">
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</component>
--- a/.idea/runConfigurations/app_vglimenti.xml
+++ b/.idea/runConfigurations/app_vglimenti.xml
@@ -1,19 +1,21 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="app_vglimenti" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS_Native.app" />
+    <module name="WMS.app" />
    <option name="DEPLOY" value="true" />
    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
    <option name="DEPLOY_AS_INSTANT" value="false" />
    <option name="ARTIFACT_NAME" value="" />
    <option name="PM_INSTALL_OPTIONS" value="" />
    <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS.dynamic__base" />
    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
    <option name="MODE" value="default_activity" />
    <option name="CLEAR_LOGCAT" value="true" />
    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
    <option name="FORCE_STOP_RUNNING_APP" value="true" />
+    <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
@@ -44,7 +46,7 @@
      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
      <option name="STARTUP_PROFILING_ENABLED" value="false" />
      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Callstack Sample" />
      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
    </Profilers>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,17 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.google.firebase.firebase-perf'
+
+if (!project.hasProperty("disable-performance-plugin")) {
+    apply plugin: 'com.google.firebase.firebase-perf'
+}
+
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'

 android {

-    def appVersionCode = 198
-    def appVersionName = '1.16.16'
+    def appVersionCode = 271
+    def appVersionName = '1.24.3'

    signingConfigs {
        release {
@@ -15,6 +19,9 @@ android {
            keyPassword 'inpmiy'
            storeFile file('Integry.jks')
            storePassword 'inpmiy'
+
+            enableV3Signing true
+            enableV4Signing true
        }
    }

@@ -24,12 +31,12 @@ android {
        }
    }

-    compileSdkVersion 29
+    compileSdkVersion 31

    defaultConfig {
        applicationId "it.integry.integrywmsnative"
        minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 31
        versionCode appVersionCode
        versionName appVersionName
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -50,8 +57,9 @@ android {
    android.buildFeatures.dataBinding true

    compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+
    }
    productFlavors {
    }
@@ -74,7 +82,7 @@ android {
        abortOnError false
    }

-    dynamicFeatures = [":dynamic__base", ":dynamic_vgalimenti", ":dynamic_ime", ":dynamic_frudis", ":dynamic_saporiveri_pv", ":dynamic_saporiveri", ':dynamic_gramm']
+    dynamicFeatures = [":dynamic__base", ":dynamic_vgalimenti"]


 }
@@ -90,53 +98,51 @@ dependencies {
    //Firebase

    // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:26.3.0')
+    implementation platform('com.google.firebase:firebase-bom:29.1.0')
    implementation 'com.google.firebase:firebase-analytics'
    implementation 'com.google.firebase:firebase-core'
-    implementation 'com.google.firebase:firebase-crash'
    implementation 'com.google.firebase:firebase-crashlytics'
    implementation 'com.google.firebase:firebase-perf'
-    implementation 'com.google.android.gms:play-services-basement:17.6.0'
+    implementation 'com.google.android.gms:play-services-basement:18.0.0'


-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.3.0-rc01'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-    implementation 'com.annimon:stream:1.2.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0'
+    implementation 'com.annimon:stream:1.2.2'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.3.0'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.1'
    implementation 'org.apache.commons:commons-text:1.9'

    //MVVM
-    def dagger2_version = '2.29.1'
+    def dagger2_version = '2.40'
    api "com.google.dagger:dagger:$dagger2_version"
    annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
    api "com.google.dagger:dagger-android:$dagger2_version"
-    api "com.google.dagger:dagger-android-support:$dagger2_version" // if you use the support libraries
+    api "com.google.dagger:dagger-android-support:$dagger2_version"
+    // if you use the support libraries
    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger2_version"

    //FAB
    implementation 'com.github.clans:fab:1.6.4'
    //CUSTOM VIEWS
    implementation 'com.github.NaimishTrivedi:FBToast:1.0'
-    implementation 'net.cachapa.expandablelayout:expandablelayout:2.9.2'
+    implementation 'com.github.cachapa:ExpandableLayout:2.9.2'
    implementation 'com.github.frankiesardo:linearlistview:1.0.1@aar'
-    implementation 'com.fede987:status-bar-alert:1.0.1'
-    implementation 'com.fxn769:stash:1.2'
-    testImplementation 'junit:junit:4.13.1'
+    implementation 'com.github.fede87:StatusBarAlert:1.0.1'
    implementation 'com.github.zhukic:sectioned-recyclerview:1.2.3'
    implementation 'com.github.pedromassango:doubleClick:3.0'

    //SQLite ROOM
-    def room_version = "2.2.6"
+    def room_version = "2.4.1"

    implementation "androidx.room:room-runtime:$room_version"
    annotationProcessor "androidx.room:room-compiler:$room_version"
@@ -150,11 +156,18 @@ dependencies {
    implementation project(':barcode_base_android_library')
    implementation project(':honeywellscannerlibrary')
    implementation project(':keyobardemulatorscannerlibrary')
-    implementation project(':barcode_kaiteki')
-    androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
-    androidTestImplementation 'org.testng:testng:7.3.0'
+
+
+    implementation 'com.github.RaviKoradiya:LiveAdapter:1.3.4'
+
+    // Required -- JUnit 4 framework
+//    testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.1"
+//    androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+//    androidTestImplementation 'org.testng:testng:7.4.0'
 }
+
 repositories {
    mavenCentral()
    google()
+    maven { url 'https://jitpack.io' }
 }
--- a/app/src/androidTest/java/it/integry/integrywmsnative/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/it/integry/integrywmsnative/ExampleInstrumentedTest.java
@@ -1,26 +0,0 @@
-package it.integry.integrywmsnative;
-
-import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("it.integry.integrywmsnative", appContext.getPackageName());
-    }
-}
--- a/app/src/androidTest/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModelTest.java
+++ b/app/src/androidTest/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModelTest.java
@@ -1,8 +0,0 @@
-package it.integry.integrywmsnative.gest.spedizione;
-
-class SpedizioneViewModelTest {
-
-    @org.junit.jupiter.api.Test
-    void createNewLU() {
-    }
-}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.CAMERA" />

    <application
        android:name=".MainApplication"
@@ -18,22 +19,30 @@
        android:supportsRtl="true"
        android:theme="@style/AppTheme"
        android:usesCleartextTraffic="true"
-        android:fullBackupContent="@xml/backup_descriptor">
+        android:fullBackupContent="@xml/backup_descriptor"
+        android:requestLegacyExternalStorage="true">
        <activity
            android:name=".gest.spedizione.SpedizioneActivity"
            android:screenOrientation="portrait"
            android:theme="@style/Light"
            android:windowSoftInputMode="adjustNothing" />
-        <activity android:name=".gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity" />
+        <activity android:name=".gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Light"
+            android:windowSoftInputMode="adjustNothing" />
+        <activity android:name=".gest.contab_doc_interni.edit_form.DocInterniEditFormActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Light"
+            android:windowSoftInputMode="adjustNothing" />
        <activity
            android:name=".gest.picking_resi.PickingResiActivity"
            android:screenOrientation="portrait"
            android:theme="@style/Light" />
        <activity
-            android:name=".MainActivity"
-            android:screenOrientation="portrait"
+            android:name=".gest.main.MainActivity"
            android:theme="@style/Light"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustNothing"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.CLIENTBARCODEACTIVITY" />

@@ -47,7 +56,6 @@
            android:windowSoftInputMode="adjustNothing" />
        <activity
            android:name=".gest.login.LoginActivity"
-            android:screenOrientation="portrait"
            android:theme="@style/Light" />
        <activity
            android:name=".gest.lista_bancali.ListaBancaliActivity"
@@ -67,7 +75,8 @@
        <activity
            android:name=".SplashActivity"
            android:label="@string/app_name"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

--- a/app/src/main/java/it/integry/integrywmsnative/MainApplication.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplication.java
@@ -4,6 +4,8 @@ import android.app.Application;
 import android.content.res.Configuration;
 import android.content.res.Resources;

+import javax.inject.Inject;
+
 import it.integry.integrywmsnative.core.context.AppContext;
 import it.integry.integrywmsnative.core.data_store.db.RoomModule;

@@ -17,7 +19,8 @@ public class MainApplication extends Application {
    public static MainApplicationModule appModule;
    public static RoomModule roomModule;

-    private AppContext appContext = new AppContext(this);
+    @Inject
+    AppContext appContext;



@@ -27,16 +30,15 @@ public class MainApplication extends Application {
    public void onCreate() {
        super.onCreate();

-        appModule = new MainApplicationModule(MainApplication.this, this);
+        appModule = new MainApplicationModule(this);
        roomModule = new RoomModule(this);
        appComponent = DaggerMainApplicationComponent.builder()
                .mainApplicationModule(appModule)
                .roomModule(roomModule)
                .build();

-        appComponent.inject(appContext);
+        appComponent.inject(this);

-        appContext.init();
        res = getResources();
    }

--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
@@ -5,22 +5,56 @@ import javax.inject.Singleton;
 import dagger.Component;
 import it.integry.integrywmsnative.core.context.AppContext;
 import it.integry.integrywmsnative.core.data_store.db.RoomModule;
+import it.integry.integrywmsnative.core.expansion.BaseActivityComponent;
+import it.integry.integrywmsnative.core.expansion.BaseActivityModule;
+import it.integry.integrywmsnative.core.expansion.BaseFragmentComponent;
+import it.integry.integrywmsnative.core.expansion.BaseFragmentModule;
+import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneComponent;
+import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneModule;
 import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePickingComponent;
 import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePickingModule;
+import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniComponent;
+import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniModule;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoComponent;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoModule;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniEditFormComponent;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniEditFormModule;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsComponent;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsModule;
+import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleComponent;
+import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleModule;
+import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliComponent;
+import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliModule;
+import it.integry.integrywmsnative.gest.login.LoginComponent;
+import it.integry.integrywmsnative.gest.login.LoginModule;
+import it.integry.integrywmsnative.gest.main.MainActivityComponent;
+import it.integry.integrywmsnative.gest.main.MainActivityModule;
+import it.integry.integrywmsnative.gest.main.MainFragmentComponent;
+import it.integry.integrywmsnative.gest.main.MainFragmentModule;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoComponent;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoModule;
 import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoComponent;
 import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoModule;
 import it.integry.integrywmsnative.gest.picking_resi.PickingResiComponent;
 import it.integry.integrywmsnative.gest.picking_resi.PickingResiModule;
+import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoComponent;
+import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoModule;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdComponent;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdModule;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaComponent;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaModule;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeComponent;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeModule;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceComponent;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.ProdRientroMerceOrderDetailComponent;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeComponent;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeModule;
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditComponent;
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditModule;
-import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdineAcquistoGrigliaComponent;
-import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdineAcquistoGrigliaModule;
+import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.DialogEditArticoloComponent;
+import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.DialogEditArticoloModule;
+import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaComponent;
+import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaModule;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeComponent;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeModule;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneComponent;
@@ -31,18 +65,39 @@ import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneCl
 import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteModule;
 import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreComponent;
 import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreModule;
+import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceComponent;
+import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceModule;
+import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteComponent;
+import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteModule;
+import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArtsComponent;
+import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArtsModule;
+import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotComponent;
+import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotModule;
+import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialogComponent;
+import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdComponent;
+import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdModule;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Component;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Module;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtComponent;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtModule;
+import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUComponent;
+import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUModule;

 // Definition of the Application graph
@Singleton
@Component(modules = {
-        MainApplicationModule.class,
        RoomModule.class,
+        SplashActivityModule.class,
+        MainApplicationModule.class,
+        BaseActivityModule.class,
+        BaseFragmentModule.class,
+        LoginModule.class,
        MainActivityModule.class,
-        PVOrdineAcquistoGrigliaModule.class,
+        MainFragmentModule.class,
+        MainAccettazioneModule.class,
+        ListaBancaliModule.class,
+        ContenutoBancaleModule.class,
+        PVOrdiniAcquistoGrigliaModule.class,
        PVOrdineAcquistoEditModule.class,
        PickingLiberoModule.class,
        RettificaGiacenzeModule.class,
@@ -53,30 +108,111 @@ import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtModule;
        PickingResiModule.class,
        OrdiniUscitaElencoModule.class,
        DialogInputQuantityV2Module.class,
+        DialogInputLUProdModule.class,
        DialogScanArtModule.class,
+        DialogScanOrCreateLUModule.class,
        ProdFabbisognoLineeProdModule.class,
+        VersamentoMerceModule.class,
        DialogAskMagazzinoProssimitaModule.class,
-        DialogRowInfoProdFabbisognoLineeProdModule.class})
+        DialogChooseBatchLotModule.class,
+        DialogRowInfoProdFabbisognoLineeProdModule.class,
+        ProdOrdineProduzioneElencoModule.class,
+        ProdRecuperoMaterialeModule.class,
+        ProdVersamentoMaterialeModule.class,
+        DialogChooseArtsFromListaArtsModule.class,
+        DocInterniModule.class,
+        DialogSelectDocInfoModule.class,
+        DocInterniEditFormModule.class,
+        DialogSelectDocRowsModule.class,
+        DialogAskClienteModule.class,
+        DialogEditArticoloModule.class
+})
 public interface MainApplicationComponent {

+    BaseActivityComponent.Factory baseActivityComponent();
+
+    BaseFragmentComponent.Factory baseFragmentComponent();
+
+    SplashActivityComponent.Factory splashActivityComponent();
+
+    LoginComponent.Factory loginActivityComponent();
+
    MainActivityComponent.Factory mainActivityComponent();
-    PVOrdineAcquistoGrigliaComponent.Factory pvOrdineAcquistoGrigliaComponent();
+
+    MainFragmentComponent.Factory mainFragmentComponent();
+
+    MainAccettazioneComponent.Factory mainAccettazioneComponent();
+
+    ListaBancaliComponent.Factory listaBancaliComponent();
+
+    ContenutoBancaleComponent.Factory contenutoBancaleComponent();
+
+    PVOrdiniAcquistoGrigliaComponent.Factory pvOrdineAcquistoGrigliaComponent();
+
    PVOrdineAcquistoEditComponent.Factory pvOrdineAcquistoEditComponent();
+
    PickingLiberoComponent.Factory pickingLiberoComponent();
+
    RettificaGiacenzeComponent.Factory rettificaGiacenzeComponent();
+
    SpedizioneComponent.Factory spedizioneComponent();
+
    AccettazionePickingComponent.Factory accettazionePickingComponent();
+
    UltimeConsegneClienteComponent.Factory ultimeConsegneClienteComponent();
+
    UltimiArriviFornitoreComponent.Factory ultimiArriviFornitoreComponent();
+
    PickingResiComponent.Factory pickingResiComponent();
+
    OrdiniUscitaElencoComponent.Factory prodOrdineLavorazioneElencoComponent();
+
+    DialogAskClienteComponent.Factory dialogAskClienteComponent();
+
    DialogInputQuantityV2Component.Factory dialogInputQuantityV2Component();
+
+    DialogInputLUProdComponent.Factory dialogInputLUProdComponent();
+
    DialogScanArtComponent.Factory dialogScanArtComponent();
+
+    DialogScanOrCreateLUComponent.Factory dialogScanOrCreateLUComponent();
+
    ProdFabbisognoLineeProdComponent.Factory prodFabbisognoLineeProdComponent();
+
+    VersamentoMerceComponent.Factory versamentoMerceComponent();
+
    DialogAskMagazzinoProssimitaComponent.Factory dialogAskMagazzinoProssimitaComponent();
+
+    DialogChooseBatchLotComponent.Factory dialogChooseBatchLotComponent();
+
    DialogRowInfoProdFabbisognoLineeProdComponent.Factory dialogRowInfoProdFabbisognoLineeProdComponent();

+    ProdRientroMerceComponent.Factory prodRientroMerceComponent();

-    void inject(AppContext appContext);
+    ProdRientroMerceOrderDetailComponent.Factory prodRientroMerceOrderDetailComponent();
+
+    ProdOrdineProduzioneElencoComponent.Factory prodOrdineProduzioneElencoComponent();
+
+    ProdRecuperoMaterialeComponent.Factory prodRecuperoMaterialeComponent();
+
+    ProdVersamentoMaterialeComponent.Factory prodVersamentoMaterialeComponent();
+
+    DialogChooseArtsFromListaArtsComponent.Factory dialogChooseArtsFromListaArtsComponent();
+
+    DocInterniComponent.Factory docInterniComponent();
+
+    DialogSelectDocInfoComponent.Factory dialogSelectMgrpDtipPairComponent();
+
+    DialogSelectDocRowsComponent.Factory dialogSelectDocRowsComponent();
+
+    DocInterniEditFormComponent.Factory docInterniEditFormComponent();
+
+    InfoAggiuntiveLUDialogComponent.Factory infoAggiuntiveLUDialogComponent();
+
+    DialogEditArticoloComponent.Factory dialogEditArticoloComponent();
+
+    void inject(MainApplication mainApplication);
+
+    void inject(AppContext mainApplication);

 }
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
@@ -1,31 +1,44 @@
 package it.integry.integrywmsnative;

 import android.app.Application;
-import android.content.Context;

 import javax.inject.Singleton;

 import dagger.Module;
 import dagger.Provides;
+import it.integry.integrywmsnative.core.context.AppContext;
+import it.integry.integrywmsnative.core.context.MainContext;
 import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
+import it.integry.integrywmsnative.core.data_store.db.AppDatabase;
+import it.integry.integrywmsnative.core.menu.MenuRESTConsumer;
+import it.integry.integrywmsnative.core.menu.MenuService;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.CommessaRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.DepositoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.EntityRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.core.services.inventario.InventarioService;
+import it.integry.integrywmsnative.core.update.UpdatesManager;
+import it.integry.integrywmsnative.gest.contab_doc_interni.rest.DocInterniRESTConsumer;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;

@Module
 public class MainApplicationModule {

-    private final Context mContext;
    private final Application mApplication;

-    public MainApplicationModule(Context context, Application application) {
-        this.mContext = context;
+    public MainApplicationModule(Application application) {
        this.mApplication = application;
    }

@@ -37,14 +50,52 @@ public class MainApplicationModule {

    @Provides
    @Singleton
-    ColliDataRecoverService provideColliDataRecoverService() {
-        return new ColliDataRecoverService();
+    AppContext providesAppContext() {
+        return new AppContext(mApplication);
    }

    @Provides
    @Singleton
-    OrdiniRESTConsumer provideOrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new OrdiniRESTConsumer(systemRESTConsumer);
+    MainContext providesMainContextNew(MenuService menuService, AppDatabase appDatabase) {
+        return new MainContext(mApplication.getApplicationContext(), menuService, appDatabase);
+    }
+
+    @Provides
+    @Singleton
+    ColliDataRecoverService provideColliDataRecoverService() {
+        ColliDataRecoverService colliDataRecoverService = new ColliDataRecoverService(mApplication.getApplicationContext());
+        colliDataRecoverService.init();
+        return colliDataRecoverService;
+    }
+
+    @Provides
+    @Singleton
+    MenuService provideMenuService(MenuRESTConsumer menuRESTConsumer) {
+        return new MenuService(menuRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    UpdatesManager provideUpdatesManager() {
+        return new UpdatesManager();
+    }
+
+    @Provides
+    @Singleton
+    DialogProgressView providesDialogProgressView() {
+        return DialogProgressView.newInstance();
+    }
+
+    @Provides
+    @Singleton
+    DialogInputQuantityV2View providesDialogInputQuantityV2View() {
+        return new DialogInputQuantityV2View();
+    }
+
+    @Provides
+    @Singleton
+    OrdiniRESTConsumer provideOrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
+        return new OrdiniRESTConsumer(systemRESTConsumer, entityRESTConsumer);
    }

    @Provides
@@ -55,14 +106,50 @@ public class MainApplicationModule {

    @Provides
    @Singleton
-    ArticoloRESTConsumer provideArticoloRESTConsumer() {
-        return new ArticoloRESTConsumer();
+    ArticoloRESTConsumer provideArticoloRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new ArticoloRESTConsumer(systemRESTConsumer);
    }

    @Provides
    @Singleton
-    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(ArticoloRESTConsumer articoloRESTConsumer) {
-        return new ColliMagazzinoRESTConsumer(articoloRESTConsumer);
+    CommessaRESTConsumer provideCommessaRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new CommessaRESTConsumer(systemRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    DepositoRESTConsumer provideDepositoRESTConsumer(EntityRESTConsumer entityRESTConsumer, SystemRESTConsumer systemRESTConsumer) {
+        return new DepositoRESTConsumer(entityRESTConsumer, systemRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    MenuRESTConsumer provideMenuRESTConsumer() {
+        return new MenuRESTConsumer();
+    }
+
+    @Provides
+    @Singleton
+    MagazzinoRESTConsumer provideMagazzinoRESTConsumer() {
+        return new MagazzinoRESTConsumer();
+    }
+
+    @Provides
+    @Singleton
+    MesRESTConsumer provideMesRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new MesRESTConsumer(systemRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    EntityRESTConsumer provideEntityRESTConsumer() {
+        return new EntityRESTConsumer();
+    }
+
+    @Provides
+    @Singleton
+    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
+        return new ColliMagazzinoRESTConsumer(systemRESTConsumer, articoloRESTConsumer, entityRESTConsumer);
    }

    @Provides
@@ -95,6 +182,22 @@ public class MainApplicationModule {
        return new ProdFabbisognoLineeProdRESTConsumer(systemRESTConsumer);
    }

+    @Provides
+    @Singleton
+    DocInterniRESTConsumer provideDocInterniRESTConsumer() {
+        return new DocInterniRESTConsumer();
+    }

+    @Provides
+    @Singleton
+    GiacenzaRESTConsumer provideGiacenzaRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
+        return new GiacenzaRESTConsumer(systemRESTConsumer, articoloRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    InventarioService provideInventarioService(GiacenzaRESTConsumer giacenzaRESTConsumer) {
+        return new InventarioService(giacenzaRESTConsumer);
+    }

 }
--- a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
@@ -1,10 +1,12 @@
 package it.integry.integrywmsnative;

+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.text.SpannableString;
+import android.text.Spanned;
 import android.view.LayoutInflater;

 import androidx.databinding.DataBindingUtil;
@@ -12,6 +14,8 @@ import androidx.databinding.DataBindingUtil;
 import java.util.ArrayList;
 import java.util.List;

+import javax.inject.Inject;
+
 import it.integry.integrywmsnative.core.context.MainContext;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
 import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
@@ -20,47 +24,48 @@ import it.integry.integrywmsnative.core.utility.PermissionsHelper;
 import it.integry.integrywmsnative.core.utility.UtilityContext;
 import it.integry.integrywmsnative.databinding.ActivitySplashBinding;
 import it.integry.integrywmsnative.gest.login.LoginActivity;
+import it.integry.integrywmsnative.gest.main.MainActivity;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;

-public class SplashActivity extends BaseActivity {
+public class SplashActivity extends BaseActivity implements MainContext.Listener {


    private ActivitySplashBinding mBinding;

-    private MainContext mainContext = new MainContext(this);
+//    private MainContext mainContext = new MainContext(this);
+
+    @Inject
+    MainContext mainContext;

    private RunnableArgsss<Integer, String[], List<Integer>> onRequestPermissionResult;

+    public static void startActivity(Context context) {
+        Intent intent = new Intent(context, SplashActivity.class);
+        context.startActivity(intent);
+    }
+
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

+        MainApplication.appComponent
+                .splashActivityComponent()
+                .create()
+                .inject(this);
+
+        mainContext.setListener(this);
+
        mBinding = DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.activity_splash, null, false);
        setContentView(mBinding.getRoot());

        UtilityContext.initMainActivity(this);

-        initAppVersion();

+        initAppVersion();
        initPermissions(this::init);
    }

-    private void initPermissions(Runnable onComplete) {
-        PermissionsHelper.askPermissions(this, () -> {
-            onComplete.run();
-        }, permanentlyDenied -> {
-            if(permanentlyDenied) {
-                DialogSimpleMessageView.makeErrorDialog(new SpannableString(getText(R.string.permissions_permanently_denied)), null, () -> {
-                            this.finish();
-                        })
-                        .show(getSupportFragmentManager(), "tag");
-            } else {
-                initPermissions(onComplete);
-            }
-        });
-    }
-
-
    private void initAppVersion() {
        try {
            PackageInfo pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
@@ -68,7 +73,7 @@ public class SplashActivity extends BaseActivity {

            String debugText = "";

-            if(BuildConfig.DEBUG) debugText += "\n[DEBUG VERSION]";
+            if (BuildConfig.DEBUG) debugText += "\n[DEBUG VERSION]";

            mBinding.appVersionTextview.setText("v" + version + debugText);
        } catch (PackageManager.NameNotFoundException e) {
@@ -76,15 +81,39 @@ public class SplashActivity extends BaseActivity {
        }
    }

+    private void initPermissions(Runnable onComplete) {
+        PermissionsHelper.askPermissions(this, onComplete, permanentlyDenied -> {
+            if (permanentlyDenied) {
+                onError(new SpannableString(getText(R.string.permissions_permanently_denied)));
+
+            } else {
+                initPermissions(onComplete);
+            }
+        });
+    }
+
    private void init() {
-        if(!SettingsManager.i().isUserLoggedIn()){
+        if (!SettingsManager.i().isUserLoggedIn()) {
            startLoginActivity();
        } else {
-            mainContext.init(this::startMainActivity);
+            mainContext.init();
        }
    }

+    @Override
+    public void onDBDataLoading(String item) {
+        mBinding.loadingInfoTextview.setText("Caricamento " + item);
+    }

+    @Override
+    public void onMenuLoading() {
+        mBinding.loadingInfoTextview.setText("Caricamento menù");
+    }
+
+    @Override
+    public void onContextInitialized() {
+        startMainActivity();
+    }


    public void setOnRequestPermissionsResult(RunnableArgsss<Integer, String[], List<Integer>> onRequestPermissionResult) {
@@ -94,9 +123,10 @@ public class SplashActivity extends BaseActivity {

    @Override
    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
-        if(this.onRequestPermissionResult != null) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (this.onRequestPermissionResult != null) {
            List<Integer> grantResultsList = new ArrayList<>();
-            for(int i = 0; i < grantResults.length; i++) {
+            for (int i = 0; i < grantResults.length; i++) {
                grantResultsList.add(grantResults[i]);
            }

@@ -105,20 +135,26 @@ public class SplashActivity extends BaseActivity {
    }


-
-
-
-    private void startLoginActivity(){
+    private void startLoginActivity() {
        this.finish();
        Intent myIntent = new Intent(this, LoginActivity.class);
        startActivity(myIntent);
    }

-    private void startMainActivity(){
+    private void startMainActivity() {
        this.finish();
        Intent myIntent = new Intent(this, MainActivity.class);
        startActivity(myIntent);
    }


+    @Override
+    public void onError(Spanned message) {
+
+        DialogSimpleMessageView.makeErrorDialog(
+                message, null, this::finish, R.string.logout, () -> {
+                    this.mainContext.logout(MainApplication::exit);
+                })
+                .show(this.getSupportFragmentManager(), "tag");
+    }
 }
--- a/app/src/main/java/it/integry/integrywmsnative/SplashActivityComponent.java
+++ b/app/src/main/java/it/integry/integrywmsnative/SplashActivityComponent.java
@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface SplashActivityComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+
+        SplashActivityComponent create();
+    }
+
+    void inject(SplashActivity mainActivity);
+}
--- a/app/src/main/java/it/integry/integrywmsnative/SplashActivityModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/SplashActivityModule.java
@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative;
+
+import dagger.Module;
+
+@Module(subcomponents = SplashActivityComponent.class)
+public class SplashActivityModule {
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/CommonConst.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/CommonConst.java
@@ -16,7 +16,7 @@ public class CommonConst {

        public static String DEFAULT_ANONYMOUS_UL_SERIE = "UL";

-        public static int NUMBER_OF_DECIMAL_DIGITS = 3;
+        public static int NUMBER_OF_DECIMAL_DIGITS = 5;
    }

    public static class Files {
--- a/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeCallbackDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeCallbackDTO.java
@@ -23,7 +23,7 @@ public class BarcodeCallbackDTO {
        return onScanSuccessfull;
    }

-    public BarcodeCallbackDTO setOnScanSuccessfull(RunnableArgs<BarcodeScanDTO> onScanSuccessfull) {
+    public BarcodeCallbackDTO setOnScanSuccessful(RunnableArgs<BarcodeScanDTO> onScanSuccessfull) {
        this.onScanSuccessfull = onScanSuccessfull;
        return this;
    }
--- a/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java
@@ -1,33 +1,27 @@
 package it.integry.integrywmsnative.core.barcode_reader;

+import android.content.Context;
 import android.view.KeyEvent;

-import androidx.appcompat.app.AppCompatActivity;
-
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.List;

-import it.integry.barcode_base_android_library.exception.BarcodeAdapterNotFoundException;
 import it.integry.barcode_base_android_library.interfaces.BarcodeReaderInterface;
 import it.integry.honeywellscannerlibrary.HoneyWellBarcodeReader;
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.keyobardemulatorscannerlibrary.KeyboardEmulatorBarcodeReader;
 import it.integry.pointmobilescannerlibrary.PointMobileBarcodeReader;
 import it.integry.zebrascannerlibrary.ZebraBarcodeReader;

 public class BarcodeManager {

-    private static AppCompatActivity context;
-
    private static BarcodeReaderInterface mCurrentBarcodeInterface;
-    private static List<BarcodeCallbackDTO> mBarcodeCallbacksStacktrace = new ArrayList<>();
+    private static final List<BarcodeCallbackDTO> mBarcodeCallbacksStacktrace = new ArrayList<>();

    private static boolean mEnabled = true;


-    private static Class<? extends BarcodeReaderInterface>[] registeredBarcodeReaderInterfaces = new Class[]{
+    private static final Class<? extends BarcodeReaderInterface>[] registeredBarcodeReaderInterfaces = new Class[]{
            PointMobileBarcodeReader.class,
            ZebraBarcodeReader.class,
            HoneyWellBarcodeReader.class,
@@ -35,73 +29,60 @@ public class BarcodeManager {
    };


-    public static void init(AppCompatActivity context) {
-        BarcodeManager.context = context;
+    public static void init(Context applicationContext) throws Exception {

-        initBarcodeReader();
+        initBarcodeReader(applicationContext);
    }

-    private static void initBarcodeReader() {
+    private static void initBarcodeReader(Context applicationContext) throws Exception {

-        for (Class<? extends BarcodeReaderInterface> readerInterface : registeredBarcodeReaderInterfaces){
+        for (Class<? extends BarcodeReaderInterface> readerInterface : registeredBarcodeReaderInterfaces) {

-            Constructor<?> cons = null;
-            try {
-                cons = Class.forName(readerInterface.getName()).getConstructors()[0];
-                BarcodeReaderInterface object = (BarcodeReaderInterface) cons.newInstance(context);
+            Constructor<?> cons = Class.forName(readerInterface.getName()).getConstructors()[0];
+            BarcodeReaderInterface object = (BarcodeReaderInterface) cons.newInstance(applicationContext);

-                if(object.isRightAdapter()) {
-                    mCurrentBarcodeInterface = object;
-                    break;
-                }
-
-
-            } catch (Exception e) {
-                UtilityExceptions.defaultException(context,e);
+            if (object.isRightAdapter()) {
+                mCurrentBarcodeInterface = object;
+                break;
            }
+
+
        }

-        if(mCurrentBarcodeInterface != null) {
+        if (mCurrentBarcodeInterface != null) {

-            try {
-                mCurrentBarcodeInterface.init(() -> {
-
-                    mCurrentBarcodeInterface.register(data -> {
-                        BarcodeCallbackDTO callback = getValidCallback();
-                        if(callback != null && mEnabled) {
-                            callback.getOnScanSuccessfull().run(data);
-                        }
-                    }, ex -> {
-                        BarcodeCallbackDTO callback = getValidCallback();
-                        if(callback != null && mEnabled) {
-                            callback.getOnScanFailed().run(ex);
-                        }
-                    });
+            mCurrentBarcodeInterface.init(() -> {

+                mCurrentBarcodeInterface.register(data -> {
+                    BarcodeCallbackDTO callback = getValidCallback();
+                    if (callback != null && mEnabled) {
+                        callback.getOnScanSuccessfull().run(data);
+                    }
+                }, ex -> {
+                    BarcodeCallbackDTO callback = getValidCallback();
+                    if (callback != null && mEnabled) {
+                        callback.getOnScanFailed().run(ex);
+                    }
                });
-            } catch (BarcodeAdapterNotFoundException ex) {
-                UtilityExceptions.defaultException(context, ex);
-            }
-

+            });
        }
-
    }


    private static BarcodeCallbackDTO getValidCallback() {

-        if(mBarcodeCallbacksStacktrace.size() > 0) {
-            return mBarcodeCallbacksStacktrace.get(mBarcodeCallbacksStacktrace.size() -1);
+        if (mBarcodeCallbacksStacktrace.size() > 0) {
+            return mBarcodeCallbacksStacktrace.get(mBarcodeCallbacksStacktrace.size() - 1);
        } else {
            return null;
        }

    }

-    public static boolean onKeyDown(int keyCode, KeyEvent keyEvent){
+    public static boolean onKeyDown(int keyCode, KeyEvent keyEvent) {
        if (mCurrentBarcodeInterface != null)
-        mCurrentBarcodeInterface.onKeyEvent(keyEvent);
+            mCurrentBarcodeInterface.onKeyEvent(keyEvent);
        return true;
    }

@@ -113,8 +94,8 @@ public class BarcodeManager {

        int newID = -1;

-        if(mBarcodeCallbacksStacktrace.size() > 0) {
-            newID = mBarcodeCallbacksStacktrace.get(mBarcodeCallbacksStacktrace.size() -1).getID() + 1;
+        if (mBarcodeCallbacksStacktrace.size() > 0) {
+            newID = mBarcodeCallbacksStacktrace.get(mBarcodeCallbacksStacktrace.size() - 1).getID() + 1;
        } else {
            newID = 1;
        }
@@ -131,7 +112,7 @@ public class BarcodeManager {
        //Rimuovo la callback con l'ID trovato e tutte quelle con >ID in modo che rimuovo tutte le call aggiunte successivamente

        for (int i = 0; i < mBarcodeCallbacksStacktrace.size(); i++) {
-            if(mBarcodeCallbacksStacktrace.get(i).getID() == ID || callbackObjFound) {
+            if (mBarcodeCallbacksStacktrace.get(i).getID() == ID || callbackObjFound) {
                mBarcodeCallbacksStacktrace.remove(i);

                callbackObjFound = true;
--- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java
@@ -2,7 +2,6 @@ package it.integry.integrywmsnative.core.class_router;

 import java.util.HashMap;

-import it.integry.integrywmsnative.core.class_router.configs.MenuConfiguration;
 import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
 import it.integry.integrywmsnative.core.utility.UtilityHashMap;

@@ -10,14 +9,12 @@ public class BaseCustomConfiguration implements ICustomConfiguration {


    public static class Keys {
-        public static int MENU_CONFIGURATION = 0;
        public static int FLAG_SHOW_COD_FORN_IN_SPEDIZIONE = 1;
        public static int CUSTOM_DYNAMIC_VERSION_PATH = 2;
        public static int FLAG_SPEDIZIONE_GROUP_BY_GRP_MERC = 3;
    }

-    protected HashMap<Integer, Object> configurations = new HashMap<Integer, Object>() {{
-        put(Keys.MENU_CONFIGURATION, new MenuConfiguration());
+    protected HashMap<Integer, Object> configurations = new HashMap<>() {{
        put(Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE, true);
        put(Keys.FLAG_SPEDIZIONE_GROUP_BY_GRP_MERC, false);
    }};
--- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java
@@ -6,8 +6,6 @@ import android.util.Pair;
 import java.util.ArrayList;
 import java.util.List;

-import it.integry.integrywmsnative.core.class_router.exceptions.MethodPathNotRegisteredException;
-
 public class ClassRouter {

    public enum PATH {
@@ -21,8 +19,8 @@ public class ClassRouter {

    private static List<Pair<PATH, Object>> mRouteClasses = new ArrayList<>();

-    public static void init(Context context) {
-        ClassRouter.context = context;
+    public static void init() {
+//        ClassRouter.context = context;
    }

    private static boolean checkIClassExists(PATH path) {
@@ -51,9 +49,7 @@ public class ClassRouter {

        try {
            mRouteClasses.add(new Pair<>(path, clazz.newInstance()));
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InstantiationException e) {
+        } catch (IllegalAccessException | InstantiationException e) {
            e.printStackTrace();
        }
    }
@@ -69,15 +65,15 @@ public class ClassRouter {
        try {

            if (!checkIClassExists(path)) {
-                throw new MethodPathNotRegisteredException(path);
+//                throw new MethodPathNotRegisteredException(path);
            }

            Object instance = mRouteClasses.get(getClassIndex(path)).second;

            return (T)instance;

-        } catch (MethodPathNotRegisteredException ex) {
-            // UtilityExceptions.defaultException(null, ex, true);
+        } catch (Exception ex) {
+//             UtilityExceptions.defaultException(null, ex, true);
        }

        return null;
--- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/BaseMenuConfiguration.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/BaseMenuConfiguration.java
@@ -32,6 +32,8 @@ public class BaseMenuConfiguration {
        @IdRes
        private int mGroupId;

+        private String codMenu;
+
        private List<MenuItem> mItems = new ArrayList<>();

        public @IdRes int getGroupId() {
@@ -52,6 +54,15 @@ public class BaseMenuConfiguration {
            return this;
        }

+        public String getCodMenu() {
+            return codMenu;
+        }
+
+        public MenuGroup setCodMenu(String codMenu) {
+            this.codMenu = codMenu;
+            return this;
+        }
+
        public List<MenuItem> getItems() {
            return mItems;
        }
@@ -67,6 +78,7 @@ public class BaseMenuConfiguration {
        @StringRes private int mTitleText;
        @DrawableRes private int mTitleIcon;
        @DrawableRes private int mDrawerIcon;
+        private String codMenu;
        private RunnableWithReturn<Fragment> fragmentFactory;

        public int getID() {
@@ -105,6 +117,15 @@ public class BaseMenuConfiguration {
            return this;
        }

+        public String getCodMenu() {
+            return codMenu;
+        }
+
+        public MenuItem setCodMenu(String codMenu) {
+            this.codMenu = codMenu;
+            return this;
+        }
+
        public RunnableWithReturn<Fragment> getFragmentFactory() {
            return fragmentFactory;
        }
--- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java
@@ -3,12 +3,15 @@ package it.integry.integrywmsnative.core.class_router.configs;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment;
+import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniFragment;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoFragment;
 import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdFragment;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceFragment;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment;
+import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaFragment;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment;
 import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment;
 import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreFragment;
@@ -24,9 +27,11 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                        new MenuGroup()
                                .setGroupText(R.string.purchase)
                                .setGroupId(R.id.nav_group_acquisto)
+                                .setCodMenu("MM008")

                                .addItem(new MenuItem()
                                        .setID(R.id.nav_accettazione)
+                                        .setCodMenu("MG044")
                                        .setTitleText(R.string.accettazione_title_fragment)
                                        .setTitleIcon(R.drawable.ic_dashboard_accettazione)
                                        .setDrawerIcon(R.drawable.ic_black_download)
@@ -34,6 +39,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {

                                .addItem(new MenuItem()
                                        .setID(R.id.nav_resi_fornitore)
+                                        .setCodMenu("MG045")
                                        .setTitleText(R.string.fragment_ultime_arrivi_fornitore_title)
                                        .setTitleIcon(R.drawable.ic_latest_delivery)
                                        .setDrawerIcon(R.drawable.ic_black_latest_delivery)
@@ -42,9 +48,11 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                new MenuGroup()
                        .setGroupText(R.string.checkout)
                        .setGroupId(R.id.nav_group_spedizione)
+                        .setCodMenu("MM010")

                        .addItem(new MenuItem()
                                .setID(R.id.nav_spedizione)
+                                .setCodMenu("MG046")
                                .setTitleText(R.string.vendita_title_fragment)
                                .setTitleIcon(R.drawable.ic_dashboard_spedizione)
                                .setDrawerIcon(R.drawable.ic_black_upload)
@@ -52,6 +60,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {

                        .addItem(new MenuItem()
                                .setID(R.id.nav_free_picking)
+                                .setCodMenu("MG047")
                                .setTitleText(R.string.free_picking)
                                .setTitleIcon(R.drawable.ic_dashboard_picking_libero)
                                .setDrawerIcon(R.drawable.ic_black_barcode_scanner)
@@ -59,6 +68,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {

                        .addItem(new MenuItem()
                                .setID(R.id.nav_resi_cliente)
+                                .setCodMenu("MG048")
                                .setTitleText(R.string.fragment_ultime_consegne_cliente_title)
                                .setTitleIcon(R.drawable.ic_latest_delivery_customer)
                                .setDrawerIcon(R.drawable.ic_black_latest_delivery)
@@ -66,9 +76,11 @@ public class MenuConfiguration extends BaseMenuConfiguration {
        ).addGroup(new MenuGroup()
                .setGroupText(R.string.manufacture)
                .setGroupId(R.id.nav_group_produzione)
+                .setCodMenu("MM009")

                .addItem(new MenuItem()
                        .setID(R.id.nav_prod_ordine_produzione)
+                        .setCodMenu("MG049")
                        .setTitleText(R.string.prod_ordine_produzione_title_fragment)
                        .setTitleIcon(R.drawable.ic_dashboard_prod_accettazione_produzione)
                        .setDrawerIcon(R.drawable.ic_black_external)
@@ -76,6 +88,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {

                .addItem(new MenuItem()
                        .setID(R.id.nav_prod_ordine_lavorazione)
+                        .setCodMenu("MG050")
                        .setTitleText(R.string.prod_ordine_lavorazione_title_fragment)
                        .setTitleIcon(R.drawable.ic_dashboard_prod_picking_lavorazione)
                        .setDrawerIcon(R.drawable.ic_black_external)
@@ -83,6 +96,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {

                .addItem(new MenuItem()
                        .setID(R.id.nav_free_lav_picking)
+                        .setCodMenu("MG051")
                        .setTitleText(it.integry.integrywmsnative.R.string.free_lav_picking)
                        .setTitleIcon(R.drawable.ic_dashboard_prod_picking_libero)
                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner)
@@ -90,6 +104,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {

                .addItem(new MenuItem()
                        .setID(R.id.nav_prod_posizionamento_da_ord)
+                        .setCodMenu("MG052")
                        .setTitleText(R.string.prod_fabbisogno_linee_prod_title)
                        .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_merce)
                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf)
@@ -97,6 +112,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {

                .addItem(new MenuItem()
                        .setID(R.id.nav_prod_versamento_materiale)
+                        .setCodMenu("MG053")
                        .setTitleText(R.string.prod_versamento_materiale_title_fragment)
                        .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_materiale)
                        .setDrawerIcon(R.drawable.ic_black_external)
@@ -104,32 +120,70 @@ public class MenuConfiguration extends BaseMenuConfiguration {

                .addItem(new MenuItem()
                        .setID(R.id.nav_prod_recupero_materiale)
+                        .setCodMenu("MG054")
                        .setTitleText(R.string.prod_recupero_materiale_title_fragment)
                        .setTitleIcon(R.drawable.ic_dashboard_prod_recupero_materiale)
                        .setDrawerIcon(R.drawable.ic_black_external)
                        .setFragmentFactory(ProdRecuperoMaterialeFragment::newInstance))
-        )
-                .addGroup(
-                        new MenuGroup()
-                                .setGroupText(R.string.internal_handling)
-                                .setGroupId(R.id.nav_group_movimentazione_interna)

-                                .addItem(new MenuItem()
-                                        .setID(R.id.nav_versamento_merce)
-                                        .setTitleText(R.string.versamento_merce_fragment_title)
-                                        .setTitleIcon(R.drawable.ic_dashboard_versamento_merce)
-                                        .setDrawerIcon(R.drawable.ic_black_load_shelf)
-                                        .setFragmentFactory(VersamentoMerceFragment::newInstance))
+                .addItem(new MenuItem()
+                        .setID(it.integry.integrywmsnative.R.id.nav_prod_rientro_merce)
+                        .setCodMenu("MG059")
+                        .setTitleText(it.integry.integrywmsnative.R.string.rientro_merce_fragment_title)
+                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_accettazione_produzione)
+                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external)
+                        .setFragmentFactory(ProdRientroMerceFragment::newInstance))
+        ).addGroup(
+                new MenuGroup()
+                        .setGroupText(R.string.internal_handling)
+                        .setGroupId(R.id.nav_group_movimentazione_interna)
+                        .setCodMenu("MM011")

-                                .addItem(new MenuItem()
-                                        .setID(R.id.nav_rettifica_giacenze)
-                                        .setTitleText(R.string.rettifica_giacenze_fragment_title)
-                                        .setTitleIcon(R.drawable.ic_dashboard_rettifica_giacenze)
-                                        .setDrawerIcon(R.drawable.ic_black_empty_box)
-                                        .setFragmentFactory(RettificaGiacenzeFragment::newInstance))
+                        .addItem(new MenuItem()
+                                .setID(R.id.nav_versamento_merce)
+                                .setCodMenu("MG055")
+                                .setTitleText(R.string.versamento_merce_fragment_title)
+                                .setTitleIcon(R.drawable.ic_dashboard_versamento_merce)
+                                .setDrawerIcon(R.drawable.ic_black_load_shelf)
+                                .setFragmentFactory(VersamentoMerceFragment::newInstance))
+
+                        .addItem(new MenuItem()
+                                .setID(R.id.nav_rettifica_giacenze)
+                                .setCodMenu("MG056")
+                                .setTitleText(R.string.rettifica_giacenze_fragment_title)
+                                .setTitleIcon(R.drawable.ic_dashboard_rettifica_giacenze)
+                                .setDrawerIcon(R.drawable.ic_black_empty_box)
+                                .setFragmentFactory(RettificaGiacenzeFragment::newInstance))


-                );
+        ).addGroup(
+                new MenuGroup()
+                        .setCodMenu("MM012")
+                        .setGroupText(it.integry.integrywmsnative.R.string.punto_vendita)
+                        .setGroupId(it.integry.integrywmsnative.R.id.nav_group_puntivendita)
+
+                        .addItem(new MenuItem()
+                                .setCodMenu("MG057")
+                                .setID(it.integry.integrywmsnative.R.id.nav_pv_ordini_acquisto)
+                                .setTitleText(it.integry.integrywmsnative.R.string.generate_orders)
+                                .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv)
+                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv)
+                                .setFragmentFactory(PVOrdiniAcquistoGrigliaFragment::newInstance))
+                        .addItem(new MenuItem()
+                                .setCodMenu("MG058")
+                                .setID(it.integry.integrywmsnative.R.id.nav_pv_doc_interni)
+                                .setTitleText(it.integry.integrywmsnative.R.string.doc_interni)
+                                .setTitleIcon(R.drawable.ic_dashboard_contab_doc_interni)
+                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_contab_doc_interni)
+                                .setFragmentFactory(DocInterniFragment::newInstance))
+
+//                                .addItem(new MenuItem()
+//                                        .setID(it.integry.integrywmsnative.R.id.nav_pv_ordini_acquisto_trasmessi)
+//                                        .setTitleText(it.integry.integrywmsnative.R.string.transmitted_orders)
+//                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_trasmitted_orders_list)
+//                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_trasmitted_orders_list)
+//                                        .setFragmentClass(PVOrdiniAcquistoTransmittedListFragment.newInstance()))
+        );

    }

--- a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java
@@ -7,31 +7,38 @@ import com.orhanobut.logger.AndroidLogAdapter;
 import com.orhanobut.logger.Logger;

 import javax.inject.Inject;
+import javax.inject.Singleton;

 import it.integry.integrywmsnative.BuildConfig;
+import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.core.data_store.db.AppDatabase;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.settings.Stash;
 import it.integry.integrywmsnative.core.utility.UtilityContext;
 import it.integry.integrywmsnative.core.utility.UtilityResources;
-import it.integry.integrywmsnative.core.utility.UtilitySettings;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.core.utility.UtilityToast;

+@Singleton
 public class AppContext {

    //Note: this is the Application Context NOT the Activity Context
-    private final Context mContext;
+    private final Context mApplicationContext;

    @Inject
    AppDatabase mAppDatabase;

    public AppContext(Context context) {
-        this.mContext = context;
+        this.mApplicationContext = context;
+
+        MainApplication.appComponent
+                .inject(this);
    }



+
+    @Inject
    public void init() {
        this.initUtilities();

@@ -43,10 +50,9 @@ public class AppContext {
    }


-
    private void initSettings() {
-        Stash.init(mContext);
-        SettingsManager.init(mContext);
+        Stash.init(mApplicationContext);
+        SettingsManager.init(mApplicationContext);
    }

    private void initCrashlytics() {
@@ -64,15 +70,13 @@ public class AppContext {
    }

    private void initUtilities() {
-        UtilityContext.initApplicationContext(mContext);
-        UtilityResources.init(mContext);
-        UtilityToast.init(mContext);
-        UtilitySettings.init(mAppDatabase);
+        UtilityContext.initApplicationContext(mApplicationContext);
+        UtilityResources.init(mApplicationContext);
+        UtilityToast.init(mApplicationContext);
    }

    private void initLogger() {
        Logger.addLogAdapter(new AndroidLogAdapter());
    }

-
 }
--- a/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java
@@ -4,54 +4,81 @@ import android.content.Context;
 import android.text.Html;
 import android.text.SpannableString;
 import android.text.Spanned;
-
-import androidx.appcompat.app.AppCompatActivity;
+import android.text.SpannedString;

 import java.lang.reflect.Method;
 import java.net.ConnectException;

-import it.integry.integrywmsnative.MainApplication;
-import it.integry.integrywmsnative.R;
+import javax.inject.Singleton;
+
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.class_router.ClassRouter;
-import it.integry.integrywmsnative.core.data_recover.ColliDataRecover;
+import it.integry.integrywmsnative.core.data_store.db.AppDatabase;
+import it.integry.integrywmsnative.core.menu.MenuService;
 import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilitySettings;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
+import it.integry.integrywmsnative.core.utility.UtilityThread;

+@Singleton
 public class MainContext {

-    private final AppCompatActivity mContext;
+    private final Context applicationContext;
+    private final MenuService menuService;
+    private final AppDatabase appDatabase;

-    public MainContext(AppCompatActivity context) {
-        this.mContext = context;
+    private Listener mListener;
+
+    public MainContext(Context applicationContext, MenuService menuService, AppDatabase appDatabase) {
+        this.applicationContext = applicationContext;
+        this.menuService = menuService;
+        this.appDatabase = appDatabase;
    }

+    public void init() {

-    public void init(Runnable onContextInitialized) {
+        try {
+            BarcodeManager.init(applicationContext);
+        } catch (Exception exception) {

-        BarcodeManager.init(mContext);
+        }

        this.initDBData(() -> {
-            onContextInitialized.run();
+            this.initMenu(() -> {
+
+                this.initReflections();
+                if (mListener != null) mListener.onContextInitialized();
+            });
        });

-        this.initReflections();

        this.initServerStatusChecker();

-        ColliDataRecover.init(mContext);
    }

+    public void logout(Runnable onLoggedOut) {
+        menuService.invalidateCache();
+        UtilityThread.executeParallel(() -> {
+            SettingsManager.i().setUser(null);
+            SettingsManager.i().setUserSession(null);
+            SettingsManager.update();
+            appDatabase.clearAllTables();
+
+            onLoggedOut.run();
+        }, true);
+    }

    private void initServerStatusChecker() {
        ServerStatusChecker.init();
    }

    private void initDBData(Runnable onComplete) {
-        SettingsManager.loadDBVariables(onComplete, ex -> {
+
+
+        SettingsManager.loadDBVariables(item -> {
+                    if (mListener != null) mListener.onDBDataLoading(item);
+                },
+                onComplete,
+                ex -> {

                    Spanned message = null;

@@ -63,18 +90,21 @@ public class MainContext {
                        message = new SpannableString(ex.getMessage());
                    }

-                    DialogSimpleMessageView.makeErrorDialog(
-                            message, null, mContext::finish, R.string.logout, () -> {
-                                UtilitySettings.logout();
-                                MainApplication.exit();
-                            })
-                            .show(mContext.getSupportFragmentManager(), "tag");
+                    if (mListener != null) mListener.onError(message);
+
                }
        );
    }

+    private void initMenu(Runnable onComplete) {
+        if (mListener != null) mListener.onMenuLoading();
+        this.menuService.init(onComplete, ex -> {
+            if (mListener != null) mListener.onError(new SpannedString(ex.getMessage()));
+        });
+    }
+
    private void initReflections() {
-        ClassRouter.init(mContext);
+        ClassRouter.init();

        try {
            String initMethod = "init";
@@ -87,14 +117,29 @@ public class MainContext {
                    // for static methods we can use null as instance of class
                    final Object newInstance = dynamicContextClass.newInstance();

-                    m.invoke(newInstance, (Context) mContext);
+                    m.invoke(newInstance, applicationContext);
                    break;
                }
            }

        } catch (Exception e) {
-            UtilityExceptions.defaultException(mContext, e, true);
+//            UtilityExceptions.defaultException(mContext, e, true);
        }
    }

+
+    public MainContext setListener(Listener listener) {
+        this.mListener = listener;
+        return this;
+    }
+
+    public interface Listener {
+        void onDBDataLoading(String item);
+
+        void onMenuLoading();
+
+        void onContextInitialized();
+
+        void onError(Spanned message);
+    }
 }
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/Coollection.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/Coollection.java
@@ -1,49 +0,0 @@
-package it.integry.integrywmsnative.core.coollection;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.Contains;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.Equals;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.EqualsIgnoreCase;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.GreaterThan;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.IsNull;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.LessThan;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.Not;
-import it.integry.integrywmsnative.core.coollection.query.Query;
-
-import java.util.Collection;
-
-public class Coollection {
-
-  public static <T> Query<T> from(Collection<T> collection) {
-    return new Query<T>(collection);
-  }
-
-  public static Matcher eq(Object value) {
-    return new Equals(value);
-  }
-
-  public static Matcher contains(String value) {
-    return new Contains(value);
-  }
-
-  public static Matcher eqIgnoreCase(String value) {
-    return new EqualsIgnoreCase(value);
-  }
-
-  public static Matcher not(Matcher matcher) {
-    return new Not(matcher);
-  }
-
-  public static Matcher greaterThan(Number value) {
-    return new GreaterThan(value);
-  }
-
-  public static Matcher lessThan(Number value) {
-    return new LessThan(value);
-  }
-
-  public static Matcher isNull() {
-    return new IsNull();
-  }
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/Matcher.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/Matcher.java
@@ -1,7 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher;
-
-public interface Matcher {
-
-  boolean match(Object value);
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/Contains.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/Contains.java
@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class Contains implements Matcher {
-
-  private final String matcherValue;
-
-  public Contains(String matcherValue) {
-    this.matcherValue = matcherValue;
-  }
-
-  @Override
-  public boolean match(Object value) {
-    return String.valueOf(value).contains(matcherValue);
-  }
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/Equals.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/Equals.java
@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class Equals implements Matcher {
-
-  private final Object value;
-
-  public Equals(Object value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object anotherValue) {
-    return value.equals(anotherValue);
-  }
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/EqualsIgnoreCase.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/EqualsIgnoreCase.java
@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class EqualsIgnoreCase implements Matcher {
-
-  private final String value;
-
-  public EqualsIgnoreCase(String value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object anotherValue) {
-    return (value).equalsIgnoreCase((String) anotherValue);
-  }
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/GreaterThan.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/GreaterThan.java
@@ -1,21 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class GreaterThan implements Matcher {
-
-  private final Number value;
-
-  public GreaterThan(Number value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object matchValue) {
-    if (matchValue == null) {
-      return false;
-    }
-    return ((Number) matchValue).doubleValue() > value.doubleValue();
-  }
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/IsNull.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/IsNull.java
@@ -1,12 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class IsNull implements Matcher {
-
-  @Override
-  public boolean match(Object value) {
-    return value == null;
-  }
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/LessThan.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/LessThan.java
@@ -1,21 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class LessThan implements Matcher {
-
-  private final Number value;
-
-  public LessThan(Number value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object matchValue) {
-    if (matchValue == null) {
-      return false;
-    }
-    return ((Number) matchValue).doubleValue() < value.doubleValue();
-  }
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/Not.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/Not.java
@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class Not implements Matcher {
-
-  private final Matcher matcher;
-
-  public Not(Matcher matcher) {
-    this.matcher = matcher;
-  }
-
-  @Override
-  public boolean match(Object value) {
-    return !matcher.match(value);
-  }
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/Query.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/Query.java
@@ -1,90 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-import it.integry.integrywmsnative.core.coollection.query.criteria.CriteriaList;
-import it.integry.integrywmsnative.core.coollection.query.order.Order;
-import it.integry.integrywmsnative.core.coollection.query.order.OrderCriteria;
-import it.integry.integrywmsnative.core.coollection.query.specification.custom.AndSpecification;
-import it.integry.integrywmsnative.core.coollection.query.specification.custom.OrSpecification;
-
-public class Query<T> {
-
-  private final Collection<T> collection;
-  private CriteriaList<T> criterias;
-  private OrderCriteria<T> orderCriteria;
-
-  public Query(Collection<T> collection) {
-    this.collection = collection;
-    criterias = new CriteriaList<T>();
-  }
-
-  public Query<T> where(String method, Matcher matcher) {
-    Criteria<T> criteria = new Criteria<T>(method, matcher);
-    criterias.add(criteria);
-    return this;
-  }
-
-  public Query<T> and(String method, Matcher matcher) {
-    Criteria<T> criteria = new Criteria<T>(method, matcher);
-    criteria.setSpecification(new AndSpecification<T>());
-    criterias.add(criteria);
-    return this;
-  }
-
-  public Query<T> or(String method, Matcher matcher) {
-    Criteria<T> criteria = new Criteria<T>(method, matcher);
-    criteria.setSpecification(new OrSpecification<T>());
-    criterias.add(criteria);
-    return this;
-  }
-
-  public Query<T> orderBy(String method, Order order) {
-    orderCriteria = new OrderCriteria<T>(method, order);
-    return this;
-  }
-
-  public Query<T> orderBy(String method) {
-    return orderBy(method, Order.ASC);
-  }
-
-  public List<T> all() {
-    List<T> all = new ArrayList<T>();
-    for (T item : collection) {
-      if (criterias.match(item)) {
-        all.add(item);
-      }
-    }
-    if (orderCriteria != null) {
-      all = orderCriteria.sort(all);
-    }
-    return all;
-  }
-
-  public T first() {
-    List<T> all = cloneCollection(collection);
-    if (orderCriteria != null) {
-      all = orderCriteria.sort(all);
-    }
-    for (T item : all) {
-      if (criterias.match(item)) {
-        return item;
-      }
-    }
-    return null;
-  }
-
-  private List<T> cloneCollection(Collection<T> collection) {
-    List<T> list = new ArrayList<T>();
-    for (T item : collection) {
-      list.add(item);
-    }
-    return list;
-  }
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/criteria/Criteria.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/criteria/Criteria.java
@@ -1,34 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.criteria;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-import it.integry.integrywmsnative.core.coollection.query.specification.Specification;
-import it.integry.integrywmsnative.core.coollection.reflection.Phanton;
-
-public class Criteria<T> {
-
-  private final String method;
-  private final Matcher matcher;
-  private Specification<T> specification;
-
-  public Criteria(String method, Matcher matcher) {
-    this.method = method;
-    this.matcher = matcher;
-  }
-
-  public void setSpecification(Specification<T> specification) {
-    this.specification = specification;
-  }
-
-  public Specification<T> specification() {
-    return specification;
-  }
-
-  public boolean match(T item) {
-    try {
-      Object value = Phanton.from(item).call(method);
-      return matcher.match(value);
-    } catch (Exception err) {
-      throw new RuntimeException(err);
-    }
-  }
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/criteria/CriteriaList.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/criteria/CriteriaList.java
@@ -1,34 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.criteria;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class CriteriaList<T> {
-
-  private List<Criteria<T>> criterias;
-
-  public CriteriaList() {
-    criterias = new ArrayList<Criteria<T>>();
-  }
-
-  public void add(Criteria<T> criteria) {
-    criterias.add(criteria);
-  }
-
-  public boolean match(T item) {
-    if (criterias.size() == 0) {
-      return true;
-    }
-    if (criterias.size() == 1) {
-      return criterias.get(0).match(item);
-    }
-    boolean matched = true;
-    for (int i = criterias.size() - 1; i > 0; i--) {
-      Criteria<T> one = criterias.get(i);
-      Criteria<T> other = criterias.get(i - 1);
-      matched = matched && one.specification().match(item, one, other);
-    }
-    return matched;
-  }
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/order/Order.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/order/Order.java
@@ -1,5 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.order;
-
-public enum Order {
-  ASC, DESC
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/order/OrderComparator.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/order/OrderComparator.java
@@ -1,30 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.order;
-
-import it.integry.integrywmsnative.core.coollection.reflection.Phanton;
-
-import java.util.Comparator;
-
-public class OrderComparator<T> implements Comparator<T> {
-
-  private final String method;
-
-  public OrderComparator(String method) {
-    this.method = method;
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public int compare(T one, T other) {
-    Object oneValue = Phanton.from(one).call(method);
-    Object otherValue = Phanton.from(other).call(method);
-    if (oneValue == null || otherValue == null) {
-      return 0;
-    }
-    if (oneValue instanceof Comparable) {
-      return ((Comparable<Object>) oneValue).compareTo(otherValue);
-    } else {
-      return 0;
-    }
-  }
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/order/OrderCriteria.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/order/OrderCriteria.java
@@ -1,24 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.order;
-
-import java.util.Collections;
-import java.util.List;
-
-public class OrderCriteria<T> {
-
-  private final String method;
-  private final Order order;
-
-  public OrderCriteria(String method, Order order) {
-    this.method = method;
-    this.order = order;
-  }
-
-  public List<T> sort(List<T> list) {
-    Collections.sort(list, new OrderComparator<T>(method));
-    if (order == Order.DESC) {
-      Collections.reverse(list);
-    }
-    return list;
-  }
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/specification/Specification.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/specification/Specification.java
@@ -1,9 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.specification;
-
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-
-public interface Specification<T> {
-
-  boolean match(T item, Criteria<T> one, Criteria<T> other);
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/specification/custom/AndSpecification.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/specification/custom/AndSpecification.java
@@ -1,13 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.specification.custom;
-
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-import it.integry.integrywmsnative.core.coollection.query.specification.Specification;
-
-public class AndSpecification<T> implements Specification<T> {
-
-  @Override
-  public boolean match(T item, Criteria<T> one, Criteria<T> other) {
-    return one.match(item) && other.match(item);
-  }
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/specification/custom/OrSpecification.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/query/specification/custom/OrSpecification.java
@@ -1,14 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.specification.custom;
-
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-import it.integry.integrywmsnative.core.coollection.query.specification.Specification;
-
-public class OrSpecification<T> implements Specification<T> {
-
-  @Override
-  public boolean match(T item, Criteria<T> one, Criteria<T> other) {
-    return one.match(item) || other.match(item);
-  }
-
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/coollection/reflection/Phanton.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/coollection/reflection/Phanton.java
@@ -1,37 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.reflection;
-
-import java.lang.reflect.Field;
-
-public class Phanton<T> {
-
-  private final T target;
-  private Class<?> clazz;
-
-  private Phanton(T target) {
-    this.target = target;
-    clazz = target.getClass();
-  }
-
-  public static <T> Phanton<T> from(T target) {
-    return new Phanton<T>(target);
-  }
-
-  public Object call(String name) {
-    return invoke(name);
-  }
-
-  private Object invoke(String name) {
-    for (final Field field : clazz.getDeclaredFields()) {
-      try {
-        if (name.equals(field.getName())) {
-          field.setAccessible(Boolean.TRUE);
-          return field.get(target);
-        }
-      } catch (final IllegalAccessException e) {
-        throw new RuntimeException(e);
-      }
-    }
-    throw new RuntimeException("No such property with name " + name);
-  }
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java
@@ -1,233 +0,0 @@
-package it.integry.integrywmsnative.core.data_recover;
-
-import android.content.Context;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.annimon.stream.Optional;
-import com.annimon.stream.Stream;
-import com.google.android.gms.common.util.IOUtils;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import it.integry.integrywmsnative.core.CommonConst;
-import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-
-public class ColliDataRecover {
-
-    public static class RecoverDTO {
-        private int id;
-        private int numCollo;
-        private String serCollo;
-        private String dataCollo;
-        private String gestioneCollo;
-        private String filtro;
-
-        private List<OrdineUscitaInevasoDTO> testateOrdini;
-
-        public int getId() {
-            return id;
-        }
-
-        public RecoverDTO setId(int id) {
-            this.id = id;
-            return this;
-        }
-
-        public int getNumCollo() {
-            return numCollo;
-        }
-
-        public RecoverDTO setNumCollo(int numCollo) {
-            this.numCollo = numCollo;
-            return this;
-        }
-
-        public String getSerCollo() {
-            return serCollo;
-        }
-
-        public RecoverDTO setSerCollo(String serCollo) {
-            this.serCollo = serCollo;
-            return this;
-        }
-
-        public String getDataCollo() {
-            return dataCollo;
-        }
-
-        public RecoverDTO setDataCollo(String dataCollo) {
-            this.dataCollo = dataCollo;
-            return this;
-        }
-
-        public String getGestioneCollo() {
-            return gestioneCollo;
-        }
-
-        public RecoverDTO setGestioneCollo(String gestioneCollo) {
-            this.gestioneCollo = gestioneCollo;
-            return this;
-        }
-
-        public String getFiltro() {
-            return filtro;
-        }
-
-        public RecoverDTO setFiltro(String filtro) {
-            this.filtro = filtro;
-            return this;
-        }
-
-        public List<OrdineUscitaInevasoDTO> getTestateOrdini() {
-            return testateOrdini;
-        }
-
-        public RecoverDTO setTestateOrdini(List<OrdineUscitaInevasoDTO> testateOrdini) {
-            this.testateOrdini = testateOrdini;
-            return this;
-        }
-
-
-        public MtbColt getMtbColt() {
-            return new MtbColt()
-                    .setNumCollo(getNumCollo())
-                    .setSerCollo(getSerCollo())
-                    .setGestione(getGestioneCollo())
-                    .setDataCollo(getDataCollo())
-                    .setFiltroOrdini(getFiltro());
-        }
-    }
-
-    private static AppCompatActivity mContext;
-
-    private static List<RecoverDTO> mtbColtsSessions = new ArrayList<>();
-
-    public static void init(AppCompatActivity context) {
-        mContext = context;
-
-        if(isFilePresent(CommonConst.Files.RECOVER_COLLO_FILE)) {
-            loadLocalFile();
-        }
-    }
-
-    public static boolean thereIsAnExistantSession() {
-        return mtbColtsSessions.size() > 0;
-    }
-
-    public static List<Integer> getAllSessionIDs() {
-        if(thereIsAnExistantSession()) {
-
-            return Stream.of(mtbColtsSessions)
-                    .map(RecoverDTO::getId)
-                    .toList();
-
-        } else return null;
-    }
-
-    public static RecoverDTO getSession(Integer sessionID) {
-
-        if(sessionID == null) return null;
-
-        return getIfExists(sessionID);
-    }
-
-    private static RecoverDTO getIfExists(int id) {
-        Optional<RecoverDTO> recoverDTOOptional = Stream.of(mtbColtsSessions)
-                .filter(x -> x.getId() == id)
-                .findSingle();
-
-
-        return recoverDTOOptional.isPresent() ? recoverDTOOptional.get() : null;
-    }
-
-    public static int startNewSession(MtbColt mtbColtSession, List<OrdineUscitaInevasoDTO> testateOrdini) {
-        Integer newId = null;
-
-        while(newId == null) {
-            int randomId = new Random().nextInt(1000);
-            RecoverDTO dto = getIfExists(randomId);
-            if(dto == null) newId = randomId;
-        }
-
-
-        RecoverDTO recoverDTO = new RecoverDTO()
-                .setId(newId)
-                .setDataCollo(mtbColtSession.getDataColloS())
-                .setNumCollo(mtbColtSession.getNumCollo())
-                .setSerCollo(mtbColtSession.getSerCollo())
-                .setGestioneCollo(mtbColtSession.getGestione())
-                .setFiltro(mtbColtSession.getFiltroOrdini())
-                .setTestateOrdini(testateOrdini);
-
-        mtbColtsSessions.add(recoverDTO);
-        updateLocalFile();
-        return newId;
-    }
-
-    public static void closeSession(int ID) {
-        RecoverDTO dto = getIfExists(ID);
-
-        if(dto != null) {
-            mtbColtsSessions.remove(dto);
-            updateLocalFile();
-        }
-    }
-
-
-    private static void loadLocalFile() {
-        InputStream inputStream;
-
-        Gson gson = new Gson();
-
-        try {
-            inputStream = mContext.openFileInput(CommonConst.Files.RECOVER_COLLO_FILE);
-
-            byte[] bytes = IOUtils.readInputStreamFully(inputStream);
-            String jsonString = new String(bytes);
-
-            Type listType = new TypeToken<ArrayList<RecoverDTO>>(){}.getType();
-            mtbColtsSessions = gson.fromJson(jsonString, listType);
-
-            inputStream.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-            UtilityExceptions.defaultException(mContext, e);
-        }
-    }
-
-
-    private static void updateLocalFile() {
-        FileOutputStream outputStream;
-
-        Gson gson = new Gson();
-        String jsonText = gson.toJson(mtbColtsSessions);
-
-        try {
-            outputStream = mContext.openFileOutput(CommonConst.Files.RECOVER_COLLO_FILE, Context.MODE_PRIVATE);
-            outputStream.write(jsonText.getBytes());
-            outputStream.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-            UtilityExceptions.defaultException(mContext, e);
-        }
-    }
-
-    private static boolean isFilePresent(String fileName) {
-        String path = mContext.getFilesDir().getAbsolutePath() + "/" + fileName;
-        File file = new File(path);
-        return file.exists();
-    }
-
-
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java
@@ -2,8 +2,6 @@ package it.integry.integrywmsnative.core.data_recover;

 import android.content.Context;

-import androidx.appcompat.app.AppCompatActivity;
-
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 import com.google.android.gms.common.util.IOUtils;
@@ -24,29 +22,27 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;

@Singleton
 public class ColliDataRecoverService {


-    private AppCompatActivity mContext;
+    private final Context mApplicationContext;
    private List<ColliDataRecoverDTO> mtbColtsSessions = new ArrayList<>();

-    @Inject
-    public ColliDataRecoverService() {
+    public ColliDataRecoverService(Context applicationContext) {
+        this.mApplicationContext = applicationContext;
    }

-    public void init(AppCompatActivity appCompatActivity) {
-        this.mContext = appCompatActivity;
-
+    @Inject
+    public void init() {
        if(isFilePresent(CommonConst.Files.RECOVER_COLLO_FILE)) {
            loadLocalFile();
        }
    }

    public boolean thereIsAnExistantSession() {
-        return mtbColtsSessions.size() > 0;
+        return mtbColtsSessions != null && mtbColtsSessions.size() > 0;
    }

    public List<Integer> getAllSessionIDs() {
@@ -114,7 +110,7 @@ public class ColliDataRecoverService {
        Gson gson = new Gson();

        try {
-            inputStream = mContext.openFileInput(CommonConst.Files.RECOVER_COLLO_FILE);
+            inputStream = mApplicationContext.openFileInput(CommonConst.Files.RECOVER_COLLO_FILE);

            byte[] bytes = IOUtils.readInputStreamFully(inputStream);
            String jsonString = new String(bytes);
@@ -125,7 +121,7 @@ public class ColliDataRecoverService {
            inputStream.close();
        } catch (Exception e) {
            e.printStackTrace();
-            UtilityExceptions.defaultException(mContext, e);
+//            UtilityExceptions.defaultException(mContext, e);
        }
    }

@@ -137,17 +133,17 @@ public class ColliDataRecoverService {
        String jsonText = gson.toJson(mtbColtsSessions);

        try {
-            outputStream = mContext.openFileOutput(CommonConst.Files.RECOVER_COLLO_FILE, Context.MODE_PRIVATE);
+            outputStream = mApplicationContext.openFileOutput(CommonConst.Files.RECOVER_COLLO_FILE, Context.MODE_PRIVATE);
            outputStream.write(jsonText.getBytes());
            outputStream.close();
        } catch (Exception e) {
            e.printStackTrace();
-            UtilityExceptions.defaultException(mContext, e);
+//            UtilityExceptions.defaultException(mContext, e);
        }
    }

    private boolean isFilePresent(String fileName) {
-        String path = mContext.getFilesDir().getAbsolutePath() + "/" + fileName;
+        String path = mApplicationContext.getFilesDir().getAbsolutePath() + "/" + fileName;
        File file = new File(path);
        return file.exists();
    }
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java
@@ -4,24 +4,28 @@ import androidx.room.Database;
 import androidx.room.RoomDatabase;
 import androidx.room.TypeConverters;

+import it.integry.integrywmsnative.core.data_store.db.converter.BigDecimalConverter;
 import it.integry.integrywmsnative.core.data_store.db.converter.DateConverter;
 import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloGrigliaDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloOrdineDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.GrigliaDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.MtbColrDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.MtbColtDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.OrdineDao;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
 import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
 import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;

-@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class}, version = 1, exportSchema = false)
+@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class, SqlMtbColt.class, SqlMtbColr.class}, version = 8, exportSchema = false)
@TypeConverters({
-        DateConverter.class
+        DateConverter.class,
+        BigDecimalConverter.class
 })
 public abstract class AppDatabase extends RoomDatabase {

-//    private AppDatabase mRoomInstance;
-
    public abstract ArticoloGrigliaDao articoloGrigliaDao();

    public abstract GrigliaDao grigliaDao();
@@ -30,26 +34,9 @@ public abstract class AppDatabase extends RoomDatabase {

    public abstract ArticoloOrdineDao articoloOrdineDao();

-//    public static AppDatabase getDatabase(final Context context) {
-//        if (INSTANCE == null) {
-//            synchronized (AppDatabase.class) {
-//                if (INSTANCE == null) {
-//                    INSTANCE = Room.databaseBuilder(context.getApplicationContext(),
-//                            AppDatabase.class, "integry_wms")
-//                            .fallbackToDestructiveMigration()
-//                            .build();
-//                }
-//            }
-//        }
-//        return INSTANCE;
-//    }
+    public abstract MtbColtDao mtbColtDao();

-//    public AppDatabase(Application application) {
-//        mRoomInstance = Room.databaseBuilder(application,
-//                AppDatabase.class, "integry_wms")
-//                .fallbackToDestructiveMigration()
-//                .build();
-//    }
+    public abstract MtbColrDao mtbColrDao();


 }
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/RoomModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/RoomModule.java
@@ -11,15 +11,21 @@ import dagger.Provides;
 import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloGrigliaDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloOrdineDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.GrigliaDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.MtbColrDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.MtbColtDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.OrdineDao;
 import it.integry.integrywmsnative.core.data_store.db.repository.ArticoliOrdineRepository;
 import it.integry.integrywmsnative.core.data_store.db.repository.ArticoloGrigliaRepository;
 import it.integry.integrywmsnative.core.data_store.db.repository.GrigliaRepository;
+import it.integry.integrywmsnative.core.data_store.db.repository.MtbColrRepository;
+import it.integry.integrywmsnative.core.data_store.db.repository.MtbColtRepository;
 import it.integry.integrywmsnative.core.data_store.db.repository.OrdineRepository;
 import it.integry.integrywmsnative.core.data_store.db.repository.implementations.ArticoliGrigliaDataSource;
 import it.integry.integrywmsnative.core.data_store.db.repository.implementations.ArticoliOrdineDataSource;
 import it.integry.integrywmsnative.core.data_store.db.repository.implementations.GrigliaDataSource;
 import it.integry.integrywmsnative.core.data_store.db.repository.implementations.OrdineDataSource;
+import it.integry.integrywmsnative.core.data_store.db.repository.implementations.SqlMtbColrDataSource;
+import it.integry.integrywmsnative.core.data_store.db.repository.implementations.SqlMtbColtDataSource;

@Module
 public class RoomModule {
@@ -66,6 +72,18 @@ public class RoomModule {
        return appDatabase.articoloOrdineDao();
    }

+    @Singleton
+    @Provides
+    MtbColtDao providesMtbColtDao(AppDatabase appDatabase) {
+        return appDatabase.mtbColtDao();
+    }
+
+    @Singleton
+    @Provides
+    MtbColrDao providesMtbColrDao(AppDatabase appDatabase) {
+        return appDatabase.mtbColrDao();
+    }
+



@@ -96,4 +114,16 @@ public class RoomModule {
        return new OrdineDataSource(ordineDao);
    }

+    @Singleton
+    @Provides
+    MtbColtRepository providesMtbColtRepository(MtbColtDao mtbColtDao) {
+        return new SqlMtbColtDataSource(mtbColtDao);
+    }
+
+    @Singleton
+    @Provides
+    MtbColrRepository providesMtbColrRepository(MtbColrDao mtbColrDao) {
+        return new SqlMtbColrDataSource(mtbColrDao);
+    }
+
 }
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/converter/BigDecimalConverter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/converter/BigDecimalConverter.java
@@ -0,0 +1,17 @@
+package it.integry.integrywmsnative.core.data_store.db.converter;
+
+import androidx.room.TypeConverter;
+
+import java.math.BigDecimal;
+
+public class BigDecimalConverter {
+    @TypeConverter
+    public static BigDecimal fromFloat(Float value) {
+        return value == null ? null : BigDecimal.valueOf(value.doubleValue());
+    }
+
+    @TypeConverter
+    public static Float dateToTimestamp(BigDecimal value) {
+        return value == null ? null : value.floatValue();
+    }
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/ArticoloGrigliaDao.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/ArticoloGrigliaDao.java
@@ -4,9 +4,10 @@ import androidx.room.Dao;
 import androidx.room.Delete;
 import androidx.room.Insert;
 import androidx.room.Query;
+import androidx.room.RawQuery;
 import androidx.room.Update;
+import androidx.sqlite.db.SupportSQLiteQuery;

-import java.util.ArrayList;
 import java.util.List;

 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
@@ -21,10 +22,13 @@ public interface ArticoloGrigliaDao {

    @Insert
    void insertAll(List<ArticoloGriglia> articoli);
+
    @Insert
    Long insert(ArticoloGriglia articolo);
+
    @Update
    void updateAll(List<ArticoloGriglia> articoli);
+
    @Update
    void update(ArticoloGriglia articolo);

@@ -37,12 +41,18 @@ public interface ArticoloGrigliaDao {
    @Query("SELECT * FROM articoli_griglia WHERE cod_mart = :codMart AND id_griglia = :idGriglia LIMIT 1")
    ArticoloGriglia findArticoloByCodMartAndGriglia(String codMart, int idGriglia);

-    @Query("SELECT * FROM articoli_griglia WHERE (cod_mart = :scan OR bar_code =:scan )AND id_griglia = :idGriglia LIMIT 1")
+    @Query("SELECT * FROM articoli_griglia WHERE (cod_mart = :scan OR bar_code =:scan) AND id_griglia = :idGriglia LIMIT 1")
    ArticoloGriglia findArticoloByScanAndGriglia(String scan, int idGriglia);

-    @Query("SELECT articolo_griglia_id FROM articoli_griglia WHERE (cod_mart = :codMart AND bar_code =:barCode )AND id_griglia = :idGriglia LIMIT 1")
+    @Query("SELECT articolo_griglia_id FROM articoli_griglia WHERE (cod_mart = :codMart AND bar_code =:barCode) AND id_griglia = :idGriglia LIMIT 1")
    Integer getIdArticoloByGrigliaAndBarcodeAndCodMart(int idGriglia, String barCode, String codMart);

+    @RawQuery(observedEntities = ArticoloGriglia.class)
+    List<ArticoloGriglia> getArticoli(SupportSQLiteQuery query);
+
    @Query("SELECT * FROM articoli_griglia WHERE id_griglia = :grigliaId")
    List<ArticoloGriglia> getArticoliFromGriglia(int grigliaId);
+
+    @Query("SELECT * FROM articoli_griglia WHERE id_griglia = :grigliaId AND new_no_promo = 1")
+    List<ArticoloGriglia> getNewArticoliInGriglia(int grigliaId);
 }
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/ArticoloOrdineDao.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/ArticoloOrdineDao.java
@@ -8,9 +8,8 @@ import androidx.room.Update;

 import java.util.List;

-import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
-import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
+import it.integry.integrywmsnative.core.data_store.db.wrappers.ArticoloOrdineWrapper;

@Dao
 public interface ArticoloOrdineDao {
@@ -34,8 +33,17 @@ public interface ArticoloOrdineDao {
    @Update
    void update(ArticoloOrdine articolo);

-    @Query("SELECT * FROM articoli_ordine where id_ordine = :ordineId")
-    List<ArticoloOrdine> findArticoliByOrdine(int ordineId);
+    @Query("SELECT articoli_ordine.*," +
+            "articoli_griglia.gg_scadenza," +
+            "articoli_griglia.giacenza," +
+            "articoli_griglia.qta_prevista_vendita," +
+            "articoli_griglia.qta_proposta " +
+            "FROM articoli_ordine " +
+            "INNER JOIN ordini on articoli_ordine.id_ordine = ordini.ordine_id " +
+            "LEFT OUTER JOIN articoli_griglia " +
+            "on articoli_ordine.cod_mart = articoli_griglia.cod_mart  and ordini.id_griglia = articoli_griglia.id_griglia and articoli_ordine.bar_code = articoli_griglia.bar_code " +
+            "where id_ordine = :ordineId")
+    List<ArticoloOrdineWrapper> findArticoliByOrdine(int ordineId);

    @Query("SELECt * from articoli_ordine where cod_mart = :codMart and id_ordine = :ordineId LIMIT 1")
    ArticoloOrdine findArticoloByCodMartAndOrdine(int ordineId, String codMart);
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/GrigliaDao.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/GrigliaDao.java
@@ -8,7 +8,6 @@ import androidx.room.Update;

 import java.util.List;

-import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
 import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
 import it.integry.integrywmsnative.core.data_store.db.wrappers.GrigliaWrapper;

@@ -17,7 +16,7 @@ public interface GrigliaDao {
    @Query("SELECT * from griglie")
    List<Griglia> getAll();

-    @Query("SELECT *, COUNT(articoli_griglia.articolo_griglia_id) as countArticoli from griglie LEFT JOIN articoli_griglia ON (griglie.griglia_id = articoli_griglia.id_griglia) where cod_alis = :codAlis GROUP BY griglie.griglia_id")
+    @Query("SELECT griglie.*, COUNT(articoli_griglia.articolo_griglia_id) as countArticoli from griglie LEFT JOIN articoli_griglia ON (griglie.griglia_id = articoli_griglia.id_griglia) where cod_alis = :codAlis GROUP BY griglie.griglia_id")
    GrigliaWrapper findByCodAlis(String codAlis);

    @Insert
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/MtbColrDao.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/MtbColrDao.java
@@ -0,0 +1,30 @@
+package it.integry.integrywmsnative.core.data_store.db.dao;
+
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.Query;
+import androidx.room.Update;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
+
+@Dao
+public interface MtbColrDao {
+    @Query("SELECT * from mtb_colr ")
+    List<SqlMtbColr> getAll();
+
+    @Insert
+    Long insert(SqlMtbColr mtbColr);
+
+    @Update
+    void update(SqlMtbColr mtbColr);
+
+    @Delete
+    void delete(SqlMtbColr mtbColr);
+
+    @Query("SELECT * from mtb_colr where id_collo = :idDocument")
+    List<SqlMtbColr> getDocumentRows(int idDocument);
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/MtbColtDao.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/MtbColtDao.java
@@ -0,0 +1,43 @@
+package it.integry.integrywmsnative.core.data_store.db.dao;
+
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.Query;
+import androidx.room.Update;
+
+import java.util.Date;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
+import it.integry.integrywmsnative.core.data_store.db.view_model.OrdineWithGriglia;
+import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper;
+import it.integry.integrywmsnative.core.data_store.db.wrappers.OrdineWrapper;
+
+@Dao
+public interface MtbColtDao {
+    @Query("SELECT * from mtb_colt")
+    List<SqlMtbColt> getAll();
+
+    @Insert
+    Long insert(SqlMtbColt mtbColt);
+
+    @Update
+    void update(SqlMtbColt mtbColt);
+
+    @Delete
+    void delete(SqlMtbColt mtbColt);
+
+    @Query("SELECT mtb_colt.*, count(mtb_colr.id) as countArticoli from mtb_colt left outer join mtb_colr on (mtb_colr.id_collo = mtb_colt.id) where" +
+            " cod_dtip_provv = :codDtip " +
+            " AND ( cod_anag = :codAnag OR (cod_anag is null and :codAnag is null)) " +
+            " AND ( cod_vdes = :codVdes OR (cod_vdes is null and :codVdes is null)) " +
+            " AND ( mtb_colt.data_doc = :dataDoc OR (mtb_colt.data_doc is null and :dataDoc is null)) " +
+            " AND ( mtb_colt.num_doc = :numDoc OR (mtb_colt.num_doc is null and :numDoc is null)) " +
+            " and cod_dtip is null group by mtb_colt.id")
+    List<DocInternoWrapper> getLocalDocumentsByCodDtip(String codDtip, String codAnag, String codVdes, Date dataDoc, String numDoc);
+
+    @Query("SELECT ifnull(MAX(num_collo),0) +1 as num_collo from mtb_colt")
+    Integer getNextNumCollo();
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloGriglia.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloGriglia.java
@@ -6,6 +6,8 @@ import androidx.room.ForeignKey;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;

+import java.math.BigDecimal;
+
 import it.integry.integrywmsnative.core.utility.UtilityDate;

@Entity(
@@ -25,7 +27,7 @@ import it.integry.integrywmsnative.core.utility.UtilityDate;
 public class ArticoloGriglia {
    @PrimaryKey(autoGenerate = true)
    @ColumnInfo(name = "articolo_griglia_id")
-    private int articoloGrigliaId;
+    private Integer articoloGrigliaId;

    @ColumnInfo(name = "cod_mart")
    private String codMart;
@@ -54,14 +56,29 @@ public class ArticoloGriglia {
    @ColumnInfo(name = "qta_min_ordinabile")
    private float qtaMinOrdinabile;

+    @ColumnInfo(name = "gg_scadenza")
+    private int ggScadenza;
+
+    @ColumnInfo(name = "giacenza")
+    private float giacenza;
+
+    @ColumnInfo(name = "qta_prevista_vendita")
+    private float qtaPrevistaVendita;
+
+    @ColumnInfo(name = "qta_proposta")
+    private float qtaProposta;
+
    @ColumnInfo(name = "id_griglia")
    private int idGriglia;

-    public int getArticoloGrigliaId() {
+    @ColumnInfo(name = "new_no_promo")
+    private boolean newNoPromo = false;
+
+    public Integer getArticoloGrigliaId() {
        return articoloGrigliaId;
    }

-    public void setArticoloGrigliaId(int articoloGrigliaId) {
+    public void setArticoloGrigliaId(Integer articoloGrigliaId) {
        this.articoloGrigliaId = articoloGrigliaId;
    }

@@ -145,6 +162,46 @@ public class ArticoloGriglia {
        this.idGriglia = idGriglia;
    }

+    public int getGgScadenza() {
+        return ggScadenza;
+    }
+
+    public void setGgScadenza(int ggScadenza) {
+        this.ggScadenza = ggScadenza;
+    }
+
+    public float getGiacenza() {
+        return giacenza;
+    }
+
+    public void setGiacenza(float giacenza) {
+        this.giacenza = giacenza;
+    }
+
+    public float getQtaPrevistaVendita() {
+        return qtaPrevistaVendita;
+    }
+
+    public void setQtaPrevistaVendita(float qtaPrevistaVendita) {
+        this.qtaPrevistaVendita = qtaPrevistaVendita;
+    }
+
+    public float getQtaProposta() {
+        return qtaProposta;
+    }
+
+    public void setQtaProposta(float qtaProposta) {
+        this.qtaProposta = qtaProposta;
+    }
+
+    public boolean isNewNoPromo() {
+        return newNoPromo;
+    }
+
+    public void setNewNoPromo(boolean newNoPromo) {
+        this.newNoPromo = newNoPromo;
+    }
+
    public ArticoloOrdine convertToArticoloOrdine(Ordine ordine) {
        ArticoloOrdine articolo = new ArticoloOrdine();

@@ -160,6 +217,12 @@ public class ArticoloGriglia {
        articolo.setUntMis(this.getUntMis());
        articolo.setDescrizione(this.getDescrizione());
        articolo.setDataIns(UtilityDate.getDateInstance());
+        articolo.setGgScadenza(this.getGgScadenza());
+        articolo.setGiacenza(BigDecimal.valueOf(this.getGiacenza()));
+        articolo.setQtaPrevistaVendita(BigDecimal.valueOf(this.getQtaPrevistaVendita()));
+        articolo.setQtaProposta(BigDecimal.valueOf(this.getQtaProposta()));
+        articolo.setNewNoPromo(this.isNewNoPromo());
+
        articolo.setQtaOrd(0);

        return articolo;
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java
@@ -3,16 +3,19 @@ package it.integry.integrywmsnative.core.data_store.db.entity;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.ForeignKey;
+import androidx.room.Ignore;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;

+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;

@Entity(
        tableName = "articoli_ordine",
        indices = {
                @Index(value = "id_ordine"),
-                @Index(value = {"id_ordine","cod_mart"}, unique = true)
+                @Index(value = {"id_ordine", "cod_mart"}, unique = true)
        },
        foreignKeys = {
                @ForeignKey(
@@ -22,11 +25,11 @@ import java.util.Date;
                        onDelete = ForeignKey.CASCADE
                )
        }
-        )
+)
 public class ArticoloOrdine {
    @PrimaryKey(autoGenerate = true)
    @ColumnInfo(name = "articolo_ordine_id")
-    private int articoloOrdineId;
+    private Integer articoloOrdineId;

    @ColumnInfo(name = "cod_mart")
    private String codMart;
@@ -64,11 +67,30 @@ public class ArticoloOrdine {
    @ColumnInfo(name = "data_ins")
    private Date dataIns;

-    public int getArticoloOrdineId() {
+    @ColumnInfo(name = "new_no_promo")
+    private boolean newNoPromo;
+
+    @Ignore
+    private int ggScadenza = 0;
+
+    @Ignore
+    private BigDecimal giacenza = BigDecimal.ZERO;
+
+    @Ignore
+    private BigDecimal qtaPrevistaVendita = BigDecimal.ZERO;
+
+    @Ignore
+    private BigDecimal qtaProposta = BigDecimal.ZERO;
+
+    @Ignore
+    private int bgTint;
+
+
+    public Integer getArticoloOrdineId() {
        return articoloOrdineId;
    }

-    public void setArticoloOrdineId(int articoloOrdineId) {
+    public void setArticoloOrdineId(Integer articoloOrdineId) {
        this.articoloOrdineId = articoloOrdineId;
    }

@@ -167,4 +189,81 @@ public class ArticoloOrdine {
    public void setDataIns(Date dataIns) {
        this.dataIns = dataIns;
    }
+
+    public int getGgScadenza() {
+        return ggScadenza;
+    }
+
+    public ArticoloOrdine setGgScadenza(int ggScadenza) {
+        this.ggScadenza = ggScadenza;
+        return this;
+    }
+
+    public BigDecimal getGiacenza() {
+        return giacenza;
+    }
+
+    public ArticoloOrdine setGiacenza(BigDecimal giacenza) {
+        this.giacenza = giacenza;
+        return this;
+    }
+
+    public BigDecimal getQtaPrevistaVendita() {
+        return qtaPrevistaVendita;
+    }
+
+    public ArticoloOrdine setQtaPrevistaVendita(BigDecimal qtaPrevistaVendita) {
+        this.qtaPrevistaVendita = qtaPrevistaVendita;
+        return this;
+    }
+
+    public BigDecimal getQtaProposta() {
+        return qtaProposta;
+    }
+
+    public ArticoloOrdine setQtaProposta(BigDecimal qtaProposta) {
+        this.qtaProposta = qtaProposta;
+        return this;
+    }
+
+    public BigDecimal getQtaCnfPrevistaVendita() {
+        return qtaPrevistaVendita.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaPrevistaVendita.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
+    }
+
+    public BigDecimal getQtaCnfProposta() {
+        return qtaProposta.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaProposta.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
+    }
+
+    public BigDecimal getQtaCnfGiacenza() {
+        return giacenza.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : giacenza.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
+    }
+
+    public boolean isNewNoPromo() {
+        return newNoPromo;
+    }
+
+    public void setNewNoPromo(boolean newNoPromo) {
+        this.newNoPromo = newNoPromo;
+    }
+
+    public float getCnfDaRic() {
+        return qtaCnf > 0.f ? merceDaRic * qtaCnf : 0;
+    }
+
+    public int checkQtaProposta() {
+        int check = 0;
+        if (!qtaProposta.equals(BigDecimal.ZERO)) {
+            check = BigDecimal.valueOf(qtaOrd).compareTo(qtaProposta);
+        }
+        return check;
+    }
+
+    public int getBgTint() {
+        return bgTint;
+    }
+
+    public ArticoloOrdine setBgTint(int bgTint) {
+        this.bgTint = bgTint;
+        return this;
+    }
 }
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/Griglia.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/Griglia.java
@@ -11,6 +11,7 @@ import androidx.room.PrimaryKey;
                @Index(value = "cod_alis", unique = true)
        }
 )
+
 public class Griglia {
    @PrimaryKey(autoGenerate = true)
    @ColumnInfo(name = "griglia_id")
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/SqlMtbColr.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/SqlMtbColr.java
@@ -0,0 +1,438 @@
+package it.integry.integrywmsnative.core.data_store.db.entity;
+
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.ForeignKey;
+import androidx.room.Index;
+import androidx.room.PrimaryKey;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Entity(
+        tableName = "mtb_colr",
+        indices = {
+                @Index(value = {"data_collo", "ser_collo", "num_collo", "gestione","riga"}, unique = true),
+                @Index(value = {"id_collo"})
+        },
+        foreignKeys = {
+                @ForeignKey(
+                        entity = SqlMtbColt.class,
+                        parentColumns = "id",
+                        childColumns = "id_collo",
+                        onDelete = ForeignKey.CASCADE
+                )
+        }
+)
+
+public class SqlMtbColr {
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = "id")
+    private int id;
+
+    @ColumnInfo(name = "id_collo")
+    private int idCollo;
+
+
+    @ColumnInfo(name = "data_collo")
+    private Date dataCollo;
+
+    @ColumnInfo(name = "gestione")
+    private String gestione;
+
+    @ColumnInfo(name = "ser_collo")
+    private String serCollo;
+
+    @ColumnInfo(name = "descrizione")
+    private String descrizione;
+
+    @ColumnInfo(name = "num_collo")
+    private Integer numCollo;
+
+
+    @ColumnInfo(name = "riga")
+    private Integer riga;
+
+    @ColumnInfo(name = "riga_ord")
+    private Integer rigaOrd;
+
+    @ColumnInfo(name = "cod_mart")
+    private String codMart;
+
+    @ColumnInfo(name = "cod_barre")
+    private String codBarre;
+
+    @ColumnInfo(name = "cod_col")
+    private String codCol;
+
+    @ColumnInfo(name = "cod_tagl")
+    private String codTagl;
+
+    @ColumnInfo(name = "partita_mag")
+    private String partitaMag;
+
+    @ColumnInfo(name = "gestione_rif")
+    private String gestioneRif;
+
+    @ColumnInfo(name = "ser_collo_rif")
+    private String serColloRif;
+
+    @ColumnInfo(name = "note")
+    private String note;
+
+    @ColumnInfo(name = "data_ord")
+    private Date dataOrd;
+
+    @ColumnInfo(name = "data_collo_rif")
+    private Date dataColloRif;
+
+    @ColumnInfo(name = "qta_cnf")
+    private Float qtaCnf;
+
+    @ColumnInfo(name = "qta_col")
+    private Float qtaCol;
+
+    @ColumnInfo(name = "num_ord")
+    private Integer numOrd;
+
+    @ColumnInfo(name = "num_etich")
+    private Integer numEtich;
+
+    @ColumnInfo(name = "num_collo_rif")
+    private Integer numColloRif;
+
+    @ColumnInfo(name = "datetime_row")
+    private Date datetimeRow;
+
+    @ColumnInfo(name = "cod_jcom")
+    private String codJcom;
+
+    @ColumnInfo(name = "num_cnf")
+    private Float numCnf;
+
+    @ColumnInfo(name = "causale")
+    private String causale;
+
+    @ColumnInfo(name = "utente")
+    private String utente;
+
+    @ColumnInfo(name = "cod_anag_doc")
+    private String codAnagDoc;
+
+    @ColumnInfo(name = "cod_dtip_doc")
+    private String codDtipDoc;
+
+    @ColumnInfo(name = "data_doc")
+    private Date dataDoc;
+
+    @ColumnInfo(name = "ser_doc")
+    private String serDoc;
+
+    @ColumnInfo(name = "num_doc")
+    private Integer numDoc;
+
+    @ColumnInfo(name = "id_riga_doc")
+    private Integer idRigaDoc;
+
+    @ColumnInfo(name = "unt_mis")
+    private String untMis;
+    @ColumnInfo(name = "data_scad")
+    private Date dataScad;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getIdCollo() {
+        return idCollo;
+    }
+
+    public void setIdCollo(int idCollo) {
+        this.idCollo = idCollo;
+    }
+
+    public Date getDataCollo() {
+        return dataCollo;
+    }
+
+    public void setDataCollo(Date dataCollo) {
+        this.dataCollo = dataCollo;
+    }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public void setGestione(String gestione) {
+        this.gestione = gestione;
+    }
+
+    public String getSerCollo() {
+        return serCollo;
+    }
+
+    public void setSerCollo(String serCollo) {
+        this.serCollo = serCollo;
+    }
+
+    public Integer getNumCollo() {
+        return numCollo;
+    }
+
+    public void setNumCollo(Integer numCollo) {
+        this.numCollo = numCollo;
+    }
+
+    public Integer getRiga() {
+        return riga;
+    }
+
+    public void setRiga(Integer riga) {
+        this.riga = riga;
+    }
+
+    public Integer getRigaOrd() {
+        return rigaOrd;
+    }
+
+    public void setRigaOrd(Integer rigaOrd) {
+        this.rigaOrd = rigaOrd;
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public void setCodMart(String codMart) {
+        this.codMart = codMart;
+    }
+
+    public String getCodBarre() {
+        return codBarre;
+    }
+
+    public void setCodBarre(String codBarre) {
+        this.codBarre = codBarre;
+    }
+
+    public String getCodCol() {
+        return codCol;
+    }
+
+    public void setCodCol(String codCol) {
+        this.codCol = codCol;
+    }
+
+    public String getCodTagl() {
+        return codTagl;
+    }
+
+    public void setCodTagl(String codTagl) {
+        this.codTagl = codTagl;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public void setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+    }
+
+    public String getGestioneRif() {
+        return gestioneRif;
+    }
+
+    public void setGestioneRif(String gestioneRif) {
+        this.gestioneRif = gestioneRif;
+    }
+
+    public String getSerColloRif() {
+        return serColloRif;
+    }
+
+    public void setSerColloRif(String serColloRif) {
+        this.serColloRif = serColloRif;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    public Date getDataOrd() {
+        return dataOrd;
+    }
+
+    public void setDataOrd(Date dataOrd) {
+        this.dataOrd = dataOrd;
+    }
+
+    public Date getDataColloRif() {
+        return dataColloRif;
+    }
+
+    public void setDataColloRif(Date dataColloRif) {
+        this.dataColloRif = dataColloRif;
+    }
+
+    public Float getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public void setQtaCnf(Float qtaCnf) {
+        this.qtaCnf = qtaCnf;
+    }
+
+    public Float getQtaCol() {
+        return qtaCol;
+    }
+
+    public void setQtaCol(Float qtaCol) {
+        this.qtaCol = qtaCol;
+    }
+
+    public Integer getNumOrd() {
+        return numOrd;
+    }
+
+    public void setNumOrd(Integer numOrd) {
+        this.numOrd = numOrd;
+    }
+
+    public Integer getNumEtich() {
+        return numEtich;
+    }
+
+    public void setNumEtich(Integer numEtich) {
+        this.numEtich = numEtich;
+    }
+
+    public Integer getNumColloRif() {
+        return numColloRif;
+    }
+
+    public void setNumColloRif(Integer numColloRif) {
+        this.numColloRif = numColloRif;
+    }
+
+    public Date getDatetimeRow() {
+        return datetimeRow;
+    }
+
+    public void setDatetimeRow(Date datetimeRow) {
+        this.datetimeRow = datetimeRow;
+    }
+
+    public String getCodJcom() {
+        return codJcom;
+    }
+
+    public void setCodJcom(String codJcom) {
+        this.codJcom = codJcom;
+    }
+
+    public Float getNumCnf() {
+        return numCnf;
+    }
+
+    public void setNumCnf(Float numCnf) {
+        this.numCnf = numCnf;
+    }
+
+    public String getCausale() {
+        return causale;
+    }
+
+    public void setCausale(String causale) {
+        this.causale = causale;
+    }
+
+    public String getUtente() {
+        return utente;
+    }
+
+    public void setUtente(String utente) {
+        this.utente = utente;
+    }
+
+    public String getCodAnagDoc() {
+        return codAnagDoc;
+    }
+
+    public void setCodAnagDoc(String codAnagDoc) {
+        this.codAnagDoc = codAnagDoc;
+    }
+
+    public String getCodDtipDoc() {
+        return codDtipDoc;
+    }
+
+    public void setCodDtipDoc(String codDtipDoc) {
+        this.codDtipDoc = codDtipDoc;
+    }
+
+    public Date getDataDoc() {
+        return dataDoc;
+    }
+
+    public void setDataDoc(Date dataDoc) {
+        this.dataDoc = dataDoc;
+    }
+
+    public String getSerDoc() {
+        return serDoc;
+    }
+
+    public void setSerDoc(String serDoc) {
+        this.serDoc = serDoc;
+    }
+
+    public Integer getNumDoc() {
+        return numDoc;
+    }
+
+    public void setNumDoc(Integer numDoc) {
+        this.numDoc = numDoc;
+    }
+
+    public Integer getIdRigaDoc() {
+        return idRigaDoc;
+    }
+
+    public void setIdRigaDoc(Integer idRigaDoc) {
+        this.idRigaDoc = idRigaDoc;
+    }
+
+    public String getUntMis() {
+        return untMis;
+    }
+
+    public void setUntMis(String untMis) {
+        this.untMis = untMis;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public void setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+    }
+
+    public Date getDataScad() {
+        return dataScad;
+    }
+
+    public void setDataScad(Date dataScad) {
+        this.dataScad = dataScad;
+    }
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/SqlMtbColt.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/SqlMtbColt.java
@@ -0,0 +1,341 @@
+package it.integry.integrywmsnative.core.data_store.db.entity;
+
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.Index;
+import androidx.room.PrimaryKey;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Entity(
+        tableName = "mtb_colt",
+        indices = {
+                @Index(value = {"data_collo", "ser_collo", "num_collo", "gestione"}, unique = true)
+        }
+)
+
+public class SqlMtbColt {
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = "id")
+    private int id;
+
+    @ColumnInfo(name = "username")
+    private String username;
+
+    @ColumnInfo
+    private String gestione;
+
+    @ColumnInfo(name = "data_collo")
+    private Date dataCollo;
+
+    @ColumnInfo(name = "ser_collo")
+    private String serCollo;
+
+    @ColumnInfo(name = "num_collo")
+    private Integer numCollo;
+
+    @ColumnInfo(name = "rif_ord")
+    private String rifOrd;
+
+    @ColumnInfo(name = "cod_anag")
+    private String codAnag;
+
+    @ColumnInfo(name = "cod_vdes")
+    private String codVdes;
+
+    @ColumnInfo(name = "cod_mdep")
+    private String codMdep;
+
+    @ColumnInfo(name = "cod_vlis")
+    private String codVlis;
+
+    @ColumnInfo(name = "cod_dtip")
+    private String codDtip;
+
+    @ColumnInfo(name = "cod_tcol")
+    private String codTcol;
+
+    @ColumnInfo(name = "ser_doc")
+    private String serDoc;
+
+    @ColumnInfo(name = "annotazioni")
+    private String annotazioni;
+
+    @ColumnInfo(name = "posizione")
+    private String posizione;
+
+    @ColumnInfo(name = "cod_dtip_provv")
+    private String codDtipProvv;
+
+    @ColumnInfo(name = "ser_doc_provv")
+    private String serDocProvv;
+
+    @ColumnInfo(name = "cod_jfas")
+    private String codJfas;
+
+    @ColumnInfo(name = "data_ord")
+    private Date dataOrd;
+
+    @ColumnInfo(name = "data_doc")
+    private Date dataDoc;
+
+    @ColumnInfo(name = "data_doc_provv")
+    private Date dataDocProvv;
+
+    @ColumnInfo(name = "cod_mgrp")
+    private String codMgrp;
+
+    @ColumnInfo(name = "data_vers")
+    private Date dataVers;
+
+    @ColumnInfo(name = "segno")
+    private Integer segno;
+
+    @ColumnInfo(name = "num_ord")
+    private Integer numOrd;
+
+    @ColumnInfo(name = "num_doc")
+    private Integer numDoc;
+
+    @ColumnInfo(name = "num_doc_provv")
+    private Integer numDocProvv;
+
+    @Ignore
+    private List<SqlMtbColr> sqlMtbColrs = new ArrayList<>();
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public void setGestione(String gestione) {
+        this.gestione = gestione;
+    }
+
+    public Date getDataCollo() {
+        return dataCollo;
+    }
+
+    public void setDataCollo(Date dataCollo) {
+        this.dataCollo = dataCollo;
+    }
+
+    public String getSerCollo() {
+        return serCollo;
+    }
+
+    public void setSerCollo(String serCollo) {
+        this.serCollo = serCollo;
+    }
+
+    public Integer getNumCollo() {
+        return numCollo;
+    }
+
+    public void setNumCollo(Integer numCollo) {
+        this.numCollo = numCollo;
+    }
+
+    public String getRifOrd() {
+        return rifOrd;
+    }
+
+    public void setRifOrd(String rifOrd) {
+        this.rifOrd = rifOrd;
+    }
+
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public void setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+    }
+
+    public String getCodVdes() {
+        return codVdes;
+    }
+
+    public void setCodVdes(String codVdes) {
+        this.codVdes = codVdes;
+    }
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public void setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+    }
+
+    public String getCodVlis() {
+        return codVlis;
+    }
+
+    public void setCodVlis(String codVlis) {
+        this.codVlis = codVlis;
+    }
+
+    public String getCodDtip() {
+        return codDtip;
+    }
+
+    public void setCodDtip(String codDtip) {
+        this.codDtip = codDtip;
+    }
+
+    public String getCodTcol() {
+        return codTcol;
+    }
+
+    public void setCodTcol(String codTcol) {
+        this.codTcol = codTcol;
+    }
+
+    public String getSerDoc() {
+        return serDoc;
+    }
+
+    public void setSerDoc(String serDoc) {
+        this.serDoc = serDoc;
+    }
+
+    public String getAnnotazioni() {
+        return annotazioni;
+    }
+
+    public void setAnnotazioni(String annotazioni) {
+        this.annotazioni = annotazioni;
+    }
+
+    public String getPosizione() {
+        return posizione;
+    }
+
+    public void setPosizione(String posizione) {
+        this.posizione = posizione;
+    }
+
+    public String getCodDtipProvv() {
+        return codDtipProvv;
+    }
+
+    public void setCodDtipProvv(String codDtipProvv) {
+        this.codDtipProvv = codDtipProvv;
+    }
+
+    public String getSerDocProvv() {
+        return serDocProvv;
+    }
+
+    public void setSerDocProvv(String serDocProvv) {
+        this.serDocProvv = serDocProvv;
+    }
+
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public void setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+    }
+
+    public Date getDataOrd() {
+        return dataOrd;
+    }
+
+    public void setDataOrd(Date dataOrd) {
+        this.dataOrd = dataOrd;
+    }
+
+    public Date getDataDoc() {
+        return dataDoc;
+    }
+
+    public void setDataDoc(Date dataDoc) {
+        this.dataDoc = dataDoc;
+    }
+
+    public Date getDataDocProvv() {
+        return dataDocProvv;
+    }
+
+    public void setDataDocProvv(Date dataDocProvv) {
+        this.dataDocProvv = dataDocProvv;
+    }
+
+    public Date getDataVers() {
+        return dataVers;
+    }
+
+    public void setDataVers(Date dataVers) {
+        this.dataVers = dataVers;
+    }
+
+    public Integer getSegno() {
+        return segno;
+    }
+
+    public void setSegno(Integer segno) {
+        this.segno = segno;
+    }
+
+    public Integer getNumOrd() {
+        return numOrd;
+    }
+
+    public void setNumOrd(Integer numOrd) {
+        this.numOrd = numOrd;
+    }
+
+    public Integer getNumDoc() {
+        return numDoc;
+    }
+
+    public void setNumDoc(Integer numDoc) {
+        this.numDoc = numDoc;
+    }
+
+    public Integer getNumDocProvv() {
+        return numDocProvv;
+    }
+
+    public void setNumDocProvv(Integer numDocProvv) {
+        this.numDocProvv = numDocProvv;
+    }
+
+    public List<SqlMtbColr> getSqlMtbColrs() {
+        return sqlMtbColrs;
+    }
+
+    public void setSqlMtbColrs(List<SqlMtbColr> sqlMtbColrs) {
+        this.sqlMtbColrs = sqlMtbColrs;
+    }
+
+    public String getCodMgrp() {
+        return codMgrp;
+    }
+
+    public void setCodMgrp(String codMgrp) {
+        this.codMgrp = codMgrp;
+    }
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/ArticoloGrigliaRepository.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/ArticoloGrigliaRepository.java
@@ -16,4 +16,6 @@ public interface ArticoloGrigliaRepository {

    void findArticoloByScanAndGriglia(String scan, int idGriglia, RunnableArgs<ArticoloGriglia> onSuccess, RunnableArgs<Exception> onFail);

+    void findNewArticoliInGrigla(int idGriglia, RunnableArgs<List<ArticoloGriglia>> onSuccess, RunnableArgs<Exception> onFail);
+
 }
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/MtbColrRepository.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/MtbColrRepository.java
@@ -0,0 +1,21 @@
+package it.integry.integrywmsnative.core.data_store.db.repository;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public interface MtbColrRepository {
+
+    void selectAll(RunnableArgs<List<SqlMtbColr>> onSuccess, RunnableArgs<Exception> onError);
+
+    void insert(SqlMtbColr mtbColr, RunnableArgs<Integer> onSuccess, RunnableArgs<Exception> onError);
+
+    void update(SqlMtbColr mtbColr, RunnableArgs<SqlMtbColr> onSuccess, RunnableArgs<Exception> onError);
+
+    void delete(SqlMtbColr mtbColr, Runnable onSuccess, RunnableArgs<Exception> onError);
+
+    void getDocumentRows(SqlMtbColt sqlMtbColt, RunnableArgs<List<SqlMtbColr>> onSuccess, RunnableArgs<Exception> onError);
+
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/MtbColtRepository.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/MtbColtRepository.java
@@ -0,0 +1,28 @@
+package it.integry.integrywmsnative.core.data_store.db.repository;
+
+import java.util.Date;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
+import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
+import it.integry.integrywmsnative.core.data_store.db.view_model.OrdineWithGriglia;
+import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper;
+import it.integry.integrywmsnative.core.data_store.db.wrappers.OrdineWrapper;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public interface MtbColtRepository {
+
+    void selectAll(RunnableArgs<List<SqlMtbColt>> onSuccess, RunnableArgs<Exception> onError);
+
+    void insert(SqlMtbColt mtbColt, RunnableArgs<Integer> onSuccess, RunnableArgs<Exception> onError);
+
+    void update(SqlMtbColt mtbColt, RunnableArgs<SqlMtbColt> onSuccess, RunnableArgs<Exception> onError);
+
+    void delete(SqlMtbColt mtbColt, Runnable onSuccess, RunnableArgs<Exception> onError);
+
+    void getLocalDocumentsByCodDtip(String codDtip, String codAnag, String codVdes, Date dataDoc, String numDoc, RunnableArgs<List<DocInternoWrapper>> onSuccess, RunnableArgs<Exception> onError);
+
+    void getNextNumCollo(RunnableArgs<Integer> onSuccess, RunnableArgs<Exception> onError);
+
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/ArticoliGrigliaDataSource.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/ArticoliGrigliaDataSource.java
@@ -5,7 +5,14 @@ import com.annimon.stream.Stream;
 import org.apache.commons.lang3.StringUtils;

 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;

 import javax.inject.Inject;

@@ -24,27 +31,21 @@ public class ArticoliGrigliaDataSource extends Repository implements ArticoloGri
        this.mArticoloGrigliaDao = articoloGrigliaDao;
    }

-    public void saveArticoliToGriglia(List<ArticoloGriglia> articoli, Griglia griglia, Runnable onSuccess, RunnableArgs<Exception> onFail) {
+    public void saveArticoliToGriglia(List<ArticoloGriglia> updatedArts, Griglia griglia, Runnable onSuccess, RunnableArgs<Exception> onFail) {
        execute(() -> {
            try {
-                List<ArticoloGriglia> toUpdate = new ArrayList<>();
-                List<ArticoloGriglia> toInsert = new ArrayList<>();
-                List<String> codMarts = new ArrayList<>();
-                for (ArticoloGriglia art : articoli) {
-                    Integer id = mArticoloGrigliaDao.getIdArticoloByGrigliaAndBarcodeAndCodMart(griglia.getGrigliaId(), art.getBarCode(), art.getCodMart());
-                    codMarts.add(art.getCodMart());
-                    if (id != null) {
-                        art.setArticoloGrigliaId(id);
-                        toUpdate.add(art);
-                    } else {
-                        toInsert.add(art);
-                    }
-                }
+                var tmp = calcItemsToInsertAndUpdate(updatedArts);
+                var toInsert = (List<ArticoloGriglia>) tmp.get("toInsert");
+                var toUpdate = (List<ArticoloGriglia>) tmp.get("toUpdate");
+                var codMarts = (List<String>) tmp.get("codMarts");
+
                mArticoloGrigliaDao.insertAll(toInsert);
                mArticoloGrigliaDao.updateAll(toUpdate);
+
                List<ArticoloGriglia> articoliGriglia = mArticoloGrigliaDao.getArticoliFromGriglia(griglia.getGrigliaId());
                List<ArticoloGriglia> toDelete = Stream.of(articoliGriglia).filter(articolo -> !codMarts.contains(articolo.getCodMart())).toList();
                mArticoloGrigliaDao.deleteList(toDelete);
+
                onSuccess.run();
            } catch (Exception e) {
                onFail.run(e);
@@ -52,6 +53,52 @@ public class ArticoliGrigliaDataSource extends Repository implements ArticoloGri
        });
    }

+    private HashMap<String, Object> calcItemsToInsertAndUpdate(List<ArticoloGriglia> updatedArts) throws InterruptedException, ExecutionException {
+        var toInsert = new ArrayList<ArticoloGriglia>();
+        var toUpdate = new ArrayList<ArticoloGriglia>();
+        var codMarts = new ArrayList<String>();
+
+        int cores = Runtime.getRuntime().availableProcessors();
+        ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(cores);
+        List<Callable<ArticoloGriglia>> calls = new ArrayList<>();
+
+        for (int i = 0; i < updatedArts.size(); i++) {
+            int finalI = i;
+            Callable<ArticoloGriglia> callableTask = () -> {
+                var updatedArt = updatedArts.get(finalI);
+                Integer id = mArticoloGrigliaDao.getIdArticoloByGrigliaAndBarcodeAndCodMart(updatedArt.getIdGriglia(), updatedArt.getBarCode(), updatedArt.getCodMart());
+
+                if (id != null) {
+                    updatedArt.setArticoloGrigliaId(id);
+                }
+
+                return updatedArt;
+            };
+
+            calls.add(callableTask);
+        }
+
+        List<Future<ArticoloGriglia>> futures = executor.invokeAll(calls, Long.MAX_VALUE, TimeUnit.MILLISECONDS);
+
+        for (Future<ArticoloGriglia> future : futures) {
+            if (future.isDone()) {
+                codMarts.add(future.get().getCodMart());
+                if (future.get().getArticoloGrigliaId() == null) toInsert.add(future.get());
+                else toUpdate.add(future.get());
+            } else {
+                future.cancel(true);
+            }
+        }
+
+        var tmp = new HashMap<String, Object>();
+
+        tmp.put("toInsert", toInsert);
+        tmp.put("toUpdate", toUpdate);
+        tmp.put("codMarts", codMarts);
+
+        return tmp;
+    }
+
    public void findArticoloByBarcodeAndGriglia(String barcode, int idGriglia, RunnableArgs<ArticoloGriglia> onSuccess, RunnableArgs<Exception> onFail) {
        execute(() -> {
            try {
@@ -89,4 +136,14 @@ public class ArticoliGrigliaDataSource extends Repository implements ArticoloGri
            }
        });
    }
+
+    public void findNewArticoliInGrigla(int idGriglia, RunnableArgs<List<ArticoloGriglia>> onSuccess, RunnableArgs<Exception> onFail) {
+        execute(() -> {
+            try {
+                onSuccess.run(mArticoloGrigliaDao.getNewArticoliInGriglia(idGriglia));
+            } catch (Exception e) {
+                onFail.run(e);
+            }
+        });
+    }
 }
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/ArticoliOrdineDataSource.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/ArticoliOrdineDataSource.java
@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.data_store.db.repository.implementations;

+import com.annimon.stream.Stream;
+
 import org.apache.commons.lang3.StringUtils;

 import java.util.ArrayList;
@@ -11,6 +13,7 @@ import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloOrdineDao;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
 import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
 import it.integry.integrywmsnative.core.data_store.db.repository.ArticoliOrdineRepository;
+import it.integry.integrywmsnative.core.data_store.db.wrappers.ArticoloOrdineWrapper;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;

 public class ArticoliOrdineDataSource extends Repository implements ArticoliOrdineRepository {
@@ -28,13 +31,15 @@ public class ArticoliOrdineDataSource extends Repository implements ArticoliOrdi
                List<ArticoloOrdine> toUpdate = new ArrayList<>();
                List<ArticoloOrdine> toInsert = new ArrayList<>();
                for (ArticoloOrdine art : articoli) {
-                    if (art.getArticoloOrdineId() > 0) {
+                    if (art.getArticoloOrdineId() != null && art.getArticoloOrdineId() > 0) {
                        toUpdate.add(art);
                    } else {
                        toInsert.add(art);
                    }
                }
-                mArticoloOrdineDao.insertAll(toInsert);
+                for (ArticoloOrdine newArt : toInsert) {
+                    mArticoloOrdineDao.insert(newArt);
+                }
                mArticoloOrdineDao.updateAll(toUpdate);
                onSuccess.run();

@@ -48,7 +53,7 @@ public class ArticoliOrdineDataSource extends Repository implements ArticoliOrdi
    public void saveArticoloToOrdine(ArticoloOrdine articolo, Runnable onSuccess, RunnableArgs<Exception> onFail) {
        execute(() -> {
            try {
-                if (articolo.getArticoloOrdineId() > 0) {
+                if (articolo.getArticoloOrdineId() != null && articolo.getArticoloOrdineId() > 0) {
                    mArticoloOrdineDao.update(articolo);
                } else {
                    mArticoloOrdineDao.insert(articolo);
@@ -93,7 +98,15 @@ public class ArticoliOrdineDataSource extends Repository implements ArticoliOrdi
    public void findArticoliByOrdine(Ordine ordine, RunnableArgs<List<ArticoloOrdine>> onLoad, RunnableArgs<Exception> onError) {
        execute(() -> {
            try {
-                onLoad.run(mArticoloOrdineDao.findArticoliByOrdine(ordine.getOrdineId()));
+                List<ArticoloOrdineWrapper> list = mArticoloOrdineDao.findArticoliByOrdine(ordine.getOrdineId());
+                onLoad.run(Stream.of(list).map(x -> {
+                    ArticoloOrdine art = x.getArticoloOrdine();
+                    art.setGgScadenza(x.getGgScadenza());
+                    art.setGiacenza(x.getGiacenza());
+                    art.setQtaProposta(x.getQtaProposta());
+                    art.setQtaPrevistaVendita(x.getQtaPrevistaVendita());
+                    return art;
+                }).toList());
            } catch (Exception e) {
                onError.run(e);
            }
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/SqlMtbColrDataSource.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/SqlMtbColrDataSource.java
@@ -0,0 +1,77 @@
+package it.integry.integrywmsnative.core.data_store.db.repository.implementations;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.core.data_store.db.dao.MtbColrDao;
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
+import it.integry.integrywmsnative.core.data_store.db.repository.MtbColrRepository;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public class SqlMtbColrDataSource extends Repository implements MtbColrRepository {
+
+    private MtbColrDao mMtbColrDao;
+
+    @Inject
+    public SqlMtbColrDataSource(MtbColrDao mtbColrDao) {
+        this.mMtbColrDao = mtbColrDao;
+    }
+
+    public void selectAll(RunnableArgs<List<SqlMtbColr>> onSuccess, RunnableArgs<Exception> onError) {
+        Runnable query = () -> {
+            try {
+                onSuccess.run(mMtbColrDao.getAll());
+            } catch (Exception e) {
+                onError.run(e);
+            }
+        };
+        execute(query);
+    }
+
+    public void insert(SqlMtbColr mtbColr, RunnableArgs<Integer> onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> {
+            try {
+                Long id = mMtbColrDao.insert(mtbColr);
+                onSuccess.run(id.intValue());
+            } catch (Exception e) {
+                onError.run(e);
+            }
+        });
+    }
+
+
+    public void update(SqlMtbColr mtbColr, RunnableArgs<SqlMtbColr> onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> {
+            try {
+                mMtbColrDao.update(mtbColr);
+                onSuccess.run(mtbColr);
+            } catch (Exception e) {
+                onError.run(e);
+            }
+        });
+    }
+
+    public void delete(SqlMtbColr mtbColr, Runnable onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> {
+            try {
+                mMtbColrDao.delete(mtbColr);
+                onSuccess.run();
+            } catch (Exception e) {
+                onError.run(e);
+            }
+        });
+    }
+
+    public void getDocumentRows(SqlMtbColt document, RunnableArgs<List<SqlMtbColr>> onSuccess, RunnableArgs<Exception> onError) {
+        Runnable query = () -> {
+            try {
+                onSuccess.run(mMtbColrDao.getDocumentRows(document.getId()));
+            } catch (Exception e) {
+                onError.run(e);
+            }
+        };
+        execute(query);
+    }
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/SqlMtbColtDataSource.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/SqlMtbColtDataSource.java
@@ -0,0 +1,93 @@
+package it.integry.integrywmsnative.core.data_store.db.repository.implementations;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.core.data_store.db.dao.MtbColtDao;
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
+import it.integry.integrywmsnative.core.data_store.db.repository.MtbColtRepository;
+import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public class SqlMtbColtDataSource extends Repository implements MtbColtRepository {
+
+    private MtbColtDao mMtbColtDao;
+
+    @Inject
+    public SqlMtbColtDataSource(MtbColtDao mtbColtDao) {
+        this.mMtbColtDao = mtbColtDao;
+    }
+
+    public void selectAll(RunnableArgs<List<SqlMtbColt>> onSuccess, RunnableArgs<Exception> onError) {
+        Runnable query = () -> {
+            try {
+                onSuccess.run(mMtbColtDao.getAll());
+            } catch (Exception e) {
+                onError.run(e);
+            }
+        };
+        execute(query);
+    }
+
+    public void insert(SqlMtbColt mtbColt, RunnableArgs<Integer> onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> {
+            try {
+                Long id = mMtbColtDao.insert(mtbColt);
+                onSuccess.run(id.intValue());
+            } catch (Exception e) {
+                onError.run(e);
+            }
+        });
+    }
+
+
+    public void update(SqlMtbColt mtbColt, RunnableArgs<SqlMtbColt> onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> {
+            try {
+                mMtbColtDao.update(mtbColt);
+                onSuccess.run(mtbColt);
+            } catch (Exception e) {
+                onError.run(e);
+            }
+        });
+    }
+
+    public void delete(SqlMtbColt mtbColt, Runnable onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> {
+            try {
+                mMtbColtDao.delete(mtbColt);
+                onSuccess.run();
+            } catch (Exception e) {
+                onError.run(e);
+            }
+        });
+    }
+
+    @Override
+    public void getLocalDocumentsByCodDtip(String codDtip, String codAnag, String codVdes, Date dataDoc, String numDoc, RunnableArgs<List<DocInternoWrapper>> onSuccess, RunnableArgs<Exception> onError) {
+        Runnable query = () -> {
+            try {
+                onSuccess.run(mMtbColtDao.getLocalDocumentsByCodDtip(codDtip,codAnag,codVdes,dataDoc,numDoc));
+            } catch (Exception e) {
+                onError.run(e);
+            }
+        };
+        execute(query);
+    }
+
+    @Override
+    public void getNextNumCollo(RunnableArgs<Integer> onSuccess, RunnableArgs<Exception> onError) {
+        Runnable query = () -> {
+            try {
+                onSuccess.run(mMtbColtDao.getNextNumCollo());
+            } catch (Exception e) {
+                onError.run(e);
+            }
+        };
+        execute(query);
+    }
+
+
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/ArticoloDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/view_model/ArticoloDTO.java
@@ -4,31 +4,23 @@ import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;

 public class ArticoloDTO {

-    private String codMart;
+    public String codMart;
+    public String descrizione;
+    public String untMis;
+    public float qtaCnf;
+    public String barcode;
+    public float merceDaRic;
+    public float mediaSett;
+    public String flagQtaMultipla;
+    public String flagTracciabilita;
+    public float qtaMinOrdinabile;
+    public boolean newNoPromo;
+    private int ggScadenza;
+    private float giacenza;
+    private float qtaPrevistaVendita;
+    private float qtaProposta;


-    private String descrizione;
-
-
-    private String untMis;
-
-
-    private float qtaCnf;
-
-
-    private String barcode;
-
-
-    private float merceDaRic;
-
-
-    private float mediaSett;
-
-
-    private String flagQtaMultipla;
-
-    private float qtaMinOrdinabile;
-
    public String getCodMart() {
        return codMart;
    }
@@ -101,8 +93,65 @@ public class ArticoloDTO {
        this.qtaMinOrdinabile = qtaMinOrdinabile;
    }

+    public String getBarcode() {
+        return barcode;
+    }

-    public ArticoloGriglia toArticoloGriglia(){
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+    public int getGgScadenza() {
+        return ggScadenza;
+    }
+
+    public void setGgScadenza(int ggScadenza) {
+        this.ggScadenza = ggScadenza;
+    }
+
+    public float getGiacenza() {
+        return giacenza;
+    }
+
+    public void setGiacenza(float giacenza) {
+        this.giacenza = giacenza;
+    }
+
+    public float getQtaPrevistaVendita() {
+        return qtaPrevistaVendita;
+    }
+
+    public void setQtaPrevistaVendita(float qtaPrevistaVendita) {
+        this.qtaPrevistaVendita = qtaPrevistaVendita;
+    }
+
+    public float getQtaProposta() {
+        return qtaProposta;
+    }
+
+    public void setQtaProposta(float qtaProposta) {
+        this.qtaProposta = qtaProposta;
+    }
+
+    public String getFlagTracciabilita() {
+        return flagTracciabilita;
+    }
+
+    public ArticoloDTO setFlagTracciabilita(String flagTracciabilita) {
+        this.flagTracciabilita = flagTracciabilita;
+        return this;
+    }
+
+    public boolean isNewNoPromo() {
+        return newNoPromo;
+    }
+
+    public ArticoloDTO setNewNoPromo(boolean newNoPromo) {
+        this.newNoPromo = newNoPromo;
+        return this;
+    }
+
+    public ArticoloGriglia toArticoloGriglia() {
        ArticoloGriglia result = new ArticoloGriglia();
        result.setBarCode(this.getBarCode());
        result.setDescrizione(this.getDescrizione());
@@ -113,6 +162,11 @@ public class ArticoloDTO {
        result.setMediaSett(this.getMediaSett());
        result.setFlagQtaMultipla(this.getFlagQtaMultipla());
        result.setQtaMinOrdinabile(this.getQtaMinOrdinabile());
+        result.setGgScadenza(this.ggScadenza);
+        result.setNewNoPromo(this.newNoPromo);
+        result.setGiacenza(this.giacenza);
+        result.setQtaPrevistaVendita(this.qtaPrevistaVendita);
+        result.setQtaProposta(this.qtaProposta);

        return result;
    }
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/wrappers/ArticoloOrdineWrapper.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/wrappers/ArticoloOrdineWrapper.java
@@ -0,0 +1,65 @@
+package it.integry.integrywmsnative.core.data_store.db.wrappers;
+
+import androidx.room.ColumnInfo;
+import androidx.room.Embedded;
+
+import java.math.BigDecimal;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
+
+public class ArticoloOrdineWrapper {
+    @Embedded
+    private ArticoloOrdine articoloOrdine;
+
+    @ColumnInfo(name = "gg_scadenza")
+    private int ggScadenza = 0;
+
+    @ColumnInfo(name = "giacenza")
+    private BigDecimal giacenza = BigDecimal.ZERO;
+
+    @ColumnInfo(name = "qta_prevista_vendita")
+    private BigDecimal qtaPrevistaVendita = BigDecimal.ZERO;
+
+    @ColumnInfo(name = "qta_proposta")
+    private BigDecimal qtaProposta = BigDecimal.ZERO;
+
+    public ArticoloOrdine getArticoloOrdine() {
+        return articoloOrdine;
+    }
+
+    public void setArticoloOrdine(ArticoloOrdine articoloOrdine) {
+        this.articoloOrdine = articoloOrdine;
+    }
+
+    public int getGgScadenza() {
+        return ggScadenza;
+    }
+
+    public void setGgScadenza(int ggScadenza) {
+        this.ggScadenza = ggScadenza;
+    }
+
+    public BigDecimal getGiacenza() {
+        return giacenza;
+    }
+
+    public void setGiacenza(BigDecimal giacenza) {
+        this.giacenza = giacenza;
+    }
+
+    public BigDecimal getQtaPrevistaVendita() {
+        return qtaPrevistaVendita;
+    }
+
+    public void setQtaPrevistaVendita(BigDecimal qtaPrevistaVendita) {
+        this.qtaPrevistaVendita = qtaPrevistaVendita;
+    }
+
+    public BigDecimal getQtaProposta() {
+        return qtaProposta;
+    }
+
+    public void setQtaProposta(BigDecimal qtaProposta) {
+        this.qtaProposta = qtaProposta;
+    }
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/wrappers/DocInternoWrapper.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/wrappers/DocInternoWrapper.java
@@ -0,0 +1,30 @@
+package it.integry.integrywmsnative.core.data_store.db.wrappers;
+
+import androidx.room.ColumnInfo;
+import androidx.room.Embedded;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
+
+public class DocInternoWrapper {
+    @Embedded
+    private SqlMtbColt document;
+    
+    @ColumnInfo(name = "countArticoli")
+    private int countArticoli = 0;
+
+    public SqlMtbColt getDocument() {
+        return document;
+    }
+
+    public void setDocument(SqlMtbColt document) {
+        this.document = document;
+    }
+
+    public int getCountArticoli() {
+        return countArticoli;
+    }
+
+    public void setCountArticoli(int countArticoli) {
+        this.countArticoli = countArticoli;
+    }
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBigDecimal.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBigDecimal.java
@@ -0,0 +1,127 @@
+package it.integry.integrywmsnative.core.di;
+
+import androidx.annotation.NonNull;
+import androidx.databinding.Bindable;
+import androidx.databinding.Observable;
+import androidx.databinding.PropertyChangeRegistry;
+
+import java.math.BigDecimal;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public class BindableBigDecimal  implements Observable {
+
+    BigDecimal mValue;
+
+    private transient PropertyChangeRegistry mCallbacks;
+
+    public BindableBigDecimal() {
+    }
+
+    public BindableBigDecimal(BigDecimal startValue) {
+        this.mValue = startValue;
+    }
+
+
+    @Override
+    public void addOnPropertyChangedCallback(@NonNull OnPropertyChangedCallback callback) {
+        synchronized (this) {
+            if (mCallbacks == null) {
+                mCallbacks = new PropertyChangeRegistry();
+            }
+        }
+        mCallbacks.add(callback);
+    }
+
+    public void addOnPropertyChangedCallback(@NonNull Runnable callback) {
+        synchronized (this) {
+            if (mCallbacks == null) {
+                mCallbacks = new PropertyChangeRegistry();
+            }
+        }
+        mCallbacks.add(new OnPropertyChangedCallback() {
+            @Override
+            public void onPropertyChanged(Observable sender, int propertyId) {
+                callback.run();
+            }
+        });
+    }
+
+    @Override
+    public void removeOnPropertyChangedCallback(@NonNull OnPropertyChangedCallback callback) {
+        synchronized (this) {
+            if (mCallbacks == null) {
+                return;
+            }
+        }
+        mCallbacks.remove(callback);
+    }
+
+    public void resetOnPropertyChangedCallback() {
+        synchronized (this) {
+            if (mCallbacks == null) {
+                return;
+            }
+        }
+        mCallbacks.clear();
+        mCallbacks = null;
+    }
+
+    /**
+     * Notifies listeners that all properties of this instance have changed.
+     */
+    public void notifyChange() {
+        synchronized (this) {
+            if (mCallbacks == null) {
+                return;
+            }
+        }
+        mCallbacks.notifyCallbacks(this, 0, null);
+    }
+
+    /**
+     * Notifies listeners that a specific property has changed. The getter for the property
+     * that changes should be marked with {@link Bindable} to generate a field in
+     * <code>BR</code> to be used as <code>fieldId</code>.
+     *
+     * @param fieldId The generated BR id for the Bindable field.
+     */
+    public void notifyPropertyChanged(int fieldId) {
+        synchronized (this) {
+            if (mCallbacks == null) {
+                return;
+            }
+        }
+        mCallbacks.notifyCallbacks(this, fieldId, null);
+    }
+
+    public BigDecimal get() {
+        return mValue;
+    }
+
+    public void set(BigDecimal value) {
+        this.set(value, false);
+    }
+
+    public void set(BigDecimal value, boolean forceRefresh) {
+        if ((mValue == null)  || !mValue.equals(value) || forceRefresh) {
+            this.mValue = value;
+            notifyChange();
+        }
+    }
+
+    public static void registerListener(BindableBigDecimal bindableBigDecimal, RunnableArgs<BigDecimal> onValueChanged) {
+        bindableBigDecimal.addOnPropertyChangedCallback(new OnPropertyChangedCallback() {
+            @Override
+            public void onPropertyChanged(Observable sender, int propertyId) {
+                if(onValueChanged != null) onValueChanged.run(bindableBigDecimal.get());
+            }
+        });
+    }
+
+    public static void resetListeners(BindableBigDecimal bindableBigDecimal){
+        BigDecimal oldValue = bindableBigDecimal.get();
+        bindableBigDecimal = new BindableBigDecimal();
+        bindableBigDecimal.set(oldValue);
+    }
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBoolean.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBoolean.java
@@ -1,12 +1,11 @@
 package it.integry.integrywmsnative.core.di;

 import androidx.annotation.NonNull;
-import androidx.databinding.BaseObservable;
 import androidx.databinding.Bindable;
 import androidx.databinding.Observable;
 import androidx.databinding.PropertyChangeRegistry;

-public class BindableBoolean  implements Observable {
+public class BindableBoolean implements Observable {

    boolean mValue;

@@ -105,5 +104,9 @@ public class BindableBoolean  implements Observable {
            notifyChange();
        }
    }
+
+    public void toggle() {
+        set(!get());
+    }
 }

--- a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableInteger.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableInteger.java
@@ -1,6 +1,9 @@
 package it.integry.integrywmsnative.core.di;

 import androidx.databinding.BaseObservable;
+import androidx.databinding.Observable;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;

 public class BindableInteger  extends BaseObservable {
    Integer mValue;
@@ -34,4 +37,19 @@ public class BindableInteger  extends BaseObservable {
        return mValue == null;
    }

+    public static void registerListener(BindableInteger bindableInteger, RunnableArgs<Integer> onValueChanged) {
+        bindableInteger.addOnPropertyChangedCallback(new OnPropertyChangedCallback() {
+            @Override
+            public void onPropertyChanged(Observable sender, int propertyId) {
+                if(onValueChanged != null) onValueChanged.run(bindableInteger.get());
+            }
+        });
+    }
+
+    public static void resetListeners(BindableInteger bindableInteger){
+        Integer oldValue = bindableInteger.get();
+        bindableInteger = new BindableInteger();
+        bindableInteger.set(oldValue);
+    }
+
 }
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableString.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableString.java
@@ -7,6 +7,20 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;

 public class BindableString extends BaseObservable {
    String value;
+    private boolean isHtml = false;
+
+    public BindableString(){};
+    public BindableString(boolean isHtml){
+        this.isHtml = isHtml;
+    };
+    public BindableString(String startingValue ,boolean isHtml){
+        this.isHtml = isHtml;
+        this.set(startingValue);
+    };
+
+    public boolean isHtml() {
+        return isHtml;
+    }

    public String get() {
        return value != null ? value : "";
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
@@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.di;

 import android.app.DatePickerDialog;
 import android.content.res.ColorStateList;
+import android.text.Html;
+import android.text.SpannableString;
 import android.util.Log;
 import android.view.View;
 import android.widget.AutoCompleteTextView;
@@ -37,18 +39,20 @@ import java.util.Locale;

 import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
 import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;

 public class Converters {


    @BindingConversion
    public static String convertBindableToString(BindableString bindableString) {
-        if(bindableString != null) return bindableString.get();
+        if (bindableString != null) return bindableString.get();
        return "";
    }

@@ -72,7 +76,8 @@ public class Converters {
            TextWatcherAdapter watcher = new TextWatcherAdapter() {
                @Override
                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                    if(bindableInteger != null) bindableInteger.set(Integer.parseInt(s.toString()));
+                    if (bindableInteger != null)
+                        bindableInteger.set(Integer.parseInt(s.toString()));
                }
            };
            view.setTag(R.id.bound_observable, new Pair<>(bindableInteger, watcher));
@@ -84,6 +89,28 @@ public class Converters {
        }
    }

+    @BindingAdapter("binding")
+    public static void bindEditText(AppCompatTextView view, final ObservableField<String> observableField) {
+        Pair<ObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableField) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    if (observableField != null) observableField.set(s.toString());
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableField, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        String newValue = observableField.get();
+        if (!view.getText().toString().equals(newValue)) {
+            view.setText(newValue);
+        }
+    }
+
    @BindingAdapter("binding")
    public static void bindEditText(EditText view, final BindableString bindableString) {
        Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
@@ -101,11 +128,56 @@ public class Converters {
            view.addTextChangedListener(watcher);
        }
        String newValue = bindableString.get();
+        boolean isHtml = bindableString.isHtml();
+        if (!view.getText().toString().equals(newValue)) {
+            view.setText(isHtml ? Html.fromHtml(newValue) : newValue);
+        }
+    }
+
+    @BindingAdapter("binding")
+    public static void bindEditText(EditText view, final ObservableField<String> observableString) {
+        Pair<ObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableString) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    observableString.set(s.toString());
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableString, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        String newValue = observableString.get();
        if (!view.getText().toString().equals(newValue)) {
            view.setText(newValue);
        }
    }

+    @BindingAdapter("binding")
+    public static void bindEditText(AutoCompleteTextView view, final ObservableField<String> observableString) {
+        Pair<ObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableString) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    observableString.set(s.toString());
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableString, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        String newValue = observableString.get();
+        if (!view.getText().toString().equals(newValue)) {
+            view.setText(newValue, false);
+        }
+    }
+
    @BindingAdapter("binding")
    public static void bindTextInputEditText(TextInputEditText view, final BindableString bindableString) {
        Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
@@ -139,7 +211,8 @@ public class Converters {
                @Override
                public void onTextChanged(CharSequence s, int start, int before, int count) {
                    BigDecimal value = null;
-                    if(!UtilityString.isNullOrEmpty(s.toString())) value = new BigDecimal(s.toString());
+                    if (!UtilityString.isNullOrEmpty(s.toString()))
+                        value = new BigDecimal(s.toString());
                    observableBigDecimal.set(value);
                }
            };
@@ -149,11 +222,65 @@ public class Converters {
        BigDecimal newValue = observableBigDecimal.get();
        BigDecimal viewValue = view.getText().toString().trim().length() > 0 ? new BigDecimal(view.getText().toString()) : null;

-        if(!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
+        if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
            view.setText(UtilityNumber.decimalToString(newValue));
        }
    }

+    @BindingAdapter("binding")
+    public static void bindTextInputEditTextBigDecimal(TextInputEditText view, final BindableBigDecimal bindableBigDecimal) {
+        Pair<BindableBigDecimal, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != bindableBigDecimal) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    BigDecimal value = null;
+                    if (!UtilityString.isNullOrEmpty(s.toString()))
+                        value = new BigDecimal(s.toString());
+                    bindableBigDecimal.set(value);
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(bindableBigDecimal, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        BigDecimal newValue = bindableBigDecimal.get();
+        BigDecimal viewValue = view.getText().toString().trim().length() > 0 ? new BigDecimal(view.getText().toString()) : null;
+
+        if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
+            view.setText(UtilityNumber.decimalToString(newValue));
+        }
+    }
+
+    @BindingAdapter("binding")
+    public static void bindTextInputEditTextInteger(TextInputEditText view, final BindableInteger bindableInteger) {
+        Pair<BindableInteger, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != bindableInteger) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    Integer value = null;
+                    if (!UtilityString.isNullOrEmpty(s.toString()))
+                        value = Integer.valueOf(s.toString());
+                    bindableInteger.set(value);
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(bindableInteger, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        Integer newValue = bindableInteger.get();
+        Integer viewValue = view.getText().toString().trim().length() > 0 ? Integer.valueOf(view.getText().toString()) : Integer.valueOf(0);
+
+        if (!(viewValue.compareTo(newValue) == 0)) {
+            view.setText(newValue.toString());
+        }
+    }
+
    @BindingAdapter("binding")
    public static void bindTextInputEditTextString(TextInputEditText view, final ObservableField<String> observableString) {
        Pair<ObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
@@ -173,13 +300,13 @@ public class Converters {
        String newValue = observableString.get();
        String viewValue = view.getText().toString();

-        if(!viewValue.equalsIgnoreCase(newValue)) {
+        if (!viewValue.equalsIgnoreCase(newValue)) {
            view.setText(newValue);
        }
    }

-    @BindingAdapter({"binding"})
-    public static void bindTextInputEditTextDate(TextInputEditText view, final ObservableField<Date> observableDate) {
+    @BindingAdapter(value = {"binding", "parentView", "warningOnOldDates"}, requireAll = false)
+    public static void bindTextInputEditTextDate(TextInputEditText view, final ObservableField<Date> observableDate, BaseDialogFragment parentFragment, boolean warningOnOldDates) {
        Pair<ObservableField<Date>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
        if (pair == null || pair.first != observableDate) {
            if (pair != null) {
@@ -197,7 +324,7 @@ public class Converters {
                // Get Current Date
                Calendar c = UtilityDate.getCalendarInstance();

-                if(observableDate.get() != null) {
+                if (observableDate.get() != null) {
                    c.setTime(observableDate.get());
                }

@@ -208,16 +335,28 @@ public class Converters {
                DatePickerDialog datePickerDialog = new DatePickerDialog(view.getContext(),
                        (cView, year, month, day) -> {
                            Date resultDate = new GregorianCalendar(year, month, day).getTime();
-                            view.setText(UtilityDate.formatDate(resultDate, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
-                            observableDate.set(resultDate);
+
+                            if (parentFragment != null && warningOnOldDates && resultDate.before(new Date())) {
+                                DialogSimpleMessageView
+                                        .makeWarningDialog(new SpannableString("Hai scelto una data precedente a quella odierna. Continuare?"), null, () -> {
+                                            view.setText(UtilityDate.formatDate(resultDate, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+                                            observableDate.set(resultDate);
+                                        }, () -> {
+
+                                        })
+                                        .show(parentFragment.requireActivity().getSupportFragmentManager(), "tag");
+                            } else {
+                                view.setText(UtilityDate.formatDate(resultDate, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+                                observableDate.set(resultDate);
+                            }
                        }, mYear, mMonth, mDay);
                datePickerDialog.show();
            };

            //Adding click-listener
            view.setOnClickListener(onClick::run);
-            if(view.getParent() != null && view.getParent().getParent() != null && view.getParent().getParent() instanceof TextInputLayout) {
-                ((FrameLayout)view.getParent()).setOnClickListener(onClick::run);
+            if (view.getParent() != null && view.getParent().getParent() != null && view.getParent().getParent() instanceof TextInputLayout) {
+                ((FrameLayout) view.getParent()).setOnClickListener(onClick::run);
                ((TextInputLayout) view.getParent().getParent()).setOnClickListener(onClick::run);
            }
        }
@@ -286,8 +425,9 @@ public class Converters {
            view.addTextChangedListener(watcher);
        }
        String newValue = bindableString.get();
+        boolean isHtml = bindableString.isHtml();
        if (!view.getText().toString().equals(newValue)) {
-            view.setText(newValue);
+            view.setText(isHtml ? Html.fromHtml(newValue) : newValue);
        }
    }

@@ -396,7 +536,7 @@ public class Converters {


    @BindingAdapter("visibility")
-    public static void bindView(View view, final ObservableField<Boolean> bindableBoolean) {
+    public static void bindViewVisibility(View view, final ObservableField<Boolean> bindableBoolean) {
        if (view.getTag(R.id.bound_observable) != bindableBoolean) {
            view.setTag(R.id.bound_observable, bindableBoolean);
        }
@@ -411,6 +551,44 @@ public class Converters {
    }


+    @BindingAdapter("visibility")
+    public static void bindViewVisibility(View view, boolean bool) {
+        view.setVisibility(bool ? View.VISIBLE : View.GONE);
+    }
+
+
+    @BindingAdapter({"reverse_visibility"})
+    public static void bindViewReverseVisibility(View view, final BindableBoolean bindableBoolean) {
+        if (view.getTag(R.id.bound_observable) != bindableBoolean) {
+            view.setTag(R.id.bound_observable, bindableBoolean);
+        }
+        bindableBoolean.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
+            @Override
+            public void onPropertyChanged(Observable sender, int propertyId) {
+                view.setVisibility(bindableBoolean.get() ? View.GONE : View.VISIBLE);
+            }
+        });
+
+        view.setVisibility(bindableBoolean.get() ? View.GONE : View.VISIBLE);
+    }
+
+
+    @BindingAdapter("reverse_visibility")
+    public static void bindViewReverseVisibility(View view, final ObservableField<Boolean> bindableBoolean) {
+        if (view.getTag(R.id.bound_observable) != bindableBoolean) {
+            view.setTag(R.id.bound_observable, bindableBoolean);
+        }
+        bindableBoolean.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
+            @Override
+            public void onPropertyChanged(Observable sender, int propertyId) {
+                view.setVisibility(bindableBoolean.get() ? View.GONE : View.VISIBLE);
+            }
+        });
+
+        view.setVisibility(bindableBoolean.get() ? View.GONE : View.VISIBLE);
+    }
+
+
    @BindingAdapter("android:layout_weight")
    public static void setLayoutWeight(View view, final Float weight) {

--- a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/AutoCompleteTextViewBinders.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/AutoCompleteTextViewBinders.java
@@ -0,0 +1,6 @@
+package it.integry.integrywmsnative.core.di.binders;
+
+public class AutoCompleteTextViewBinders {
+
+
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/exception/AlreadyAttachedDocumentToLUException.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/AlreadyAttachedDocumentToLUException.java
@@ -0,0 +1,12 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public class AlreadyAttachedDocumentToLUException extends Exception {
+
+    public AlreadyAttachedDocumentToLUException() {
+        super(UtilityResources.getString(R.string.lu_already_attache_to_doc));
+    }
+
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/exception/MyExceptionHandler.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/MyExceptionHandler.java
@@ -1,36 +0,0 @@
-package it.integry.integrywmsnative.core.exception;
-
-import android.content.Context;
-import android.content.Intent;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-public class MyExceptionHandler implements
-        java.lang.Thread.UncaughtExceptionHandler {
-    private final Context myContext;
-    private final Class<?> myActivityClass;
-
-    public MyExceptionHandler(Context context, Class<?> c) {
-
-        myContext = context;
-        myActivityClass = c;
-    }
-
-    public void uncaughtException(Thread thread, Throwable exception) {
-
-        StringWriter stackTrace = new StringWriter();
-        exception.printStackTrace(new PrintWriter(stackTrace));
-        System.err.println(stackTrace);// You can use LogCat too
-//        Intent intent = new Intent(myContext, myActivityClass);
-//        String s = stackTrace.toString();
-//        //you can use this String to know what caused the exception and in which Activity
-//        intent.putExtra("uncaughtException",
-//                "Exception is: " + stackTrace.toString());
-//        intent.putExtra("stacktrace", s);
-//        myContext.startActivity(intent);
-        //for restarting the Activity
-//        Process.killProcess(Process.myPid());
-//        System.exit(0);
-    }
-}
--- a/app/src/main/java/it/integry/integrywmsnative/core/exception/NoArtsInLUException.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/NoArtsInLUException.java
@@ -0,0 +1,12 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public class NoArtsInLUException extends Exception {
+
+    public NoArtsInLUException() {
+        super(UtilityResources.getString(R.string.no_items_found_message));
+    }
+
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/exception/NoResultFromBarcodeException.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/NoResultFromBarcodeException.java
@@ -4,7 +4,7 @@ import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.utility.UtilityResources;

 public final class NoResultFromBarcodeException extends Exception {
-    public NoResultFromBarcodeException() {
-        super(UtilityResources.getString(R.string.no_result_from_barcode));
+    public NoResultFromBarcodeException(String barcode) {
+        super(UtilityResources.getString(R.string.no_result_from_barcode) + " (" + barcode + ")");
    }
 }
--- a/app/src/main/java/it/integry/integrywmsnative/core/exception/NotValidLicenseException.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/NotValidLicenseException.java
@@ -0,0 +1,8 @@
+package it.integry.integrywmsnative.core.exception;
+
+public class NotValidLicenseException extends Exception {
+
+    public NotValidLicenseException() {
+        super("Licenza non valida");
+    }
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/exception/TooManyLUFoundInMonoLUPositionException.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/TooManyLUFoundInMonoLUPositionException.java
@@ -0,0 +1,11 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public class TooManyLUFoundInMonoLUPositionException extends Exception {
+
+    public TooManyLUFoundInMonoLUPositionException() {
+        super(UtilityResources.getString(R.string.too_much_lu_found_message_in_mono_lu));
+    }
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
@@ -1,20 +1,39 @@
 package it.integry.integrywmsnative.core.expansion;

-import android.app.Dialog;
+import android.content.Context;
+import android.util.AttributeSet;
 import android.view.KeyEvent;
+import android.view.View;

+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;

+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
-import it.integry.integrywmsnative.core.utility.UtilityProgress;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;

 public class BaseActivity extends AppCompatActivity {

+    @Inject
+    public DialogProgressView mCurrentProgress;

-    protected Dialog mCurrentProgress;
+    private boolean progressOpened;

-    public BaseActivity() {
-        //Thread.setDefaultUncaughtExceptionHandler(new MyExceptionHandler(this, BaseActivity.class));
+    @Nullable
+    @Override
+    public View onCreateView(@Nullable View parent, @NonNull String name, @NonNull Context context, @NonNull AttributeSet attrs) {
+        var v = super.onCreateView(parent, name, context, attrs);
+
+        MainApplication.appComponent
+                .baseActivityComponent()
+                .create()
+                .inject(this);
+
+        return v;
    }

    @Override
@@ -38,17 +57,46 @@ public class BaseActivity extends AppCompatActivity {
    }


-
    protected void openProgress() {
-        if (this.mCurrentProgress == null) {
-            this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(this);
+        BarcodeManager.disable();
+        if (!progressOpened && !this.mCurrentProgress.isAdded()) {
+            this.progressOpened = true;
+            runOnUiThread(() -> {
+                this.mCurrentProgress.show(getSupportFragmentManager(), "tag");
+            });
        }
    }

    protected void closeProgress() {
-        if (mCurrentProgress != null) {
-            mCurrentProgress.dismiss();
-            mCurrentProgress = null;
+        BarcodeManager.enable();
+        if (progressOpened) {
+            this.progressOpened = false;
+            runOnUiThread(() -> {
+                mCurrentProgress.dismiss();
+            });
        }
    }
+
+
+    public void onLoadingStarted() {
+//        new Thread(() -> {
+            BarcodeManager.disable();
+            this.openProgress();
+//        }).start();
+    }
+
+    public void onLoadingEnded() {
+//        new Thread(() -> {
+            this.closeProgress();
+            BarcodeManager.enable();
+//        }).start();
+    }
+
+    public void onError(Exception ex) {
+        this.runOnUiThread(() -> {
+            this.closeProgress();
+            UtilityExceptions.defaultException(this, ex, mCurrentProgress);
+            BarcodeManager.enable();
+        });
+    }
 }
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivityComponent.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivityComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface BaseActivityComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        BaseActivityComponent create();
+    }
+
+    void inject(BaseActivity baseActivity);
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivityModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivityModule.java
@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import dagger.Module;
+
+@Module(subcomponents = BaseActivityComponent.class)
+public class BaseActivityModule {
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
@@ -1,27 +1,42 @@
 package it.integry.integrywmsnative.core.expansion;

-import android.app.Dialog;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;

 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityProgress;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;

 public class BaseDialogFragment extends DialogFragment {

    private boolean mBarcodeListener = false;
-    private Dialog mCurrentProgress;
+    private DialogProgressView mCurrentProgress;

    public BaseDialogFragment() {
        super();
    }


+    @Override
+    public void show(FragmentManager manager, String tag) {
+        try {
+            FragmentTransaction ft = manager.beginTransaction();
+            ft.add(this, tag);
+            ft.commit();
+        } catch (IllegalStateException e) {
+            Log.d("ABSDIALOGFRAG", "Exception", e);
+        }
+    }
+
    @Override
    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);
@@ -49,16 +64,46 @@ public class BaseDialogFragment extends DialogFragment {
        this.mBarcodeListener = listen;
    }

+
+
+
+    public void onLoadingStarted() {
+        BarcodeManager.disable();
+        this.openProgress();
+    }
+
+    public void onLoadingEnded() {
+        this.closeProgress();
+        BarcodeManager.enable();
+    }
+
    protected void openProgress() {
-        if (this.mCurrentProgress == null) {
-            this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
-        }
+
+//        new Thread(() -> {
+        requireActivity().runOnUiThread(() -> {
+            if (this.mCurrentProgress == null) {
+                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(requireActivity());
+            }
+        });
+//        }).start();
    }

    protected void closeProgress() {
-        if (mCurrentProgress != null) {
-            mCurrentProgress.dismiss();
-            mCurrentProgress = null;
-        }
+//        new Thread(() -> {
+        requireActivity().runOnUiThread(() -> {
+            if (mCurrentProgress != null) {
+                mCurrentProgress.dismiss();
+                mCurrentProgress = null;
+            }
+        });
+//        }).start();
+    }
+
+
+    public void onError(Exception ex) {
+        requireActivity().runOnUiThread(() -> {
+            this.closeProgress();
+            UtilityExceptions.defaultException(requireActivity(), ex);
+        });
    }
 }
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
@@ -1,30 +1,107 @@
 package it.integry.integrywmsnative.core.expansion;

-import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;

+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;

-import it.integry.integrywmsnative.core.utility.UtilityProgress;
+import java.util.ArrayList;
+import java.util.List;

-public class BaseFragment extends Fragment {
+import javax.inject.Inject;

-    protected Dialog mCurrentProgress;
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.ui.ElevatedToolbar;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;

+public abstract class BaseFragment extends Fragment {
+
+    @Inject
+    public DialogProgressView mCurrentProgress;
+
+    protected ElevatedToolbar mToolbar;
+
+    protected final List<Runnable> mOnPreDestroyList = new ArrayList<>();
+    private boolean progressOpened;
+
+
+    public void setScrollToolbar(ElevatedToolbar toolbar) {
+        mToolbar = toolbar;
+    }
+
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = super.onCreateView(inflater, container, savedInstanceState);
+
+        MainApplication.appComponent
+                .baseFragmentComponent()
+                .create()
+                .inject(this);
+
+        return view;
+    }
+
+    public void onLoadingStarted() {
+        BarcodeManager.disable();
+        this.openProgress();
+    }
+
+    public void onLoadingEnded() {
+        this.closeProgress();
+        BarcodeManager.enable();
+    }
+
+    public void onError(Exception ex) {
+        requireActivity().runOnUiThread(() -> {
+            this.closeProgress();
+            UtilityExceptions.defaultException(getActivity(), ex, mCurrentProgress);
+            BarcodeManager.enable();
+        });
+    }
+
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        for (Runnable onPreDestroy : mOnPreDestroyList) {
+            onPreDestroy.run();
+        }
+    }

    protected void openProgress() {
-        if (this.mCurrentProgress == null) {
-            getActivity().runOnUiThread(() -> {
-                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
+        if (!progressOpened) {
+            this.progressOpened = true;
+            requireActivity().runOnUiThread(() -> {
+                this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag");
            });
        }
    }

    protected void closeProgress() {
-        if (mCurrentProgress != null) {
-            getActivity().runOnUiThread(() -> {
+        if (progressOpened) {
+            this.progressOpened = false;
+            requireActivity().runOnUiThread(() -> {
                mCurrentProgress.dismiss();
-                mCurrentProgress = null;
            });
        }
    }
+
+    protected void popMe() {
+        requireActivity().runOnUiThread(() -> {
+            ((IPoppableActivity) requireActivity()).pop();
+        });
+    }
 }
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragmentComponent.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragmentComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface BaseFragmentComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        BaseFragmentComponent create();
+    }
+
+    void inject(BaseFragment baseFragment);
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragmentModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragmentModule.java
@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import dagger.Module;
+
+@Module(subcomponents = BaseFragmentComponent.class)
+public class BaseFragmentModule {
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/OnGeneralChangedCallback.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/OnGeneralChangedCallback.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import androidx.databinding.Observable;
+
+public abstract class OnGeneralChangedCallback extends Observable.OnPropertyChangedCallback implements Runnable{
+
+    @Override
+    public void onPropertyChanged(Observable sender, int propertyId) {
+        run();
+    }
+
+//    public abstract void run();
+
+}
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/OnListGeneralChangedCallback.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/OnListGeneralChangedCallback.java
@@ -1,28 +1,28 @@
 package it.integry.integrywmsnative.core.expansion;

-import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableList;
+import androidx.databinding.ObservableList.OnListChangedCallback;

-public abstract class OnListGeneralChangedCallback extends ObservableList.OnListChangedCallback {
+public abstract class OnListGeneralChangedCallback<T> extends OnListChangedCallback<ObservableList<T>> {


    @Override
-    public void onItemRangeChanged(ObservableList sender, int positionStart, int itemCount) {
+    public void onItemRangeChanged(ObservableList<T> sender, int positionStart, int itemCount) {
        onChanged(sender);
    }

    @Override
-    public void onItemRangeInserted(ObservableList sender, int positionStart, int itemCount) {
+    public void onItemRangeInserted(ObservableList<T> sender, int positionStart, int itemCount) {
        onChanged(sender);
    }

    @Override
-    public void onItemRangeMoved(ObservableList sender, int fromPosition, int toPosition, int itemCount) {
+    public void onItemRangeMoved(ObservableList<T> sender, int fromPosition, int toPosition, int itemCount) {
        onChanged(sender);
    }

    @Override
-    public void onItemRangeRemoved(ObservableList sender, int positionStart, int itemCount) {
+    public void onItemRangeRemoved(ObservableList<T> sender, int positionStart, int itemCount) {
        onChanged(sender);
    }

--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/view/ExtendedRecyclerView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/view/ExtendedRecyclerView.java
@@ -7,6 +7,7 @@ import androidx.databinding.ObservableList;
 import androidx.recyclerview.widget.RecyclerView;

 import java.util.ArrayList;
+import java.util.List;

 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;

@@ -38,6 +39,28 @@ public abstract class ExtendedRecyclerView<T, VH extends RecyclerView.ViewHolder
        return mDataset.size();
    }

+    public void clearDataset() {
+        mDataset.clear();
+        notifyDataSetChanged();
+    }
+
+    public void updateDataset(List<T> updatedDataset) {
+        mDataset.clear();
+
+        if(updatedDataset != null && !updatedDataset.isEmpty()) {
+            mDataset.addAll(updatedDataset);
+        }
+
+        notifyDataSetChanged();
+    }
+
+    public void addDataset(List<T> insertDataset) {
+        if(insertDataset != null && !insertDataset.isEmpty()) {
+            mDataset.addAll(insertDataset);
+            notifyDataSetChanged();
+        }
+    }
+
    public ExtendedRecyclerView<T, VH> setEmptyView(View emptyView) {
        this.mEmptyView = emptyView;
        this.checkIfEmpty();
--- a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISearchableFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISearchableFragment.java
@@ -2,7 +2,7 @@ package it.integry.integrywmsnative.core.interfaces;

 import androidx.appcompat.widget.SearchView;

-public interface ISearcableFragment extends SearchView.OnQueryTextListener, IDestroyableFragment {
+public interface ISearchableFragment extends SearchView.OnQueryTextListener, IDestroyableFragment {

    void onSearchEnabled();

--- a/app/src/main/java/it/integry/integrywmsnative/core/menu/MenuRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/menu/MenuRESTConsumer.java
@@ -0,0 +1,34 @@
+package it.integry.integrywmsnative.core.menu;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.StbMenu;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+@Singleton
+public class MenuRESTConsumer extends _BaseRESTConsumer {
+
+    public void retrieveMenu(String rootCodOpz, RunnableArgs<StbMenu> onComplete, RunnableArgs<Exception> onFailed) {
+        MenuRESTConsumerService menuRESTConsumerService = RESTBuilder.getService(MenuRESTConsumerService.class);
+        menuRESTConsumerService.retrieveMenuConfig(rootCodOpz).enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<StbMenu>> call, Response<ServiceRESTResponse<StbMenu>> response) {
+                analyzeAnswer(response, "retrieveMenu", (m) -> {
+                    onComplete.run(response.body().getEntity());
+                }, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<StbMenu>> call, Throwable t) {
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
+}
--- a/Show More
+++ b/Show More