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

2586 Commits

Author SHA1 Message Date
Jorge Penadés a467c44b91 feat: refs #6818 saysimple integration 2024-11-08 11:51:13 +01:00
Javier Segarra e8312701f4 Merge branch 'master' into hotfix_itemFixedPrice 2024-11-08 09:03:30 +01:00
Javier Segarra ead326c66b Merge branch 'improve_isRequired_input' of https://gitea.verdnatura.es/verdnatura/salix-front into improve_isRequired_input 2024-11-08 08:39:29 +01:00
Javier Segarra 0a5c3bfe5b Merge branch 'dev' into improve_isRequired_input 2024-11-08 07:29:54 +00:00
Javier Segarra 96d68ed106 Merge branch 'dev' into fix/OrderCatalog 2024-11-08 06:59:26 +00:00
Carlos Satorres 04f6107909 fix: refs #7529 fix scss 2024-11-07 14:38:54 +01:00
Javier Segarra 489df51d64 Merge branch 'dev' into fix_customer_issues 2024-11-07 12:54:19 +01:00
Javier Segarra 2bf7fa46ca perf: remove appendParams 2024-11-07 12:53:17 +01:00
Alex Moreno abd7b76636 feat(VnInput): empty to null 2024-11-05 13:50:25 +01:00
Jorge Penadés ca9a7f2932 Merge branch 'dev' into 8078-enableMultiSelection 2024-11-05 10:18:46 +00:00
Jorge Penadés a542f69b0f Merge branch 'dev' of https: refs #8078//gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection 2024-11-05 10:02:09 +01:00
Alex Moreno e050a077d4 test: refactor e2e 2024-11-04 13:41:37 +01:00
Alex Moreno 08204aa5f0 refactor(InvoiceInBasicData): use VnDms 2024-11-04 13:02:39 +01:00
William Buezas d627c1f698 fix: order catalog 2024-11-03 10:29:03 -03:00
Javier Segarra 1761cc23e0 feat: use composable to unify logic 2024-10-30 08:29:04 +01:00
Javi Gallego 4e957ed8a7 feat: refs #7346 style radioButton 2024-10-29 17:23:45 +01:00
Javier Segarra 4de23c31b3 feat: use composable to unify logic 2024-10-29 15:01:49 +01:00
Alex Moreno f4bdefd4e7 Merge branch 'dev' into improve_isRequired_input 2024-10-29 13:13:59 +00:00
Alex Moreno bf4bee0f95 feat(VnSelect): refs #7136 add scroll 2024-10-29 14:07:34 +01:00
Jon Elias 282999c49e fix: refs #7206 deleted duplicate code 2024-10-29 13:23:15 +01:00
Jon Elias 8be4210138 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7206-ModifySelectAddress 2024-10-29 13:21:56 +01:00
Jon Elias 476ef1dedd feat: refs #7206 added inactive label and corrected minor errors 2024-10-29 13:14:42 +01:00
Jorge Penadés e39f85ff4b fix: refs #8078 improve handleSelection 2024-10-29 09:56:06 +01:00
Jorge Penadés 19a7e52605 fix: refs #8078 handleSelection 2024-10-29 09:39:56 +01:00
Jorge Penadés 77cb2d84be fix: refs #8078 handleSelection 2024-10-29 09:38:40 +01:00
Alex Moreno 42fbdff5bd test: fix e2e 2024-10-29 08:48:06 +01:00
Javier Segarra 4b00ab877c perf: use required instead :required="true" 2024-10-29 02:26:35 +01:00
Javier Segarra 0b2c404ab3 perf: minor bugs detected 2024-10-29 02:15:21 +01:00
Javier Segarra 0de4dfd4f8 feat: apply changes for customerModule 2024-10-29 02:15:02 +01:00
Jorge Penadés 1e16e3312e fix: refs #8078 improve cy command 2024-10-28 16:21:00 +01:00
Jorge Penadés 7e3e194b46 fix: refs #8078 e2e #7970 2024-10-28 16:19:13 +01:00
Jorge Penadés 5ef5285abc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection 2024-10-28 14:45:40 +01:00
Jorge Penadés 526b7d91de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection 2024-10-28 13:26:27 +01:00
Jon Elias ac3013205e Merge branch 'dev' into 7970-NotifySaleChanges 2024-10-28 11:46:02 +00:00
Jon Elias 3d4ca2bc67 refactor: refs #7970 added emit 2024-10-28 12:45:13 +01:00
Jon Elias e5a221d073 Merge branch '7970-NotifySaleChanges' of https://gitea.verdnatura.es/verdnatura/salix-front into 7970-NotifySaleChanges 2024-10-28 11:44:50 +01:00
Jon Elias 9347bb1ef5 refactor: refs #7970 refactored VnConfirm to emit events 2024-10-28 11:44:49 +01:00
Alex Moreno ffee9fb27c Merge branch 'dev' into fix_itemType-redirection 2024-10-28 09:14:21 +00:00
Alex Moreno bc8a87b267 chore: typo 2024-10-28 09:58:07 +01:00
Alex Moreno cca255507a fix: itemType redirection and fix filters 2024-10-28 09:57:25 +01:00
Jon Elias 454be43884 Merge branch 'dev' into 7970-NotifySaleChanges 2024-10-28 07:17:06 +00:00
Jon Elias ca6547e174 feat: refs #7970 notify changes 2024-10-28 07:48:11 +01:00
Jorge Penadés 0cc0e82aaa feat: refs #8078 add shortcut multi selection 2024-10-27 14:48:44 +01:00
Jorge Penadés 1da86900e6 fix: refs #7524 e2e & worker module 2024-10-27 13:43:38 +01:00
William Buezas 211da859bd fix: catalog view category and type filter 2024-10-25 08:57:16 -03:00
Alex Moreno c127fee467 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-25 13:08:37 +02:00
Alex Moreno c1e4c45318 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-25 13:08:26 +02:00
Alex Moreno 5b24aa4570 fix: performance addEventListeners 2024-10-25 12:58:23 +02:00
Alex Moreno e7d0ecf6bb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-25 10:40:57 +02:00
Jon Elias e13090bb3b feat: refs #8038 added new functionality in VnSelect and refactor styles 2024-10-25 07:01:58 +02:00
Alex Moreno 92e147355f fix: better performance 2024-10-24 15:13:05 +02:00
Javier Segarra 9a518ed990 Merge branch 'test' into warmfix_createNewPostcodeForm 2024-10-24 12:48:25 +00:00
Alex Moreno e739f42ddf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8036-arrayData_exprBuilder_after 2024-10-24 14:46:00 +02:00
Alex Moreno fd72f4dd45 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-24 14:45:34 +02:00
Alex Moreno 9daed096db Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-24 14:45:23 +02:00
Javier Segarra 26de0cf72f perf: remove limit 2024-10-24 12:39:49 +00:00
Javier Segarra 70dcadc57d Actualizar src/components/CreateNewPostcodeForm.vue 2024-10-24 11:52:13 +00:00
Jorge Penadés 823c354ef1 fix: refs #7524 vnProgressModal 2024-10-24 13:27:08 +02:00
Jorge Penadés f52b4c9a59 fix: refs #7524 vnProgressModal 2024-10-24 13:24:45 +02:00
Jorge Penadés 2779e7ac8d Merge branch 'test' of https: refs #7524//gitea.verdnatura.es/verdnatura/salix-front into 7524-warmfix-useVnTable 2024-10-24 10:29:55 +02:00
Jorge Penadés 6f57d9e490 refactor: refs #7524 use VnTable 2024-10-24 10:21:25 +02:00
Alex Moreno 99549c6787 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8036-arrayData_exprBuilder_after 2024-10-24 07:58:00 +02:00
Alex Moreno de7f55c589 Merge branch 'dev' of https: refs #8039//gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify 2024-10-24 07:56:00 +02:00
Alex Moreno d1e4017869 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-23 13:59:11 +02:00
Alex Moreno 2420c6dee2 Merge branch 'dev' of https: refs #8039//gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify 2024-10-23 13:14:30 +02:00
Alex Moreno 0528474250 chore: refs #8010 kebab-case 2024-10-23 13:13:00 +02:00
Jon Elias 03f2da8169 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations 2024-10-23 12:14:50 +02:00
Alex Moreno e7acdfd4f7 fix: refs #8010 footer class 2024-10-23 10:48:30 +02:00
Javi Gallego 1bf1844c8f fix: refs #7349 dependencia no usada 2024-10-23 07:46:52 +02:00
Alex Moreno aaf749db6c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-22 15:08:11 +02:00
Javi Gallego 2a94916bc2 feat: refs #7346 radioButton 2024-10-22 15:04:23 +02:00
Alex Moreno 81a55a9e7a chore: test gitea 2024-10-22 14:55:47 +02:00
Jorge Penadés f751408de2 feat: refs #8083 add change state btn 2024-10-22 13:22:43 +02:00
Alex Moreno a732ec05fb test: refs #8039 add hasNotify and, refactor: agencyWorkCenter test 2024-10-22 13:21:16 +02:00
Alex Moreno 9db1c4f721 fix: refs #8039 bad tests 2024-10-22 12:29:33 +02:00
Javi Gallego 69215851bb Merge branch 'dev' into 7346-manualInvoice 2024-10-21 14:01:18 +02:00
Jon Elias cd4b17048c Merge branch 'dev' into Fix-TicketsModule 2024-10-21 11:40:02 +00:00
Javier Segarra e5064e8a37 Merge branch 'dev' into 7679_improve_newPostcode_form 2024-10-21 11:17:01 +00:00
Jon Elias 1d41647022 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations 2024-10-21 12:57:32 +02:00
Jon Elias e5cd9d4b8f refactor: refs #7132 global translations files changed 2024-10-21 12:56:09 +02:00
Alex Moreno 0afcba0b07 Merge branch 'dev' into 6233-fix_ticketBasicData_zone 2024-10-21 10:49:43 +00:00
Alex Moreno d221b8e3c4 chore: refs #7632 change requests 2024-10-21 12:04:20 +02:00
Alex Moreno f2147311d3 fix(TicketBasicData_zone): refs #6233 add acls and fix get zones 2024-10-21 08:41:19 +02:00
Alex Moreno 0cc1090739 Merge branch 'dev' into 7632-axios_isLoading 2024-10-21 06:23:05 +00:00
Alex Moreno 8381a25017 fix: refs #8036 apply exprBuilder after save filters 2024-10-18 13:46:34 +02:00
Jon Elias 11092866b8 fix: merge conflicts 2024-10-18 13:33:28 +02:00
Jon Elias 89cb9aacec refactor: refs #7132 1st wave of changes in global translations files 2024-10-18 12:54:21 +02:00
Alex Moreno 175ebbc343 feat(navBar): refs #7632 isLoading 2024-10-18 11:03:43 +02:00
Jorge Penadés 0c2d9e6ec6 fix: refs #7353 load on scroll end 80% zoom 2024-10-18 10:08:46 +02:00
Jorge Penadés c42c811444 fix: refs #7353 load on scroll end 2024-10-17 17:39:49 +02:00
Carlos Satorres b82453582a fix: refs #7304 7304 clean warning 2024-10-17 07:44:31 +02:00
Javier Segarra 70ae50a5f1 Merge branch 'dev' into 7679_improve_newPostcode_form 2024-10-16 12:07:26 +00:00
Pablo Natek 7f1ae16270 fix: refs #8004 fix conflict 2024-10-16 06:20:41 +02:00
Jon Elias c4670b57de Merge branch 'dev' into 7825-FixCreatebankEntity 2024-10-15 11:13:35 +00:00
Jon Elias 15f171da0f perf: refs #7825 create bank entity 2024-10-15 13:12:37 +02:00
Alex Moreno 3bb5f66ce7 fix(claimNotes): refs #8093 $props.selectType && !newNote.observationTypeFk 2024-10-15 08:43:58 +02:00
Alex Moreno d87e8ec4ae Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-15 08:01:22 +02:00
Jorge Penadés 245c027357 chore: refs #7874 refactor imports 2024-10-14 15:43:59 +02:00
Jorge Penadés 0fb9b22935 chore: refs #7874 refactor code 2024-10-14 14:09:52 +02:00
Jorge Penadés 4ff3c18f33 feat: refs #7874 use badge type 2024-10-14 13:00:15 +02:00
Jorge Penadés 6f2187cb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType 2024-10-14 12:18:37 +02:00
Jorge Penadés 4b78c1acd0 fix: refs #7524 dynamic 2024-10-14 12:00:05 +02:00
Javier Segarra 0fae36c239 Merge branch 'dev' into 7679_improve_newPostcode_form 2024-10-14 09:01:15 +00:00
Jorge Penadés fdbae5c0b5 Merge branch 'dev' into 8019-makeResponsiveInputs 2024-10-14 08:48:50 +00:00
Javier Segarra b6bce0c2f3 Merge branch 'dev' into 7679_improve_newPostcode_form 2024-10-14 09:27:56 +02:00
Pablo Natek df775ea594 feat: refs #8004 hide rightFilter 2024-10-14 08:49:01 +02:00
Pablo Natek b32c8dd9f0 fix: refs #8004 more list style issues 2024-10-13 11:20:51 +02:00
Pablo Natek 1ff7d55644 Merge branch 'dev' of https: refs #8004//gitea.verdnatura.es/verdnatura/salix-front into 8004-liliumStyleRemake 2024-10-11 11:44:54 +02:00
Pablo Natek e6756aebee fix: refs #8004 vnTable card with and add permanent labels 2024-10-11 11:39:28 +02:00
Pablo Natek 5ac59840a2 refactor: refs #8004 remove consoleLogs 2024-10-11 11:03:36 +02:00
Pablo Natek 321b8dd9f9 fix: refs #8004 some style issues on all list 2024-10-11 11:01:58 +02:00
Jorge Penadés 50042ed45b feat: refs #7874 prevent submit if empty fields 2024-10-10 16:49:41 +02:00
Jorge Penadés 6d674f2a2b Merge branch 'dev' into 7874-addObservationType 2024-10-10 13:41:01 +00:00
Javier Segarra 3dfb836f8e revert: rollback compress spacestyle 2024-10-10 13:56:11 +02:00
Jorge Penadés 830decb6db Merge branch 'dev' into 7874-addObservationType 2024-10-10 08:16:36 +00:00
Jon Elias 2dd3e09928 refactor: requested changes 2024-10-10 08:26:16 +02:00
Javier Segarra 801b6585e8 perf: refs #7679 change limit value 2024-10-09 00:44:54 +02:00
Javier Segarra 9edf35fba2 Merge branch 'dev' into 7679_improve_newPostcode_form 2024-10-08 20:27:04 +00:00
Alex Moreno b6778aaf17 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-08 12:24:39 +02:00
Alex Moreno bde739e7ef Merge branch 'master' into hotFix_VnPaginate_offset 2024-10-08 06:50:16 +00:00
Jorge Penadés 4344458bb0 feat: refs #8019 fine-tunning vnTime 2024-10-07 16:02:29 +02:00
Jorge Penadés c815066953 feat: refs #8019 fine-tunning vnDate 2024-10-07 15:55:18 +02:00
Javier Segarra 43da6ea1b8 Merge branch 'master' into hotfix_vnImg_zoom_resolution 2024-10-07 12:00:12 +00:00
Jorge Penadés d1b3e01d87 chore: refs #8019 refactor css scoped 2024-10-07 13:36:27 +02:00
Javier Segarra 0ed9fdd55d fix: refs VnImg zoom resolution missing property 2024-10-07 13:02:40 +02:00
Jorge Penadés d88fadca55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8019-makeResponsiveInputs 2024-10-07 11:47:39 +02:00
Jorge Penadés 5c5a359986 refactor: refs #8019 create VnTime 2024-10-07 09:38:39 +02:00
Jorge Penadés 947f913679 refactor: refs #8019 create VnDate 2024-10-07 09:25:06 +02:00
Alex Moreno b8407140f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-07 09:02:01 +02:00
Alex Moreno 426b7254d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-07 09:01:57 +02:00
Alex Moreno 34a40dd87c fix(VnPaginate): use default value 2024-10-07 08:24:53 +02:00
Javier Segarra 04b2a4d9ce perf: clean warnings 2024-10-05 00:31:41 +02:00
Jorge Penadés 9c5ce6dbfd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType 2024-10-04 13:50:31 +02:00
Jorge Penadés b735ccb3a0 Merge branch 'dev' of https: refs #7323//gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-10-04 13:37:55 +02:00
Jorge Penadés 67c2e284ba feat: refs #7702 ask old pass 2024-10-04 11:45:10 +02:00
Javier Segarra 1aab0abbcd Merge branch 'dev' into 7346-manualInvoice 2024-10-04 07:45:31 +00:00
Jorge Penadés cd20db637c fix: refs #7874 btn ui 2024-10-03 15:30:26 +02:00
Jorge Penadés e10088ed06 Merge branch 'dev' of https: refs #7702//gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword 2024-10-03 13:49:33 +02:00
Jorge Penadés 01dc25da8c refactor: refs #7874 create element if condition 2024-10-03 10:23:27 +02:00
Jorge Penadés a8c48789ca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType 2024-10-03 10:03:49 +02:00
Jorge Penadés 9b8e388525 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType 2024-10-03 09:49:04 +02:00
Pablo Natek 06fa5b13a4 Merge branch 'dev' into 7404-fixStyle 2024-10-03 07:47:52 +00:00
Javi Gallego 909244a658 Merge branch 'dev' into 7346-manualInvoice 2024-10-03 08:50:46 +02:00
Javi Gallego df64814c57 fix: hotfix refund invoice 2024-10-03 08:31:13 +02:00
Javi Gallego ed5cf137b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-03 08:29:29 +02:00
Javi Gallego b08a5e63e9 fix: inheritWarehouse 2024-10-03 08:29:26 +02:00
Javier Segarra fef875270e Merge branch 'dev' into 7679_improve_newPostcode_form 2024-10-02 22:08:13 +00:00
Javi Gallego 6d08875809 fix: icons 2024-10-02 15:37:05 +02:00
Javier Segarra 40f7ccf42b perf: refs #7404 #7679 improve create 2024-10-02 14:58:57 +02:00
Carlos Satorres ba3b2198b8 Merge branch 'dev' into warmFix-userListFixRole 2024-10-02 09:31:54 +00:00
Javier Segarra 692c649b8c perf: refs #7679 #7679 improve watch 2024-10-02 09:29:05 +02:00
Javier Segarra 2bd004f52b perf: refs #7679 add sortBy & limit whe retrieve Autonomies 2024-10-01 21:56:12 +02:00
Pablo Natek c0fd5a1c21 fix: refs #7404 fix style 2024-10-01 16:12:18 +02:00
Javier Segarra 1a697aa018 feat: refs #7679 #7679 add sortBy and limit 2024-10-01 15:02:42 +02:00
Javi Gallego c5eb3a4b00 Merge branch 'dev' into 7346-manualInvoice 2024-10-01 14:02:53 +02:00
Javi Gallego fc3a025047 feat: manualInvoice with address 2024-10-01 13:03:55 +02:00
Javier Segarra 6e4677848f Merge branch 'dev' into Fix-TicketSale 2024-10-01 09:53:34 +00:00
Javier Segarra 27b2d0232c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into fixConflicts_testToDev 2024-10-01 11:35:14 +02:00
Carlos Satorres e64e6eefe3 refs #7355 add role 2024-10-01 10:35:31 +02:00
Javier Segarra 8fa82c818d fix: remove limit 2024-10-01 10:04:56 +02:00
Javier Segarra d6efd21db6 style: remove space between value and label 2024-10-01 10:03:39 +02:00
Javier Segarra e9364f69d4 feat: #7679 show tooltips 2024-10-01 10:03:14 +02:00
Javier Segarra 778e6299ce fix: solve conflicts from test to dev 2024-10-01 08:57:04 +02:00
Javier Segarra 41acf0e1e2 feat: #7679 show country provinces 2024-10-01 00:24:34 +02:00
Javier Segarra 2302e22f11 fix: solve conflicts from master to test 2024-09-30 15:00:05 +02:00
Pablo Natek deb608cc96 Merge branch 'dev' into 7404-fixSomeStyleIssues 2024-09-30 12:26:37 +00:00
Javier Segarra 7001a707b9 Merge branch 'dev' into 8031_notify_dataSaved 2024-09-30 11:34:38 +00:00
Javier Segarra da78edb6d2 Merge branch '7404-fixSomeStyleIssues' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-fixSomeStyleIssues 2024-09-30 13:34:21 +02:00
Javier Segarra 2812e6f456 Merge branch 'master' into fix_8018 2024-09-30 11:13:20 +00:00
Javier Segarra cf509d608a Merge branch 'dev' into 8018_location_label 2024-09-30 10:53:33 +00:00
Javier Segarra b3c36e555f style: refs #7404 compress spaces 2024-09-30 12:50:23 +02:00
Javier Segarra b41026806f style: refs #7404 compress spaces 2024-09-30 12:48:05 +02:00
Javier Segarra cf67865b0b feat: refs #7404 updates 2024-09-30 11:53:54 +02:00
Javier Segarra 63d2b06b70 Merge branch 'dev' into 8031_notify_dataSaved 2024-09-30 08:23:12 +00:00
Pablo Natek 37d32a7934 Merge branch 'dev' into 7404-fixSomeStyleIssues 2024-09-30 08:14:44 +00:00
Pablo Natek 868e6a312f fix: refs #7404 class name 2024-09-30 10:04:00 +02:00
Pablo Natek cb0d3c5bca fix: refs #7404 sticky footer and transparent header for vnTable 2024-09-30 09:46:00 +02:00
Javier Segarra 8356be1ec0 fix: onDataSaved VnTable 
Habia un problema al usar this en entorno no local
 2024-09-27 18:10:43 +00:00
