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

8750 Commits

Author SHA1 Message Date
Jon Elias f93c512e16 Merge branch 'master' into Hotfix-InvoiceOutCompanyFilter 2025-02-07 07:00:43 +00:00
Jon Elias 43b6ff89be fix: fixed company filter 2025-02-07 07:56:08 +01:00
Alex Moreno 3021e38ae8 fix: hotfix fetchData not use userFilter 2025-02-07 07:32:28 +01:00
Alex Moreno 2fea795bdb fix: hotfix empty observations 2025-02-07 07:21:59 +01:00
Jorge Penadés f9ba0642e1 Merge pull request '#7524 dynamic fetch' (!1339) from 7524-hotfix-removeLimit into master 
Reviewed-on: verdnatura/salix-front#1339
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-06 09:32:44 +00:00
Jorge Penadés 6732effe0c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7524-hotfix-removeLimit 2025-02-06 10:30:16 +01:00
Alex Moreno c6758c3346 Merge pull request 'fix: use userFilter to keep includes' (!1340) from hotFix_use_userFilter into master 
Reviewed-on: verdnatura/salix-front#1340
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-06 09:26:02 +00:00
Alex Moreno ab2d3fc4dc fix: use userFilter to keep includes 2025-02-06 10:12:52 +01:00
Jorge Penadés 80337c61df fix: refs #7524 dynamic fetch 2025-02-06 10:09:30 +01:00
Alex Moreno a88696d590 Merge pull request 'fix(VnLog): load filters' (!1338) from hotFix_VnLog_filters into master 
Reviewed-on: verdnatura/salix-front#1338
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-06 08:48:26 +00:00
Alex Moreno 2ed9323f0f fix(VnLog): load filters 2025-02-06 08:23:46 +01:00
Alex Moreno 1b52468e14 fix: translation 2025-02-05 13:47:44 +01:00
Alex Moreno 5696a44c1b fix: empty order 2025-02-05 12:15:30 +01:00
Alex Moreno 6e8f2754e5 fix: empty order 2025-02-05 12:00:34 +01:00
Alex Moreno 43284e3b79 fix: empty order 2025-02-05 11:49:53 +01:00
Javier Segarra cc9a4af169 Merge pull request 'HOTFIX: orderList column created' (!1327) from hotfix_column_created_orderList into master 
Reviewed-on: verdnatura/salix-front#1327
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-03 16:21:08 +00:00
Javier Segarra ac57141c0e fix: orderList column created 2025-02-03 16:19:33 +00:00
Jon Elias d5f2dd8f06 Merge pull request 'Hotfix: Fixed VnPaginate' (!1322) from Hotfix-OrderCatalogPaginate into master 
Reviewed-on: verdnatura/salix-front#1322
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-03 08:49:28 +00:00
Jon Elias a1bba4496d fix: deleted catalog limit 2025-02-03 08:48:32 +01:00
Jon Elias 855da2b7bf fix: fixed VnPaginate 2025-02-03 08:46:44 +01:00
Jon Elias 76ebb3beb4 Merge pull request 'Hotfix[ItemRequest]: Deleted duplicate request' (!1290) from Hotfix-PurchaseRequestDuplicate into master 
Reviewed-on: verdnatura/salix-front#1290
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-30 14:09:59 +00:00
Jon Elias abbfe7bc4a Merge branch 'master' into Hotfix-PurchaseRequestDuplicate 2025-01-30 13:42:31 +00:00
Jorge Penadés 2b474cab67 Merge pull request 'hotfix: refs #8198 ensure warehouseFk is a number when set from query' (!1308) from 8198-hotfix-parseQueryParam into master 
Reviewed-on: verdnatura/salix-front#1308
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-30 09:05:04 +00:00
Jorge Penadés ef129eb542 fix: refs #8198 correct date comparison in getBadgeAttrs function 2025-01-29 14:38:58 +01:00
Jorge Penadés 8660b1bea4 fix: refs #8198 ensure warehouseFk is a number when set from query 2025-01-29 12:24:26 +01:00
Alex Moreno 5c761ca111 fix: scroll 2025-01-28 12:12:00 +01:00
Carlos Satorres 879373209e refactor: entriesTotals 2025-01-28 10:54:59 +01:00
Jon Elias 55ac9e9329 Merge pull request 'Hotfix[ItemType]: Fixed itemType translations' (!1297) from Hotfix-ItemType into master 
Reviewed-on: verdnatura/salix-front#1297
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-28 08:58:07 +00:00
Jon Elias 15487bfbf2 fix: item type translations 2025-01-28 08:42:31 +01:00
Alex Moreno 5d6c14f4d7 fix(fixedPrice): hotFix subtoolbar 2025-01-28 08:01:01 +01:00
Alex Moreno afee23b99d Merge pull request '8452-testToMaster' (!1292) from 8452-testToMaster into master 
Reviewed-on: verdnatura/salix-front#1292
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2025-01-28 06:44:16 +00:00
Alex Moreno a0a7ef6734 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 8452-testToMaster 2025-01-28 07:17:43 +01:00
Alex Moreno 8b916016c6 Merge pull request 'warmifx: Customer_filters' (!1131) from warmifx_customer_filters into test 
Reviewed-on: verdnatura/salix-front#1131
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-28 06:17:30 +00:00
Javier Segarra e923ebcc72 Merge branch 'test' into warmifx_customer_filters 2025-01-27 18:05:16 +00:00
Alex Moreno d3e6462aed build: refs #8452 add change log 2025-01-27 15:24:08 +01:00
Alex Moreno b0420ee2b0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-27 14:37:57 +01:00
Javier Segarra ba3f6a79e6 style: customerList 2025-01-27 14:31:54 +01:00
Javier Segarra b266c44d34 fix: sage params 2025-01-27 14:30:59 +01:00
Javier Segarra 8cbb97af29 Merge branch 'test' into warmifx_customer_filters 2025-01-27 14:08:59 +01:00
Javier Segarra 0916afbe37 fix: changel i18n 2025-01-27 14:04:37 +01:00
Javier Segarra 9dd216269a fix: vnSelectWorker fix template 2025-01-27 14:03:38 +01:00
Javier Segarra d1ba6e580f fix: params 2025-01-27 13:52:44 +01:00
Javier Segarra 13cd59c6bb fix: socialName filter 2025-01-27 13:52:37 +01:00
Jon Elias 9565f97c4f fix: deleted duplicate request 2025-01-27 13:37:14 +01:00
Alex Moreno 1322dad63d fix(VnCardBeta): add userFilter 2025-01-27 08:29:42 +01:00
Alex Moreno 198db0df49 fix(VnCardBeta): add userFilter 2025-01-27 08:23:09 +01:00
Javier Segarra c556a8b82d Merge pull request 'fix: use right endpoint for CustomerList' (!1283) from hotfix_customerExtendedList into master 
Reviewed-on: verdnatura/salix-front#1283
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-24 14:41:20 +00:00
Javier Segarra fb5b347bb6 fix: use right endpoint for CustomerList 2025-01-24 15:38:47 +01:00
Alex Moreno f7b1d7bd37 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-24 11:47:13 +01:00
Alex Moreno 658747d479 fix: empty store.order 2025-01-24 11:45:03 +01:00