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

928 Commits

Author SHA1 Message Date
Guillermo Bonet 407b81f4b7 Merge branch 'master' into test 2024-12-05 09:24:35 +01:00
Jorge Penadés 4b1a4adfe3 feat: add country filter & fix userParams 2024-12-03 14:01:17 +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 50796df06a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-29 07:28:06 +01:00
Carlos Andrés 67c257ce0e fix: translations travel 2024-11-28 19:24:13 +01:00
Javier Segarra 280a70a145 fix: remove message when setWeigth ticket 2024-11-28 14:05:04 +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
Javier Segarra ff91ca2dfe feat: remove More options separator 2024-11-26 23:57:10 +01:00
Alex Moreno 9086b7d48d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-26 14:20:08 +01:00
Carlos Satorres ad8d5b5e9a fix: hotfix travel 2024-11-26 13:00:38 +01:00
Carlos Satorres 5dd508c559 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-11-25 13:31:02 +01:00
Carlos Andrés 5268140d8b feat: refs#8087 Redadas en travel 2024-11-21 15:51:27 +01:00
Carlos Satorres 258da0f60b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-11-20 13:16:10 +01:00
Carlos Andrés 317e9ad034 Merge branch 'dev' into 8087-nuevosCamposTravel 2024-11-20 12:14:50 +00:00
Alex Moreno a498e1178f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-19 14:50:14 +01:00
Alex Moreno fdafeee39d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-19 14:49:22 +01:00
Alex Moreno 7b243a470c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-19 14:41:47 +01:00
Carlos Andrés 5da6e9b2ca Merge branch 'dev' of https: refs #8087//gitea.verdnatura.es/verdnatura/salix-front into 8087-nuevosCamposTravel 2024-11-19 14:04:13 +01:00
Robert Ferrús 8a1db719e3 fix(Supplier): change isSerious to isReal 2024-11-19 11:58:16 +01:00
Jorge Penadés 1faab668b1 fix: refs #7323 show advanced fields 2024-11-19 11:53:33 +01:00
Jorge Penadés 38ccf464b7 fix: refs #7323 locale #7396 2024-11-19 11:52:00 +01:00
Javier Segarra d284cec31a Merge branch '7346-manualInvoice' of https: refs #7346//gitea.verdnatura.es/verdnatura/salix-front into 7346-manualInvoice 2024-11-14 11:50:09 +01:00
Javi Gallego 79ce2ad79e Merge branch 'dev' into 7346-manualInvoice 2024-11-14 09:22:18 +01:00
Jon Elias 540e0348a1 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations 2024-11-13 14:10:08 +01:00
Carlos Andrés 4a0c15ed90 Merge branch 'dev' into 8087-nuevosCamposTravel 2024-11-12 10:24:06 +00:00
Carlos Andrés fc73149dcf feat: refs #8087 refs#8087 Redadas en travel 2024-11-11 14:20:39 +01:00
Alex Moreno 777ac58f04 feat(Supplier): add companySize 2024-11-11 10:31:41 +01:00
Carlos Satorres 780af58747 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-11-07 12:48:26 +01:00
Jon Elias 1ff77abaf5 Merge branch 'dev' into Fix_OrderModuleProblems 2024-10-29 08:26:16 +00:00
Carlos Satorres adbf1af453 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-10-29 06:13:22 +01:00
Carlos Andrés b8ba313132 Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!864) from 8087-nuevoCampoTravel into dev 
Reviewed-on: verdnatura/salix-front#864
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-28 13:29:05 +00:00
Carlos Satorres 847cf6a5b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-10-28 13:31:42 +01:00
Jon Elias 639e08406e Merge branch 'dev' into Fix_OrderModuleProblems 2024-10-28 11:22:23 +00:00
Jon Elias df1c123444 feat: refs #7193 modified parking to use the scope and corrected small errors 2024-10-28 10:39:45 +01:00
Alex Moreno 100dfbec3e Merge branch 'dev' into 8087-nuevoCampoTravel 2024-10-25 08:14:09 +00:00
Carlos Andrés 12c236276d feat: refs #8087 Traspasar redadas a travels 2024-10-24 19:32:20 +02:00
Carlos Andrés 64f36c7d4b feat: refs #8087 Traspasar redadas a travels 2024-10-24 12:35:11 +02:00
Javier Segarra 3f640c650b perf: refs #7283 #7283 handle i18n 2024-10-24 12:32:15 +02:00
Javier Segarra 87d2e0a39b perf: refs #7283 #7283 handle composable i18n 2024-10-24 10:36:48 +02:00
Jon Elias 76ed5150a5 Merge branch 'dev' into Fix_OrderModuleProblems 2024-10-23 11:05:14 +00:00
Jon Elias b69ef48a44 refactor: refs #7132 deleted pageTitles repeated 2024-10-23 12:21:34 +02:00
Jon Elias 03f2da8169 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations 2024-10-23 12:14:50 +02:00
Carlos Satorres 84dae53d66 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-23 07:53:02 +02:00
Alex Moreno 735ee09ef8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-22 15:08:20 +02:00
Alex Moreno aaf749db6c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-22 15:08:11 +02:00
Jorge Penadés 9f3c834ce4 Merge branch 'master' of https: refs #8083//gitea.verdnatura.es/verdnatura/salix-front into 8083-hotfix-changeState 2024-10-22 14:24:41 +02:00
Jorge Penadés f751408de2 feat: refs #8083 add change state btn 2024-10-22 13:22:43 +02:00
Jon Elias 5b116a7301 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems 2024-10-22 11:31:45 +02:00
Jorge Penadés 0fbd5f45e1 fix: refs #7524 select department 2024-10-21 14:29:29 +02:00
Javi Gallego 69215851bb Merge branch 'dev' into 7346-manualInvoice 2024-10-21 14:01:18 +02:00