Merge branch 'test'

# Conflicts:
#	.idea/gradle.xml
#	.idea/jarRepositories.xml
#	.idea/misc.xml
#	.idea/runConfigurations.xml
#	app/build.gradle
#	app/release/output-metadata.json
#	app/release/vn-picking.apk
#	app/src/main/java/es/verdnatura/di/viewModelModule.kt
#	app/src/main/java/es/verdnatura/domain/ApiUtils.kt
#	app/src/main/java/es/verdnatura/domain/GetBuscarItemAllUserCase.kt
#	app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt
#	app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt
#	app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt
#	app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt
#	app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt
#	app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
#	app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/buscaritemall/fragment/BuscarItemAllFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/buscaritemall/fragment/BuscarItemAllViewModel.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/historico/adapter/HistoricoAdapter.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/historico/fragment/HistoricoFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/login/activity/LoginActivity.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/adapter/ExpeditionListAdapter.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/sacador/adapter/CollectionAdapter.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
#	app/src/main/res/layout/fragment_inventary_old.xml
#	app/src/main/res/values-es/strings.xml
#	app/src/main/res/values/strings.xml
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties

README.md

@@ -0,0 +1,2 @@
+# appverdnatura
+App para gestión del almacén de verdnatura