wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
3,509 Commits 154 Branches 0 Tags 24 MiB
Commit Graph

2769 Commits

Author SHA1 Message Date
Jon Elias 4ca7df5bfb refactor: refs #7361 changes in css 2024-05-17 10:30:50 +02:00
Javier Segarra 01ad6d9bea Merge branch 'dev' into feature/ZoneDelivery 2024-05-17 09:52:21 +02:00
Javier Segarra dc597f73e2 fix: style 2024-05-17 09:50:18 +02:00
Javier Segarra dba42a6001 feat: #6957: Rename FetchedTags instance tag 2024-05-16 23:02:49 +02:00
Javier Segarra 38d7c96c00 feat: #6957: Rename FetchedTags instance tag 2024-05-16 23:01:55 +02:00
Javier Segarra 77a454b590 feat: refactor template 2024-05-16 20:59:51 +00:00
William Buezas a35ccb5b51 Zone Locations 2024-05-16 16:38:27 -03:00
Carlos Satorres 660577c9fe refs #6914 fix vnLocation workerCreate 2024-05-16 16:02:38 +02:00
Carlos Satorres b19d9ec473 refs #6914 fix VnLocationCountry 2024-05-16 14:18:41 +02:00
Pablo Natek a5dd7c817e Merge branch 'dev' into 7187-refactorWokerPda 2024-05-16 12:08:51 +00:00
Pablo Natek 108533d475 fix: delete translates 2024-05-16 12:57:35 +02:00
Jorge Penadés 2855499148 fix: refs #6891 hide across only on disable 2024-05-16 12:07:47 +02:00
Jorge Penadés d4cbdb469a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings 2024-05-16 09:06:48 +02:00
Jorge Penadés 1654fb93d4 fix: refs #6598 build 2024-05-16 09:06:12 +02:00
Jorge Penadés 288f776c9c Merge branch 'dev' into 7274-fixCustomer 2024-05-16 07:01:08 +00:00
Jorge Penadés ed9310cbb1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings 2024-05-16 08:58:00 +02:00
Alex Moreno cf16db2e33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-05-16 08:52:03 +02:00
Alex Moreno c7cb591008 warmFix(customerFiscalData): fix vnRows 2024-05-16 08:52:02 +02:00
Robert Ferrús ca5cf66f56 Merge branch 'dev' into 7039-country-country 2024-05-16 06:46:32 +00:00
Carlos Satorres 8b86846530 Merge branch 'dev' into 6905-fixUserPanel2 2024-05-16 06:18:49 +00:00
Robert Ferrús b7fce0917e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7039-country-country 2024-05-16 07:29:07 +02:00
Jon Elias 059ec702c9 Merge branch 'dev' into 6739-invoiceOut 2024-05-16 05:21:11 +00:00
Jon Elias 6603c81aa3 Merge branch 'dev' into 7361-TicketSummaryRefactor 2024-05-16 05:18:13 +00:00
Pablo Natek c24062fccb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7187-refactorWokerPda 2024-05-15 22:18:40 +02:00
Pablo Natek bc9c1fdf8e feat: pda duplicates 2024-05-15 22:17:40 +02:00
Carlos Satorres adde8d1ab8 refs #6332 fix colors 2024-05-15 16:00:56 +02:00
Jorge Penadés 3cb02d5e5f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings 2024-05-15 15:42:13 +02:00
William Buezas 5677a1af1b remove unused onMounted 2024-05-15 10:31:33 -03:00
William Buezas f3a5ebbcec Bug fix 2024-05-15 10:27:45 -03:00
William Buezas cd8095d3b8 Last changes 2024-05-15 09:39:15 -03:00
Jon Elias e766bdfdfb Merge branch 'dev' into 7361-TicketSummaryRefactor 2024-05-15 12:35:59 +00:00
Jon Elias 5e3fca3f81 Merge branch '7361-TicketSummaryRefactor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7361-TicketSummaryRefactor 2024-05-15 14:35:09 +02:00
Jon Elias ccaf993841 refactor: refs #7361 requested changes 2024-05-15 14:35:08 +02:00
Jorge Penadés 628fc888ba fix: refs #7281 fix warnings 2024-05-15 14:31:51 +02:00
Jorge Penadés bf43893b05 fix: refs #7274 use VnInputDate 2024-05-15 14:06:42 +02:00
Carlos Satorres 0819d00d05 refs #6905 fix pr 2024-05-15 12:55:39 +02:00
Jorge Penadés 872aee51ca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel 2024-05-15 12:34:21 +02:00
Jorge Penadés 2eca98d31d feat: refs #7274 show total on rightMenu 2024-05-15 11:54:14 +02:00
Carlos Satorres 942efc319a refs #6905 fix userState 2024-05-15 11:46:04 +02:00
Jorge Penadés 31573c0f0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7274-fixCustomer 2024-05-15 11:22:23 +02:00
Carlos Satorres a3f074ea0a refs #6905 fix data 2024-05-15 10:13:49 +02:00
Alex Moreno 2b27e39d72 fix: zone icon and isVolumetric default false 2024-05-15 09:37:33 +02:00
Jorge Penadés 9d9d3db43b fix: refs #7274 defaulterFilter 2024-05-14 17:29:15 +02:00
William Buezas cbe44c97f6 Upcoming deliveries 2024-05-14 12:03:43 -03:00
Jorge Penadés e4637b7d15 fix: refs #7274 add note 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 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 2024-05-14 12:42:14 +02:00
Javier Segarra fc6bd82ea0 Merge branch 'dev' into feature/ZoneCreate 2024-05-14 11:52:29 +02:00
Javier Segarra f4dd9b84fd fix: VnLocation > fiscal-data 2024-05-14 11:42:34 +02:00
Javier Segarra c443b0a00f feat: input validations 2024-05-14 10:50:29 +02:00
Javier Segarra 20f9b53afb Merge branch 'dev' into 7271-EndZoneMigration 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 2024-05-13 17:59:39 +02:00
Jorge Penadés a878ad23b9 fix: refs #6891 fix invoiceInform design 2024-05-13 16:01:18 +02:00
William Buezas 7b99d2f38b re order translation 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 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 2024-05-13 12:15:50 +00:00
Javier Segarra a94c1a32e1 fix: show label agency instead id 2024-05-13 14:13:41 +02:00
Jon Elias 04ce9558b7 Merge branch 'dev' into 7361-TicketSummaryRefactor 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 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 2024-05-13 13:20:15 +02:00
Jon Elias 14910c5899 feat: refs #7271 basicData and Log 2024-05-13 12:46:25 +02:00
Alex Moreno 0ed3cafcab Merge branch 'dev' into feature/ZoneList 2024-05-13 07:31:17 +00:00
Alex Moreno a28d18f1e1 fix: redirection when clone and styles 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 2024-05-13 06:47:41 +00:00
Jon Elias bb3b34ecc6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut 2024-05-13 07:14:10 +02:00
Jon Elias 68082dddd0 Merge branch 'dev' into 7361-TicketSummaryRefactor 2024-05-13 05:08:19 +00:00
Jorge Penadés a692ca4a18 feat: refs #5919 test & set workerFk null. 2024-05-10 16:01:32 +02:00
Jorge Penadés 7fd4c43b8b feat: refs #5919 workerlocker 2024-05-10 13:07:58 +02:00
Jon Elias 686bead961 Merge branch 'dev' into 7361-TicketSummaryRefactor 2024-05-10 10:01:49 +00:00
Jon Elias 071e6a7296 refactor: refs #7361 ticket/summary like salix 2024-05-10 12:00:16 +02:00
Jon Elias 2183385e58 Merge branch 'dev' into 6767-deleteDivCol 2024-05-10 09:39:31 +00:00
Javier Segarra daf1d4de2d style changes 2024-05-10 08:51:47 +02:00
Javier Segarra cb24ac81ff Merge branch 'dev' into feature/ZoneList 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 2024-05-10 08:35:42 +02:00
Javier Segarra 7f185c091b feat: add descriptor 2024-05-10 08:13:02 +02:00
Jon Elias 07bfe0512c Merge branch '6739-invoiceOut' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut 2024-05-10 07:04:05 +02:00
Jon Elias a64d333995 refactor: refs #6739 requested changes 2024-05-10 07:04:03 +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 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 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 2024-05-09 09:15:52 -03:00
William Buezas 7cc5c0bdbd Fix client table initial request 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 2024-05-09 10:53:27 +00:00
Javier Segarra e7833206e7 fix: Risk field 2024-05-09 12:10:26 +02:00
Javier Segarra 437a75da4e fix: CustomerExtendedList paginate 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 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 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 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
Jon Elias 57e1a2cfdb Merge branch 'dev' into 6739-invoiceOut 2024-05-08 12:54:41 +00:00
Javier Segarra 0ebb9c6c52 fix: unnexpected bottom spca 2024-05-08 13:43:45 +02:00
Javier Segarra fdd94b09f3 style: fix searchba input width 2024-05-08 11:43:18 +00:00
Carlos Satorres 26506c1f9f refs #6877 remove update 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 2024-05-08 13:26:05 +02:00
Jorge Penadés e52cb99a80 feat: refs #6891 itemTypeSearchbar 2024-05-08 13:23:41 +02:00
Jorge Penadés c02dcf622a fix: refs #6891 correct redirection 2024-05-08 13:22:21 +02:00
Jorge Penadés 54de101442 feat: refs #6891 improve useRedirect 2024-05-08 13:00:54 +02:00
Jorge Penadés f7b6f3b9e1 fix: refs #6891 parking basicData 2024-05-08 12:59:56 +02:00
Jorge Penadés 80336868dc feat: refs #6891 improve useRedirect 2024-05-08 12:52:42 +02:00
Jorge Penadés 7b370e6b93 feat: refs #6891 improve useRedirect 2024-05-08 12:39:48 +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
Jorge Penadés 4d1cef7f68 feat: refs #6891 improve useRedirect 2024-05-08 12:06:31 +02:00
Javier Segarra 2fc3868a25 Merge branch 'test' into fix_Customer_1 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 2024-05-08 11:03:40 +02:00
Jorge Penadés a1f785ccbe feat: refs #5919 WIP workerlocker 2024-05-08 11:02:40 +02:00
Jorge Penadés dec9b924eb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker 2024-05-08 10:36:03 +02:00
Carlos Satorres 3d3f72757a Merge branch 'dev' into 6842-errorCalendar 2024-05-08 08:10:37 +00:00
Alex Moreno d69b362407 Merge branch 'dev' into feature/ItemTags 2024-05-08 08:02:55 +00:00
Carlos Satorres 1b65ec7c38 refs #6877 fix filterdate 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 2024-05-08 09:08:53 +02:00
Javier Segarra ccc87a0958 Merge branch 'dev' into 7271_boilerplate_zones 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 0a281b2b73 fix: refs #6891 rollback customUrl 2024-05-07 17:33:12 +02:00
Jorge Penadés ff0e290963 feat: refs #6891 ticket 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 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 2024-05-07 16:19:13 +02:00
Jorge Penadés 5e0db81a21 fix: refs #6938 conflicts 2024-05-07 15:51:55 +02:00
Jorge Penadés 0a71060f60 fix: refs #6938 workerCard 2024-05-07 15:28:00 +02:00
Jorge Penadés 014ec60e47 feat: refs #6891 worker & supplier 2024-05-07 15:10:36 +02:00
Alex Moreno 1d9616c25e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-05-07 14:18:56 +02:00
Alex Moreno 13f8937f12 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 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 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 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 2024-05-07 13:04:27 +02:00
Alex Moreno 9b31fa5042 Merge branch 'dev' into feature/ItemShelving 2024-05-07 10:54:12 +00:00
Jorge Penadés 5712810ae2 fix: refs #6938 rollback phone 2024-05-07 12:00:20 +02:00
Javier Segarra c0dd140a3a fix: validTag 2024-05-07 11:38:12 +02:00
Javier Segarra 0dc95ca3a0 fix: VnSelectFilter 2024-05-07 11:35:41 +02:00
Jon Elias bc1a79ac68 refactor: refs #6739 updated transferInvoice function 2024-05-07 11:27:39 +02:00
Jorge Penadés 097e25a0b8 feat: refs #6891 shelving 2024-05-07 11:22:35 +02:00
Jon Elias 7befca94bd refactor: refs #6739 new confirmation window 2024-05-07 10:35:48 +02:00
Carlos Satorres ac0993aa11 refs #6842 pr changes 2024-05-07 10:20:26 +02:00
Jorge Penadés 777ee0895e feat: refs #6891 route & drop searchbar 2024-05-07 10:15:47 +02:00
Jorge Penadés e9f5c0cc8d feat: refs #6891 add custom url 2024-05-07 10:12:35 +02:00
Jorge Penadés 111333a6cf fix: refs #6891 reactivity & show filter panel 2024-05-07 09:46:52 +02:00
Jorge Penadés 48bba65baf fix: refs #6891 use vnCard searchbar 2024-05-07 09:30:59 +02:00
Alex Moreno a139c11a22 Merge branch 'test' into fix_Customer_1 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 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 7b6841afc6 feat: refs #6891 hide if no content 2024-05-06 16:44:48 +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 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 2024-05-06 14:59:23 +02:00
Jon Elias 5ed2a82194 feat: refs #6739 transferInvoice new checkbox and functionality 2024-05-06 14:50:15 +02:00
Jorge Penadés 15b080f7bd feat: refs #6891 add redirection on VnfilterPanel 2024-05-06 14:27:04 +02:00
Jorge Penadés b487ff4adc feat: refs #6891 create rightMenu 2024-05-06 14:25:39 +02:00
Jorge Penadés d444a8721d feat: refs #6891 create composable & update searchbar 2024-05-06 14:05:58 +02:00
Javier Segarra 4d490652ea feat #7271: add template 2024-05-06 10:11:07 +02:00
Javier Segarra 49b6c57ad4 fix: show Color 2024-05-06 08:53:12 +02:00
Javier Segarra 6a81076874 fix: replace inputMin rule 2024-05-06 08:45:29 +02:00
Javier Segarra 62bf968b0b change action to st-actions 2024-05-06 08:41:12 +02:00
Javier Segarra f85665b271 fix: replace QToolbar by Teleport 2024-05-06 08:37:41 +02:00
Javier Segarra 0f5d06614d feat: VnInput numberValidation 2024-05-06 07:24:52 +02:00
Robert Ferrús 24edecf51a Merge branch 'dev' into 7039-country-country 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 2024-05-03 17:19:13 -03:00
Javier Segarra 743faef956 fix: #6842 Not update calendar correctly 2024-05-03 15:05:37 +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
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
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
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
Javier Segarra 9fa03beda1 Merge branch 'dev' into 6887-endClaimMigration 2024-05-02 12:44:02 +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