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

6774 Commits

Author SHA1 Message Date
Jon Elias 3adec919dc Merge branch '8247-EnableAccount' of https://gitea.verdnatura.es/verdnatura/salix-front into 8247-EnableAccount 2025-01-14 07:37:22 +01:00
Jon Elias e5d8bfcf3a refactor: refs #8247 use new acl for sysadmin 2025-01-14 07:37:17 +01:00
Alex Moreno 099ea793bd fix: refs #8389 minor bugs 2025-01-14 07:29:44 +01:00
PAU ROVIRA ROSALENY 34442c8577 Merge branch 'dev' into 7055-testFilterItemForm 2025-01-14 05:59:53 +00:00
Jorge Penadés 8d1a095302 Merge branch 'test' into 8197-fix_searchbar_teleport 2025-01-13 15:15:23 +00:00
Alex Moreno 863d6deb10 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-13 14:49:15 +01:00
Alex Moreno 5a58012f80 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-13 14:49:02 +01:00
Alex Moreno 01a6d714eb Merge branch 'test' into 8197-fix_searchbar_teleport 2025-01-13 13:36:56 +00:00
Alex Moreno 671f308006 revert: revert header 2025-01-13 13:29:39 +01:00
PAU ROVIRA ROSALENY a22330b15e Merge branch 'dev' into 7077-testVnInputTime 2025-01-13 12:20:33 +00:00
PAU ROVIRA ROSALENY 2a8c2a1079 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-13 11:54:12 +00:00
PAU ROVIRA ROSALENY 50008ce7f1 fix: refs #7055 #7055 #7055 fixed some tests 2025-01-13 12:27:26 +01:00
Jorge Penadés ac589a8626 fix: refs #8110 prevent form submit 2025-01-13 12:21:33 +01:00
Alex Moreno dd335ef409 fix: refs #8197 not use yet 2025-01-13 12:18:52 +01:00
Alex Moreno ed0730df22 feat: refs #8197 useHasContent and use in VnSection and RightMenu 2025-01-13 12:17:55 +01:00
PAU ROVIRA ROSALENY 7a5de9f708 Merge branch 'dev' into 7055-testFilterItemForm 2025-01-13 11:07:04 +00:00
Jon Elias a9ac5106cf Merge branch 'test' into Warmfix-OrderProblems 2025-01-13 10:56:32 +00:00
Jon Elias 5272e5aaae fix: redirect to sales when confirming lines 2025-01-13 11:53:55 +01:00
PAU ROVIRA ROSALENY f0fc748c76 fix: changed translations to only use "invoicein" 2025-01-13 11:48:45 +01:00
Javi Gallego 803b8d508d feat: refs #8381 add initial and final temperature fields to entry forms and summaries 2025-01-13 11:27:00 +01:00
PAU ROVIRA ROSALENY f5003687eb Merge branch 'traduccionesInvoiceIn' of https://gitea.verdnatura.es/verdnatura/salix-front into traduccionesInvoiceIn 2025-01-13 11:06:06 +01:00
PAU ROVIRA ROSALENY eb92c69475 fix: changed invoiceIn for InvoiceIn 2025-01-13 11:06:01 +01:00
PAU ROVIRA ROSALENY 49f54c6efe Merge branch 'dev' into traduccionesInvoiceIn 2025-01-13 09:55:20 +00:00
PAU ROVIRA ROSALENY 2a121dbbb3 fix: added missing translations in InvoiceIn 2025-01-13 10:54:28 +01:00
Alex Moreno ce698522c3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-13 10:23:41 +01:00
Alex Moreno d761af6537 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-13 10:23:27 +01:00
Alex Moreno bb8e9c5baa Merge branch 'dev' into 8225-UseSameMoreOptions 2025-01-13 09:14:24 +00:00
Javi Gallego 7018f09ad1 Merge pull request 'feat: refs #8298 add price optimum input and update translations for bonus and price optimum' (!1185) from 8298-zonePriceOptimum into dev 
Reviewed-on: verdnatura/salix-front#1185
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 08:41:49 +00:00
Jose Antonio Tubau 1af67db644 refactor: refs #8316 move order localization 2025-01-13 08:37:01 +01:00
Jon Elias f229ef1cd8 Merge branch 'dev' into 8225-UseSameMoreOptions 2025-01-13 07:35:38 +00:00
Jon Elias 413d567ffb refactor: refs #8225 requested changes 2025-01-13 08:34:32 +01:00
PAU ROVIRA ROSALENY 5bd72c830d Merge branch '7087-testCardSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 7087-testCardSummary 2025-01-13 08:11:46 +01:00
PAU ROVIRA ROSALENY 1295f394f3 feat: refs #7087 added more test cases 2025-01-13 08:11:41 +01:00
Pablo Natek fb5d76737d feat: add decimal places for longitude and latitude inputs in CustomerAddressEdit 2025-01-13 08:01:05 +01:00
Jose Antonio Tubau bd66d3aee5 Merge branch 'dev' into 8316-entryCardWithVnCardBeta 2025-01-13 06:45:26 +00:00
Jose Antonio Tubau a8706b3daa Merge branch 'dev' into 8316-claimCardWithVnCardBeta 2025-01-13 06:34:35 +00:00
Jose Antonio Tubau 7be5f9633b feat: refs #8316 add entryFilter prop to VnTable component in EntryList 2025-01-10 15:24:40 +01:00
Jose Antonio Tubau c896b66a50 feat: refs #8316 add entryFilter to VnTableEntryList component 2025-01-10 15:24:09 +01:00
PAU ROVIRA ROSALENY 6a01c9b746 Merge branch 'dev' into 7055-testFilterItemForm 2025-01-10 13:54:08 +00:00
PAU ROVIRA ROSALENY e8105f312f Merge branch 'dev' into 7087-testCardSummary 2025-01-10 13:08:58 +00:00
PAU ROVIRA ROSALENY bb6fae5d08 feat: refs #7087 created CardSummary test 2025-01-10 14:08:25 +01:00
Alex Moreno a28d9280a4 Merge branch 'dev' into 8372-workerPBX 2025-01-10 12:38:01 +00:00
PAU ROVIRA ROSALENY 47168cdeb8 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-10 10:53:10 +00:00
Jon Elias 57c538c9c9 fix: refs #8225 invoice in translations 2025-01-10 10:49:07 +01:00
Jon Elias ac1515e107 feat: refs #8225 added worker and zone modules 2025-01-10 10:27:03 +01:00
Jon Elias 69bcab0ec4 feat: refs #8225 added invoiceIn and travel module 2025-01-10 10:25:16 +01:00
Jon Elias 300d64b076 feat: refs #8225 added entry module and fixed translations 2025-01-10 10:22:37 +01:00
Jon Elias 774c714755 feat: refs #8225 added route and shelving module 2025-01-10 10:14:56 +01:00
Jon Elias 5d9227723e feat: refs #8225 added account and invoiceOut modules 2025-01-10 10:10:16 +01:00
Jon Elias 1b986f4b4c feat: refs #8225 use it in claim, item and order modules 2025-01-10 10:03:51 +01:00
Jon Elias 95712728d6 feat: refs #8225 added moreOptions and use it in customer and ticket summary 2025-01-10 10:00:42 +01:00
PAU ROVIRA ROSALENY f834f3b754 feat: refs #8258 added button to pass to uppercase 2025-01-10 07:52:22 +01:00
PAU ROVIRA ROSALENY 3148461dc1 Merge branch 'dev' of https: refs #8258//gitea.verdnatura.es/verdnatura/salix-front into 8258-uppercaseInputs 2025-01-10 07:44:02 +01:00
PAU ROVIRA ROSALENY 27aa2969e8 fix: fixed InvoiceIn filter translations 2025-01-10 07:34:29 +01:00
Robert Ferrús 0057932bfa feat: refs #8372 workerPBX 2025-01-09 14:46:53 +01:00
Carlos Satorres 2837d2e5af Merge branch 'master' into hotfix-7283itemRequestConfirm 2025-01-09 11:51:37 +00:00
Alex Moreno 288919f695 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-09 10:11:56 +01:00
Alex Moreno 3a7f46856a Merge branch 'master' into 8264-hotFix_globalInvoicing_paralellism 2025-01-09 09:10:19 +00:00
PAU ROVIRA ROSALENY 343c1b538a Merge branch 'dev' into 8322-workerDepartment 2025-01-09 09:01:42 +00:00
Alex Moreno c95d2d7eac Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-09 09:54:26 +01:00
Alex Moreno e36e9b5617 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-09 09:54:15 +01:00
Carlos Satorres 135266a300 Merge branch 'master' into hotfix-7283itemRequestConfirm 2025-01-09 08:54:09 +00:00
Alex Moreno a317006cc4 fix: refs #8316 ref="claimFilterRef" 2025-01-09 09:52:44 +01:00
Carlos Satorres 5882ee8463 fix: fix confirmRequest 2025-01-09 09:44:37 +01:00
PAU ROVIRA ROSALENY e9ea70de19 fix: removed unused searchbar 2025-01-09 08:03:59 +00:00
Alex Moreno f668a4bac4 Merge branch 'test' into perf_redirectTransition 2025-01-09 08:00:57 +00:00
Alex Moreno 3f167ffd3a fix: hotFix if not date return null/undefined 2025-01-09 09:00:29 +01:00
Javi Gallego bd09090e11 fix: update button sizes in ExtraCommunity.vue for better visibility 2025-01-09 08:47:18 +01:00
Alex Moreno a54483f9a5 Merge branch 'test' into perf_redirectTransition 2025-01-09 07:30:37 +00:00
Alex Moreno b28873c67d perf: simplify if 2025-01-09 08:30:23 +01:00
PAU ROVIRA ROSALENY 92a130b5db Merge branch 'dev' into 7055-testFilterItemForm 2025-01-09 07:25:36 +00:00
PAU ROVIRA ROSALENY b466dfe034 feat: refs #7055 added new test case 2025-01-09 08:25:23 +01:00
Alex Moreno 2505061b8c perf: simplify if 2025-01-09 08:06:35 +01:00
Carlos Satorres 93c059cdde Merge branch 'dev' into 7076-createTestVnInputDate 2025-01-09 07:04:56 +00:00
Carlos Satorres 5e31b93675 fix: modelName 2025-01-09 08:00:30 +01:00
Jose Antonio Tubau f8a0940eba test: refs #7076 added new test for VnInputDate 2025-01-09 07:59:43 +01:00
Alex Moreno 6d1478f703 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-09 07:59:34 +01:00
Alex Moreno b563eda782 Merge branch '8264-hotFix_globalInvoicing_paralellism' of https://gitea.verdnatura.es/verdnatura/salix-front into 8264-hotFix_globalInvoicing_paralellism 2025-01-09 07:56:00 +01:00
Alex Moreno 0c30a82440 fix(InvoiceOutGlobal): refs #8264 fix invoicing 2025-01-09 07:55:57 +01:00
PAU ROVIRA ROSALENY 58a4ef2ca8 Merge branch 'dev' into 7088-testFetchedTags 2025-01-09 06:00:13 +00:00
Alex Moreno 83d4997c89 Merge branch 'master' into 8264-hotFix_globalInvoicing_paralellism 2025-01-08 13:29:39 +00:00
Carlos Satorres ad8f58e3e1 Merge branch 'dev' into 7699-refactroViewPassword 2025-01-08 13:04:00 +00:00
Jon Elias 1c2f3e7c53 Merge branch 'dev' into Fix-VnTableFilterTranslations 2025-01-08 12:24:52 +00:00
PAU ROVIRA ROSALENY 149cca37ef Merge branch 'dev' into 7055-testFilterItemForm 2025-01-08 12:02:43 +00:00
Robert Ferrús 65b9da7b54 Merge branch 'master' into 8001-expeditionGrafanaHotFix 2025-01-08 12:02:23 +00:00
PAU ROVIRA ROSALENY 5dc14b8dc1 feat: refs #7055 created FilterItemForm test 2025-01-08 13:02:08 +01:00
Alex Moreno e693323166 fix: workerTimeControl state week colors 2025-01-08 12:57:15 +01:00
Robert Ferrús 1a72eda359 fix: refs #8001 change link grafana 2025-01-08 12:44:35 +01:00
Alex Moreno 3ba37d515a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-08 12:19:51 +01:00
Alex Moreno b889bfd178 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-08 12:19:38 +01:00
Alex Moreno 70f692ffd5 fix(WorkerTimeControl): fix isoYear 2025-01-08 12:19:27 +01:00
Javi Gallego 3e06f604bb feat: refs #8298 add price optimum input and update translations for bonus and price optimum 2025-01-08 10:32:15 +01:00
Carlos Satorres 96f8cab38c Merge branch 'dev' into 7699-refactroViewPassword 2025-01-08 08:27:54 +00:00
Pablo Natek d392e93efd Merge branch 'master' into 8348-exportDataOnCsv 2025-01-08 07:15:05 +00:00
PAU ROVIRA ROSALENY dfd7ba9379 feat: refs #8258 added uppercase option to VnInput 2025-01-08 08:14:37 +01:00
Jose Antonio Tubau 7f1684ddfc refactor: refs #8316 added entryFilter 2025-01-08 08:14:05 +01:00
PAU ROVIRA ROSALENY 03c23a133b Merge branch 'dev' into 7088-testFetchedTags 2025-01-08 07:12:02 +00:00
Jose Antonio Tubau 11642c075c refactor: refs #8316 added claimFilter 2025-01-08 08:10:00 +01:00
PAU ROVIRA ROSALENY 6499eeda01 Merge branch 'dev' into 7088-testFetchedTags 2025-01-08 06:40:29 +00:00
PAU ROVIRA ROSALENY 0d3b1130f9 fix: refs #7088 changed "vm.vm" to "vm" 2025-01-08 07:39:50 +01:00
Jon Elias ec40dc6171 Merge branch 'dev' of https: refs #8219//gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E 2025-01-08 07:15:52 +01:00
Jon Elias 39917e656e Merge branch 'dev' into Fix-VnTableFilterTranslations 2025-01-08 06:13:35 +00:00
Jon Elias f4b443f2b0 fix: translations 2025-01-08 07:11:26 +01:00
Jose Antonio Tubau cdcc3de917 Merge branch 'dev' into 8317-buttonsToRightOnItemFixedPrice 2025-01-08 06:08:44 +00:00
Jon Elias 57ce6d6ea3 Merge branch 'dev' into 8117-filtersAndValuesReviewed 2025-01-08 06:06:02 +00:00
Jose Antonio Tubau 79c7d66fe6 Merge branch 'dev' into 7100-createVnNotesSpec 2025-01-08 06:03:37 +00:00
Jose Antonio Tubau eb6121cbb5 Merge branch 'dev' into 8117-filtersAndValuesReviewed 2025-01-08 06:01:45 +00:00
Jose Antonio Tubau 6ce571a8ab Merge branch 'dev' into 8317-buttonsToRightOnItemFixedPrice 2025-01-08 05:59:56 +00:00
PAU ROVIRA ROSALENY f0889f158d Merge branch 'dev' into 7088-testFetchedTags 2025-01-08 05:56:57 +00:00
PAU ROVIRA ROSALENY 663a417a45 Merge branch 'dev' into 7078-testVnJsonValue 2025-01-08 05:03:46 +00:00
Jorge Penadés 08d20d3e7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges 2025-01-07 15:35:45 +01:00
Alex Moreno 5dcf77a226 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-07 15:05:44 +01:00
Alex Moreno 621d98b32b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-07 15:05:33 +01:00
Alex Moreno ebb4d36fda fix: refs #8264 parallelism 2025-01-07 15:04:45 +01:00
Jorge Penadés 8f418dcb4b style: refs #7957 update VnSearchbar padding for improved layout 2025-01-07 14:31:38 +01:00
Jorge Penadés b289ba3196 Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges 2025-01-07 14:11:44 +01:00
Jon Elias 33ba6d3142 Merge branch 'dev' into 8220-ItemsE2E 2025-01-07 12:48:26 +00:00
PAU ROVIRA ROSALENY 8e1f888134 Merge branch 'dev' into 8322-worker 2025-01-07 12:24:44 +00:00
Jon Elias ea89cf4062 Merge branch 'dev' into 8220-ItemsE2E 2025-01-07 12:22:32 +00:00
Jon Elias 548db113eb refactor: refs #8220 requested changes 2025-01-07 13:16:05 +01:00
Jon Elias 5de2805fa9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E 2025-01-07 13:13:12 +01:00
Alex Moreno 62cdc2b4f7 Merge branch 'dev' into 8322-worker 2025-01-07 12:02:22 +00:00
Alex Moreno 02973cc7d6 fix: refs #8322 unnecessary section 2025-01-07 13:02:04 +01:00
Alex Moreno 5440d94df2 chore: refs #8322 unnecessary prop 2025-01-07 13:00:42 +01:00
Alex Moreno 245530b542 refactor: refs #8322 set department inside worker 2025-01-07 13:00:00 +01:00
Jorge Penadés 73c133c62b fix: refs #7957 css 2025-01-07 12:26:05 +01:00
Jorge Penadés d925e3f8b4 fix: refs #7957 css 2025-01-07 12:24:32 +01:00
Jorge Penadés 7b9731a4c8 fix: refs #7957 css 2025-01-07 12:22:21 +01:00
Jorge Penadés 30bdf42f3f Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges 2025-01-07 12:16:39 +01:00
PAU ROVIRA ROSALENY 07222f9fb8 fix: refs #8338 removed chipLocale property/added more translations 2025-01-07 11:43:39 +01:00
Carlos Satorres 8c2f102414 Merge branch '7699-refactroViewPassword' of https://gitea.verdnatura.es/verdnatura/salix-front into 7699-refactroViewPassword 2025-01-07 11:18:19 +01:00
Carlos Satorres 3953721424 fix: refs #7699 fix component 2025-01-07 11:18:16 +01:00
Jorge Penadés da0e31b978 fix: refs #7323 update getAbsences to handle multiple years for absence data 2025-01-07 11:17:56 +01:00
PAU ROVIRA ROSALENY e8bad89008 Merge branch 'dev' into 8338-traduccionesVnTable 2025-01-07 09:42:16 +00:00
Jorge Penadés e0179d99d6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-hideCaption 2025-01-07 10:33:05 +01:00
Jorge Penadés 59c755329a fix: refs #7936 update VnSelect to conditionally render option caption 2025-01-07 10:29:37 +01:00
Jon Elias 04f1a805ab Merge branch 'dev' into Fix-EntrySummary 2025-01-07 09:24:00 +00:00
PAU ROVIRA ROSALENY e7f2d6ae7f Merge branch 'dev' into 8322-worker 2025-01-07 09:22:40 +00:00
Jon Elias 48ba567489 Merge branch 'dev' into Fix-IntegrationE2ETests 2025-01-07 09:09:35 +00:00
Jon Elias 2373404d90 Merge branch 'dev' into 7202-AddCustomAgentFkColumn2 2025-01-07 09:02:13 +00:00
Jorge Penadés 13d51bedc9 fix: refs #7936 disable option caption in EditTableCellValueForm 2025-01-07 10:00:29 +01:00
Jon Elias bc2b8fff0f Merge branch 'dev' into Fix-IntegrationE2ETests 2025-01-07 08:58:19 +00:00
Alex Moreno 1d92e84227 fix: claimList order 2025-01-07 09:51:36 +01:00
PAU ROVIRA ROSALENY 7eb62ce23c Merge branch 'dev' into 7088-testFetchedTags 2025-01-07 08:44:22 +00:00
PAU ROVIRA ROSALENY a14f3153b0 Merge branch 'dev' into 7078-testVnJsonValue 2025-01-07 08:44:05 +00:00
Alex Moreno ddc2f99efd Merge branch 'test' of https: refs #8356//gitea.verdnatura.es/verdnatura/salix-front into 8356-devToTest 2025-01-07 09:33:47 +01:00
Alex Moreno c645a8b4b6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-07 09:07:08 +01:00
Alex Moreno e46b4b0b97 fix: vnNotes filter & fix: itemFixedPrice order 2025-01-07 09:06:41 +01:00
Alex Moreno 97fee8d1d0 perf: order 2025-01-07 08:26:33 +01:00
Alex Moreno d8c3e6bce7 perf: revert processData 2025-01-07 08:24:37 +01:00