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

9280 Commits

Author SHA1 Message Date
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
Alex Moreno 01a6d714eb Merge branch 'test' into 8197-fix_searchbar_teleport 2025-01-13 13:36:56 +00: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
Robert Ferrús 51fb940adb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8387-itemTagCrudModelFront 2025-01-13 14:32:02 +01:00
Robert Ferrús 65c2b24b78 feat: refs #8387 crudModel 2025-01-13 14:30:58 +01:00
Alex Moreno 074bb6c94c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-13 13:34:55 +01:00
Alex Moreno 671f308006 revert: revert header 2025-01-13 13:29:39 +01:00
PAU ROVIRA ROSALENY a22330b15e Merge branch 'dev' into 7077-testVnInputTime 2025-01-13 12:20:33 +00:00
Alex Moreno d0e6c28ea2 Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-13 13:15:49 +01:00
Alex Moreno e9645cf86c Merge branch '8316-customerCardWithVnCardBeta' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-13 13:15:05 +01:00
Alex Moreno 06e04e1fb5 refactor: refs #8316 remove invoiceInSearchbar 2025-01-13 13:12:55 +01:00
Alex Moreno 168fe4c5b1 fix: refs #8316 user-filter 2025-01-13 13:10:59 +01:00
PAU ROVIRA ROSALENY 2a8c2a1079 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-13 11:54:12 +00:00
PAU ROVIRA ROSALENY c9c0e87e46 Merge branch 'dev' into 7087-testCardSummary 2025-01-13 11:42:01 +00:00
Javier Segarra 7f281b8630 perf: refs #7308 call 1 time useSession 2025-01-13 12:30:07 +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
Jorge Penadés ac589a8626 fix: refs #8110 prevent form submit 2025-01-13 12:21:33 +01:00
Javier Segarra 70000e3eca Merge branch 'dev' into 7308_warning 2025-01-13 12:19:44 +01:00
Alex Moreno dd335ef409 fix: refs #8197 not use yet 2025-01-13 12:18:52 +01:00
Alex Moreno ed0730df22 feat: refs #8197 useHasContent and use in VnSection and RightMenu 2025-01-13 12:17:55 +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
Javier Segarra 6c96089445 Merge branch 'dev' into 7134-supplierBalance 2025-01-13 11:55:04 +01: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
Javi Gallego 803b8d508d feat: refs #8381 add initial and final temperature fields to entry forms and summaries 2025-01-13 11:27:00 +01:00
Robert Ferrús 2246792404 feat: refs #6629 change values 2025-01-13 11:24:11 +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
Jon Elias d75c48df0f Merge branch 'dev' into 8120-CompactSummaryPopup 2025-01-13 10:05:42 +00:00
Jon Elias 19e8b948ae feat: refs #8120 use new prop in the requierd modules 2025-01-13 11:04:41 +01:00
Jon Elias 1091a762de Merge branch '8120-CompactSummaryPopup' of https://gitea.verdnatura.es/verdnatura/salix-front into 8120-CompactSummaryPopup 2025-01-13 11:01:27 +01:00
Jon Elias b48cc55f4b refactor: refs #8120 requested changes 2025-01-13 11:01:26 +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 fd589ff798 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-parkingCardWithVnCardBeta 2025-01-13 10:29:35 +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 9cd8b2e8d6 Merge branch 'dev' into 8120-CompactSummaryPopup 2025-01-13 09:23:17 +00:00
Jon Elias 2aff1d3d06 feat: refs #8120 added new style to summary popups 2025-01-13 10:20:28 +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
Alex Moreno bb8e9c5baa Merge branch 'dev' into 8225-UseSameMoreOptions 2025-01-13 09:14:24 +00:00
PAU ROVIRA ROSALENY 4b7b689a6c Merge branch 'dev' into 8322-route 2025-01-13 09:04:18 +00:00
Javi Gallego 7018f09ad1 Merge pull request 'feat: refs #8298 add price optimum input and update translations for bonus and price optimum' (!1185) from 8298-zonePriceOptimum into dev 
Reviewed-on: verdnatura/salix-front#1185
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 08:41:49 +00:00
Jose Antonio Tubau 278faeb533 Merge branch 'dev' into 7073-createTestToVnDms 2025-01-13 08:10:51 +00:00
Jose Antonio Tubau 5b6ad1a7c0 test: refs #7073 add test to defaultData if formInitialData has value 2025-01-13 09:10:41 +01:00
Jose Antonio Tubau e50b8f0094 Merge branch 'dev' into 8316-invoiceInCardWithVnCardBeta 2025-01-13 08:43:57 +01:00