 Sergio De la torre
|
4c59d4cb10
|
Merge branch '4021_embalajes' into 4021-gestion_embalajes
# Conflicts:
# .idea/workspace.xml
# app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.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/packaging/model/EntrySalix.kt
# app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
# app/src/main/res/values-es/strings.xml
# app/src/main/res/values/strings.xml
|
2023-06-06 10:46:56 +02:00 |
|
Sergio De la torre
|
fd04b7b52f
|
version 23.22.1
|
2023-06-06 09:55:07 +02:00 |
|
Sergio De la torre
|
e3e7a3375a
|
version 23.22
|
2023-06-06 08:56:01 +02:00 |
|
Sergio De la torre
|
f48f112773
|
refs #5332 app obtener imagen
|
2023-06-06 08:54:13 +02:00 |
|
Sergio De la torre
|
f13e6e14da
|
refs #5332
|
2023-06-06 08:53:46 +02:00 |
|
Sergio De la torre
|
29094f4d90
|
refs #5713
|
2023-06-06 08:52:32 +02:00 |
|
Sergio De la torre
|
05e1abae63
|
refs #5713
|
2023-06-06 08:52:17 +02:00 |
|
Sergio De la torre
|
a8df499138
|
refs #4678
|
2023-06-06 08:50:56 +02:00 |
|
Sergio De la torre
|
491008a4a3
|
refs #5513
|
2023-06-06 08:50:14 +02:00 |
|
Sergio De la torre
|
0031abf841
|
Translation
|
2023-06-06 08:49:14 +02:00 |
|
Sergio De la torre
|
cf28002926
|
refs #5322 NaturePhotos
|
2023-06-06 08:48:55 +02:00 |
|
Sergio De la torre
|
f292de3db0
|
strings
|
2023-06-05 07:42:07 +02:00 |
|
Sergio De la torre
|
e2f8e1e0a5
|
Merge branch 'testBeta' of https://gitea.verdnatura.es/verdnatura/vn-warehouse into testBeta
Conflicts:
app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
|
2023-06-02 14:56:41 +02:00 |
|
Sergio De la torre
|
7633d0ce69
|
refs #5322 NaturePhotos
|
2023-06-02 14:50:58 +02:00 |
|
Sergio De la torre
|
307a53849b
|
refs #5322 NaturePhotos
|
2023-06-02 14:50:25 +02:00 |
 Alexandre Riera
|
de65d14a33
|
refs #5513 addFromBuy endpoint
|
2023-06-02 14:07:56 +02:00 |
|
Sergio De la torre
|
6db09cd73a
|
refs #5322 Nature
|
2023-06-02 12:54:09 +02:00 |
|
Sergio De la torre
|
65d1b4a7fd
|
refs #5764 Añadir onclick pantalla Día de venta
|
2023-06-02 07:16:41 +02:00 |
|
Sergio De la torre
|
a265550138
|
Modificado IntvsLong
|
2023-06-01 16:27:38 +02:00 |
|
Alexandre Riera
|
2b112b51e6
|
refs #5509 upload entry photo endpoint
|
2023-06-01 14:42:20 +02:00 |
|
Sergio De la torre
|
98ba481976
|
version alfa
|
2023-05-31 16:03:41 +02:00 |
|
Sergio De la torre
|
4304da8316
|
refs #4678 preparar fallo conexión
|
2023-05-31 16:02:32 +02:00 |
|
Sergio De la torre
|
22faafd907
|
refs lentitud al leer codigos y fallo al volver atrás
|
2023-05-31 16:01:54 +02:00 |
|
Sergio De la torre
|
b1fd26327a
|
refs #5618 traducción
|
2023-05-31 16:01:06 +02:00 |
|
Sergio De la torre
|
6ab21a1b03
|
refs #5513 testBack
|
2023-05-31 16:00:09 +02:00 |
|
Sergio De la torre
|
44b8713915
|
refs #4678
|
2023-05-31 15:57:59 +02:00 |
|
Sergio De la torre
|
491a4f8762
|
refs #4940
|
2023-05-29 12:20:57 +02:00 |
|
Sergio De la torre
|
fae0d8a444
|
refs #5618 traducciones
|
2023-05-25 09:53:58 +02:00 |
|
Sergio De la torre
|
d49c5db49e
|
refs #5675 fallo parking
|
2023-05-25 09:20:32 +02:00 |
|
Sergio De la torre
|
5454d00ca4
|
refs #4678 Carga/descarga
|
2023-05-25 09:19:26 +02:00 |
|
Sergio De la torre
|
a76692dff6
|
refs #4678 Carga/descarga
|
2023-05-25 09:18:48 +02:00 |
|
Sergio De la torre
|
6c9e85c574
|
refs #5071 summaryFragment
|
2023-05-25 09:18:05 +02:00 |
|
Sergio De la torre
|
c7807adb4c
|
refs #5618 traducciones
|
2023-05-25 08:44:45 +02:00 |
|
Sergio De la torre
|
5cb66d89d1
|
refs #4902 retrocompatibilidad etd-eta
|
2023-05-17 08:28:15 +02:00 |
|
Sergio De la torre
|
1583304c80
|
version 23.18.3Beta solucionado fallo ubicador. Añadido bbdd
|
2023-05-12 12:38:59 +02:00 |
|
Sergio De la torre
|
0bf19d0da0
|
version 23.18.2Beta - Solucionado doble pitido, fusionada pantalla sacador, filtro a ubicador, quitado baldas.
|
2023-05-11 11:52:19 +02:00 |
|
Sergio De la torre
|
a63cbb8f08
|
refs #5442
|
2023-05-04 08:50:05 +02:00 |
|
Sergio De la torre
|
8fc79a4d5d
|
refs #5430
|
2023-05-03 13:48:31 +02:00 |
|
Sergio De la torre
|
ee8527f6a3
|
refs #4815
|
2023-05-03 11:44:42 +02:00 |
|
Sergio De la torre
|
c5ef139004
|
refs #5335
|
2023-05-03 11:43:22 +02:00 |
|
Sergio De la torre
|
5d4acebccd
|
refs #4815
|
2023-05-02 16:20:37 +02:00 |
|
Sergio De la torre
|
078713348e
|
varios version despues Campaña
|
2023-05-02 16:17:49 +02:00 |
|
Sergio De la torre
|
e000ca66bc
|
refs #4979
|
2023-04-27 08:09:24 +02:00 |
|
Sergio De la torre
|
76f8fdc8b8
|
refs #5004
|
2023-04-27 08:07:16 +02:00 |
|
Sergio De la torre
|
528a4bbda0
|
version 23.14.1
|
2023-04-21 08:02:30 +02:00 |
|
Sergio De la torre
|
53a230db30
|
refs #5004
|
2023-04-21 07:10:07 +02:00 |
|
Sergio De la torre
|
47b1fce0b9
|
refs Precontrol activado
|
2023-04-20 08:04:36 +02:00 |
|
Sergio De la torre
|
705efcf1d3
|
refs varios
|
2023-04-20 07:16:02 +02:00 |
|
Sergio De la torre
|
6b507bf7ae
|
refs precontrol
|
2023-04-14 07:07:33 +02:00 |
|
Sergio De la torre
|
d4403cecc0
|
refs #4021
|
2023-04-12 14:10:13 +02:00 |