Commit Graph

541 Commits

Author SHA1 Message Date
Sergio De la torre ac121ee176 refs #6574 feat:modify screen 2024-04-10 07:55:14 +02:00
Sergio De la torre 3b7b0291db refs #6574 feat:modify screen 2024-04-10 07:54:09 +02:00
Sergio De la torre 3cae4565da Merge remote-tracking branch 'warehouse/dev' into dev 2024-04-04 13:04:43 +02:00
Sergio De la torre 65c90ec860 refs #6982 feat:pickerHelper 2024-04-04 13:02:28 +02:00
Sergio De la torre a6644a1cf2 refs #6276 feat:silex →salix 2024-04-04 12:18:33 +02:00
Sergio De la torre 42258687d5 refs #6276 feat:silex →salix 2024-04-04 12:17:06 +02:00
Sergio De la torre e2a91d7596 version 24.14Beta 2024-04-04 11:58:12 +02:00
Sergio De la torre 1260fcaa20 refs #6982 feat:pickerHelper 2024-04-04 11:57:30 +02:00
Sergio De la torre 2be1c44f83 refs #6574 feat:ui 2024-04-04 11:56:13 +02:00
Sergio De la torre 40baca19b5 refs #4677 feat:tickets 2024-04-04 11:54:02 +02:00
Sergio De la torre 64ebe19a42 refs #6276 feat:silex →salix 2024-04-04 11:51:55 +02:00
Sergio De la torre 91de8dd3e9 refs #6073 feat:menus 2024-03-28 08:56:07 +01:00
Sergio De la torre 8c5fe29da4 refs #6952 feat:pickerHelper 2024-03-28 08:54:48 +01:00
Sergio De la torre b91712ea9e refs #6574 feat:ui 2024-03-28 08:54:35 +01:00
Sergio De la torre ea305d5812 refs #6073 feat:menus 2024-03-28 08:53:02 +01:00
Sergio De la torre 84c1f0905e refs #6952 feat:pickerHelper 2024-03-28 08:51:27 +01:00
Sergio De la torre 9fb40e3090 refs #6073 feat:menus 2024-03-28 08:49:52 +01:00
Sergio De la torre b9e6947f21 refs #6276 feat:silex →salix 2024-03-27 15:49:09 +01:00
Sergio De la torre 02fe790204 refs #6276 feat:silex →salix 2024-03-27 15:47:37 +01:00
Sergio De la torre 2c6e6bdfa9 refs #6276 feat:crashlytics 2024-03-27 15:46:55 +01:00
Sergio De la torre 1f53fe4643 refs #6810 feat:crashlytics 2024-03-22 13:20:12 +01:00
Sergio De la torre 7ae8244cd2 refs #6964 feat:hasItemOlder 2024-03-22 13:19:55 +01:00
Sergio De la torre 4ce7dc9a01 refs #6810 feat:crashlytics 2024-03-22 13:01:58 +01:00
Sergio De la torre f5fda9ae7e refs #6810 feat:crashlytics 2024-03-22 12:36:53 +01:00
Sergio De la torre cedd84dc9b refs #6964 feat:hasItemOlder 2024-03-22 12:05:03 +01:00
Sergio De la torre aff6620ece refs #6964 feat:hasItemOlder 2024-03-22 12:04:53 +01:00
Sergio De la torre 4a5b09fc56 refs #6810 feat:crashlytics 2024-03-22 12:02:53 +01:00
Sergio De la torre 388081d10e refs #6413 feat:ubicador 2024-03-21 08:00:57 +01:00
Sergio De la torre abf1dfd37b refs #6810 feat:crashlytics 2024-03-21 07:57:45 +01:00
Sergio De la torre 343d9434e1 refs #6276 feat:silex →salix 2024-03-14 07:13:28 +01:00
Sergio De la torre 3eb1861ea5 refs #6873 feat:historico 2024-03-14 07:12:21 +01:00
Sergio De la torre 38d940fde4 refs #6276 feat:silex →salix 2024-03-14 07:10:36 +01:00
Sergio De la torre 817ac7750b refs #6658 feat:tests 2024-03-12 12:27:25 +01:00
Sergio De la torre 281f33047a refs #4683 feat:webFragment 2024-03-12 11:27:07 +01:00
Sergio De la torre 982713f4a2 refs #6193 feat:url 2024-03-12 11:24:42 +01:00
Sergio De la torre 66ee03032f refs #6193 feat:url 2024-03-12 11:24:28 +01:00
Sergio De la torre 317aae6286 refs #4021 feat:packaging 2024-03-12 07:32:12 +01:00
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
Sergio De la torre 86bcb7e3dd varios 2024-03-06 13:48:24 +01:00
Sergio De la torre 754d4c41c3 refs #5890 feat:itemShelvingSale 2024-03-06 13:33:59 +01:00
Sergio De la torre f163ac5b11 refs #6078 feat:activityWorker 2024-03-06 13:28:40 +01:00
Sergio De la torre bfcf7916b4 refs #6607 feat:checking_boxes 2024-03-06 13:27:33 +01:00
Sergio De la torre 8dd4a6dacf version 24.8Beta 2024-03-06 12:49:55 +01:00
Sergio De la torre 47a768004b refs #6964 feat:hasOlderItem 2024-03-06 12:49:02 +01:00
Sergio De la torre e67b6fbf12 refs #6964 refactor:settings 2024-03-06 12:46:50 +01:00
Sergio De la torre 220c8e8062 refs #6560 refactor:settings 2024-03-06 12:43:30 +01:00
Sergio De la torre 0f4ed51427 refs #6560 refactor:settings 2024-03-06 10:51:08 +01:00
Sergio De la torre 24fd2152bb refs #6284 feat:update and review xml 2024-03-01 10:37:53 +01:00
Sergio De la torre 27267c08a6 refs #6284 feat:update and review xml 2024-03-01 10:37:04 +01:00
Sergio De la torre f5def21b26 refs #6284 feat:update and review xml 2024-02-29 09:23:31 +01:00