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

7525 Commits

Author SHA1 Message Date
Jorge Penadés a3f14bc39f refactor: drop logic 2024-12-02 12:12:23 +01:00
Jorge Penadés cfa22bbc85 Merge branch 'performance_mixins' of https://gitea.verdnatura.es/verdnatura/salix-front into performance_mixins 2024-12-02 11:58:57 +01:00
Jorge Penadés bfa7300651 Merge branch 'dev' into performance_mixins 2024-12-02 10:58:52 +00:00
Jorge Penadés 1710ae718e Merge branch 'performance_mixins' of https://gitea.verdnatura.es/verdnatura/salix-front into performance_mixins 2024-12-02 11:58:44 +01:00
Jorge Penadés b00a3d7acf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into performance_mixins 2024-12-02 11:55:54 +01:00
Carlos Satorres a4bf89882a Merge pull request 'fix: refs #7304 7304 clean warning' (!838) from 7304-warningCustomerBasicData into dev 
Reviewed-on: verdnatura/salix-front#838
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-02 09:38:37 +00:00
Carlos Satorres 392cc66030 Merge branch 'dev' into 7304-warningCustomerBasicData 2024-12-02 09:34:31 +00:00
Javier Segarra bd95f8877f Merge pull request 'fix_city_from_province' (!1032) from fix_city_from_province into dev 
Reviewed-on: verdnatura/salix-front#1032
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2024-12-02 08:50:08 +00:00
Javier Segarra ff344c24d8 Merge branch 'dev' into fix_city_from_province 2024-12-02 08:18:11 +00:00
Javier Segarra 21dc47ed74 perf: add dataCy 2024-12-02 01:25:42 +01:00
Javier Segarra 007b95a616 test: remove #q- 2024-12-02 00:50:31 +01:00
Javier Segarra 444f68e937 fix: #8016 fetching data 2024-12-01 23:52:41 +01:00
Alex Moreno 4480b58551 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-29 12:23:26 +01:00
Alex Moreno 79c86e271c Merge pull request 'hotFix_supplier_autoBic' (!1023) from hotFix_supplier_autoBic into master 
Reviewed-on: verdnatura/salix-front#1023
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-11-29 11:22:55 +00:00
Alex Moreno 068b2dc9aa fix: e2e 2024-11-29 10:36:22 +01:00
Alex Moreno 89a13e8886 Merge branch 'master' into hotFix_supplier_autoBic 2024-11-29 09:27:23 +00:00
Carlos Andrés 658551e085 Merge pull request 'fix: translations travel' (!1021) from Hotfix--translationsTravel into master 
Reviewed-on: verdnatura/salix-front#1021
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-29 09:13:29 +00:00
Guillermo Bonet bf8b9e4283 Merge branch 'test' into dev 2024-11-29 09:48:43 +01:00
Guillermo Bonet 8428c7a205 fix: refs #7920 Changed shelving option value 2024-11-29 09:48:09 +01:00
Alex Moreno f1fc5edac3 chore: duplicate isLoading.value = false; 2024-11-29 09:39:42 +01:00
Alex Moreno d364e30cf0 feat(SupplierAccount): add autoBic when change bankEntity 2024-11-29 09:38:58 +01:00
Robert Ferrús 4f8bf00786 Merge pull request 'feat: refs #245362 itemTags' (!1017) from 245362-hotFixItemTags into master 
Reviewed-on: verdnatura/salix-front#1017
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-29 07:42:15 +00:00
Robert Ferrús bedf7d8a3a Merge branch 'master' into 245362-hotFixItemTags 2024-11-29 07:39:40 +00:00
Javier Segarra b83c640760 feat: improve Merge branch 'test' into dev 2024-11-29 07:32:31 +01:00
Alex Moreno 50796df06a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-29 07:28:06 +01:00
Alex Moreno 36de1ad400 fix(MailForwarding): add try catch 2024-11-29 07:27:14 +01:00
Robert Ferrús 650acccbee Merge branch 'master' into 245362-hotFixItemTags 2024-11-29 04:53:09 +00:00
Carlos Andrés 67c257ce0e fix: translations travel 2024-11-28 19:24:13 +01:00
Javier Segarra 7a3e2c0a9b Merge pull request 'fix: remove message when setWeigth ticket' (!1019) from setWeight_modal into master 
Reviewed-on: verdnatura/salix-front#1019
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-11-28 13:06:00 +00:00
Javier Segarra 280a70a145 fix: remove message when setWeigth ticket 2024-11-28 14:05:04 +01:00
Jon Elias ddfcc0aff5 Merge pull request 'Hotfix: delete event and dated value when excluding a day' (!1010) from Hotfix-ZoneEventsExclusion into master 
Reviewed-on: verdnatura/salix-front#1010
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-28 12:51:44 +00:00
Jon Elias 4193710123 Merge branch 'master' into Hotfix-ZoneEventsExclusion 2024-11-28 12:43:41 +00:00
Jon Elias 6263481a3e refactor: exclusionCreate function and translations 2024-11-28 13:42:22 +01:00
Javier Segarra d74bad50cb Merge pull request 'HOTFIX #8217 Update Customer Credit' (!986) from hotfix_8217_updateCustomerCredit into master 
Reviewed-on: verdnatura/salix-front#986
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-28 12:34:11 +00:00
Javier Segarra 07274002cf Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-28 12:33:07 +00:00
Jon Elias 61d0d71538 fix: fixed functionality like Salix 2024-11-28 12:26:33 +01:00
Robert Ferrús 547455d976 Merge branch 'master' into 245362-hotFixItemTags 2024-11-28 10:38:00 +00:00
Robert Ferrús 97c12bced3 feat: refs #245362 change request 2024-11-28 11:36:59 +01:00
Javier Segarra 1bbce5f828 Merge pull request 'HOTFIX: ticketSale keyup.enter' (!1009) from hotfix_ticketSale_enter into master 
Reviewed-on: verdnatura/salix-front#1009
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-28 10:03:40 +00:00
Javier Segarra 8bc3c1610b Merge branch 'master' into hotfix_ticketSale_enter 2024-11-28 08:39:18 +00:00
Robert Ferrús 5c79c6bfef feat: refs #245362 itemTags 2024-11-28 09:38:28 +01:00
Guillermo Bonet 7315d117c0 Merge branch 'test' into dev 2024-11-28 09:01:17 +01:00
Guillermo Bonet 41fb880c0e fix: refs #7266 Minor fixes 2024-11-28 08:59:13 +01:00
Alex Moreno 1ae53791bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-28 08:41:58 +01:00
Alex Moreno a251e348a8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-28 08:41:56 +01:00
Guillermo Bonet 4af309ce8d Merge branch 'test' into dev 2024-11-28 08:36:36 +01:00
Javier Segarra 8daa08b99c Merge branch 'master' into hotfix_ticketSale_enter 2024-11-28 07:35:46 +00:00
Alex Moreno fe34eefc55 Merge pull request 'fix: not fetch on mounted' (!1015) from hotfix-notRedirectOnLoad into master 
Reviewed-on: verdnatura/salix-front#1015
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-28 07:34:21 +00:00
Alex Moreno 118e346a07 Merge branch 'master' into hotfix-notRedirectOnLoad 2024-11-28 07:32:52 +00:00
Guillermo Bonet 55b9e3ddcd fix: refs #7266 Bad report 2024-11-28 08:21:09 +01:00