Kevin Martinez
|
c0f6906119
|
Merge branch 'dev' into feature/order
# Conflicts:
# src/i18n/en/index.js
# src/router/modules/index.js
|
2023-12-14 07:08:58 -04:00 |
Carlos Satorres
|
3eb0b38633
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix-amountClaimLines
|
2023-12-14 12:07:57 +01:00 |
Carlos Satorres
|
126e1323bf
|
refs #6334 refresh
|
2023-12-14 12:06:25 +01:00 |
Alex Moreno
|
f7ebb86960
|
refs #6576 fix: correct version
|
2023-12-14 11:42:37 +01:00 |
William Buezas
|
0097d2d7f8
|
Merge pull request 'Input text refactor' (#27) from feature/ms-44-InputTextRefactor into dev
Reviewed-on: hyervoni/salix-front-mindshore#27
|
2023-12-13 18:21:38 +00:00 |
William Buezas
|
d369ce7152
|
more filters adaptations
|
2023-12-13 14:57:27 -03:00 |
William Buezas
|
b3e0f4979a
|
add is-outlined prop to VnInputDate and merge with dev
|
2023-12-13 14:31:48 -03:00 |
William Buezas
|
2eac632b32
|
resolve conflicts
|
2023-12-13 13:44:25 -03:00 |
William Buezas
|
d4b9dcc0b9
|
WIP
|
2023-12-13 12:09:23 -03:00 |
Alex Moreno
|
a149928015
|
refs #6062 fix: invoiceIn translation
|
2023-12-13 14:44:56 +01:00 |
Alex Moreno
|
6a440e053b
|
Merge pull request 'refs #6062 fix: migration errors' (!126) from 6062-migration-v1 into dev
Reviewed-on: verdnatura/salix-front#126
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
|
2023-12-13 13:40:38 +00:00 |
Alex Moreno
|
bbb2dadc9d
|
refs #6062 test: fix value name
|
2023-12-13 14:36:01 +01:00 |
Alex Moreno
|
7557096af6
|
refs #6062 fix: migration errors
|
2023-12-13 14:19:42 +01:00 |
Carlos Fonseca
|
d4c95a03a0
|
Merge pull request 'Se cambian textos a internacionalizacion' (#33) from features/ms_correcciones_pr_4 into dev
Reviewed-on: hyervoni/salix-front-mindshore#33
|
2023-12-13 12:11:20 +00:00 |
carlosfonseca
|
c90e4196d4
|
Se cambian textos a internacionalizacion
|
2023-12-13 07:09:20 -05:00 |
Jorge Penadés
|
055f10e6ff
|
Merge pull request 'refs #5835 migrateInvoiceIn' (!110) from 5835-migrateInvoiceIn into dev
Reviewed-on: verdnatura/salix-front#110
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-13 10:25:06 +00:00 |
William Buezas
|
c12f3f150b
|
remove id label from wagon list card
|
2023-12-12 15:40:22 -03:00 |
William Buezas
|
fdb417cf13
|
Fix and improve select cards logic in invoice out list
|
2023-12-12 15:23:06 -03:00 |
William Buezas
|
11839c7811
|
WIP
|
2023-12-12 14:00:56 -03:00 |
William Buezas
|
806a0a1d8b
|
Merge branch 'feature/ms-69-VnSelectCreate' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ms-67-WorkersCreationForm
|
2023-12-12 11:59:47 -03:00 |
William Buezas
|
c93a418dd3
|
WIP
|
2023-12-12 11:58:44 -03:00 |
William Buezas
|
d75ca32d1b
|
Add title to ticket card
|
2023-12-12 08:53:39 -03:00 |
William Buezas
|
cded128c4c
|
WIP
|
2023-12-12 08:45:08 -03:00 |
Jorge Penadés
|
d1a5029ef7
|
refs #5835 refactor
|
2023-12-12 12:11:45 +01:00 |
Jorge Penadés
|
2c5dc276b2
|
refs #5835
|
2023-12-12 09:01:32 +01:00 |
William Buezas
|
2432496eaf
|
more color palet corrections
|
2023-12-11 15:01:51 -03:00 |
William Buezas
|
2315940e83
|
Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev
|
2023-12-11 14:47:30 -03:00 |
William Buezas
|
4c4334aa55
|
fix QField cant be clicked in extra community table
|
2023-12-11 14:47:15 -03:00 |
Kevin Martinez
|
8db1b0f9ac
|
Create Input date
|
2023-12-11 13:10:28 -04:00 |
Kevin Martinez
|
9eab901be4
|
Fix worker descriptor image
|
2023-12-11 10:52:10 -04:00 |
Kevin Martinez
|
57b06f7d1f
|
Update shelving filter fields
|
2023-12-11 10:51:40 -04:00 |
Kevin Martinez
|
9a477c2c25
|
Create order page
|
2023-12-11 10:47:16 -04:00 |
William Buezas
|
bd69d0cb34
|
merge with dev
|
2023-12-11 10:27:05 -03:00 |
William Buezas
|
e0215e5216
|
Change more forms styling
|
2023-12-11 10:14:45 -03:00 |
Carlos Fonseca
|
71e729c0f4
|
Merge pull request 'Se hace cambio de color usando la paleta' (#31) from features/ms_correcciones_pr_3 into dev
Reviewed-on: hyervoni/salix-front-mindshore#31
|
2023-12-11 12:52:51 +00:00 |
Jorge Penadés
|
22a634e7eb
|
refs #5835 refactor taxRate
|
2023-12-11 13:49:50 +01:00 |
William Buezas
|
02e220ea42
|
cambios varios en id de cards y travel summary layout data
|
2023-12-11 09:47:51 -03:00 |
carlosfonseca
|
1313c50e0f
|
Se hace cambio de color usando la paleta
|
2023-12-11 07:42:19 -05:00 |
William Buezas
|
bc6ef24cd8
|
use vn-dark css variable
|
2023-12-11 08:56:27 -03:00 |
Jorge Penadés
|
61955268f4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn
|
2023-12-11 12:36:07 +01:00 |
Jorge Penadés
|
0e6417ff6a
|
Merge pull request 'ref #6104 recreate vnlog' (!96) from 6104-changeVnLog into dev
Reviewed-on: verdnatura/salix-front#96
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2023-12-11 11:34:36 +00:00 |
Jorge Penadés
|
e7c9a18f36
|
refs #6104 fix package
|
2023-12-11 12:29:31 +01:00 |
Jorge Penadés
|
d2e9a4cde4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn
|
2023-12-11 12:00:10 +01:00 |
Jorge Penadés
|
63372df35a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6104-changeVnLog
|
2023-12-11 11:59:46 +01:00 |
Jorge Penadés
|
52622d9a00
|
refs #6104 fix tests
|
2023-12-11 11:59:01 +01:00 |
Carlos Satorres
|
fbb59b8d61
|
Merge pull request 'refs #5633 create componente VnAccountNumber' (!118) from 5633-accountNumberComponent into dev
Reviewed-on: verdnatura/salix-front#118
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2023-12-11 08:36:32 +00:00 |
Carlos Satorres
|
f5e89a9edc
|
Merge branch 'dev' into 5633-accountNumberComponent
|
2023-12-11 08:31:08 +00:00 |
Jorge Penadés
|
42c34f7a46
|
refs #6104 merge conflicts
|
2023-12-11 09:11:39 +01:00 |
Pablo Natek
|
5c84a68ca6
|
Merge pull request '6475-descriptor_preview' (!109) from 6475-descriptor_preview into dev
Reviewed-on: verdnatura/salix-front#109
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-12-11 07:27:42 +00:00 |
Jorge Penadés
|
ea12508fff
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn
|
2023-12-11 08:27:07 +01:00 |