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

8766 Commits

Author SHA1 Message Date
Jorge Penadés e9c0d6ae2d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8571-hotfix-notShowToken 2025-02-13 12:00:23 +01:00
Pablo Natek 8411a2d779 Merge pull request 'fix: update user filter binding in ClaimLines' (!1384) from hotFixClaimLinesF5 into master 
Reviewed-on: verdnatura/salix-front#1384
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-02-13 09:20:27 +00:00
Pablo Natek 7d55f42fac Merge branch 'master' into hotFixClaimLinesF5 2025-02-13 09:18:57 +00:00
Pablo Natek e8d03328cf fix: update user filter binding in ClaimLines 2025-02-13 10:16:36 +01:00
Jorge Penadés e070245d3e fix: refs #8571 remove Authorization header from config and adjust confirmation modal logic 2025-02-12 14:15:52 +01:00
Jon Elias c941b99ea3 Merge pull request 'Hotfix[OrderCatalogItemDialog]: Fixed addToOrder functionality' (!1363) from hotfix-AddItemToOrder into master 
Reviewed-on: verdnatura/salix-front#1363
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-12 07:33:41 +00:00
Jon Elias 61199d456e Merge branch 'master' into hotfix-AddItemToOrder 2025-02-12 07:32:31 +00:00
Carlos Satorres 5ae54e8aef Merge pull request 'fix: refs #8551 department summary' (!1360) from 8551-departmentSummary into master 
Reviewed-on: verdnatura/salix-front#1360
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-11 15:19:55 +00:00
Carlos Satorres ba178291fa Merge branch 'master' into 8551-departmentSummary 2025-02-11 15:14:32 +00:00
Jorge Penadés 506b77766d Merge pull request 'fix: refs #8554 update password handling based on user identity' (!1375) from 8554-hotfix-wrongEndPoint into master 
Reviewed-on: verdnatura/salix-front#1375
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2025-02-11 13:04:12 +00:00
Jorge Penadés 61fc973951 fix: refs #8554 update password handling based on user identity 2025-02-11 12:40:16 +01:00
Javier Segarra e62ae810bd Merge pull request 'HOTFIX: #69443 - Customer fiscal data add mapper before save' (!1367) from hotfix_customerFD_mapper into master 
Reviewed-on: verdnatura/salix-front#1367
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-10 14:27:35 +00:00
Javier Segarra 13fc67261e fix: add mapper 2025-02-10 14:40:15 +01:00
Jon Elias a0e24bb5d1 fix: fixed addToOrder functionality 2025-02-10 10:37:39 +01:00
Carlos Satorres 0bfb08d9b8 fix: refs #8551 department summary 2025-02-10 09:40:59 +01:00
Jon Elias 98bcb2f45b Merge pull request 'Hotfix[InvoiceOutList]: Fixed company filter' (!1349) from Hotfix-InvoiceOutCompanyFilter into master 
Reviewed-on: verdnatura/salix-front#1349
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-07 07:12:36 +00:00
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