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

9217 Commits

Author SHA1 Message Date
Javi Gallego ab0343582e Merge branch 'dev' into 8381-thermographTravel 2025-01-21 11:56:08 +01:00
Alex Moreno 9f280c6089 Merge pull request 'perf: refs #8197 fix and imrpove filters' (!1234) from 8197-fix_filters into dev 
Reviewed-on: verdnatura/salix-front#1234
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-21 10:48:31 +00:00
Alex Moreno a2499f11e1 Merge branch 'dev' into 8197-fix_filters 2025-01-21 10:45:42 +00:00
Alex Moreno f3fbfe41bb Merge pull request '8448-devToTest' (!1254) from 8448-devToTest into test 
Reviewed-on: verdnatura/salix-front#1254
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-01-21 10:44:45 +00:00
Robert Ferrús d4a7a9374a Merge branch 'dev' into 8387-itemTagCrudModelFront 2025-01-21 10:43:48 +00:00
Jon Elias 28db925645 refactor: refs #7068 adjust variables 2025-01-21 11:05:24 +01:00
Alex Moreno 6c6e4ca950 fix: refs #8448 not use croppie 2025-01-21 10:58:46 +01:00
Javier Segarra df7ab77225 Merge branch 'dev' into update_quasar_version 2025-01-21 09:53:29 +00:00
Jorge Penadés a0fc8a528c Merge pull request '#8087 hotfix-addFilterFields' (!1257) from 8087-hotfix-addFilterFields into master 
Reviewed-on: verdnatura/salix-front#1257
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 09:52:21 +00:00
Robert Ferrús 3a95bdbbf7 Merge branch 'dev' into 6822-createEntryTransferOption 2025-01-21 09:48:11 +00:00
Jon Elias 96d1ef7f68 fix: refs #8448 e2e 2025-01-21 10:48:04 +01:00
Jorge Penadés 1cf9a46286 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle 2025-01-21 10:47:48 +01:00
Jorge Penadés ae507167b7 feat: refs #8087 add additional filter fields to TravelCard component 2025-01-21 10:43:44 +01:00
PAU ROVIRA ROSALENY 9dd53855b5 Merge pull request 'feat: #8395 added total column in invoiceInVat' (!1243) from 8395-invoiceInVatTotal into dev 
Reviewed-on: verdnatura/salix-front#1243
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-21 09:10:48 +00:00
PAU ROVIRA ROSALENY 0f64477763 fix: refs #8395 update label for total column 2025-01-21 10:08:26 +01:00
PAU ROVIRA ROSALENY 1fbcd0ccd5 Merge branch '8395-invoiceInVatTotal' of https://gitea.verdnatura.es/verdnatura/salix-front into 8395-invoiceInVatTotal 2025-01-21 10:04:21 +01:00
PAU ROVIRA ROSALENY 402b2882da feat: refs #8395 added computed to calculate and display amounts 2025-01-21 10:04:18 +01:00
PAU ROVIRA ROSALENY e169031c19 Merge branch 'dev' into 8395-invoiceInVatTotal 2025-01-21 09:03:26 +00:00
Robert Ferrús b1d18de23e Merge branch 'dev' into 6822-createEntryTransferOption 2025-01-21 08:48:40 +00:00
PAU ROVIRA ROSALENY df403e35e6 Merge branch 'dev' into 7103-testVnSearchbar 2025-01-21 08:46:12 +00:00
PAU ROVIRA ROSALENY e8cee99b78 feat: refs #7103 created test for VnSearchbar 2025-01-21 09:45:47 +01:00
Carlos Satorres 836f40867c Merge pull request 'fix: refs #6896 hotfix search' (!1255) from 6896-hotfixOrdersSearch into master 
Reviewed-on: verdnatura/salix-front#1255
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 08:25:53 +00:00
Jon Elias eb1c621066 Merge branch '7068-TableVisibleColumnsTest' of https://gitea.verdnatura.es/verdnatura/salix-front into 7068-TableVisibleColumnsTest 2025-01-21 09:06:55 +01:00
Jon Elias b36c53119c refactor: refs #7068 requested changes 2025-01-21 09:06:53 +01:00
Jon Elias d178a77bc6 Merge pull request 'Fix: Move dialog to descriptorMenu' (!1246) from Fix-InvoiceInDescriptorDialog into dev 
Reviewed-on: verdnatura/salix-front#1246
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-21 07:52:42 +00:00
Alex Moreno e9555a6017 Merge branch 'master' into 6896-hotfixOrdersSearch 2025-01-21 07:52:20 +00:00
Jon Elias 7c91869c8b Merge branch 'dev' into Fix-InvoiceInDescriptorDialog 2025-01-21 07:51:35 +00:00
Javi Gallego 23bff237a5 Merge branch 'dev' into 8381-thermographTravel 2025-01-21 07:52:20 +01:00
Alex Moreno e6c16356be Merge pull request 'Fix(TicketService): Sort by name in description' (!1253) from Fix-TicketServicesSortByName into dev 
Reviewed-on: verdnatura/salix-front#1253
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 06:50:57 +00:00
Alex Moreno bee5a1e82d Merge branch 'dev' into Fix-TicketServicesSortByName 2025-01-21 06:49:28 +00:00
Javi Gallego 590b4d9ca6 Merge pull request 'feat: refs #8381 add initial and final temperature fields to entry forms and summaries' (!1202) from 8381-entryTemperature into dev 
Reviewed-on: verdnatura/salix-front#1202
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 06:48:30 +00:00
Javi Gallego 545cb19dce feat: refs #8381 add initial and final temperature labels in English and Spanish locales 2025-01-21 07:46:14 +01:00
Javi Gallego d21e11cc3d Merge branch 'dev' into 8381-entryTemperature 2025-01-21 07:45:44 +01:00
Javi Gallego 45c4e08191 Merge branch 'dev' into 8381-entryTemperature 2025-01-21 07:45:20 +01:00
Alex Moreno 1feb26bd6d Merge branch 'dev' into 8197-fix_filters 2025-01-21 06:37:59 +00:00
Alex Moreno 3cb21d7117 fix: use entryFilter 2025-01-21 07:34:48 +01:00
Alex Moreno 824b60df57 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-21 07:33:09 +01:00
Alex Moreno 7357559c48 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-21 07:32:21 +01:00
Alex Moreno 44d3fa7634 Merge pull request 'fix: remove departmentCode' (!1240) from fix_customerList_departmentCode into dev 
Reviewed-on: verdnatura/salix-front#1240
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 06:31:42 +00:00
Javier Segarra c86dbcb456 Merge branch 'dev' into fix_customerList_departmentCode 2025-01-20 22:13:30 +00:00
Javier Segarra 3f753a97e7 Merge branch 'dev' into update_quasar_version 2025-01-20 21:46:57 +00:00
Javier Segarra fb2baa6180 Merge branch 'dev' into 8380-createTestToVnImg 2025-01-20 21:39:42 +00:00
Javier Segarra 0b52be2568 Merge branch 'dev' into Fix-TicketServicesSortByName 2025-01-20 21:33:13 +00:00
Javier Segarra bbac57845a Merge branch 'dev' into 8197-advancedMenu 2025-01-20 21:33:01 +00:00
Javier Segarra 0f8edae458 Merge pull request 'perf: remove warning default value' (!1241) from warning_defaultValue_firstParam into dev 
Reviewed-on: verdnatura/salix-front#1241
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-20 17:30:10 +00:00
Javier Segarra c0144e78c4 Merge branch 'dev' into warning_defaultValue_firstParam 2025-01-20 17:29:21 +00:00
Jorge Penadés f8bcc74133 Merge branch 'Fix-InvoiceInDescriptorDialog' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-InvoiceInDescriptorDialog 2025-01-20 18:09:31 +01:00
Jorge Penadés 2a5942a9a9 feat: refs #7119 update vehicle selection to use active vehicles and refactor vehicle card component 2025-01-20 18:05:32 +01:00
Jorge Penadés 365597e5cf refactor: refs #7119 remove vehicle deletion 2025-01-20 17:31:54 +01:00
Jorge Penadés e1b329db34 Merge pull request '#7936 update select model-value' (!1247) from 7936-hotfix-autoComplete into master 
Reviewed-on: verdnatura/salix-front#1247
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-20 14:42:57 +00:00