wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
2,953 Commits 154 Branches 0 Tags 24 MiB
Commit Graph

2953 Commits

Author SHA1 Message Date
Javier Segarra 56a6f24071 feat: family filter 2024-04-29 14:21:39 +02:00
Javier Segarra 1ccad36020 feat: remove unnused filters 2024-04-29 13:25:18 +02:00
Javier Segarra df29ad31fd minor changes 2024-04-29 13:22:31 +02:00
Javier Segarra 7108444a44 fix: 1. Warehouse default 2024-04-29 13:22:23 +02:00
Javier Segarra 5425902918 Merge branch 'dev' into 6321_negative_tickets 2024-04-29 11:55:56 +02:00
Alex Moreno b71aeb1d07 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-29 10:39:44 +02:00
Alex Moreno 5378ed6f2e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-04-29 10:34:48 +02:00
Javier Casado e757fff4dd Merge pull request 'refs #6641 add checkbox' (!283) from 6641-myTeamFilterClaim into dev 
Reviewed-on: verdnatura/salix-front#283
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-29 06:49:07 +00:00
Javier Casado fe22fb26fb Merge branch 'dev' into 6641-myTeamFilterClaim 2024-04-29 06:47:55 +00:00
Javier Segarra 4d0b9707cf Merge pull request 'feature/ItemListFilter' (!324) from hyervoni/salix-front-mindshore:feature/ItemListFilter into dev 
Reviewed-on: verdnatura/salix-front#324
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-29 06:02:41 +00:00
Javier Segarra f83ef4eb4c Merge branch 'dev' into feature/ItemListFilter 2024-04-29 06:02:02 +00:00
Alex Moreno fdd088955b Merge pull request 'Item Barcode' (!333) from hyervoni/salix-front-mindshore:feature/ItemBarCode into dev 
Reviewed-on: verdnatura/salix-front#333
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-29 05:24:59 +00:00
Javier Segarra 1e1c88e55c fix: reset fieldFilter.value when change model 2024-04-26 21:05:45 +02:00
William Buezas ce55109dd3 fix more fields label when selected 2024-04-26 15:41:03 -03:00
William Buezas 4282463e51 Fill filter fields with user params 2024-04-26 14:29:11 -03:00
William Buezas ad085974da remove console.log 2024-04-26 13:51:20 -03:00
William Buezas 4792485214 Translate more fields label 2024-04-26 13:50:39 -03:00
William Buezas dc0f4fb40e resolve conflicts 2024-04-26 10:37:19 -03:00
William Buezas 485e916f55 Add input focus 2024-04-26 09:16:26 -03:00
Alex Moreno 88e1e577c4 hotFix: refs #6636 fix ref optionsList 2024-04-26 13:10:29 +02:00
Javier Segarra 95fded4a83 Merge branch 'dev' into feature/ItemListFilter 2024-04-26 10:49:20 +00:00
Javier Casado 8864048a56 Merge branch 'dev' into 6641-myTeamFilterClaim 2024-04-26 09:14:54 +00:00
Alex Moreno 8f064e3338 warmFix: replace VnSelectFilter to VnSelect 2024-04-26 09:37:02 +02:00
Javier Segarra c84555b0a3 Merge pull request 'Item botanical' (!329) from hyervoni/salix-front-mindshore:feature/ItemBotanical into dev 
Reviewed-on: verdnatura/salix-front#329
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-26 07:31:29 +00:00
Javier Segarra 98846bbd1a Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical 2024-04-26 09:28:40 +02:00
Javier Segarra 36e99e2c6c fix: bug when save 2024-04-26 09:28:32 +02:00
Pablo Natek 119f625435 Merge pull request '#4988 - agencySection' (!293) from 4988-agencySection into dev 
Reviewed-on: verdnatura/salix-front#293
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-26 07:19:07 +00:00
Pablo Natek 7af802c306 Merge branch 'dev' into 4988-agencySection 2024-04-26 07:07:15 +00:00
Carlos Satorres f53caac771 Merge pull request 'refs #6976 supplier onUnmounted' (!286) from 6976-supplierConsumption into dev 
Reviewed-on: verdnatura/salix-front#286
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-26 07:05:00 +00:00
Javier Segarra 3c033458d3 fix: minor changes 2024-04-26 09:02:51 +02:00
Jon Elias 652e85a6e0 Merge pull request 'refactor: refs #7239 changed spanish translations' (!331) from ES_smsTranslations into master 
Reviewed-on: verdnatura/salix-front#331
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-26 07:01:39 +00:00
Carlos Satorres e64936da72 Merge branch 'dev' into 6976-supplierConsumption 2024-04-26 07:00:22 +00:00
Carlos Satorres 966831b6d3 refs #6976 fix pr 2024-04-26 09:00:42 +02:00
Pablo Natek cb22eaee4d Merge branch 'dev' into 4988-agencySection 2024-04-26 06:58:53 +00:00
Carlos Satorres dbdcc7cdf1 Merge pull request 'refs #6905 fix bank select' (!322) from 6905-fixUserPanel into dev 
Reviewed-on: verdnatura/salix-front#322
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-26 06:56:50 +00:00
Carlos Satorres 1d9f4e30af Merge branch 'dev' into 6905-fixUserPanel 2024-04-26 06:54:39 +00:00
Javier Segarra 7f4155cde9 fix: replace VnSelectFilter by VnSelect 2024-04-26 08:54:26 +02:00
Javier Segarra 22d9d369c8 Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical 2024-04-26 08:52:05 +02:00
Javier Segarra b3be7c8bc3 Merge pull request 'Item log' (!323) from hyervoni/salix-front-mindshore:feature/ItemLog into dev 
Reviewed-on: verdnatura/salix-front#323
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-04-26 06:37:22 +00:00
Carlos Satorres 7fd053b842 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-fixUserPanel 2024-04-26 08:36:15 +02:00
Javier Segarra aa87d54f57 Merge remote-tracking branch 'origin/dev' into feature/ItemLog 2024-04-26 08:34:05 +02:00
Pablo Natek faa6d0e4fa feat: setup commit 2024-04-26 08:33:41 +02:00
Carlos Satorres fc275d9274 refs #6976 remove logs 2024-04-26 08:29:34 +02:00
Pablo Natek d7bebfecb1 fix: fix translates 2024-04-26 08:28:42 +02:00
Javier Segarra 22478bed48 Merge pull request 'Item requests' (!297) from hyervoni/salix-front-mindshore:feature/ItemRequests into dev 
Reviewed-on: verdnatura/salix-front#297
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-26 06:22:11 +00:00
Jon Elias c56b6b2dbc refactor: better syntax 2024-04-26 08:22:08 +02:00
Javier Segarra 3116bf0944 Merge branch 'dev' into feature/ItemRequests 2024-04-26 06:21:36 +00:00
Javier Segarra 22356966e1 Merge pull request 'Customer Fix: minor bugs, layout & vnlocation' (!325) from 6590_fix_CustomerAdressEdit into test 
Reviewed-on: verdnatura/salix-front#325
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-26 06:00:41 +00:00
Jon Elias 443f4a4443 refactor: refs #7239 changed spanish translations 2024-04-26 07:49:28 +02:00
Javier Casado 433ca7c456 Merge pull request 'refs #6697 fix claimQuantity' (!317) from 6697-changeClaimQuantity into dev 
Reviewed-on: verdnatura/salix-front#317
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-26 05:33:40 +00:00