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

2802 Commits

Author SHA1 Message Date
Carlos Satorres e4ebf4c4db refs #6820 fix traduction 2024-05-22 13:44:53 +02:00
Carlos Satorres 499e104daa Merge branch 'dev' into fix-CalendarTimeControlRightPanel 2024-05-22 10:49:43 +00:00
Carlos Satorres 506b5dd9c2 refs #6820 fix error front 2024-05-22 12:24:08 +02:00
Jorge Penadés 5bddc6e04d fix: refs #6942 wip: formModel 2024-05-22 11:22:46 +02:00
Carlos Satorres 98449b0c1e refs #6111 scroll horizontal 2024-05-22 10:23:10 +02:00
Javier Segarra d900ed3764 Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods 2024-05-22 10:22:05 +02:00
Javier Segarra f6051472ef style: color transparent when is fetive 2024-05-22 10:21:06 +02:00
Jon Elias 77e3104047 Merge branch 'dev' into 6652-improveCustomerDefaulter 2024-05-22 08:10:52 +00:00
Jon Elias 2af4df8ded refactor: refs #6652 improved defaulter section 2024-05-22 10:07:58 +02:00
Carlos Satorres c1bcc0379d refs #6332 fix festive 2024-05-22 09:35:56 +02:00
Javier Segarra eaa0288f25 update 2024-05-22 09:27:48 +02:00
Jorge Penadés 467531d029 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-22 09:17:18 +02:00
Javier Segarra a0ca26ad9b Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods 2024-05-22 08:56:10 +02:00
Javier Segarra 0e0f649ff9 fix: 9-12 2024-05-22 08:54:37 +02:00
Carlos Satorres 81f7e06143 refs #6332 fix calendar 2024-05-22 08:35:01 +02:00
Javier Segarra 3d6fac5338 Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods 2024-05-22 08:28:51 +02:00
Javier Segarra 2094506baf fix: WorkerCalendarItem 2024-05-22 08:27:09 +02:00
Alex Moreno d466e9f70a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-05-22 08:05:05 +02:00
Alex Moreno f3c334b826 hotFix(VnDmsList): downloadModel default undefined 2024-05-22 08:02:59 +02:00
Javier Segarra ad328d9c51 Merge branch 'dev' into 6957_refactorFetechedTags 2024-05-22 00:00:58 +02:00
Pablo Natek d2d80645d0 fix: refs #7187 fix responsive 2024-05-21 19:12:40 +02:00
Carlos Satorres 27c86288e1 refs #6332 color red button 2024-05-21 16:14:55 +02:00
William Buezas 990e3f6e75 handle searchbar dataKey change 2024-05-21 09:13:36 -03:00
Carlos Satorres bacc07a4ca remove right 2024-05-21 12:04:56 +02:00
Carlos Satorres 99d16d215f refs #6332 colors 2024-05-21 11:56:30 +02:00
Jorge Penadés 5f10d25630 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-21 09:04:17 +02:00
Alex Moreno a715122a66 feat(VnTable): refs #6825 dinamic columns 2024-05-21 08:50:05 +02:00
Pablo Natek e32e922c45 Merge branch 'dev' into 7187-refactorWokerPda 2024-05-20 23:06:07 +00:00
Pablo Natek 45f56078d7 feat: refs #7187 add vnconfirm on delete 2024-05-21 01:04:52 +02:00
Pablo Natek 9468e409ea fix: refs #7187 fix reload 2024-05-21 00:34:03 +02:00
William Buezas b26bf10e70 Apply searchbar logic 2024-05-20 15:53:38 -03:00
Alex Moreno 65c22a7103 feat(VnTable): refs #6825 VnTableChip component 2024-05-20 15:08:34 +02:00
Alex Moreno 478fe23cec fix(VnTable): refs #6825 fix events and css 2024-05-20 13:58:47 +02:00
William Buezas 7466d03f15 resolve conflicts 2024-05-20 08:46:08 -03:00
Carlos Satorres 9f517eb59d refs #6820 fix BasicData Tickets 2024-05-20 12:40:47 +02:00
Javier Segarra febc88203d style: fix color when is empty 2024-05-20 11:16:05 +02:00
Jorge Penadés c1a6bca508 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-20 09:31:58 +02:00
Jorge Penadés cda9e71197 refactor: refs #6942 Fix getTotalAmount function to correctly calculate the total amount in InvoiceInDueDay.vue 2024-05-20 09:31:31 +02:00
Carlos Satorres ce72b8099b Merge branch 'dev' into 7396-addBasicDataWorker 2024-05-20 07:20:29 +00:00
Carlos Satorres e5c445fc12 Merge branch '7396-addBasicDataWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7396-addBasicDataWorker 2024-05-20 09:00:57 +02:00
Carlos Satorres 4199fc0dc5 refs #7396 fix basicData, summary, change deleteDepartment 2024-05-20 09:00:54 +02:00
Jorge Penadés 2366ef772f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-20 08:55:35 +02:00
Javier Segarra c40f322a8f Merge branch 'dev' into feature/ZoneWarehouses 2024-05-20 08:40:27 +02:00
Jon Elias 708a852473 Merge branch 'dev' into 7361-TicketSummaryRefactor 2024-05-20 05:08:02 +00:00
William Buezas 202473158c resolve conflicts 2024-05-19 14:21:32 -03:00
Javier Segarra 902d260822 Merge branch 'dev' into feature/ZoneDelivery 2024-05-18 07:06:57 +00:00
Javier Segarra 7197881cdd style: reset poc style 2024-05-18 08:53:46 +02:00
Javier Segarra 632acc13ac style: reset poc style 2024-05-18 08:53:08 +02:00
Javier Segarra ce87008c12 fix: remove console.log 2024-05-18 08:50:38 +02:00
William Buezas 78e81c6f75 ZoneWarehouses and ZoneWareousesCreate refactor 2024-05-17 17:16:58 -03:00
William Buezas e38f3fc60d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ZoneWarehouses 2024-05-17 15:32:45 -03:00
William Buezas 6c374061d0 Handle request orders 2024-05-17 15:24:17 -03:00
William Buezas 6e49982531 Revert "Handle onsubmit" 
This reverts commit 7c5b61cca8.
 2024-05-17 15:18:10 -03:00
