Jorge Penadés
|
5ef5285abc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection
|
2024-10-28 14:45:40 +01:00 |
Carlos Andrés
|
b8ba313132
|
Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!864) from 8087-nuevoCampoTravel into dev
Reviewed-on: verdnatura/salix-front#864
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-10-28 13:29:05 +00:00 |
Guillermo Bonet
|
15977357d9
|
refactor: refs #7266 Changed method name
|
2024-10-28 14:11:34 +01:00 |
Jon Elias
|
76dd27638a
|
Merge branch 'dev' into 7970-NotifySaleChanges
|
2024-10-28 12:40:47 +00:00 |
Jorge Penadés
|
526b7d91de
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection
|
2024-10-28 13:26:27 +01:00 |
Carlos Satorres
|
d252f6d2a3
|
fix: refs #7283 fix preview
|
2024-10-28 13:22:33 +01:00 |
Carlos Satorres
|
965c2f7b20
|
fix: refs #7283 preview
|
2024-10-28 13:16:51 +01:00 |
Carlos Satorres
|
f2803a6313
|
fix: refs #7283 item filters
|
2024-10-28 13:08:19 +01:00 |
Jon Elias
|
c997081303
|
Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems
|
2024-10-28 12:59:26 +01:00 |
Jon Elias
|
cab5a165d2
|
refactor: changed confirmOrder directory
|
2024-10-28 12:59:25 +01:00 |
Jon Elias
|
ac3013205e
|
Merge branch 'dev' into 7970-NotifySaleChanges
|
2024-10-28 11:46:02 +00:00 |
Jon Elias
|
3d4ca2bc67
|
refactor: refs #7970 added emit
|
2024-10-28 12:45:13 +01:00 |
Jon Elias
|
639e08406e
|
Merge branch 'dev' into Fix_OrderModuleProblems
|
2024-10-28 11:22:23 +00:00 |
Jon Elias
|
ea05637bf2
|
Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems
|
2024-10-28 12:21:28 +01:00 |
Jon Elias
|
17b1921af6
|
feat: added composable to confirm orders
|
2024-10-28 12:21:26 +01:00 |
Jon Elias
|
e5a221d073
|
Merge branch '7970-NotifySaleChanges' of https://gitea.verdnatura.es/verdnatura/salix-front into 7970-NotifySaleChanges
|
2024-10-28 11:44:50 +01:00 |
Jon Elias
|
9347bb1ef5
|
refactor: refs #7970 refactored VnConfirm to emit events
|
2024-10-28 11:44:49 +01:00 |
Jon Elias
|
18a71e63e1
|
Merge branch 'dev' into 7193-ParkingCreateScope
|
2024-10-28 09:41:08 +00:00 |
Jon Elias
|
df1c123444
|
feat: refs #7193 modified parking to use the scope and corrected small errors
|
2024-10-28 10:39:45 +01:00 |
Alex Moreno
|
ffee9fb27c
|
Merge branch 'dev' into fix_itemType-redirection
|
2024-10-28 09:14:21 +00:00 |
Alex Moreno
|
bc8a87b267
|
chore: typo
|
2024-10-28 09:58:07 +01:00 |
Alex Moreno
|
cca255507a
|
fix: itemType redirection and fix filters
|
2024-10-28 09:57:25 +01:00 |
Jon Elias
|
454be43884
|
Merge branch 'dev' into 7970-NotifySaleChanges
|
2024-10-28 07:17:06 +00:00 |
Jon Elias
|
ca6547e174
|
feat: refs #7970 notify changes
|
2024-10-28 07:48:11 +01:00 |
William Buezas
|
c93f152060
|
fix: order catalog fixes
|
2024-10-27 15:27:53 -03:00 |
Jorge Penadés
|
0cc0e82aaa
|
feat: refs #8078 add shortcut multi selection
|
2024-10-27 14:48:44 +01:00 |
Jorge Penadés
|
1da86900e6
|
fix: refs #7524 e2e & worker module
|
2024-10-27 13:43:38 +01:00 |
Alex Moreno
|
d14f2bd638
|
Merge branch 'dev' into 7006-itemTypeLog
|
2024-10-25 12:30:07 +00:00 |
Guillermo Bonet
|
494fc66c06
|
feat: refs #7006 itemType basic data new inputs
|
2024-10-25 14:14:51 +02:00 |
William Buezas
|
211da859bd
|
fix: catalog view category and type filter
|
2024-10-25 08:57:16 -03:00 |
Guillermo Bonet
|
8edba36a74
|
feat: refs #7006 itemType basic data new inputs
|
2024-10-25 13:46:36 +02:00 |
Alex Moreno
|
c127fee467
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-25 13:08:37 +02:00 |
Alex Moreno
|
c1e4c45318
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-10-25 13:08:26 +02:00 |
Guillermo Bonet
|
57a3504a7f
|
Merge branch 'dev' into 7006-itemTypeLog
|
2024-10-25 11:06:49 +00:00 |
Alex Moreno
|
5b24aa4570
|
fix: performance addEventListeners
|
2024-10-25 12:58:23 +02:00 |
Jorge Penadés
|
cdb73f7a17
|
fix: refs #7943 use correct data-key
|
2024-10-25 11:50:20 +02:00 |
Jorge Penadés
|
bb51a9e687
|
fix: refs #7943 use summary
|
2024-10-25 11:38:00 +02:00 |
Alex Moreno
|
e7d0ecf6bb
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-25 10:40:57 +02:00 |
Alex Moreno
|
100dfbec3e
|
Merge branch 'dev' into 8087-nuevoCampoTravel
|
2024-10-25 08:14:09 +00:00 |
Carlos Andrés
|
9e57c5e452
|
feat: refs #8087 Traspasar redadas a travels
|
2024-10-25 10:13:09 +02:00 |
Carlos Andrés
|
4c1e4aedd2
|
feat: refs #8087 Traspasar redadas a travels
|
2024-10-25 10:03:09 +02:00 |
Jon Elias
|
139744d90b
|
Merge branch 'test' into Fix-CustomerSummaryTable
|
2024-10-25 08:01:28 +00:00 |
Jon Elias
|
1daa8be635
|
perf: optimize get packing type function
|
2024-10-25 09:41:28 +02:00 |
Carlos Satorres
|
0cb5f34b15
|
Merge branch 'dev' into 7283-itemMigration
|
2024-10-25 07:08:16 +00:00 |
Carlos Satorres
|
69aec0cd83
|
Merge branch 'dev' into warmFix_accountAcls
|
2024-10-25 06:18:47 +00:00 |
Carlos Satorres
|
e8d2a40daf
|
fix: entryFilters
|
2024-10-25 08:11:31 +02:00 |
Jon Elias
|
1889dd02e4
|
Merge branch 'master' into Hotfix-RecalculatePriceReload
|
2024-10-25 04:49:34 +00:00 |
Jon Elias
|
9ba16e4116
|
Merge branch 'Hotfix-RecalculatePriceReload' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-RecalculatePriceReload
|
2024-10-25 06:48:11 +02:00 |
Jon Elias
|
994237260e
|
refactor: changed name of emitted event
|
2024-10-25 06:48:09 +02:00 |
Carlos Andrés
|
12c236276d
|
feat: refs #8087 Traspasar redadas a travels
|
2024-10-24 19:32:20 +02:00 |
Alex Moreno
|
92e147355f
|
fix: better performance
|
2024-10-24 15:13:05 +02:00 |
Carlos Satorres
|
67a5d10a5e
|
Merge branch 'dev' into 7283-itemMigration
|
2024-10-24 13:10:23 +00:00 |
Javier Segarra
|
855979d22d
|
perf: refs #7283 #7283 i18n params
|
2024-10-24 14:59:14 +02:00 |
Javier Segarra
|
9a518ed990
|
Merge branch 'test' into warmfix_createNewPostcodeForm
|
2024-10-24 12:48:25 +00:00 |
Alex Moreno
|
fd72f4dd45
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-24 14:45:34 +02:00 |
Alex Moreno
|
9daed096db
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-10-24 14:45:23 +02:00 |
Javier Segarra
|
26de0cf72f
|
perf: remove limit
|
2024-10-24 12:39:49 +00:00 |
Jorge Penadés
|
4828e32c9e
|
fix: refs #7652 datakey
|
2024-10-24 14:26:16 +02:00 |
Jon Elias
|
7a4e43a025
|
Merge branch 'master' into Hotfix-RecalculatePriceReload
|
2024-10-24 12:13:48 +00:00 |
Carlos Satorres
|
8cee3ac713
|
Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
|
2024-10-24 14:08:14 +02:00 |
Carlos Satorres
|
c2043902f8
|
fix: refs #7283 fix required
|
2024-10-24 14:08:11 +02:00 |
Javier Segarra
|
70dcadc57d
|
Actualizar src/components/CreateNewPostcodeForm.vue
|
2024-10-24 11:52:13 +00:00 |
Carlos Satorres
|
92ff8c188e
|
Merge branch 'dev' into 7283-itemMigration
|
2024-10-24 11:39:33 +00:00 |
Carlos Satorres
|
551b81e421
|
Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
|
2024-10-24 13:38:16 +02:00 |
Carlos Satorres
|
671d9fd6fb
|
fix: refs #7283 itemtype fix
|
2024-10-24 13:38:13 +02:00 |
Jorge Penadés
|
823c354ef1
|
fix: refs #7524 vnProgressModal
|
2024-10-24 13:27:08 +02:00 |
Jorge Penadés
|
f52b4c9a59
|
fix: refs #7524 vnProgressModal
|
2024-10-24 13:24:45 +02:00 |
Carlos Andrés
|
64f36c7d4b
|
feat: refs #8087 Traspasar redadas a travels
|
2024-10-24 12:35:11 +02:00 |
Javier Segarra
|
3f640c650b
|
perf: refs #7283 #7283 handle i18n
|
2024-10-24 12:32:15 +02:00 |
Jorge Penadés
|
c9cfb2b1cf
|
fix: refs #7524 changes
|
2024-10-24 12:29:46 +02:00 |
Jon Elias
|
c9e82f2caf
|
refactor: deleted log
|
2024-10-24 12:04:54 +02:00 |
Jon Elias
|
b02199eb07
|
fix: reload window when price is recalculated
|
2024-10-24 12:03:49 +02:00 |
Jorge Penadés
|
f1350dece5
|
fix: refs #7524 changes
|
2024-10-24 11:43:29 +02:00 |
Javier Segarra
|
87d2e0a39b
|
perf: refs #7283 #7283 handle composable i18n
|
2024-10-24 10:36:48 +02:00 |
Javier Segarra
|
45e6d2011f
|
Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
|
2024-10-24 10:35:24 +02:00 |
Jorge Penadés
|
2779e7ac8d
|
Merge branch 'test' of https: refs #7524//gitea.verdnatura.es/verdnatura/salix-front into 7524-warmfix-useVnTable
|
2024-10-24 10:29:55 +02:00 |
Jorge Penadés
|
d918b76010
|
chore: refs #7524 drop useless code
|
2024-10-24 10:24:28 +02:00 |
Jorge Penadés
|
6f57d9e490
|
refactor: refs #7524 use VnTable
|
2024-10-24 10:21:25 +02:00 |
Alex Moreno
|
de7f55c589
|
Merge branch 'dev' of https: refs #8039//gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify
|
2024-10-24 07:56:00 +02:00 |
Alex Moreno
|
32b4636706
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-24 07:49:10 +02:00 |
Alex Moreno
|
f26976b744
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-10-24 07:49:01 +02:00 |
Carlos Satorres
|
56ef811584
|
fix: refs #7283 order translation
|
2024-10-24 07:47:26 +02:00 |
Javier Segarra
|
1c8eabe293
|
perf: refs #7283 #7283 declare composable inst4ead code duplicated
|
2024-10-24 00:39:35 +02:00 |
Jorge Penadés
|
1bfede4a55
|
fix: refs #8083 drop useless code
|
2024-10-23 16:13:32 +02:00 |
Jorge Penadés
|
4e31566ddd
|
fix: refs #8083 drop useless code
|
2024-10-23 16:13:04 +02:00 |
Jorge Penadés
|
33ee1ea01b
|
fix: refs #8083 drop useless code
|
2024-10-23 16:11:58 +02:00 |
Jorge Penadés
|
126bb3f039
|
feat: refs #8083 insert
|
2024-10-23 16:10:14 +02:00 |
Jorge Penadés
|
9673f7be1e
|
fix: refs #8083 update rightly
|
2024-10-23 15:17:06 +02:00 |
Alex Moreno
|
d1e4017869
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-23 13:59:11 +02:00 |
Alex Moreno
|
2420c6dee2
|
Merge branch 'dev' of https: refs #8039//gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify
|
2024-10-23 13:14:30 +02:00 |
Alex Moreno
|
0528474250
|
chore: refs #8010 kebab-case
|
2024-10-23 13:13:00 +02:00 |
Jon Elias
|
76ed5150a5
|
Merge branch 'dev' into Fix_OrderModuleProblems
|
2024-10-23 11:05:14 +00:00 |
Jon Elias
|
37b3affdbf
|
refactor: revert catalog changes
|
2024-10-23 13:02:28 +02:00 |
Carlos Satorres
|
d8b80cfa6d
|
fix: refs #7283 fix pr
|
2024-10-23 12:30:04 +02:00 |
Jon Elias
|
b69ef48a44
|
refactor: refs #7132 deleted pageTitles repeated
|
2024-10-23 12:21:34 +02:00 |
Jon Elias
|
03f2da8169
|
Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations
|
2024-10-23 12:14:50 +02:00 |
Alex Moreno
|
e7acdfd4f7
|
fix: refs #8010 footer class
|
2024-10-23 10:48:30 +02:00 |
Carlos Satorres
|
d2da1e3544
|
Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
|
2024-10-23 09:54:25 +02:00 |
Carlos Satorres
|
b40af0ce7b
|
fix: refs #7283 fix pr
|
2024-10-23 09:49:48 +02:00 |
Jon Elias
|
4bde0dffa7
|
fix: fixed item packaging type field showing repetitive values
|
2024-10-23 09:17:14 +02:00 |
Carlos Satorres
|
84dae53d66
|
Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
|
2024-10-23 07:53:02 +02:00 |
Javi Gallego
|
1bf1844c8f
|
fix: refs #7349 dependencia no usada
|
2024-10-23 07:46:52 +02:00 |
Javi Gallego
|
ae56c06628
|
feat: refs #7349 usa back con permisos
|
2024-10-23 07:45:00 +02:00 |
Alex Moreno
|
735ee09ef8
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-10-22 15:08:20 +02:00 |
Alex Moreno
|
aaf749db6c
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-10-22 15:08:11 +02:00 |
Alex Moreno
|
81a55a9e7a
|
chore: test gitea
|
2024-10-22 14:55:47 +02:00 |
Jorge Penadés
|
033d6bddbe
|
fix: refs #8083 move expeditions
|
2024-10-22 14:43:43 +02:00 |
Jorge Penadés
|
da4c1e9c12
|
fix: refs #8083 add order
|
2024-10-22 14:36:30 +02:00 |
Jorge Penadés
|
9f3c834ce4
|
Merge branch 'master' of https: refs #8083//gitea.verdnatura.es/verdnatura/salix-front into 8083-hotfix-changeState
|
2024-10-22 14:24:41 +02:00 |
Jorge Penadés
|
b1a511ff6f
|
fix: refs #8083 delete btn & redirect
|
2024-10-22 14:21:03 +02:00 |
Alex Moreno
|
ee31bc8262
|
chore: refs #8039 not required
|
2024-10-22 14:07:27 +02:00 |
Alex Moreno
|
dd2dc86eea
|
fix: refs #8039 o not handle unnecessary errors
|
2024-10-22 14:05:15 +02:00 |
Alex Moreno
|
cd00a3c67f
|
test: refs #8039 fix WorkerNotification e2e
|
2024-10-22 13:55:35 +02:00 |
Alex Moreno
|
0c9c01b6e9
|
test: refs #8039 fix ZoneWarehouse e2e
|
2024-10-22 13:53:01 +02:00 |
Alex Moreno
|
2d81cffb33
|
feat: refs #8039 show duplicate request in local
|
2024-10-22 13:34:20 +02:00 |
Jorge Penadés
|
f751408de2
|
feat: refs #8083 add change state btn
|
2024-10-22 13:22:43 +02:00 |
Alex Moreno
|
a732ec05fb
|
test: refs #8039 add hasNotify and, refactor: agencyWorkCenter test
|
2024-10-22 13:21:16 +02:00 |
Alex Moreno
|
9db1c4f721
|
fix: refs #8039 bad tests
|
2024-10-22 12:29:33 +02:00 |
Alex Moreno
|
ffd4a402ab
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify
|
2024-10-22 12:14:09 +02:00 |
Javier Segarra
|
49c0d64c07
|
fix: refs #7283 #7283 ItemSummary bugs
|
2024-10-22 12:13:43 +02:00 |
Javier Segarra
|
fff3310658
|
fix: refs #7283 tooltips !Item
|
2024-10-22 12:09:32 +02:00 |
Javier Segarra
|
d6b8d41b6c
|
fix: refs #7283 #7283 ItemSummary bugs
|
2024-10-22 12:09:19 +02:00 |
Jon Elias
|
1346a2e7fd
|
fix: tag chips
|
2024-10-22 12:05:44 +02:00 |
Javier Segarra
|
f3a6209189
|
fix: refs #7283 #7283 bugs
|
2024-10-22 12:00:11 +02:00 |
Jon Elias
|
5b116a7301
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems
|
2024-10-22 11:31:45 +02:00 |
Alex Moreno
|
36221121f5
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-22 07:43:07 +02:00 |
Alex Moreno
|
b4d4844100
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-10-22 07:42:54 +02:00 |
Jorge Penadés
|
0fbd5f45e1
|
fix: refs #7524 select department
|
2024-10-21 14:29:29 +02:00 |
Javier Segarra
|
29a7f3b2fe
|
fix: refs #7283 #7283 ItemDiary subToolbar
|
2024-10-21 13:48:43 +02:00 |
Jon Elias
|
cd4b17048c
|
Merge branch 'dev' into Fix-TicketsModule
|
2024-10-21 11:40:02 +00:00 |
Alex Moreno
|
8478d89183
|
Merge branch '8039-canceledError_not_notify' of https://gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify
|
2024-10-21 13:33:14 +02:00 |
Alex Moreno
|
9780fe596f
|
feat: refs #8039 notify error unify
|
2024-10-21 13:33:12 +02:00 |
Alex Moreno
|
6f79275521
|
Merge branch 'dev' into 8039-canceledError_not_notify
|
2024-10-21 11:24:08 +00:00 |
Alex Moreno
|
52981953f7
|
feat(): refs #8039 canceledError not notify
|
2024-10-21 13:23:45 +02:00 |
Javier Segarra
|
e5064e8a37
|
Merge branch 'dev' into 7679_improve_newPostcode_form
|
2024-10-21 11:17:01 +00:00 |
Jon Elias
|
df3b4e7a18
|
refactor: refs #7132 deleted useless code
|
2024-10-21 13:07:07 +02:00 |
Jon Elias
|
1d41647022
|
Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations
|
2024-10-21 12:57:32 +02:00 |
Jon Elias
|
e5cd9d4b8f
|
refactor: refs #7132 global translations files changed
|
2024-10-21 12:56:09 +02:00 |
Alex Moreno
|
0afcba0b07
|
Merge branch 'dev' into 6233-fix_ticketBasicData_zone
|
2024-10-21 10:49:43 +00:00 |
Jorge Penadés
|
a4358ec0ed
|
chore: refs #7524 refactor order
|
2024-10-21 12:36:16 +02:00 |
Jorge Penadés
|
2b2ccbc6a1
|
feat: refs #7524 myTeam filter & default params
|
2024-10-21 12:14:54 +02:00 |
Alex Moreno
|
d221b8e3c4
|
chore: refs #7632 change requests
|
2024-10-21 12:04:20 +02:00 |
Alex Moreno
|
fcc213f307
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7632-axios_isLoading
|
2024-10-21 12:03:15 +02:00 |
Alex Moreno
|
f2147311d3
|
fix(TicketBasicData_zone): refs #6233 add acls and fix get zones
|
2024-10-21 08:41:19 +02:00 |
Alex Moreno
|
0cc1090739
|
Merge branch 'dev' into 7632-axios_isLoading
|
2024-10-21 06:23:05 +00:00 |
Jon Elias
|
fa0625aa86
|
Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems
|
2024-10-18 14:12:25 +02:00 |
Jon Elias
|
11bf70d76c
|
fix: category and tags filters
|
2024-10-18 14:12:23 +02:00 |
Jon Elias
|
11092866b8
|
fix: merge conflicts
|
2024-10-18 13:33:28 +02:00 |
Jon Elias
|
64c0496f7a
|
Merge branch 'dev' into Fix-ItemRequest
|
2024-10-18 11:20:43 +00:00 |
Jon Elias
|
89cb9aacec
|
refactor: refs #7132 1st wave of changes in global translations files
|
2024-10-18 12:54:21 +02:00 |
Alex Moreno
|
175ebbc343
|
feat(navBar): refs #7632 isLoading
|
2024-10-18 11:03:43 +02:00 |
Jon Elias
|
0e77d4b68f
|
refactor: refs #7132 account's module translations
|
2024-10-18 10:40:40 +02:00 |
Jorge Penadés
|
2aaba93c3c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fixLoadOnScroll
|
2024-10-18 10:11:11 +02:00 |
Jorge Penadés
|
0c2d9e6ec6
|
fix: refs #7353 load on scroll end 80% zoom
|
2024-10-18 10:08:46 +02:00 |
Jon Elias
|
7d78ce7781
|
Merge branch 'dev' into 7010-AddPackingField
|
2024-10-18 07:29:17 +00:00 |
Jon Elias
|
8eef9c0009
|
refactor: refs #7132 customer's module translations
|
2024-10-18 09:21:18 +02:00 |
Carlos Satorres
|
8bc06593c5
|
Merge branch '7986-workerMoto' of https://gitea.verdnatura.es/verdnatura/salix-front into 7986-workerMoto
|
2024-10-18 08:44:31 +02:00 |
Carlos Satorres
|
1f4b681b5b
|
fix: refs #7986 clean code
|
2024-10-18 08:44:27 +02:00 |
Jon Elias
|
58e88f605c
|
refactor: refs #7132 delete duplicate translations' keys
|
2024-10-18 08:04:52 +02:00 |
Jorge Penadés
|
c42c811444
|
fix: refs #7353 load on scroll end
|
2024-10-17 17:39:49 +02:00 |
Jon Elias
|
98a380e026
|
Merge branch 'master' into Fix-InvoiceOutSummary
|
2024-10-17 08:58:49 +00:00 |
Carlos Satorres
|
608e6c717a
|
fix: refs #7310 clean warning
|
2024-10-17 09:34:48 +02:00 |
Carlos Satorres
|
16ef5d3722
|
fix: refs #7306 clean warning
|
2024-10-17 08:30:45 +02:00 |
Carlos Satorres
|
f2cb0111eb
|
fix: refs #7283 fix image
|
2024-10-16 14:45:33 +02:00 |
Carlos Satorres
|
3cdba5dafa
|
Merge branch 'dev' into 7986-workerMoto
|
2024-10-16 12:10:22 +00:00 |
Javier Segarra
|
70ae50a5f1
|
Merge branch 'dev' into 7679_improve_newPostcode_form
|
2024-10-16 12:07:26 +00:00 |
Carlos Satorres
|
d1c61c5aed
|
Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
|
2024-10-16 14:01:01 +02:00 |
Carlos Satorres
|
e06ce4f8a4
|
fix: refs #7986 clean code
|
2024-10-15 14:56:32 +02:00 |
Carlos Satorres
|
cad3fddc3e
|
fix: refs #7986 descriptor fix
|
2024-10-15 14:52:52 +02:00 |
Carlos Satorres
|
a30915f99e
|
fix: refs #7986 fix operator, fix crudmodel update
|
2024-10-15 14:42:26 +02:00 |
Jon Elias
|
c4670b57de
|
Merge branch 'dev' into 7825-FixCreatebankEntity
|
2024-10-15 11:13:35 +00:00 |
Jon Elias
|
15f171da0f
|
perf: refs #7825 create bank entity
|
2024-10-15 13:12:37 +02:00 |
Carlos Satorres
|
b4245d05fb
|
fix: refs #7986 crudModel
|
2024-10-15 13:00:01 +02:00 |
Carlos Satorres
|
3badfbcff9
|
Merge branch 'dev' into 7767-holidayDaysExceeded
|
2024-10-15 10:54:57 +00:00 |
Carlos Satorres
|
af830591b3
|
fix: refs #7986 front fixed
|
2024-10-15 09:44:55 +02:00 |
Jon Elias
|
d416a34560
|
refactor: use docuware in ticket descriptor menu
|
2024-10-15 08:48:30 +02:00 |
Alex Moreno
|
3bb5f66ce7
|
fix(claimNotes): refs #8093 $props.selectType && !newNote.observationTypeFk
|
2024-10-15 08:43:58 +02:00 |
Alex Moreno
|
d87e8ec4ae
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-15 08:01:22 +02:00 |
Carlos Satorres
|
bc581caa4e
|
fix: refs #7767 console remove
|
2024-10-15 07:57:19 +02:00 |
Carlos Satorres
|
dfceb9403c
|
fix: refs #7986 fix front
|
2024-10-15 07:54:52 +02:00 |
Carlos Satorres
|
85eed86ba8
|
Merge branch 'master' into #6898-&-#6899-hotfixFilterList
|
2024-10-15 05:41:32 +00:00 |
Jorge Penadés
|
37dfca3bce
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixScopeDays
|
2024-10-14 16:03:13 +02:00 |
Jorge Penadés
|
19545ca7e6
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixScopeDays
|
2024-10-14 15:54:08 +02:00 |
Jorge Penadés
|
2d34921cf5
|
fix: refs #7524 paginate
|
2024-10-14 15:52:12 +02:00 |
Jorge Penadés
|
245c027357
|
chore: refs #7874 refactor imports
|
2024-10-14 15:43:59 +02:00 |
Jorge Penadés
|
0fb9b22935
|
chore: refs #7874 refactor code
|
2024-10-14 14:09:52 +02:00 |
Carlos Satorres
|
1a2c5c96fa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7986-workerMoto
|
2024-10-14 13:52:31 +02:00 |
Carlos Satorres
|
8258fbb91e
|
refs #7767 remove onMounted
|
2024-10-14 13:24:12 +02:00 |
Jorge Penadés
|
0f3168456a
|
chore: refs #7524 sort by firstName
|
2024-10-14 13:22:59 +02:00 |
Carlos Satorres
|
b225f6a4c8
|
refs #7767 fix contractHolidays
|
2024-10-14 13:18:34 +02:00 |
Jon Elias
|
1183d86867
|
Merge branch 'master' into Fix-InvoiceOutSummary
|
2024-10-14 11:10:31 +00:00 |
Jon Elias
|
0aab17becc
|
fix: fixed customer descriptor proxy
|
2024-10-14 13:08:16 +02:00 |
Jorge Penadés
|
4ff3c18f33
|
feat: refs #7874 use badge type
|
2024-10-14 13:00:15 +02:00 |
Jorge Penadés
|
6f2187cb68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
|
2024-10-14 12:18:37 +02:00 |
Jorge Penadés
|
4b78c1acd0
|
fix: refs #7524 dynamic
|
2024-10-14 12:00:05 +02:00 |
Jon Elias
|
720042bed9
|
feat: added new filter param and refactored link colors
|
2024-10-14 11:30:31 +02:00 |
Javier Segarra
|
0fae36c239
|
Merge branch 'dev' into 7679_improve_newPostcode_form
|
2024-10-14 09:01:15 +00:00 |
Jorge Penadés
|
fdbae5c0b5
|
Merge branch 'dev' into 8019-makeResponsiveInputs
|
2024-10-14 08:48:50 +00:00 |
Carlos Satorres
|
2edeb1043e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7767-holidayDaysExceeded
|
2024-10-14 10:24:49 +02:00 |
Carlos Satorres
|
85b068eddb
|
refs #6898 #6899 hotfix lists
|
2024-10-14 10:21:02 +02:00 |
Guillermo Bonet
|
787ce2fc48
|
feat: refs #7006 itemTypeLog added
|
2024-10-14 09:33:00 +02:00 |
Carlos Satorres
|
6a624b12a5
|
refs: #6898 hotfix accounts
|
2024-10-14 09:28:51 +02:00 |
Javier Segarra
|
b6bce0c2f3
|
Merge branch 'dev' into 7679_improve_newPostcode_form
|
2024-10-14 09:27:56 +02:00 |
Jorge Penadés
|
db5449444a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
|
2024-10-14 08:37:44 +02:00 |
Alex Moreno
|
64c8d264af
|
warmFix(TravelList): add daysOnward in travelFilter
|
2024-10-14 07:43:29 +02:00 |
Jorge Penadés
|
50042ed45b
|
feat: refs #7874 prevent submit if empty fields
|
2024-10-10 16:49:41 +02:00 |
Jorge Penadés
|
6d674f2a2b
|
Merge branch 'dev' into 7874-addObservationType
|
2024-10-10 13:41:01 +00:00 |
Javier Segarra
|
2ff99d3faa
|
feat: define as global dense value
|
2024-10-10 13:56:14 +02:00 |
Javier Segarra
|
3dfb836f8e
|
revert: rollback compress spacestyle
|
2024-10-10 13:56:11 +02:00 |
Jorge Penadés
|
44c4c378f9
|
chore: refs #7874 add default ob type
|
2024-10-10 11:02:03 +02:00 |
Jon Elias
|
8b68c0afeb
|
fix: improve geoFk for ZoneDeliveryPanel
|
2024-10-10 08:30:56 +00:00 |
Jorge Penadés
|
830decb6db
|
Merge branch 'dev' into 7874-addObservationType
|
2024-10-10 08:16:36 +00:00 |
Jon Elias
|
e58818e891
|
fix: Use geoFk for ZoneDeliveryPanel
|
2024-10-10 08:14:24 +00:00 |
Jorge Penadés
|
cfe95df9e8
|
fix: refs #7524 use dynamic load
|
2024-10-10 09:46:07 +02:00 |
Javier Segarra
|
3d5d267345
|
revert: commit
|
2024-10-10 09:29:12 +02:00 |
Javier Segarra
|
f16707756e
|
fix: change type vnput
|
2024-10-10 09:29:04 +02:00 |
Jorge Penadés
|
00dc2c6edc
|
Merge branch 'dev' into 7207-showPbx
|
2024-10-10 07:18:00 +00:00 |
Jon Elias
|
d721083795
|
fix: filter panel
|
2024-10-10 08:43:33 +02:00 |
Jon Elias
|
2dd3e09928
|
refactor: requested changes
|
2024-10-10 08:26:16 +02:00 |
Jon Elias
|
419d3d2d45
|
fix: refs #6896 fixed module problems
|
2024-10-10 07:20:33 +02:00 |
Javier Segarra
|
801b6585e8
|
perf: refs #7679 change limit value
|
2024-10-09 00:44:54 +02:00 |
Javier Segarra
|
9edf35fba2
|
Merge branch 'dev' into 7679_improve_newPostcode_form
|
2024-10-08 20:27:04 +00:00 |
Carlos Satorres
|
855032e4a6
|
refs #7986 fix front
|
2024-10-08 15:36:57 +02:00 |
Alex Moreno
|
b6778aaf17
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-08 12:24:39 +02:00 |
Alex Moreno
|
d8a2cdc11c
|
Merge branch 'master' into hotFix_VnPaginate_offset
|
2024-10-08 10:16:14 +00:00 |
Carlos Satorres
|
0517b39c60
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front
|
2024-10-08 09:26:07 +02:00 |
Carlos Satorres
|
56fff55f71
|
fix: unnecessary property
|
2024-10-08 09:26:00 +02:00 |
Alex Moreno
|
bde739e7ef
|
Merge branch 'master' into hotFix_VnPaginate_offset
|
2024-10-08 06:50:16 +00:00 |
Carlos Satorres
|
73e5039ec3
|
refs #7986 create front
|
2024-10-08 08:35:24 +02:00 |
Jorge Penadés
|
1723331615
|
Merge branch 'dev' of https: refs #7207//gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx
|
2024-10-07 16:35:00 +02:00 |
Jorge Penadés
|
e6535a5dd8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8019-makeResponsiveInputs
|
2024-10-07 16:10:59 +02:00 |
Jorge Penadés
|
4344458bb0
|
feat: refs #8019 fine-tunning vnTime
|
2024-10-07 16:02:29 +02:00 |
Jorge Penadés
|
c815066953
|
feat: refs #8019 fine-tunning vnDate
|
2024-10-07 15:55:18 +02:00 |
Javier Segarra
|
43da6ea1b8
|
Merge branch 'master' into hotfix_vnImg_zoom_resolution
|
2024-10-07 12:00:12 +00:00 |
Guillermo Bonet
|
50eed83d05
|
feat: refs #7893 Requested changes
|
2024-10-07 13:50:19 +02:00 |
Jorge Penadés
|
d1b3e01d87
|
chore: refs #8019 refactor css scoped
|
2024-10-07 13:36:27 +02:00 |
Jon Elias
|
27dca7c35f
|
Merge branch 'Fix-TicketsModule' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketsModule
|
2024-10-07 13:29:46 +02:00 |
Jon Elias
|
afc52f6cea
|
fix: changes in sale and summary
|
2024-10-07 13:29:43 +02:00 |
Javier Segarra
|
0ed9fdd55d
|
fix: refs VnImg zoom resolution missing property
|
2024-10-07 13:02:40 +02:00 |
Carlos Satorres
|
e396cd0cac
|
hotfix: routePrice null
|
2024-10-07 12:16:32 +02:00 |
Jorge Penadés
|
d88fadca55
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8019-makeResponsiveInputs
|
2024-10-07 11:47:39 +02:00 |
Guillermo Bonet
|
a6944561de
|
Merge branch 'dev' into 7893-wasteRecalc
|
2024-10-07 11:32:03 +02:00 |
Guillermo Bonet
|
c3eaab44ed
|
Merge branch '7893-wasteRecalc' of https://gitea.verdnatura.es/verdnatura/salix-front into 7893-wasteRecalc
|
2024-10-07 11:31:18 +02:00 |
Guillermo Bonet
|
178fa8cd21
|
feat: refs #7893 Requested changes
|
2024-10-07 11:31:16 +02:00 |
Guillermo Bonet
|
f98739f0ed
|
Merge branch 'dev' into 7893-wasteRecalc
|
2024-10-07 08:03:26 +00:00 |
Guillermo Bonet
|
4f3e7e2630
|
feat: refs #7893 Added waste recalc section
|
2024-10-07 10:03:05 +02:00 |
Carlos Satorres
|
27e6dd5bf1
|
Merge branch 'master' into 6898-hotfixSupplierAgency
|
2024-10-07 07:51:02 +00:00 |
Carlos Satorres
|
5d65d3e20c
|
refs #6898 hotfix agency
|
2024-10-07 09:48:57 +02:00 |
Jorge Penadés
|
5c5a359986
|
refactor: refs #8019 create VnTime
|
2024-10-07 09:38:39 +02:00 |
Jorge Penadés
|
947f913679
|
refactor: refs #8019 create VnDate
|
2024-10-07 09:25:06 +02:00 |
Alex Moreno
|
ef5ae0f723
|
refactor(ticketNotes): translations
|
2024-10-07 09:16:07 +02:00 |
Jon Elias
|
33d6d529c5
|
Merge branch 'dev' into Fix-TicketsModule
|
2024-10-07 07:11:52 +00:00 |
Jon Elias
|
bd3de77cbd
|
fix: changes in list and filter to fix section
|
2024-10-07 09:10:20 +02:00 |
Alex Moreno
|
b8407140f9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-07 09:02:01 +02:00 |
Alex Moreno
|
426b7254d6
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-07 09:01:57 +02:00 |
Jorge Penadés
|
355c84ad06
|
Merge branch 'dev' into 7323-fineTunningWorker
|
2024-10-07 06:39:07 +00:00 |
Alex Moreno
|
34a40dd87c
|
fix(VnPaginate): use default value
|
2024-10-07 08:24:53 +02:00 |
Javier Segarra
|
04b2a4d9ce
|
perf: clean warnings
|
2024-10-05 00:31:41 +02:00 |
Javier Segarra
|
c3c2528342
|
feat: #7356 improve NotesSummary
|
2024-10-05 00:31:32 +02:00 |
Pako Natek
|
355b1357b7
|
Merge branch 'dev' into Fix-OrderCatalog
|
2024-10-04 16:08:12 +00:00 |
Jorge Penadés
|
9383a71adb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx
|
2024-10-04 16:38:27 +02:00 |
Jorge Penadés
|
055b1b0a88
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
|
2024-10-04 16:12:31 +02:00 |
Jon Elias
|
aee23c75e8
|
fix: order module
|
2024-10-04 14:31:39 +02:00 |
Jon Elias
|
e4e60abe0e
|
Merge branch 'master' into Hotfix-ZoneOrderFilters
|
2024-10-04 12:25:49 +00:00 |
Jon Elias
|
3a21f6aadb
|
fix: order catalog
|
2024-10-04 14:22:00 +02:00 |
Jorge Penadés
|
9c5ce6dbfd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
|
2024-10-04 13:50:31 +02:00 |
Jorge Penadés
|
905841e0d6
|
Merge branch 'dev' into 7207-showPbx
|
2024-10-04 11:45:28 +00:00 |
Jorge Penadés
|
b735ccb3a0
|
Merge branch 'dev' of https: refs #7323//gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker
|
2024-10-04 13:37:55 +02:00 |
Pablo Natek
|
efe5208d30
|
Merge branch 'dev' into 4988-fixE2e
|
2024-10-04 11:32:40 +00:00 |
Pablo Natek
|
1869e3315a
|
fix: refs #4988 remove id
|
2024-10-04 13:14:14 +02:00 |
Pablo Natek
|
7dc019cfbb
|
fix: refs #4988 selector on e2e
|
2024-10-04 13:13:57 +02:00 |
Jon Elias
|
195747b5a0
|
feat: added click and transfer tickets and deleted useless code
|
2024-10-04 12:34:37 +02:00 |
Jorge Penadés
|
67c2e284ba
|
feat: refs #7702 ask old pass
|
2024-10-04 11:45:10 +02:00 |
Carlos Satorres
|
0d31adaa4b
|
refs #7767 check holiday
|
2024-10-04 11:29:21 +02:00 |
Jorge Penadés
|
e43ba9b58a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword
|
2024-10-04 10:11:38 +02:00 |
Jon Elias
|
7874db1647
|
fix: zone delivery postcodes filter and order catalog type filter
|
2024-10-04 09:58:23 +02:00 |
Jon Elias
|
4b9588c189
|
refactor: refs #7825 modified worker list form to fill the field when a bank entity is created
|
2024-10-04 08:55:48 +02:00 |
Pablo Natek
|
4ba52f1a56
|
Merge branch 'dev' into 7404-addSomeLogisticPreferences
|
2024-10-04 06:55:41 +00:00 |
Pablo Natek
|
4a357c5be6
|
Merge branch 'dev' into 7404-addSomeLogisticPreferences
|
2024-10-04 06:53:53 +00:00 |
Pablo Natek
|
99ba7a39fa
|
Merge branch 'dev' into 7129--fixTranslates
|
2024-10-04 06:53:17 +00:00 |
Carlos Satorres
|
530ed4b716
|
refs #7355 fix searchbar
|
2024-10-04 08:48:36 +02:00 |
Jorge Penadés
|
c64fe8c044
|
chore: refs #7207 refactor locale
|
2024-10-03 17:04:56 +02:00 |
Jorge Penadés
|
b0ba6a5e0f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx
|
2024-10-03 15:40:05 +02:00 |
Jorge Penadés
|
cd20db637c
|
fix: refs #7874 btn ui
|
2024-10-03 15:30:26 +02:00 |
Jorge Penadés
|
aca10b81af
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
|
2024-10-03 15:14:28 +02:00 |
Pablo Natek
|
c04dad38f1
|
feat: refs #7404 change travel name and remove buyer filter
|
2024-10-03 15:02:14 +02:00 |
Jorge Penadés
|
e10088ed06
|
Merge branch 'dev' of https: refs #7702//gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword
|
2024-10-03 13:49:33 +02:00 |
Jorge Penadés
|
ad8b72660f
|
fix: refs #7353 scopeDays
|
2024-10-03 13:37:21 +02:00 |
Jorge Penadés
|
fadfafbb1d
|
Merge branch 'dev' into 7524-dynamicFetch
|
2024-10-03 10:05:22 +00:00 |
Pablo Natek
|
05a1d0e8fb
|
fix: refs #7129 translates from globals to module locals
|
2024-10-03 10:52:16 +02:00 |
Jorge Penadés
|
01dc25da8c
|
refactor: refs #7874 create element if condition
|
2024-10-03 10:23:27 +02:00 |
Jorge Penadés
|
a8c48789ca
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
|
2024-10-03 10:03:49 +02:00 |
Jorge Penadés
|
9b8e388525
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
|
2024-10-03 09:49:04 +02:00 |
Pablo Natek
|
06fa5b13a4
|
Merge branch 'dev' into 7404-fixStyle
|
2024-10-03 07:47:52 +00:00 |
Jorge Penadés
|
739671a6da
|
Merge branch 'dev' into 7524-dynamicFetch
|
2024-10-03 07:25:40 +00:00 |
Jon Elias
|
b93375f5a4
|
Merge branch 'dev' into 7010-AddPackingField
|
2024-10-03 06:41:50 +00:00 |
Jon Elias
|
6a1bb6d41f
|
Merge branch '7010-AddPackingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField
|
2024-10-03 08:38:58 +02:00 |
Jon Elias
|
8ee4edc5d5
|
perf: refs #7010 customer summary packaging type field
|
2024-10-03 08:38:56 +02:00 |
Javi Gallego
|
df64814c57
|
fix: hotfix refund invoice
|
2024-10-03 08:31:13 +02:00 |
Javi Gallego
|
ed5cf137b0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-03 08:29:29 +02:00 |