Commit Graph

2086 Commits

Author SHA1 Message Date
Jorge Penadés 31573c0f0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7274-fixCustomer
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-15 11:22:23 +02:00
Alex Moreno 2b27e39d72 fix: zone icon and isVolumetric default false
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-15 09:37:33 +02:00
Jorge Penadés 9d9d3db43b fix: refs #7274 defaulterFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-14 17:29:15 +02:00
William Buezas cbe44c97f6 Upcoming deliveries
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-14 12:03:43 -03:00
Jorge Penadés e4637b7d15 fix: refs #7274 add note
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-14 14:39:55 +02:00
Jorge Penadés a6c761c031 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-14 13:42:38 +02:00
Jorge Penadés a095670ff1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-14 12:42:14 +02:00
Javier Segarra fc6bd82ea0 Merge branch 'dev' into feature/ZoneCreate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-14 11:52:29 +02:00
Javier Segarra c443b0a00f feat: input validations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-14 10:50:29 +02:00
Javier Segarra 20f9b53afb Merge branch 'dev' into 7271-EndZoneMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-14 10:42:43 +02:00
Javier Segarra fa82efe5d2 fix: limit width some fields 2024-05-14 10:41:28 +02:00
Javier Segarra 289bdeecae fix: Workers/isActive 2024-05-14 10:41:07 +02:00
Javier Segarra 32e715ce6b Merge branch 'dev' into feature/Monitors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 17:59:39 +02:00
Jorge Penadés a878ad23b9 fix: refs #6891 fix invoiceInform design
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 16:01:18 +02:00
William Buezas 7b99d2f38b re order translation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 10:31:11 -03:00
William Buezas 8e7b043a46 Resolve conflicts 2024-05-13 10:28:21 -03:00
Jorge Penadés d55dc638d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-13 15:23:37 +02:00
William Buezas 9304b511bc Zone delivery 2024-05-13 10:14:36 -03:00
Javier Segarra 1181cd0daa Merge branch 'dev' into 7271-EndZoneMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 12:15:50 +00:00
Javier Segarra a94c1a32e1 fix: show label agency instead id
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 14:13:41 +02:00
Jon Elias 04ce9558b7 Merge branch 'dev' into 7361-TicketSummaryRefactor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 11:58:49 +00:00
Jon Elias 146ced2ea2 Merge branch '7361-TicketSummaryRefactor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7361-TicketSummaryRefactor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 13:57:52 +02:00
Jon Elias 2859a7bad6 style: refs #7361 style refactor 2024-05-13 13:57:51 +02:00
Jorge Penadés 0b83d3663f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 13:20:15 +02:00
Jon Elias 14910c5899 feat: refs #7271 basicData and Log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 12:46:25 +02:00
Alex Moreno 0ed3cafcab Merge branch 'dev' into feature/ZoneList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 07:31:17 +00:00
Alex Moreno a28d18f1e1 fix: redirection when clone and styles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 09:30:03 +02:00
Jorge Penadés ad14d2e776 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker 2024-05-13 08:55:03 +02:00
Javier Segarra 722373fd99 Merge branch 'dev' into feature/Monitors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 06:47:41 +00:00
Jon Elias 68082dddd0 Merge branch 'dev' into 7361-TicketSummaryRefactor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 05:08:19 +00:00
Jorge Penadés a692ca4a18 feat: refs #5919 test & set workerFk null.
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-10 16:01:32 +02:00
Jorge Penadés 7fd4c43b8b feat: refs #5919 workerlocker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-10 13:07:58 +02:00
Jon Elias 686bead961 Merge branch 'dev' into 7361-TicketSummaryRefactor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-10 10:01:49 +00:00
Jon Elias 071e6a7296 refactor: refs #7361 ticket/summary like salix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-10 12:00:16 +02:00
Jon Elias 2183385e58 Merge branch 'dev' into 6767-deleteDivCol
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-10 09:39:31 +00:00
Javier Segarra daf1d4de2d style changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-10 08:51:47 +02:00
Javier Segarra cb24ac81ff Merge branch 'dev' into feature/ZoneList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-10 08:46:00 +02:00
Javier Segarra 049564f443 fix: Descriptor 2024-05-10 08:45:38 +02:00
Javier Segarra 1100588af5 fix: minor size icons 2024-05-10 08:40:56 +02:00
Javier Segarra 2697078a55 feat: Replace CarList by Table 2024-05-10 08:40:47 +02:00
Jorge Penadés 626a369f84 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-10 08:35:42 +02:00
Javier Segarra 7f185c091b feat: add descriptor 2024-05-10 08:13:02 +02:00
Pablo Natek 4e8f524f49 feat: add new list form with popup 2024-05-09 22:47:13 +02:00
William Buezas 7216b90a3e Fix filter panel bug
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-09 15:13:45 -03:00
Javier Segarra f374fe859d Merge branch 'feature/Monitors' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/Monitors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-09 17:46:28 +02:00
Javier Segarra 104ea5b8e5 feat: refreshInterval 2024-05-09 17:46:24 +02:00
William Buezas d227d4b09b Zone create 2024-05-09 11:32:04 -03:00
William Buezas b4f983b946 Add searchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-09 09:15:52 -03:00
William Buezas 7cc5c0bdbd Fix client table initial request
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-09 08:40:09 -03:00
Javier Segarra a6ec40beb4 fix: style second row 2024-05-09 13:32:03 +02:00
Javier Segarra 2df0c1eba9 fix: ticketsMonitor title 2024-05-09 13:26:53 +02:00
William Buezas 9b9e482fa7 Zone list and Zone summary 2024-05-09 08:21:30 -03:00
Carlos Satorres 349a101680 Merge branch 'dev' into 6877-itemRequestMod
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-09 10:53:27 +00:00
Javier Segarra 437a75da4e fix: CustomerExtendedList paginate
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-05-09 10:25:27 +02:00
Javier Segarra dac00236bc fix: CustomerDefaulter paginate 2024-05-09 10:20:28 +02:00
Javier Segarra b5951a5cef fix: CustomerNotifications paginate 2024-05-09 10:15:24 +02:00
Jorge Penadés ac935b9020 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-09 08:48:28 +02:00
Jorge Penadés 0b363d9e3a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-09 08:46:31 +02:00
William Buezas a3ce81d66d Zone list 2024-05-08 15:23:52 -03:00
William Buezas e74afae5b3 remove padding bottom from some inputs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-08 12:04:23 -03:00
William Buezas 399c2723a9 change monitor list layout 2024-05-08 10:58:27 -03:00
William Buezas 712d7e13ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/Monitors 2024-05-08 10:45:05 -03:00
William Buezas 5bdbbf426a Tables development 2024-05-08 10:43:18 -03:00
Javier Segarra fdd94b09f3 style: fix searchba input width
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-08 11:43:18 +00:00
Carlos Satorres 26506c1f9f refs #6877 remove update
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-08 13:27:42 +02:00
Jorge Penadés f803a210a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 13:26:05 +02:00
Jorge Penadés e52cb99a80 feat: refs #6891 itemTypeSearchbar
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 13:23:41 +02:00
Jorge Penadés f7b6f3b9e1 fix: refs #6891 parking basicData 2024-05-08 12:59:56 +02:00
Jorge Penadés 07c67b0df2 feat: refs #6891 keep arrayData opts 2024-05-08 12:30:44 +02:00
Jorge Penadés b5a599c8e7 feat: refs #6891 set text searchbar item 2024-05-08 12:09:16 +02:00
Javier Segarra 2fc3868a25 Merge branch 'test' into fix_Customer_1
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-05-08 09:28:13 +00:00
Jorge Penadés 1d16abd572 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 11:03:40 +02:00
Jorge Penadés a1f785ccbe feat: refs #5919 WIP workerlocker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-08 11:02:40 +02:00
Carlos Satorres 3d3f72757a Merge branch 'dev' into 6842-errorCalendar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-08 08:10:37 +00:00
Alex Moreno d69b362407 Merge branch 'dev' into feature/ItemTags
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-08 08:02:55 +00:00
Carlos Satorres 1b65ec7c38 refs #6877 fix filterdate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-08 09:39:26 +02:00
Jorge Penadés ad4c3a078a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 09:08:53 +02:00
Javier Segarra ccc87a0958 Merge branch 'dev' into 7271_boilerplate_zones
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-08 07:52:59 +02:00
Javier Segarra 9a6dd65774 feat: remove deprecatedHour fn 2024-05-08 07:52:18 +02:00
Jorge Penadés 05f7c4f2d3 fix: refs #6891 fix prop 2024-05-07 17:34:55 +02:00
Jorge Penadés ff0e290963 feat: refs #6891 ticket
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-07 17:11:51 +02:00
Jorge Penadés 29e567d405 fix: refs #6891 use new props 2024-05-07 16:42:09 +02:00
Jorge Penadés 7504e5d12c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-07 16:36:34 +02:00
Jorge Penadés 392d1892ba Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-07 16:19:13 +02:00
Jorge Penadés 5e0db81a21 fix: refs #6938 conflicts
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-05-07 15:51:55 +02:00
Jorge Penadés 0a71060f60 fix: refs #6938 workerCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-05-07 15:28:00 +02:00
Jorge Penadés 014ec60e47 feat: refs #6891 worker & supplier
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-07 15:10:36 +02:00
Alex Moreno 1d9616c25e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-07 14:18:56 +02:00
Alex Moreno 13f8937f12 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head There was a failure building this commit Details
2024-05-07 14:18:36 +02:00
Jorge Penadés 6b1befa037 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-07 14:15:03 +02:00
Jorge Penadés 64f41cf8dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-07 13:47:39 +02:00
Carlos Satorres a691644b9a refs #6877 changes filter date 2024-05-07 13:38:25 +02:00
Jorge Penadés 0703de350c fix: refs #6891 rollback order & route searchbar
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-07 13:04:27 +02:00
Alex Moreno 9b31fa5042 Merge branch 'dev' into feature/ItemShelving
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-07 10:54:12 +00:00
Jorge Penadés 5712810ae2 fix: refs #6938 rollback phone
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-05-07 12:00:20 +02:00
Javier Segarra c0dd140a3a fix: validTag
gitea/salix-front/pipeline/pr-dev Build queued... Details
2024-05-07 11:38:12 +02:00
Javier Segarra 0dc95ca3a0 fix: VnSelectFilter
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-05-07 11:35:41 +02:00
Jorge Penadés 097e25a0b8 feat: refs #6891 shelving
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-07 11:22:35 +02:00
Carlos Satorres ac0993aa11 refs #6842 pr changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-07 10:20:26 +02:00
Jorge Penadés 777ee0895e feat: refs #6891 route & drop searchbar
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-07 10:15:47 +02:00
Jorge Penadés 111333a6cf fix: refs #6891 reactivity & show filter panel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-07 09:46:52 +02:00
Jorge Penadés 48bba65baf fix: refs #6891 use vnCard searchbar
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-07 09:30:59 +02:00
Alex Moreno a139c11a22 Merge branch 'test' into fix_Customer_1
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-05-07 07:05:25 +00:00
Carlos Satorres b9c6b01437 refs #6877 update model 2024-05-07 08:59:55 +02:00
Jorge Penadés 036ef72593 fix: refs #6891 showFilterPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-06 17:27:30 +02:00
Jorge Penadés fe11164ae9 fix: refs #6891reactivity on agency module 2024-05-06 16:45:10 +02:00
Jorge Penadés b1147f00d3 refactor: refs #6891 use Teleport | slot 2024-05-06 16:16:00 +02:00
Javier Segarra b21abf40d2 fix: Update from-to when cmpaign changes
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-05-06 15:15:35 +02:00
Carlos Satorres 1a68cc0ced refs #6877 change attender 2024-05-06 15:00:18 +02:00
Jon Elias 6ce57d3c40 fix: #7274
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-05-06 14:59:23 +02:00
Javier Segarra 4d490652ea feat #7271: add template
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-06 10:11:07 +02:00
Javier Segarra 62bf968b0b change action to st-actions
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-06 08:41:12 +02:00
Javier Segarra f85665b271 fix: replace QToolbar by Teleport
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-06 08:37:41 +02:00
Robert Ferrús 24edecf51a Merge branch 'dev' into 7039-country-country
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-06 05:08:39 +00:00
William Buezas dbc9e9dd71 Sales monitor base 2024-05-05 19:13:36 -03:00
William Buezas f3b1de1ee4 Item tags
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-03 17:19:13 -03:00
Javier Segarra 743faef956 fix: #6842 Not update calendar correctly
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-03 15:05:37 +02:00
Carlos Satorres 710b45f43a refs #6842 isFreelance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-03 14:49:50 +02:00
William Buezas d15a92ce7d Resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-03 08:57:39 -03:00
William Buezas 99adc9aa05 WIP 2024-05-03 08:53:50 -03:00
Jon Elias 312985b427 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7271_boilerplate_zones
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-03 12:31:22 +02:00
Jon Elias 1a5f2fbea2 feat: refs #7271 advanced structure 2024-05-03 12:30:53 +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
gitea/salix-front/pipeline/pr-test This commit looks good Details
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
William Buezas d2e178a41b resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 12:02:44 -03:00
William Buezas d68934a526 Item basic data 2024-05-02 11:51:04 -03:00
Javier Segarra 9fa03beda1 Merge branch 'dev' into 6887-endClaimMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 12:44:02 +00:00
Javier Segarra 988be19b96 Merge branch 'dev' into 6887-endClaimMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 12:42:46 +00:00
Javier Segarra cb0d721465 feat: zoneSummary
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 14:34:54 +02:00
Javier Segarra 1675919801 fix: minor build bugs 2024-05-02 14:33:24 +02:00
William Buezas 8043d72676 Merge branch 'feature/ItemLastEntries' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemLastEntries
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-05-02 14:05:29 +02:00
Javier Segarra f90bd908a5 Merge branch 'dev' into feature/ItemTax
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 14:00:01 +02:00
Javier Segarra ce0c9ebd98 Merge branch 'test' into fix_Customer_1
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-05-02 11:52:11 +00:00
Jon Elias 0fa2a99080 Merge branch '6887-endClaimMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6887-endClaimMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-05-02 12:57:34 +02:00
Carlos Satorres 8bb5f77b57 Merge branch 'dev' into 6895-removeShelving
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 10:09:41 +00:00
Javier Segarra 6a958a0807 Actualizar src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-02 08:32:39 +00:00
Javier Segarra e4f787f2fa Merge branch 'dev' into feature/ItemDiary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 08:28:00 +00:00
Javier Segarra ef63d0cb6a Merge remote-tracking branch 'origin/dev' into feature/ItemTax
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-02 10:25:49 +02:00
Javier Segarra 29b215ac2e Merge branch 'feature/ItemTax' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemTax 2024-05-02 10:25:27 +02:00
Javier Segarra f46b78131c perf: remove onMounted and reload 2024-05-02 10:24:07 +02:00
Carlos Satorres 73ade834e9 Merge branch 'dev' into 7172-fixClaimBasicData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 08:21:43 +00:00
Javier Segarra 494f0be44a Merge branch 'dev' into feature/ItemDiary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 08:13:41 +00:00
Javier Segarra 94fc856bea Merge branch 'dev' into feature/ItemDiary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 08:05:17 +00:00
Javier Segarra b530101cda Merge branch 'dev' into 7190_renewTokenMultimedia
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 07:44:20 +00:00
Javier Segarra 57736654f1 Merge branch 'dev' into feature/ItemFamily
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 07:38:41 +00:00
Javier Segarra 4fdf2bacf8 fix: pvp tooltip
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-01 13:52:45 +02:00
William Buezas 72ad524c68 change prop names
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-30 16:23:19 -03:00
William Buezas 2e85b9c063 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemLastEntries
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-30 16:19:06 -03:00
William Buezas ac219bfbb7 Item shelvings 2024-04-30 16:15:48 -03:00
Alex Moreno f3387cf120 fix: refs #6336 fix reload and disable button when is loading
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-30 12:39:50 +02:00
Carlos Satorres 38cd54a7f0 refs #6895 remove autoload
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-30 12:10:30 +02:00
Javier Segarra a512f094d6 perf: ZoneDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-30 12:06:24 +02:00
Jon Elias 9563a1a6ed Merge branch 'dev' into 6887-endClaimMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-30 08:35:35 +00:00
Jon Elias d5762f65b3 refactor: refs #6887 fixed errors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-30 10:34:48 +02:00
Jon Elias 5b15558dbf refactor: refs #6887 fixed errors 2024-04-30 10:32:32 +02:00
Carlos Satorres acb4e2d98e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-30 09:44:06 +02:00
Javier Segarra 3cb662d406 Merge branch 'dev' into feature/ItemTax
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-30 07:29:07 +00:00
Javier Segarra d92a0ba77e fix: Roadmap Summary ID 2024-04-30 07:46:57 +02:00
Alex Moreno 8390a8b7b0 Merge branch 'dev' into 6336-claims_v4
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-30 05:37:46 +00:00
William Buezas ccac3a54f9 move translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 17:39:37 -03:00
William Buezas ac9063e166 Item Last entries 2024-04-29 17:01:26 -03:00
William Buezas 1b619055eb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemDiary 2024-04-29 10:32:53 -03:00
William Buezas 0b5aea76d9 Move translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 09:39:04 -03:00
William Buezas bd5bf2419b Merge branch 'feature/ItemFamily' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemFamily
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 08:23:50 -03:00
William Buezas 6276c433d1 Fix exprBuilder 2024-04-29 08:23:29 -03:00
Javier Segarra a5d6ca447b fix: TicketSummary.packages label
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 12:12:20 +02:00
Javier Segarra b3aaf35c6a Merge branch 'dev' into 6887-endClaimMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 09:58:26 +00:00
Javier Segarra e01b988ee8 Merge branch 'dev' into feature/ItemFamily 2024-04-29 11:46:56 +02:00
Javier Segarra 0fff6cd446 perf: VnCard 2024-04-29 11:46:33 +02:00
Javier Segarra 2f55272df7 fix: WorkerDescriptor 2024-04-29 11:23:50 +02:00
Alex Moreno b71aeb1d07 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 10:39:44 +02:00
Alex Moreno 5378ed6f2e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-04-29 10:34:48 +02:00
Javier Segarra 1e23666943 Merge branch 'dev' into 7190_renewTokenMultimedia
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 08:33:53 +00:00
Alex Moreno 806f3a13d5 fix(claimLines): refs #6336 fix total calc
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 10:33:32 +02:00
Javier Segarra 0e66f08674 Merge branch 'dev' into feature/ItemFamily 2024-04-29 10:22:03 +02:00
Javier Segarra 34c8874468 fix: i18n 2024-04-29 10:17:18 +02:00
Javier Segarra 8c3d32ec86 fix: remove VnFilterPanel inside Summary 2024-04-29 10:12:50 +02:00
Javier Segarra bdc5d7210f fix: remove redirect 2024-04-29 10:12:37 +02:00
Jon Elias b8380bc9c5 Merge branch 'dev' into 6887-endClaimMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 07:51:16 +00:00
Carlos Satorres abd1f72340 Merge branch '7172-fixClaimBasicData' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 09:49:32 +02:00
Carlos Satorres a78c920ec8 refs #7172 fix VnSelect 2024-04-29 09:49:29 +02:00
Jon Elias 6ae38d2611 refactor: refs #6887 pending claim changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 09:49:06 +02:00
Carlos Satorres 76a1227c0e Merge branch 'dev' into 7172-fixClaimBasicData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 07:38:59 +00:00
Carlos Satorres e3237ee4f1 refs #7172 refact VnSelect
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 09:35:57 +02:00
Alex Moreno 8b55044891 feat: refs #6336 add ItemDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 08:56:35 +02:00
Javier Casado fe22fb26fb Merge branch 'dev' into 6641-myTeamFilterClaim
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 06:47:55 +00:00
Javier Segarra 1c435725f2 Merge branch 'dev' into feature/ItemFamily 2024-04-29 08:23:11 +02:00
Javier Segarra f83ef4eb4c Merge branch 'dev' into feature/ItemListFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 06:02:02 +00:00
William Buezas 322ad816b9 item diary 2024-04-28 19:37:44 -03:00