Alex Moreno
|
ecfe933039
|
Merge pull request '7863-devToTest_2434' (!613) from 7863-devToTest_2434 into test
Reviewed-on: verdnatura/salix-front#613
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
|
2024-08-13 06:58:12 +00:00 |
Alex Moreno
|
d27821c100
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-08-13 08:37:15 +02:00 |
Jorge Penadés
|
de24a3efdb
|
feat: refs #6900 add locale
|
2024-08-12 15:34:09 +02:00 |
Jon Elias
|
aefcfdba51
|
fix: refs #7354 fix zoneSearchbar
|
2024-08-12 14:28:35 +02:00 |
Jorge Penadés
|
c7679fd142
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial
|
2024-08-12 14:22:47 +02:00 |
Jorge Penadés
|
59262019f8
|
Merge pull request '#7283 finish item card sections' (!588) from 7283-itemSectionsMigration into dev
Reviewed-on: verdnatura/salix-front#588
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-08-12 12:08:45 +00:00 |
Jon Elias
|
0f8e5b8bf0
|
Merge pull request 'Hotfix: new field's order in warehouse filter' (!611) from hotfix_TicketList_WarehouseFilter into master
Reviewed-on: verdnatura/salix-front#611
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-08-12 12:06:33 +00:00 |
Jon Elias
|
563ab2de9c
|
Merge branch 'master' into hotfix_TicketList_WarehouseFilter
|
2024-08-12 12:05:51 +00:00 |
Jorge Penadés
|
c4de1beabf
|
feat: refs #6900 add InvoiceInSerial
|
2024-08-12 13:46:56 +02:00 |
Jon Elias
|
72c8379b20
|
fix: new field's order in warehouse filter
|
2024-08-12 13:18:31 +02:00 |
Jon Elias
|
b955ded123
|
fix: refs #7354 fix list searchbar and filters
|
2024-08-12 12:58:19 +02:00 |
Jorge Penadés
|
2cf669b479
|
Merge branch 'dev' into 7283-itemSectionsMigration
|
2024-08-12 10:51:40 +00:00 |
Carlos Satorres
|
94878b700b
|
refs #7355 account cards loads
|
2024-08-12 12:39:06 +02:00 |
Alex Moreno
|
3222a7a42c
|
fix(orderLines): reload when delete and redirect when confirm
|
2024-08-12 11:51:21 +02:00 |
Alex Moreno
|
1e4a309a84
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog
|
2024-08-12 11:47:01 +02:00 |
Alex Moreno
|
65a80e006b
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-08-12 11:46:09 +02:00 |
Alex Moreno
|
1e78bc293e
|
Merge pull request 'fix(customerDescription): fix action buttons' (!608) from hotFix_customerDescription_actions into master
Reviewed-on: verdnatura/salix-front#608
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
|
2024-08-12 09:45:07 +00:00 |
Jorge Penadés
|
9708214462
|
chore: refs #7283 drop array types
|
2024-08-12 11:01:32 +02:00 |
Jorge Penadés
|
239e796d2e
|
chore: refs #7283 update VnAvatar title handling
|
2024-08-12 11:00:03 +02:00 |
Jon Elias
|
9387082fc4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End
|
2024-08-12 10:35:55 +02:00 |
Jon Elias
|
41afc52f65
|
fix events and descriptor menu
|
2024-08-12 10:33:40 +02:00 |
Alex Moreno
|
190579e7fd
|
fix: orderCatalogFilter order
|
2024-08-12 10:22:52 +02:00 |
Jorge Penadés
|
f5ffe2a07b
|
refactor: refs #7283 update avatar size and color
|
2024-08-12 10:18:14 +02:00 |
Alex Moreno
|
e11e51f432
|
fix: order description to vnTable
|
2024-08-12 09:17:51 +02:00 |
Jon Elias
|
2189244730
|
Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End
|
2024-08-12 08:38:54 +02:00 |
Alex Moreno
|
5e88004e79
|
fix(customerDescription): fix action buttons
|
2024-08-12 08:34:16 +02:00 |
Jorge Penadés
|
6b80c52b71
|
chore: refs #7283 drop import
|
2024-08-09 15:42:31 +02:00 |
Jorge Penadés
|
f17ca4fe30
|
fix: refs #7283 itemLastEntries filter
|
2024-08-09 15:34:10 +02:00 |
Jorge Penadés
|
bb1f507b27
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration
|
2024-08-09 15:29:37 +02:00 |
Alex Moreno
|
37244cdbc7
|
feat(orderBasicData): add notes
|
2024-08-09 14:55:49 +02:00 |
Alex Moreno
|
dc7c686508
|
feat(orderList): correct create order
|
2024-08-09 14:19:08 +02:00 |
Carlos Satorres
|
b21ba3dc2c
|
refs #7355 account cards roles cards
|
2024-08-09 13:55:29 +02:00 |
Alex Moreno
|
ee71ae9d24
|
feat(orderList): use orderFilter and fixed this
|
2024-08-09 13:07:37 +02:00 |
Alex Moreno
|
5741cca878
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog
|
2024-08-09 12:39:00 +02:00 |
Alex Moreno
|
42a490cf18
|
Merge pull request 'fix(VnFilterPanel): emit userParams better' (!607) from warmFix_vnFilterPanel_setUserParams into dev
Reviewed-on: verdnatura/salix-front#607
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
|
2024-08-09 10:38:01 +00:00 |
Alex Moreno
|
08972d62b0
|
Merge branch 'dev' into warmFix_vnFilterPanel_setUserParams
|
2024-08-09 10:37:09 +00:00 |
Jorge Penadés
|
bf11a184c2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration
|
2024-08-09 12:34:04 +02:00 |
Jorge Penadés
|
f4f1bb7792
|
Merge pull request '#6900 fine tunning invoice in' (!601) from 6900-fineTunning into dev
Reviewed-on: verdnatura/salix-front#601
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-08-09 10:32:24 +00:00 |
Alex Moreno
|
02cfa54a40
|
unify watchers
|
2024-08-09 12:27:24 +02:00 |
Jorge Penadés
|
ee5a592e6f
|
Merge branch '7283-itemSectionsMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration
|
2024-08-09 12:13:27 +02:00 |
Jorge Penadés
|
7a2170e7c3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration
|
2024-08-09 12:12:59 +02:00 |
Jorge Penadés
|
3680321ae8
|
fix: refs #6900 use type number
|
2024-08-09 11:44:32 +02:00 |
Alex Moreno
|
bd05460b90
|
console.log
|
2024-08-09 11:41:29 +02:00 |
Alex Moreno
|
43ca7e1667
|
fix(VnFilterPanel): emit userParams better
|
2024-08-09 11:40:05 +02:00 |
Jorge Penadés
|
a9e8621903
|
chore: refs #6900 fix e2e tests
|
2024-08-09 10:47:15 +02:00 |
Jorge Penadés
|
f1047328c7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-fineTunning
|
2024-08-09 10:19:33 +02:00 |
Alex Moreno
|
6df6e53f30
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog
|
2024-08-09 09:32:23 +02:00 |
Alex Moreno
|
2dd8376bcd
|
typo
|
2024-08-09 09:32:04 +02:00 |
Jorge Penadés
|
3f6b20270d
|
chore: refs #6900 drop console log
|
2024-08-09 09:15:12 +02:00 |
Jorge Penadés
|
81ed679a2b
|
chore: refs #6900 mv rectificative logic
|
2024-08-09 09:11:35 +02:00 |