William Buezas 7c5b61cca8 Handle onsubmit 2024-05-17 14:35:15 -03:00
Javier Segarra 6afafb2f11 minor changes 2024-05-17 18:44:25 +02:00
Javier Segarra cda59116ff Revert "first approach" 
This reverts commit 9604599b33.
 2024-05-17 18:04:48 +02:00
Jorge Penadés 81998a4137 refactor: refs #6942 summary 2024-05-17 17:26:58 +02:00
Jorge Penadés 7f880b397c fix: refs #6942 fix vncard 2024-05-17 17:26:00 +02:00
William Buezas e196cf8fd5 Zone warehouses 2024-05-17 10:57:20 -03:00
Alex Moreno a3a4e9b570 feat(VnTable): refs #6825 fix ellipsis and add titles 2024-05-17 15:13:56 +02:00
Jorge Penadés 1abcb4796f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-17 14:36:22 +02:00
Alex Moreno 75f3d4f410 fix: refs #6539 VnSelect use url 2024-05-17 14:32:39 +02:00
Carlos Satorres 488c6b3f94 Merge branch '7396-addBasicDataWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7396-addBasicDataWorker 2024-05-17 14:23:02 +02:00
Carlos Satorres d359063e5d refs #7396 fix summary 2024-05-17 14:23:00 +02:00
Javier Segarra ce444c7e5c first approach 2024-05-17 14:19:29 +02:00
Carlos Satorres cd21d7817d refs #7396 fix summary basicData 2024-05-17 14:16:06 +02:00
Javier Segarra 41e2462b49 Merge branch 'dev' into 6957_refactorFetechedTags 2024-05-17 11:58:38 +00:00
Javier Segarra 08e6703853 style updates 2024-05-17 13:57:01 +02:00
Javier Segarra 24eeb5519a style updates 2024-05-17 13:52:45 +02:00
Carlos Satorres d7e3303d68 refs #7396 add fiDueDate, machine 2024-05-17 13:19:59 +02:00
Carlos Satorres 067df2d56b Merge branch 'dev' into 6914-fixWorkerCreateErrors 2024-05-17 11:15:25 +00:00
Alex Moreno d00801b066 feat: refs #6825 VnComponent mix component and attrs Form to create new row 2024-05-17 13:00:57 +02:00
Javier Segarra 49b562ca44 Merge branch 'dev' into feature/UpcomingDeliveries 2024-05-17 12:30:55 +02:00
Javier Segarra 8e4c74c1cc fix: style 2024-05-17 12:26:45 +02:00
Pablo Natek 676e020928 fix: refs #6095 add reFfk null on search 2024-05-17 10:55:43 +02:00
Jon Elias 8b835e299b Merge branch 'dev' into 7361-TicketSummaryRefactor 2024-05-17 08:31:52 +00:00
Jon Elias d754e5efce Merge branch '7361-TicketSummaryRefactor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7361-TicketSummaryRefactor 2024-05-17 10:30:51 +02:00
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
Alex Moreno 598d116848 feat: refs #6825 share filters, create popup 2024-05-16 13:38:15 +02: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
Alex Moreno 6f38aeba83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-05-16 07:33:53 +02: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 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
Alex Moreno c223bbe0ea fea(VnTable)t: refs #6825 create VnComponent, add rowClick and redirect 2024-05-13 14:16:01 +02: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
Alex Moreno 4cb5b8c326 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-05-13 13:53:24 +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