Javier Segarra 12a452d774 Merge branch 'dev' into 8031_notify_dataSaved 2024-09-27 18:02:24 +00:00
Javier Segarra bec50d6eed perf: refs #7679 #7679 comments 2024-09-27 19:54:01 +02:00
Javier Segarra 157370ec26 Merge branch 'dev' into 8018_location_label 2024-09-27 13:18:06 +02:00
Javier Segarra e06d567e3c test: refs #7679 #7679 remove comment 2024-09-27 10:35:39 +02:00
Jorge Penadés b541ce4e56 fix: split params 2024-09-27 09:59:18 +02:00
Javier Segarra d2067c633d feat: refs #7679 #7679 use country or province to retrieve cities 2024-09-26 23:38:22 +02:00
Jorge Penadés 71201f1007 feat: refs #7874 required fields banner 2024-09-26 17:19:05 +02:00
Jorge Penadés 11c135e8c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType 2024-09-26 16:01:40 +02:00
Jorge Penadés 353116a7a0 fix: split params 2024-09-26 15:49:12 +02:00
Jorge Penadés 14b7654db3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-26 15:16:32 +02:00
Javier Segarra 428c6966f2 Merge branch 'dev' into 8018_location_label 2024-09-26 14:48:47 +02:00
Javier Segarra a0b3e933a8 Merge branch 'dev' into 8031_notify_dataSaved 2024-09-26 12:17:40 +00:00
Alex Moreno f00db79d47 fix(VnTable): header background-color 2024-09-26 14:14:27 +02:00
Jorge Penadés 478d4695b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-26 09:16:59 +02:00
Jorge Penadés 0cffe0b586 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType 2024-09-26 09:08:53 +02:00
Jorge Penadés 709a662ceb feat: refs #7874 select observation type 2024-09-26 09:08:12 +02:00
Pablo Natek 6e6b65771a Merge branch 'dev' into 7129-fixMigrationIssues 2024-09-26 06:09:21 +00:00
Pablo Natek c388d5ab2a Merge branch 'dev' of https: refs #7129//gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues 2024-09-26 07:57:59 +02:00
Javier Segarra 73c45b8c4a Merge branch 'dev' into 8031_notify_dataSaved 2024-09-25 12:08:40 +00:00
Javi Gallego eb0e18bf58 Merge branch 'dev' into 6722-thermograph 2024-09-25 13:48:12 +02:00
Javi Gallego bd2fa37450 feat: maxTemperature and minTemperature 2024-09-25 13:34:43 +02:00
Alex Moreno 8c13ceb3fe Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-25 13:28:13 +02:00
Alex Moreno 6bd2835c59 chore: refs #7155 typo 2024-09-25 13:18:26 +02:00
Alex Moreno 9a11f94922 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward_2 2024-09-25 13:17:34 +02:00
Alex Moreno 8dd2c44832 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-25 12:53:12 +02:00
Jorge Penadés d2996f0838 fix: refs #6943 prevent null 2024-09-25 12:23:41 +02:00
Javier Segarra 72ddeaa90a test: refs #8031 e2e 2024-09-25 10:53:38 +02:00
Javier Segarra 8c7ee3024f Merge branch 'dev' into 8031_notify_dataSaved 2024-09-25 09:12:17 +02:00
Pablo Natek 1ee3691cc0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues 2024-09-25 08:26:27 +02:00
Javier Segarra c1087614c6 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-25 05:50:22 +00:00
Jon Elias ff3ab83727 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-25 05:25:07 +00:00
Javier Segarra 2a64d9643e Merge branch 'dev' into vnInput_autoFocus 2024-09-24 20:16:56 +00:00
Alex Moreno d35b40a891 fix: vnTable color 2024-09-24 14:07:04 +02:00
Alex Moreno 991ad21c77 fix: refs #7155 remove userParams in watcher 2024-09-24 13:16:34 +02:00
Alex Moreno e555bd4cde Merge branch 'test' of https: refs #7155//gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward 2024-09-24 12:21:31 +02:00
Alex Moreno 3d34d9c6bb chore: refs #7155 remove console.log 2024-09-24 10:54:17 +02:00
Jon Elias 21f7613f21 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-24 08:36:57 +00:00
Jon Elias f34e81038e Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-24 10:36:02 +02:00
Jon Elias cd96003c0e refactor: refs #7553 requested changes and added keyup.enter 2024-09-24 10:35:59 +02:00
Jorge Penadés 3eb846b70c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-24 10:15:46 +02:00
Alex Moreno edb6e9ce61 feat(TravelList): add daysOnward 2024-09-24 09:57:05 +02:00
Alex Moreno b7ed63afc6 Merge branch 'dev' into 7404-fixFront 2024-09-24 06:18:42 +00:00
Alex Moreno 8760781660 fix: merge in dev 2024-09-24 08:15:44 +02:00
Alex Moreno 98a3b03be7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-24 07:48:58 +02:00
Pablo Natek 8124a341a0 feat: refs #7129 route extended list and simplify route list 2024-09-24 07:25:17 +02:00
Javier Segarra a5c6d628ca feat: enable notify positive when user update self data 2024-09-23 18:48:58 +00:00
Javier Segarra 55e017b0cc Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-23 18:39:09 +00:00
Javier Segarra 3ede256dc5 feat: change label because its more natural 2024-09-23 18:30:14 +00:00
Javier Segarra b4b31c0c92 fix: enable autofocus 2024-09-23 15:21:07 +02:00
Javier Segarra e9e2caee85 feat: autofocus after clear 2024-09-23 13:18:14 +00:00
Pablo Natek b04564d5a8 fix: refs #7404 style non center pop up 2024-09-23 13:23:25 +02:00
Pablo Natek e700f6f4a8 feat: refs #7404 style dynamic text color 2024-09-23 13:14:25 +02:00
Javier Segarra 7713e33c67 Merge branch 'dev' into 8018_location_label 2024-09-23 09:48:19 +00:00
Javier Segarra 013a76cbce test: VnLocation 2024-09-23 11:48:00 +02:00
Jorge Penadés 7bbad14f53 feat: refs #7323 delete btn 2024-09-23 11:38:27 +02:00
Jon Elias 0dd79ed708 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-23 08:22:21 +00:00
Jon Elias f025b4361e refactor: refs #7553 last requested changes 2024-09-23 10:21:30 +02:00
Jorge Penadés 37545b4cab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-23 09:29:26 +02:00
Javier Segarra 2a97f35dd9 Merge branch 'dev' into 6943_fix_customer_module 2024-09-21 01:32:45 +02:00
Jorge Penadés 6cc8ca6731 chore: refs #7702 add tests 2024-09-20 17:38:02 +02:00
Jorge Penadés fc23f9a8dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword 2024-09-20 16:22:48 +02:00
Jorge Penadés deff8a1cf4 feat: hide menus on small view 2024-09-20 13:58:26 +02:00
Javier Segarra b822c7722b feat: formatLocation when field is null 2024-09-20 13:45:43 +02:00
Javier Segarra 271e33a999 feat: formatLocation when field is null 2024-09-20 11:57:15 +02:00
Jorge Penadés ac6d98cd36 fix: refs #7353 horizontal scroll 2024-09-20 11:22:51 +02:00
Carlos Satorres 681c72a3d0 Merge branch 'master' into 6898-fixSupplier2 2024-09-20 07:31:21 +00:00
Carlos Satorres 45b5433206 refs #6898 fix filter 2024-09-20 09:14:11 +02:00
Jon Elias 2c15f79a2d Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-20 09:08:13 +02:00
Javier Segarra 88e2ea48c2 Merge branch 'dev' into 6943_fix_customer_module 2024-09-19 10:07:46 +00:00
Javier Segarra 8b379faa52 perf: imrpove exprBuilder 2024-09-19 12:06:00 +02:00
Javier Segarra 35e89591ff Merge branch 'dev' into fix_VnTable_infiniteScroll 2024-09-19 08:25:49 +00:00
Javier Segarra 46dbab4757 Merge branch 'dev' into 6943_fix_customer_module 2024-09-19 09:35:34 +02:00
Javier Segarra c21133ebd4 Merge branch 'dev' into 6943_fix_customer_module 2024-09-19 01:10:23 +02:00
Javier Segarra ccfe61d777 feat: vnSelect exprBuilder 2024-09-19 01:10:14 +02:00
Javier Segarra 1550d79160 feat: add shortcut more buttons 2024-09-19 00:10:28 +02:00
Javier Segarra 08bec59a37 add_circle 2024-09-19 00:04:58 +02:00
Javier Segarra b59e7174df Merge branch 'fix_VnTable_infiniteScroll' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_VnTable_infiniteScroll 2024-09-18 14:30:53 +02:00
Javier Segarra d76250f56f fix: reset VnTable scroll properties 2024-09-18 12:27:48 +00:00
Carlos Satorres 364ce63545 Merge branch 'dev' into 7155-scopeDays 2024-09-18 12:01:43 +00:00
Alex Moreno f86525e31d fix: not null variable 2024-09-18 13:24:21 +02:00
Alex Moreno 21a7fafba5 feat: create VnSelectEnum and add in AccountBasicData and ClaimBasicData 2024-09-18 09:57:21 +02:00
Jorge Penadés 5625ef4ce1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-18 09:41:26 +02:00
Jon Elias 07cd9d5aae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-18 08:42:59 +02:00
Alex Moreno fb1a94604b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-18 08:20:45 +02:00
Jorge Penadés 84cf3bea95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-17 16:02:15 +02:00
Carlos Satorres 4f662375cd fix(VnTable): sanitizer value is defined 2024-09-17 15:04:58 +02:00
Pablo Natek cead2c2b5e Merge branch 'dev' into 7404-stockBought 2024-09-17 11:40:42 +00:00
Pablo Natek e559ab43d7 fix: refs #7404 remove some style 2024-09-17 13:40:27 +02:00
Jorge Penadés 47de2caed7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-17 13:26:48 +02:00
Alex Moreno 3d1bb0c67a fix(itemDescriptor): fix redirection to itemDiary 2024-09-17 10:20:44 +02:00
Pablo Natek 7faa0c240f Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-17 10:10:40 +02:00
Javier Segarra e4adbfa9f7 Merge branch 'dev' into 7677_vnLocation_perf 2024-09-17 07:29:00 +00:00
Jorge Penadés da7d0326c0 fix: refs #7323 workerBalance & arrayData setUserParams 2024-09-16 17:12:48 +02:00
Alex Moreno b4cee6b02f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-16 14:24:22 +02:00
Pablo Natek 263dc29d7a fix: refs #7404 remove console.log 2024-09-16 12:19:03 +02:00
Jorge Penadés 9ec2fb4c77 feat: refs #7702 fine tunning 2024-09-16 10:36:56 +02:00
Alex Moreno 4c8238455f fix(ClaimList): fix summary 2024-09-16 10:03:12 +02:00
Alex Moreno 8c4e4a16af fix(VnSectionMain): add QPage 2024-09-16 09:19:08 +02:00
Pablo Natek c59c8127cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-16 08:59:46 +02:00
Pablo Natek deb30ee955 feat: refs #7404 travel m3 form 2024-09-16 08:59:36 +02:00
Javier Segarra 93488a5750 fix: styles 2024-09-13 23:19:16 +02:00
Javier Segarra b6cce74449 fix: merge conflicts 2024-09-13 23:11:18 +02:00
Javier Segarra 401400bdcf fix: remove FetchData 2024-09-13 22:52:26 +02:00
Javier Segarra ed5ba1dd1a Merge branch 'dev' into 7017_formModel_validations 2024-09-13 22:50:13 +02:00
Jorge Penadés 98cdeabe9f feat: refs #7702 vnChangePassword 2024-09-13 18:15:28 +02:00
Carlos Satorres 842fb9de5f refs #7155 scopeDays fix 2024-09-13 12:52:25 +02:00
Javier Segarra 5796bc9c0a fix: emit:updateModelValue 2024-09-13 10:32:40 +02:00
Javier Segarra 025436b4b8 Merge branch 'dev' into 7677_vnLocation_perf 2024-09-13 09:27:38 +02:00
Jon Elias 4a0b92eded Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-13 09:05:26 +02:00
Alex Moreno 0dbcc4be3d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-13 08:57:27 +02:00
Alex Moreno f731e4f1a6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-09-13 08:57:14 +02:00
Jon Elias eca4b02022 Merge branch 'dev' into 7500_ChangeEntryDms 2024-09-13 06:10:34 +00:00
Javier Segarra cfdfc7f531 fix: CustomerSamples 2024-09-12 13:19:37 +02:00
Jon Elias b8f6bc26ad Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms 2024-09-12 12:34:55 +02:00
Jon Elias d00a88a3f4 refactor: refs #7500 deleted useless code 2024-09-12 12:34:54 +02:00
Jon Elias be389c6736 Merge branch 'dev' into 7500_ChangeEntryDms 2024-09-12 10:32:47 +00:00
Jon Elias 35247007f0 Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms 2024-09-12 12:31:03 +02:00
Jon Elias e5056c45c0 fix: refs #7500 fixed showing images wrongly 2024-09-12 12:31:00 +02:00
Javier Segarra c22f8f1069 fix: stop call back event hasMoreData 2024-09-12 09:57:31 +00:00
Jon Elias 6a5f31ff1e fix: refs #7553 fixed conflicts 2024-09-12 10:14:38 +02:00
Javier Segarra 9941975683 fix: infiniteScroll 2024-09-12 08:07:53 +00:00
Alex Moreno d822bb6f20 fix(ClaimList): attenderFk filter 2024-09-12 09:12:36 +02:00
Pablo Natek e2dbe0fd38 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-12 09:09:21 +02:00
Alex Moreno 8bf7b729d4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-12 08:26:10 +02:00
Jon Elias 18fc5e241c fix: refs #7903 fixed ticket's search bar and keybinding tooltip 2024-09-11 14:07:31 +02:00
Javier Segarra 8d96539b24 perf: solve reload CardSummary component 2024-09-11 13:18:54 +02:00
Javier Segarra c3108b4335 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable 2024-09-11 12:48:38 +02:00
Jon Elias d1138529b2 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-11 10:26:52 +02:00
Jon Elias ff7bcfb00a refactor: refs #7553 modified ticket sale to create a row in the table 2024-09-11 10:16:42 +02:00
Jorge Penadés 2d5602e784 Merge branch 'dev' into 7663-setWeight 2024-09-11 07:40:36 +00:00
Jorge Penadés 49f90801a8 Merge branch 'test' into 6772-warmfix-fixE2e 2024-09-11 07:09:46 +00:00
Javier Segarra 19eb770893 feat: remove cli warnings 2024-09-11 08:41:16 +02:00
Alex Moreno 97da106522 hotFix: keyBinding toUpperCase if is null 2024-09-11 08:33:25 +02:00
Alex Moreno e7fb6a7963 hotFix: keyBinding toUpperCase if is null 2024-09-11 08:32:59 +02:00
Pablo Natek c7e717c611 feat: refs #7404 add travel m3 to reserves form 2024-09-11 07:55:12 +02:00
Javier Segarra b5dcc865e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable 2024-09-10 15:17:25 +02:00
Javier Segarra 622afca9be feat: CustomerSample to VnTable 2024-09-10 15:17:10 +02:00
Jorge Penadés a41143b410 chore: refs #6772 fix e2e 2024-09-10 14:43:35 +02:00
Jorge Penadés 77f2a4d825 fix: refs #6900 rollback 2024-09-10 14:36:44 +02:00
Jorge Penadés 070c9ca25f fix: refs #6900 e2e error 2024-09-10 14:17:59 +02:00
Javier Segarra bcfa67baec Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-09-10 12:26:17 +02:00
Jon Elias e7a89138ba fix: refs #7553 fix conflicts 2024-09-10 11:47:38 +02:00
Jorge Penadés f9adc49284 Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-10 09:41:34 +02:00
Jorge Penadés f7975069d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-10 08:59:01 +02:00
Alex Moreno 3164209bef Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-10 08:13:56 +02:00
Javier Segarra d347a81d74 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-10 05:19:02 +00:00
Jon Elias 4786a0e277 Merge branch 'dev' into 7889-KeyShortcuts 2024-09-10 04:45:24 +00:00
Javier Segarra 7e74123459 Merge branch '7671_dense_itemFixedPrices' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices 2024-09-10 00:18:12 +02:00
Javier Segarra 7358dab1d0 fix: call upsert when crudModel haschanges 2024-09-10 00:16:01 +02:00
Jorge Penadés f3471fe5ab fix: refs #4074 await to watch 2024-09-09 17:20:16 +02:00
Jorge Penadés 26c7dfde35 chore: refs #4074 fix tests 2024-09-09 16:44:43 +02:00
Javier Segarra b3f305a3fd Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-09 12:17:59 +00:00
Jorge Penadés ee62f85250 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-09 13:59:13 +02:00
Jon Elias 6248a4117d refactor: refs #7553 requested changes 2024-09-09 13:52:41 +02:00
Jorge Penadés ac421344d0 fix: refs #7909 add originFk 2024-09-09 13:41:04 +02:00
Jorge Penadés 803c02b80d fix: refs #7909 rollback scroll 2024-09-09 13:38:27 +02:00
Javi Gallego 7c22a5d0ac feat: fix refund parameters 2024-09-09 13:18:51 +02:00
Jorge Penadés 5ce3ef8bea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7909-hotfix-addScroll 2024-09-09 13:03:39 +02:00
Carlos Satorres 6c78fb1bee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor 2024-09-09 12:06:01 +02:00
Jorge Penadés c978cca8c5 refactor: refs #4074 useAcl in navigationStore & router 2024-09-09 11:35:49 +02:00
Jon Elias 0b961050a0 refactor: refs #7553 rollback ticket advance due to slot problems 2024-09-09 08:14:53 +02:00
Jon Elias 459551b16e Merge branch 'dev' into 7889-KeyShortcuts 2024-09-09 05:30:14 +00:00
Jon Elias b61e2a5c28 Merge branch 'dev' into 7500_ChangeEntryDms 2024-09-09 05:27:53 +00:00
Pablo Natek e083d6a802 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-08 07:54:26 +02:00
Javier Segarra 0c1cd47d38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices 2024-09-07 16:38:06 +02:00
Javier Segarra 31b8088b5f perf: improve ItemFixedPricefilterPanel 2024-09-06 14:41:38 +02:00
Jorge Penadés 86e1396da4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-06 14:23:04 +02:00
Javier Segarra a8057b47dc feat: updates 2024-09-06 14:06:30 +02:00
Jon Elias 4636e2f2e6 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-06 12:05:07 +00:00
Jorge Penadés 635cc94652 Merge branch 'dev' into 7323-fetchFromScope 2024-09-06 12:01:24 +00:00
Jon Elias 04f4521a59 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-06 12:00:41 +00:00
Jorge Penadés 34a9b4d4d0 Merge branch 'dev' of https: refs #4074//gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-06 13:23:02 +02:00
Javier Segarra 9bb298bbeb feat: handle create row 2024-09-06 13:14:46 +02:00
Jorge Penadés 2f7dd3c22e feat: refs #7847 remove reload fn 2024-09-06 12:49:33 +02:00
Jorge Penadés 64752bbace feat: refs #7847 remove reload btn 2024-09-06 12:44:20 +02:00
Jorge Penadés b13874e8a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-06 11:30:24 +02:00
Javier Segarra e592a76946 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices 2024-09-06 10:42:07 +02:00
Jon Elias ef98f60486 refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu 2024-09-06 10:30:32 +02:00
Jorge Penadés f0351b0417 chore: refs #7323 worker changes 2024-09-06 09:05:29 +02:00
Carlos Satorres d6d5039f48 Merge branch '7283-fixItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor 2024-09-06 07:50:42 +02:00
Carlos Satorres 6db1c8f083 fix traduction 2024-09-06 07:50:39 +02:00
Pablo Natek cd12343302 feat: refs #7404 add some style to the form and reorganize fields 2024-09-06 07:26:04 +02:00
Jon Elias 102f7fb13e Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-06 07:15:48 +02:00
Javier Segarra b3391ab522 perf: minor comments 2024-09-05 20:51:33 +02:00
Javier Segarra 31abd8b4c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable 2024-09-05 19:45:41 +02:00
Javier Segarra af91ca43e0 Merge branch 'dev' into 7283-fixItemDescriptor 2024-09-05 13:57:53 +00:00
Jon Elias 6321ed4ee2 Merge branch 'dev' into plus_key_shortcut 2024-09-05 11:08:52 +00:00
Jon Elias b6e14c4e6a fix: refs #7911 fixed shortcut and related files 2024-09-05 13:08:02 +02:00
Carlos Satorres c8d6a67011 fix tootltip 2024-09-05 12:49:17 +02:00
Carlos Satorres d4da8fc69f fix branch 2024-09-05 12:48:31 +02:00
Carlos Satorres 8fe6fad4a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor 2024-09-05 12:07:18 +02:00
Jon Elias 96cdb85258 Merge branch 'dev' of https: refs #7911//gitea.verdnatura.es/verdnatura/salix-front into 7911-plus_key_shortcut 2024-09-05 07:42:55 +02:00
Javi Gallego 91164da2eb feat: refuncInvoiceForm component 2024-09-04 18:16:40 +02:00
Javi Gallego 5d7e6be17c Merge branch 'dev' into 7277-RefundInvoices 2024-09-04 17:51:02 +02:00
Jorge Penadés af5e47ed3e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-04 16:06:31 +02:00
Pablo Natek 717bf1c3e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-04 14:40:53 +02:00
Pablo Natek 3dc720e2d0 feat: refs #7404 add m3 and fix detail 2024-09-04 14:40:36 +02:00
Jon Elias 65e3fd874d Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-04 14:15:58 +02:00
Jon Elias 4602f4c7b3 refactor: deleted useless prop 2024-09-04 12:25:05 +02:00
Jon Elias 1889aa85b5 refactor: refs #7553 deleted expedition code and slot in VnTable 2024-09-04 11:49:49 +02:00
Jorge Penadés 50cdb053f8 feat: refs #7663 fine tunning 2024-09-03 17:33:17 +02:00
Javi Gallego 5b53e9dc37 feat: transfer an invoice 2024-09-03 15:25:36 +02:00
Jorge Penadés 00beeaf51b feat: refs #6900 add tooltip 2024-09-03 14:37:24 +02:00
Jorge Penadés a5887114ef Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-hotfix-fineTunning 2024-09-03 12:50:35 +02:00
Pablo Natek 2fb974af0f Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-03 08:01:19 +02:00
Jon Elias 3d683c1da3 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-03 07:45:23 +02:00
Javier Segarra e9da8d44f0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7897_masterTest_24_36 2024-09-02 19:31:54 +02:00
Jorge Penadés b42385d7d6 refactor: refs #6900 create new expense form 2024-09-02 16:47:54 +02:00
Javier Segarra 9063f5e5a8 perf: change directive location 2024-09-02 15:26:06 +02:00
Javier Segarra c495698cac Merge branch 'dev' into plus_key_shortcut 2024-09-02 15:05:38 +02:00
Jon Elias 8ffbe400d5 refactor: refs #7354 modified VnInputTime 2024-09-02 14:21:58 +02:00
Jorge Penadés 136f9abeff chore: refs #6900 rollback 2024-09-02 13:39:13 +02:00
Jorge Penadés 8ea9742068 chore: refs #6900 rollback 2024-09-02 13:32:20 +02:00
Jorge Penadés f24daa4ebd feat: refs #6900 hide menu item 2024-09-02 13:15:06 +02:00
Jon Elias 1af4a559fc Merge branch 'dev' into 7354_ZoneMigration_End 2024-09-02 10:50:22 +00:00
Jon Elias 76a7f8a1b3 refactor: refs #7500 refactor vnimg when storage is dms 2024-09-02 12:09:48 +02:00
Jon Elias 5fc33cb4c3 Merge branch 'dev' of https: refs #7500//gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms 2024-09-02 11:33:10 +02:00
Javier Segarra 970c8473a2 fet: updates 2024-09-02 11:28:13 +02:00
Jon Elias 8bcecb91c6 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-02 11:25:11 +02:00
Javier Segarra fb15e90f0b Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-02 09:48:48 +02:00
Jorge Penadés a8fc5a8d73 Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-09-02 09:09:27 +02:00
Javier Segarra c25b689685 Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-08-31 00:14:42 +02:00