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

7852 Commits

Author SHA1 Message Date
Jose Antonio Tubau 4b35d4b41e refactor: refs #8293 remove redundant attributes 2024-12-18 07:59:56 +01:00
Jose Antonio Tubau 152bb7009a Merge branch 'dev' into 8293-addZoneToClaimList 2024-12-18 06:43:04 +00:00
Carlos Satorres 35de47f102 Merge pull request 'fix: monitorPayMethodFilter' (!1096) from warmfix-monitorPayMethodFilter into dev 
Reviewed-on: verdnatura/salix-front#1096
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-17 12:08:08 +00:00
Carlos Satorres 3da7425f6f fix: remove url 2024-12-17 12:59:27 +01:00
Carlos Satorres 2d9d58f79c fix: monitorPayMethodFilter 2024-12-17 12:45:02 +01:00
Alex Moreno e6ced7b2f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-12-17 10:36:39 +01:00
Alex Moreno a0a6746db4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-12-17 10:36:25 +01:00
Jon Elias 3b3d57ea79 Merge pull request 'Fix: use Teleport to avoid QDrawer overlapping' (!1093) from Fix-QDrawer into dev 
Reviewed-on: verdnatura/salix-front#1093
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-17 09:35:09 +00:00
Jon Elias 4dff5a2eec refactor: use teleport to avoid qdrawer overlapping 2024-12-17 09:03:09 +01:00
Carlos Satorres a3ea359b01 fix: remove useless try catch 2024-12-17 07:02:44 +01:00
Robert Ferrús 943b44934e Merge pull request 'feat: refs #8001 ticketExpeditionGrafana' (!865) from 8001-expeditionGrafana into dev 
Reviewed-on: verdnatura/salix-front#865
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-16 12:35:12 +00:00
Robert Ferrús 61056e008e Merge branch 'dev' into 8001-expeditionGrafana 2024-12-16 12:34:36 +00:00
Jon Elias 96ef2b776c Merge pull request 'Fix: use VnSelectWorker' (!1089) from Fix-ClaimDevelopmentSelectWorker into dev 
Reviewed-on: verdnatura/salix-front#1089
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-16 12:20:53 +00:00
Carlos Satorres 98674e528c Merge pull request 'fix: fix front' (!1061) from hotfix-irpfDaysOnWard into master 
Reviewed-on: verdnatura/salix-front#1061
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-16 11:05:34 +00:00
Jon Elias ab99f66758 refactor: use VnSelectWorker 2024-12-16 11:29:03 +01:00
Robert Ferrús b84e8a4a2b Merge branch 'dev' into 8001-expeditionGrafana 2024-12-16 07:48:37 +00:00
Jose Antonio Tubau dadf3206e0 feat: refs #8293 add zone filter 2024-12-16 08:42:37 +01:00
Jose Antonio Tubau c4db8f7818 feat: refs #8293 include zone data in each record 2024-12-16 08:41:28 +01:00
Guillermo Bonet 96ec1ca86b Merge pull request 'feat: refs #7882 Added longitude & latitude' (!1070) from 7882-osrm into dev 
Reviewed-on: verdnatura/salix-front#1070
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-16 06:59:06 +00:00
Guillermo Bonet b1cf0c2365 Merge branch 'dev' into 7882-osrm 2024-12-16 06:14:25 +00:00
Carlos Satorres 7ce92cc64b Merge branch 'master' into hotfix-irpfDaysOnWard 2024-12-16 06:06:59 +00:00
Javier Segarra 601111ee9f Merge pull request 'fix_orderCatalog_reload' (!1085) from fix_orderCatalog_reload into dev 
Reviewed-on: verdnatura/salix-front#1085
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2024-12-13 13:01:34 +00:00
Javier Segarra 9e45775457 Merge branch 'dev' into fix_orderCatalog_reload 2024-12-13 12:38:05 +00:00
Javier Segarra c7e841bdad Merge branch 'fix_orderCatalog_reload' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_orderCatalog_reload 2024-12-13 13:33:11 +01:00
Javier Segarra 5caf82fad7 fix: get total from api 2024-12-13 13:32:40 +01:00
Jon Elias 74bf536db1 Merge pull request 'fix_orderCatalog_reload' (!1081) from fix_orderCatalog_reload into dev 
Reviewed-on: verdnatura/salix-front#1081
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2024-12-13 11:46:16 +00:00
Jon Elias f4aa30c43e Merge branch 'dev' into fix_orderCatalog_reload 2024-12-13 11:45:10 +00:00
Javier Segarra b18de7df4e perf: #6896 REMOVE COMMENTS 2024-12-13 12:17:54 +01:00
Javier Segarra 608f881eab Merge pull request 'feat: hide menus' (!1083) from hotfix-hideMenu into master 
Reviewed-on: verdnatura/salix-front#1083
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-13 11:07:53 +00:00
Jorge Penadés d0e6c2c567 feat: hide menus 2024-12-13 11:45:56 +01:00
Jose Antonio Tubau 228100853c Merge pull request 'feat: refs #7072 added test to computed fn total' (!1078) from 7072-createVnDiscountSpec into dev 
Reviewed-on: verdnatura/salix-front#1078
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-13 10:33:58 +00:00
Javier Segarra b3170108e0 feat: update quantity 2024-12-13 10:50:32 +01:00
Jose Antonio Tubau f3bdcae3b1 Merge branch 'dev' into 7072-createVnDiscountSpec 2024-12-13 07:20:36 +00:00
PAU ROVIRA ROSALENY 456dde73c1 Merge pull request '#8288 changed invoice out spanish translation' (!1074) from 8288-changeInvoiceOutTranslation into dev 
Reviewed-on: verdnatura/salix-front#1074
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-13 06:26:42 +00:00
PAU ROVIRA ROSALENY a4f1967329 Merge branch 'dev' into 8288-changeInvoiceOutTranslation 2024-12-13 06:14:50 +00:00
Guillermo Bonet e6195a8529 Merge branch 'dev' into 7882-osrm 2024-12-13 06:00:26 +00:00
Javier Segarra bd15d2e73a feat: remove re-fetch when add element 2024-12-13 06:56:22 +01:00
Javier Segarra 696be32fa6 feat: remove search after category 2024-12-13 06:54:40 +01:00
Jose Antonio Tubau 6895780c09 feat: refs #7072 added test to computed fn total 2024-12-12 16:26:01 +01:00
Jose Antonio Tubau 1b05c10b50 Merge pull request 'ShowDptoLink' (!1076) from showDeptLink into dev 
Reviewed-on: verdnatura/salix-front#1076
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-12 14:35:41 +00:00
Jose Antonio Tubau 1d37d0dfb4 Merge branch 'dev' into showDeptLink 2024-12-12 13:50:42 +00:00
Jose Antonio Tubau d35c37bfdf fix: addLocales 2024-12-12 14:47:21 +01:00
Jose Antonio Tubau 013c07e51f feat: addDptoLink 2024-12-12 14:39:07 +01:00
Pablo Natek d72b507fd4 Merge pull request 'feat: refs #7301 add exclude inventory supplier from list' (!982) from 7301-itemLastEntries into dev 
Reviewed-on: verdnatura/salix-front#982
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-12 13:23:30 +00:00
Pablo Natek 87bdf532a8 Merge branch 'dev' into 7301-itemLastEntries 2024-12-12 13:11:45 +00:00
PAU ROVIRA ROSALENY ad27eef162 Merge branch 'dev' into 8288-changeInvoiceOutTranslation 2024-12-12 11:35:18 +00:00
Carlos Satorres 59b034d0b4 Merge pull request 'fix: fix department filter' (!1075) from fix-6389departmentFilter into dev 
Reviewed-on: verdnatura/salix-front#1075
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-12 10:03:24 +00:00
Carlos Satorres ac3ca3e243 fix: fix department filter 2024-12-12 10:51:13 +01:00
Carlos Satorres b022ede6a9 Merge pull request 'fix: refs #6389 ipt' (!846) from 6389-changesMonitor into dev 
Reviewed-on: verdnatura/salix-front#846
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-12 09:28:52 +00:00
Carlos Satorres e628a6c445 Merge branch 'dev' into 6389-changesMonitor 2024-12-12 08:48:28 +00:00