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

8563 Commits

Author SHA1 Message Date
Carlos Satorres c8fe115fec fix: refs #6553 fix PR, fix vnTableCard 2025-01-23 10:25:07 +01:00
Carlos Satorres 7144bb3871 fix: refs #6553 fix pr 2025-01-22 14:13:15 +01:00
Carlos Satorres 46cdd9e62b fix: refs #6553 fix user-filter 2025-01-15 10:36:39 +01:00
Carlos Satorres 3fc7f34899 fix: refs #6553 clean pr 2025-01-15 10:34:08 +01:00
Carlos Satorres 38a180f92b fix: refs #6553 front advanced 2025-01-15 10:32:49 +01:00
Carlos Satorres 72f141315e fix: refs #6553 onBeforeMount 2025-01-15 09:21:16 +01:00
Carlos Satorres 55dda496f3 Merge branch 'dev' of https: refs #6553//gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2025-01-15 08:46:46 +01:00
Alex Moreno 6de8687be1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-15 07:12:09 +01:00
Alex Moreno dd41141cf1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-15 07:11:51 +01:00
Jon Elias 372a43b17e Merge pull request 'Fix: Fixed CustomerDescriptor' (!1212) from Fix-CustomerIcons into dev 
Reviewed-on: verdnatura/salix-front#1212
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-14 11:03:39 +00:00
Javier Segarra ed483baef6 Merge pull request 'Hotfix: VnLocation' (!1211) from hotfix_vnLocation_selectValue into master 
Reviewed-on: verdnatura/salix-front#1211
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-14 11:01:50 +00:00
Javier Segarra 4c4d5649ba Merge branch 'dev' into Fix-CustomerIcons 2025-01-14 11:01:43 +00:00
Javier Segarra 6f50d44772 Merge branch 'master' into hotfix_vnLocation_selectValue 2025-01-14 11:00:38 +00:00
Jose Antonio Tubau a36c2ec32a Merge pull request 'test: refs #7076 added new test for VnInputDate' (!1188) from 7076-createTestVnInputDate into dev 
Reviewed-on: verdnatura/salix-front#1188
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-14 09:10:40 +00:00
Jose Antonio Tubau ec44bfbc11 Merge branch 'dev' into 7076-createTestVnInputDate 2025-01-14 08:43:15 +00:00
Jon Elias 8dc2955109 Merge branch 'dev' into Fix-CustomerIcons 2025-01-14 08:18:24 +00:00
Jon Elias 25dd028487 fix: modified setData in customerDescriptor to show the icons 2025-01-14 09:15:53 +01:00
Alex Moreno e61ce651ca Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-14 09:10:35 +01:00
Alex Moreno 30e501610d fix: parallelism 2025-01-14 09:09:26 +01:00
Javier Segarra 8b7337f9ee fix: vnlocation 2025-01-14 08:37:10 +01:00
Alex Moreno 0dc0c9efd0 Merge branch 'test' into dev 2025-01-14 08:18:49 +01:00
Alex Moreno 837c389f64 feat(cliamList): add auto-load, in this case they need it 2025-01-14 08:16:44 +01:00
Alex Moreno 63a6073cce Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-14 07:37:37 +01:00
Alex Moreno bce40834a5 Merge pull request '8389-testToMaster' (!1207) from 8389-testToMaster into master 
Reviewed-on: verdnatura/salix-front#1207
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2025-01-14 06:32:35 +00:00
Alex Moreno 099ea793bd fix: refs #8389 minor bugs 2025-01-14 07:29:44 +01:00
PAU ROVIRA ROSALENY b8344f3b22 Merge pull request 'feat: refs #7055 created FilterItemForm test' (!1187) from 7055-testFilterItemForm into dev 
Reviewed-on: verdnatura/salix-front#1187
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-14 06:03:50 +00:00
PAU ROVIRA ROSALENY 34442c8577 Merge branch 'dev' into 7055-testFilterItemForm 2025-01-14 05:59:53 +00:00
Alex Moreno dbafd5d689 build: refs #8389 changelog 2025-01-13 15:24:20 +01:00
Alex Moreno 863d6deb10 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-13 14:49:15 +01:00
Alex Moreno 5a58012f80 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-13 14:49:02 +01:00
Jon Elias 07ecd93fe0 Merge pull request 'Warmfix: Redirect to TicketSales when confirming lines' (!1203) from Warmfix-OrderProblems into test 
Reviewed-on: verdnatura/salix-front#1203
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 13:33:35 +00:00
Carlos Satorres 57aa38c84c fix: refs #6553 front 2025-01-13 13:56:31 +01:00
Alex Moreno 671f308006 revert: revert header 2025-01-13 13:29:39 +01:00
PAU ROVIRA ROSALENY 50008ce7f1 fix: refs #7055 #7055 #7055 fixed some tests 2025-01-13 12:27:26 +01:00
Jorge Penadés a32ec49efd Merge pull request 'fix: refs #8110 prevent form submit' (!1205) from 8110-hotfix-solveConflicts into master 
Reviewed-on: verdnatura/salix-front#1205
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 11:25:23 +00:00
Carlos Satorres f8428a5591 Merge branch '6553-workerBusiness' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2025-01-13 12:23:39 +01:00
Carlos Satorres 5a869f0722 fix: refs #6553 fix summary 2025-01-13 12:23:36 +01:00
Jorge Penadés ac589a8626 fix: refs #8110 prevent form submit 2025-01-13 12:21:33 +01:00
PAU ROVIRA ROSALENY 7a5de9f708 Merge branch 'dev' into 7055-testFilterItemForm 2025-01-13 11:07:04 +00:00
PAU ROVIRA ROSALENY 221df5fa8c Merge pull request 'fix: added missing translations in InvoiceIn' (!1201) from traduccionesInvoiceIn into dev 
Reviewed-on: verdnatura/salix-front#1201
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-13 11:05:54 +00:00
Jon Elias a9ac5106cf Merge branch 'test' into Warmfix-OrderProblems 2025-01-13 10:56:32 +00:00
Jon Elias 5272e5aaae fix: redirect to sales when confirming lines 2025-01-13 11:53:55 +01:00
PAU ROVIRA ROSALENY f0fc748c76 fix: changed translations to only use "invoicein" 2025-01-13 11:48:45 +01:00
PAU ROVIRA ROSALENY f5003687eb Merge branch 'traduccionesInvoiceIn' of https://gitea.verdnatura.es/verdnatura/salix-front into traduccionesInvoiceIn 2025-01-13 11:06:06 +01:00
PAU ROVIRA ROSALENY eb92c69475 fix: changed invoiceIn for InvoiceIn 2025-01-13 11:06:01 +01:00
PAU ROVIRA ROSALENY 49f54c6efe Merge branch 'dev' into traduccionesInvoiceIn 2025-01-13 09:55:20 +00:00
PAU ROVIRA ROSALENY 2a121dbbb3 fix: added missing translations in InvoiceIn 2025-01-13 10:54:28 +01:00
Alex Moreno ce698522c3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-13 10:23:41 +01:00
Alex Moreno d761af6537 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-13 10:23:27 +01:00
Jon Elias 330d0dd637 Merge pull request '#8225 use VnMoreOptions' (!1194) from 8225-UseSameMoreOptions into dev 
Reviewed-on: verdnatura/salix-front#1194
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 09:17:17 +00:00