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

3997 Commits

Author SHA1 Message Date
Jon Elias 8a4f723732 Merge branch 'dev' into 7717_fixOrderCatalog 2024-08-02 04:50:39 +00:00
Alex Moreno 545f7c8039 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-01 14:11:15 +02:00
Alex Moreno fa60467e76 fix(claim): small details 2024-08-01 10:51:13 +02:00
Carlos Satorres 8d8bd095f6 Merge branch 'dev' into 7355-accountMigration 2024-08-01 08:15:21 +00:00
Alex Moreno 0b7c8c41d2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-01 10:12:56 +02:00
Alex Moreno 5f6eeb77ea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-08-01 10:12:41 +02:00
Carlos Satorres 68e4831ea5 refs #7355 fix conflicts 2024-08-01 09:56:54 +02:00
Carlos Satorres 2d467016b2 refs #7355 fix roles 2024-08-01 09:51:18 +02:00
Alex Moreno d9fb0d9186 nullishToTrue fn 2024-08-01 09:47:38 +02:00
Alex Moreno 5233c1455a refactor: refs #7679 better way to update model 2024-07-31 14:57:25 +02:00
Carlos Satorres ed032badac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-31 09:37:20 +02:00
Carlos Satorres e41078b973 refs #7355 traduccions 2024-07-31 08:34:31 +02:00
Alex Moreno 287abcf90c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-31 08:10:30 +02:00
Alex Moreno 2ad72c3209 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-07-31 08:01:44 +02:00
Jon Elias 68ce5880dd refactor: refs #7717 deleted useless code 2024-07-31 07:35:59 +02:00
Carlos Satorres 5b214b58ab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-31 07:22:43 +02:00
Jon Elias cf90007023 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-30 14:33:28 +02:00
Alex Moreno ed110beda6 Merge branch 'dev' into 6943-customer_migration_subsection 2024-07-30 11:33:11 +00:00
Jon Elias 7e3bfce732 fix: refs #7717 fix basic data form & minor errors 2024-07-30 13:31:12 +02:00
Alex Moreno 108ffbe7a8 Merge branch 'master' into 7679-hotFix_vnLocation 2024-07-30 11:12:10 +00:00
Alex Moreno ecb201edce delete unnesessary class 2024-07-30 12:45:18 +02:00
Carlos Satorres 7ff20f3064 hotFix: supplierList correct filter 2024-07-30 11:50:23 +02:00
Jorge Penadés 1fe2ba7f09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6989-showClientName 2024-07-30 09:52:29 +02:00
Jon Elias 2cd696aeb9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-30 08:03:46 +02:00
Alex Moreno b5cb28a0cf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-30 07:47:46 +02:00
Alex Moreno 9179e13dcd fix: vnLocation 2024-07-29 15:03:21 +02:00
Jorge Penadés 839af6d50c fix: refs #6989 show entity name & default time from config table 2024-07-29 13:41:44 +02:00
Jorge Penadés 979b3b2a6c fix: refs #7197 drop character 2024-07-29 08:46:47 +02:00
Jorge Penadés 5705904e40 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-29 08:04:51 +02:00
Jon Elias be113656ae Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-26 14:56:27 +02:00
Jon Elias 4d7fe0fd86 fix: refs #7717 fix volume and lines redirect 2024-07-26 14:56:26 +02:00
Alex Moreno f079ba4022 hotFix: twoFactor add required import 2024-07-26 14:51:22 +02:00
Jon Elias 356e7768b7 Merge branch 'dev' into 7717_fixOrderCatalog 2024-07-26 12:11:18 +00:00
Jon Elias 4cad7cbced Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-26 14:09:10 +02:00
Jon Elias d588db05ac fix: refs #7717 fix OrderList table filters' and summary table style 2024-07-26 14:09:09 +02:00
Robert Ferrús bfbe4d64b3 Merge branch 'master' into 7039-hotFixSupplierSummary 2024-07-26 11:59:32 +00:00
Guillermo Bonet 7b13250a16 Merge branch 'test' into dev 2024-07-26 13:57:11 +02:00
Guillermo Bonet 621de11890 fix: refs #6769 Requested changes 2024-07-26 13:14:45 +02:00
Guillermo Bonet 48e133ffc7 fix: refs #6769 Fix worker images 2024-07-26 13:00:55 +02:00
Robert Ferrús d4ff3ab993 fix: refs #7039 supplierSummary 2024-07-26 12:55:36 +02:00
Guillermo Bonet 86ab161302 fix: refs #6769 Fixes item diary 2024-07-26 12:37:53 +02:00
Alex Moreno 21b642a7c5 typo 2024-07-26 12:15:57 +02:00
Carlos Satorres f4c0288ca0 refs #6898 filters sortby 2024-07-26 12:01:46 +02:00
Carlos Satorres 1ad15869e8 refs #6898 filters select 2024-07-26 11:45:13 +02:00
Carlos Satorres d575c3cdae refs #6898 filters 2024-07-26 11:25:44 +02:00
Alex Moreno 28e50512ba remove console.log 2024-07-26 09:51:46 +02:00
Alex Moreno 21dd2e4b46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-customer_migration_subsection 2024-07-26 09:49:22 +02:00
Alex Moreno 026c632a4c feat(customer): improve basicData to balance 2024-07-26 09:47:28 +02:00
Pablo Natek 81463cf129 Merge branch 'dev' into 7401-add-option-on-descriptor-menu 2024-07-26 07:46:32 +00:00
Pablo Natek 2d8eecca1c fix: refs #7401 fix routeForm 2024-07-26 09:46:00 +02:00