Go to file
Sergio De la torre 669b05826e Merge branch '4021-gestion_embalajes' into dev-embalajes
# Conflicts:
#	.idea/deploymentTargetDropDown.xml
#	.idea/workspace.xml
#	app/build.gradle
#	app/src/main/java/es/verdnatura/domain/SalixService.kt
#	app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
#	app/src/main/java/es/verdnatura/presentation/common/UIExtensions.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt
#	app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
#	app/src/main/res/layout/fragment_packaging.xml
#	app/src/main/res/layout/fragment_packaging_obs.xml
#	app/src/main/res/layout/fragment_packaging_summary.xml
#	app/src/main/res/layout/item_image_row.xml
#	app/src/main/res/layout/item_itemsupplier_row.xml
#	app/src/main/res/values-es/strings.xml
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-pt/strings.xml
#	app/src/main/res/values/strings.xml
2024-03-06 14:16:36 +01:00
.idea refs #6607 feat:checking_boxes 2024-03-06 13:27:33 +01:00
app Merge branch '4021-gestion_embalajes' into dev-embalajes 2024-03-06 14:16:36 +01:00
gradle/wrapper Actualizaciones 2023-06-16 16:34:56 +02:00
mylibrary/build Version 23.2-Fallos precontrol-Directo Ubicador desde histórico-Inventario no se cierra-Botón solo Agregar 2023-01-19 16:24:43 +01:00
.gitignore modify gitIgnore 2024-02-29 09:19:16 +01:00
README.md Initial commit 2021-07-05 07:43:59 +02:00
build.gradle refs #6411 feat:update libraries 2024-02-20 09:35:16 +01:00
gradle.properties refs #6004 feature:dataStoreByPreference 2024-01-26 11:30:04 +01:00
gradlew first commit 2020-05-04 13:15:24 +02:00
gradlew.bat first commit 2020-05-04 13:15:24 +02:00
local.properties Version 9.4Beta Cmr, Control ubicación, volver atrás de Controlador, botón llamadas, volver pantalla anterior parking, 2022-11-02 11:37:55 +01:00
settings.gradle first commit 2020-05-04 13:15:24 +02:00

README.md

appverdnatura

App para gestión del almacén de verdnatura