Jorge Penadés
|
7c1ce7f560
|
feat: refs #6243 replace url
|
2024-05-03 17:38:16 +02:00 |
Jorge Penadés
|
4b4c02c01a
|
feat: refs #6273 create worker form toggle
|
2024-05-03 16:40:11 +02:00 |
Javier Segarra
|
743faef956
|
fix: #6842 Not update calendar correctly
|
2024-05-03 15:05:37 +02:00 |
Alex Moreno
|
b76b2fd8a0
|
feat: refs #6825 VnTableFilter and VnPanelFilter init
|
2024-05-03 15:03:54 +02:00 |
Carlos Satorres
|
710b45f43a
|
refs #6842 isFreelance
|
2024-05-03 14:49:50 +02:00 |
William Buezas
|
d15a92ce7d
|
Resolve conflicts
|
2024-05-03 08:57:39 -03:00 |
William Buezas
|
99adc9aa05
|
WIP
|
2024-05-03 08:53:50 -03:00 |
Jorge Penadés
|
0e7e804475
|
feat: refs #6598 create useAcl composable
|
2024-05-03 13:18:46 +02:00 |
Jon Elias
|
312985b427
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7271_boilerplate_zones
|
2024-05-03 12:37:30 +02:00 |
Jon Elias
|
f03ad52387
|
Merge branch '7271_boilerplate_zones' of https://gitea.verdnatura.es/verdnatura/salix-front into 7271_boilerplate_zones
|
2024-05-03 12:31:22 +02:00 |
Jon Elias
|
1a5f2fbea2
|
feat: refs #7271 advanced structure
|
2024-05-03 12:30:53 +02:00 |
jcasado
|
e744077d65
|
Merge branch '7113-fixClaimPhoto' of https://gitea.verdnatura.es/verdnatura/salix-front into 7113-fixClaimPhoto
|
2024-05-03 10:21:49 +02:00 |
jcasado
|
f7e91424b9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7113-fixClaimPhoto
|
2024-05-03 10:21:41 +02:00 |
Javier Casado
|
534f71c9e3
|
Merge branch 'dev' into 7113-fixClaimPhoto
|
2024-05-03 07:26:10 +00:00 |
Jon Elias
|
f3026dfe00
|
Merge branch '6767-deleteDivCol' of https://gitea.verdnatura.es/verdnatura/salix-front into 6767-deleteDivCol
|
2024-05-03 08:56:40 +02:00 |
Jon Elias
|
8f0af24f50
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6767-deleteDivCol
|
2024-05-03 08:56:38 +02:00 |
Jon Elias
|
179ab30805
|
Merge branch 'fix_Customer_1' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1
|
2024-05-03 08:40:55 +02:00 |
Jon Elias
|
3467f30b12
|
refactor: refs #7274 changed CustomerNotificationsCampaignConsumption template and logic
|
2024-05-03 08:40:53 +02:00 |
Alex Moreno
|
0fe957db80
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable
|
2024-05-03 07:43:48 +02:00 |
Javier Casado
|
bdfcba5c3e
|
Merge branch 'dev' into 6911-saveOnEnter
|
2024-05-03 05:22:00 +00:00 |
Jorge Penadés
|
d82372c0a9
|
feat: refs #6449 show summaryId
|
2024-05-02 17:13:53 +02:00 |
William Buezas
|
d2e178a41b
|
resolve conflicts
|
2024-05-02 12:02:44 -03:00 |
William Buezas
|
d68934a526
|
Item basic data
|
2024-05-02 11:51:04 -03:00 |
Alex Moreno
|
a75b33a824
|
feat: refs #6825 qchip color
|
2024-05-02 15:01:54 +02:00 |
Javier Segarra
|
e3a36c0ab1
|
Merge pull request 'refactor: refs #6887 pending claim changes' (!335) from 6887-endClaimMigration into dev
Reviewed-on: verdnatura/salix-front#335
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-05-02 12:45:12 +00:00 |
Javier Segarra
|
9fa03beda1
|
Merge branch 'dev' into 6887-endClaimMigration
|
2024-05-02 12:44:02 +00:00 |
Javier Segarra
|
9dcce336a8
|
Merge pull request 'Item last entries' (!342) from hyervoni/salix-front-mindshore:feature/ItemLastEntries into dev
Reviewed-on: verdnatura/salix-front#342
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-02 12:43:04 +00:00 |
Javier Segarra
|
988be19b96
|
Merge branch 'dev' into 6887-endClaimMigration
|
2024-05-02 12:42:46 +00:00 |
Javier Segarra
|
cb0d721465
|
feat: zoneSummary
|
2024-05-02 14:41:51 +02:00 |
Javier Segarra
|
d069ca5095
|
Merge branch '6887-endClaimMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6887-endClaimMigration
|
2024-05-02 14:40:59 +02:00 |
Javier Segarra
|
1a79bd6fb8
|
feat: zoneSummary
|
2024-05-02 14:40:56 +02:00 |
Javier Segarra
|
03759d2746
|
Merge branch 'dev' into feature/ItemLastEntries
|
2024-05-02 14:34:54 +02:00 |
Javier Segarra
|
1675919801
|
fix: minor build bugs
|
2024-05-02 14:33:24 +02:00 |
Javier Segarra
|
7e842f2ce1
|
Merge pull request 'Item tax' (!337) from hyervoni/salix-front-mindshore:feature/ItemTax into dev
Reviewed-on: verdnatura/salix-front#337
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-02 12:23:53 +00:00 |
William Buezas
|
8043d72676
|
Merge branch 'feature/ItemLastEntries' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemLastEntries
|
2024-05-02 09:16:44 -03:00 |
William Buezas
|
120e84f439
|
Add condition to packing and grouping badge colors
|
2024-05-02 09:16:24 -03:00 |
William Buezas
|
554b9e814b
|
WIP
|
2024-05-02 09:08:03 -03:00 |
Javier Segarra
|
793376139c
|
Merge branch 'dev' into 6887-endClaimMigration
|
2024-05-02 12:05:30 +00:00 |
Javier Segarra
|
d692c77fcf
|
Merge branch 'fix_Customer_1' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1
|
2024-05-02 14:05:29 +02:00 |
Javier Segarra
|
f90bd908a5
|
Merge branch 'dev' into feature/ItemTax
|
2024-05-02 14:00:01 +02:00 |
Javier Segarra
|
ce0c9ebd98
|
Merge branch 'test' into fix_Customer_1
|
2024-05-02 11:52:11 +00:00 |
Carlos Satorres
|
104b159039
|
Merge pull request 'refs #6895 remove autoload' (!341) from 6895-removeShelving into dev
Reviewed-on: verdnatura/salix-front#341
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-02 11:43:48 +00:00 |
Jon Elias
|
0fa2a99080
|
Merge branch '6887-endClaimMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6887-endClaimMigration
|
2024-05-02 13:03:04 +02:00 |
Jon Elias
|
c1a464d9ae
|
fix: refs #6887 fix conflicts
|
2024-05-02 13:02:59 +02:00 |
Jon Elias
|
c2ba7bfe22
|
fix: campaign button
|
2024-05-02 12:57:34 +02:00 |
Carlos Satorres
|
8bb5f77b57
|
Merge branch 'dev' into 6895-removeShelving
|
2024-05-02 10:09:41 +00:00 |
Jorge Penadés
|
54155961fe
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker
|
2024-05-02 12:04:16 +02:00 |
Javier Segarra
|
6a958a0807
|
Actualizar src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
|
2024-05-02 08:32:39 +00:00 |
Javier Segarra
|
c81e20e22e
|
Merge pull request 'Item diary' (!339) from hyervoni/salix-front-mindshore:feature/ItemDiary into dev
Reviewed-on: verdnatura/salix-front#339
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-02 08:29:17 +00:00 |
Javier Segarra
|
e4f787f2fa
|
Merge branch 'dev' into feature/ItemDiary
|
2024-05-02 08:28:00 +00:00 |