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

5782 Commits

Author SHA1 Message Date
Jon Elias 1b68d3c5ea Merge branch 'test' into Fix-WorkerCreateE2E 2024-11-19 13:16:41 +00:00
Jon Elias f43e974bbc fix: worker test e2e 2024-11-19 14:14:50 +01:00
Carlos Andrés 5da6e9b2ca Merge branch 'dev' of https: refs #8087//gitea.verdnatura.es/verdnatura/salix-front into 8087-nuevosCamposTravel 2024-11-19 14:04:13 +01:00
Pablo Natek fb5e38dc0b Merge branch 'dev' into 8138-add-component-ticketProblems 2024-11-19 12:54:49 +00:00
Pablo Natek 479c428edf Merge branch '8138-add-component-ticketProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into 8138-add-component-ticketProblems 2024-11-19 13:51:23 +01:00
Pablo Natek 3824f5d124 fix: refs #8138 move component from ui folder 2024-11-19 13:51:19 +01:00
Jon Elias 98017df57d fix: refs #8038 solve conflicts 2024-11-19 12:25:15 +01:00
Jon Elias cf6695f7ff Merge branch 'dev' of https: refs #8038//gitea.verdnatura.es/verdnatura/salix-front into 8038-ImproveAndCorrectVnTable 2024-11-19 12:22:15 +01:00
Robert Ferrús 8a1db719e3 fix(Supplier): change isSerious to isReal 2024-11-19 11:58:16 +01:00
Jorge Penadés 1faab668b1 fix: refs #7323 show advanced fields 2024-11-19 11:53:33 +01:00
Jorge Penadés 38ccf464b7 fix: refs #7323 locale #7396 2024-11-19 11:52:00 +01:00
Carlos Andrés 8c20b8736b feat: refs #8087 refs#8087 Redadas en travel 2024-11-19 11:10:37 +01:00
Jon Elias 5acce4d61d Merge branch 'dev' into 6999-AddTabToFilter 2024-11-19 09:21:10 +00:00
Alex Moreno 88d2384c35 Merge branch 'dev' of https: refs #8036//gitea.verdnatura.es/verdnatura/salix-front into 8036-arrayData_exprBuilder_after 2024-11-19 10:00:20 +01:00
Alex Moreno 5d58bb0c13 fix(VnPaginate): disable pagination 2024-11-19 09:47:59 +01:00
Alex Moreno e7b431e9ec fix(VnPaginate): disable pagination 2024-11-19 09:32:35 +01:00
Javi Gallego 9c271eee08 Merge pull request '#7346 manualInvoice' (!793) from 7346-manualInvoice into dev 
Reviewed-on: verdnatura/salix-front#793
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-19 07:10:06 +00:00
Pablo Natek 6ab31fa2d2 Merge branch 'dev' into 8138-add-component-ticketProblems 2024-11-19 07:02:32 +00:00
Pablo Natek f999760205 fix: refs #8138 sme minor issues 2024-11-19 07:59:45 +01:00
Pablo Natek e119bf5bfc feat: refs #8138 add component ticket problems 2024-11-19 07:59:14 +01:00
Alex Moreno afaf2df2ee Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-19 07:56:04 +01:00
Javi Gallego 7d2f4bcf44 Merge branch 'dev' into 7346-manualInvoice 2024-11-18 15:46:08 +01:00
Alex Moreno c2db7be8cd fix(orderCatalogFilter): fix searchByTag 2024-11-18 15:06:09 +01:00
William Buezas 28bfda869a refactor: refs #8162 remove comment 2024-11-18 10:47:57 -03:00
Alex Moreno 00fdbfa2e4 fix(OrderCatalogFilter): hotFix use search-url="params" 2024-11-18 13:41:54 +01:00
Alex Moreno f3ca51aab4 Merge branch 'master' into hotfix-orderTickets 2024-11-18 12:30:22 +00:00
Carlos Satorres d3993442b6 fix: hotfix OrderTickets 2024-11-18 13:26:27 +01:00
Javier Segarra 2f06eea8ea Merge branch 'dev' into 8162-E2ETickets 2024-11-18 12:03:10 +00:00
Jon Elias 0c0b9ca648 fix: changed route.query 2024-11-18 12:27:07 +01:00
Alex Moreno dd490888cf merge test in dev 2024-11-18 11:23:36 +01:00
Alex Moreno 5b4299114b Merge branch 'master' into hotFix_ticketSummary_add_ticketDescriptorMenu 2024-11-18 10:00:54 +00:00
Javier Segarra f52095a2fc Merge branch 'test' into solveConflicts_test_to_dev 2024-11-18 10:57:49 +01:00
Alex Moreno 383f51c1b2 refactor(TicketDescritporMenu): url isEditable 2024-11-18 10:57:26 +01:00
Javier Segarra 0c36d385ec Merge branch 'test' into solveConflicts_test_to_dev 2024-11-18 10:50:42 +01:00
Alex Moreno 09aad5914f feat(TicketSummary): add ticketDescritporMenu 2024-11-18 10:49:30 +01:00
Javier Segarra 9ea9239250 fix: customerSummary balanceDue label value 2024-11-18 10:41:25 +01:00
Alex Moreno b74c1d1823 Merge branch 'master' into hotFix_ticketBasicData_getLanded_getShipped 2024-11-18 09:12:28 +00:00
Alex Moreno 149f92bc93 Merge branch 'master' into hotFix_arrayData_store_data 2024-11-18 09:08:37 +00:00
Alex Moreno a50b22bb2a Merge branch 'master' into hotFix_ticketBasicData_getLanded_getShipped 2024-11-18 09:08:29 +00:00
Alex Moreno 48513868b1 Merge branch 'master' into hotFix_arrayData_store_data 2024-11-18 09:04:21 +00:00
Jon Elias a64575c7cc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneLocationsTree 2024-11-18 09:48:02 +01:00
Jon Elias 452ba788c9 fix: how only the correct path of the search 2024-11-18 09:46:34 +01:00
Alex Moreno e230cc61a0 fix(TicketBasicData): getShipped, getLanded & bad try catch 2024-11-18 09:18:06 +01:00
Jon Elias 3d8aa3cff9 Merge branch 'dev' into 8185-DuplicateLeftMenu 2024-11-18 06:21:42 +00:00
Jon Elias 2bc219a09b refactor: refs #8185 modified LeftMenu to avoid duplicates 2024-11-18 06:59:09 +01:00
William Buezas d8c1bd5b16 test: refs #8162 more tests 2024-11-17 15:24:46 -03:00
Javier Segarra 5e5d2f3c42 fix: #7671 apply sort-by itemFk and name 2024-11-17 13:44:44 +00:00
Javier Segarra 8e37d22164 test: refs #8061 #8061 CreateNewPostcodeForm 2024-11-17 14:22:42 +01:00
Javier Segarra 69e6f0f467 test: refs #8061 #8061 CreateNewPostcodeForm 2024-11-17 12:57:35 +01:00
Javier Segarra 69a2eae542 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8061_newCP 2024-11-16 14:31:58 +01:00
Jon Elias 1dc2f54f61 Merge branch 'master' into Hotfix-SalesMana 2024-11-15 13:31:53 +00:00
Javier Segarra 2e2a118627 Merge branch 'master' into hotFix_AddressObservation_crud 2024-11-15 12:55:08 +00:00
Javier Segarra 5916923521 fix: Redirect to catalog when create new order 2024-11-15 12:51:25 +00:00
Javier Segarra 54a34e8034 fix: Redirect to catalog when create new order 2024-11-15 12:33:56 +00:00
Javier Segarra 064dbfc432 fix: #6943 Update AddressObservations 2024-11-15 12:20:50 +00:00
Jon Elias 89661397fb Merge branch 'master' into Hotfix-TicketList 2024-11-15 11:09:20 +00:00
Carlos Satorres 95291d4d4e Merge branch 'dev' into 7310-warningTravelTermographs 2024-11-15 11:06:03 +00:00
Jon Elias 1fc2ae0689 Merge branch 'master' into Hotfix-TicketList 2024-11-15 10:53:53 +00:00
Jon Elias eb287696fa fix: fixed state column in ticket list 2024-11-15 11:49:46 +01:00
Javier Segarra e64ea2db19 feat: #6943 CustomerList salesPerson 2024-11-15 11:48:19 +01:00
Javier Segarra 4d8432feb5 revert: #6943 address star feature 2024-11-15 11:46:55 +01:00
Javier Segarra bdd36f6ba1 Merge branch 'master' into hotfix-customerDescriptor_actions 2024-11-15 11:44:41 +01:00
Javier Segarra c465c9b2c7 Merge branch 'master' into hotfix-customerDescriptor_actions 2024-11-15 11:41:28 +01:00
Javier Segarra 87ba74bcfc perf: #6943 Create ticket from client 2024-11-15 11:39:43 +01:00
Javier Segarra 8e52bd0688 perf: #6943 improve OrderList 2024-11-15 11:37:27 +01:00
Javier Segarra 2891e1363a feat: #6943 CustomerDescriptor actions 2024-11-15 11:36:20 +01:00
Javier Segarra d3f538e37c perf: previous commit 2024-11-15 10:27:37 +00:00
Javier Segarra d52a0fdc7f fix: customer Risk icon color 2024-11-15 10:23:57 +00:00
Alex Moreno 0e93766670 Merge branch 'dev' into 7136-vnSelect_paginate_simplify_2 2024-11-15 10:23:55 +00:00
Javier Segarra 703aaa1f38 feat: refs #8061 #8061 updates 2024-11-15 10:28:42 +01:00
Alex Moreno e19d11baa8 Merge branch 'master' into hotFix_arrayData_store_data 2024-11-15 08:21:27 +00:00
Alex Moreno f2b132db79 fix(VnPaginate): not start without data 2024-11-15 08:50:10 +01:00
Jon Elias 141cb32cae Merge branch 'master' into Hotfix-SalesMana 2024-11-15 07:23:59 +00:00
Jon Elias 354f2ce055 fix: deleted duplicate VnUsesMana 2024-11-15 08:21:29 +01:00
Guillermo Bonet c607fc5f61 Merge branch 'dev' into 7950-cmrModelUnify 2024-11-15 06:03:30 +00:00
Javier Segarra ca0d70933e Merge branch 'master' into hotfix_customer_salesPerson_Filter 2024-11-14 15:26:00 +00:00
Javier Segarra cb1c050343 fix: customerFilter sales person input 2024-11-14 16:18:22 +01:00
Javier Segarra 39e8f73d1b Merge branch 'dev' of https: refs #7136//gitea.verdnatura.es/verdnatura/salix-front into 7136-vnSelect_paginate_simplify_2 2024-11-14 16:05:08 +01:00
Jorge Penadés 8e0b098756 fix: refs #7874 add title 2024-11-14 16:01:09 +01:00
Jorge Penadés 59b40fed45 feat: refs #7874 improve vn-notes ui 2024-11-14 15:57:01 +01:00
Javier Segarra e6ba0c7c30 Merge branch 'master' into hotfix_termograph_filter 2024-11-14 14:56:30 +00:00
Alex Moreno 045a828bf9 fix(ZoneCard): fix ZoneLocations redirections 2024-11-14 13:59:04 +01:00
Jorge Penadés 7224860c5c feat: refs #6839 normalize search 2024-11-14 13:51:39 +01:00
Alex Moreno a929dec2ab fix(ZoneCard): fix ZoneLocations redirections 2024-11-14 13:42:46 +01:00
Javier Segarra c4cad9b7bb Merge branch 'master' into hotfix_termograph_filter 2024-11-14 12:27:57 +00:00
Javier Segarra 84414df487 Merge branch 'hotfix_termograph_filter' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_termograph_filter 2024-11-14 13:27:41 +01:00
Javier Segarra aa5eb005fd feat: #8192 remove expr-builder proposal 2024-11-14 13:27:38 +01:00
Javier Segarra 61cd8c49c6 Merge branch 'dev' into warmFix_customerDescriptorActions 2024-11-14 12:22:33 +00:00
Alex Moreno 925ff859cc fix(ZoneCard): fix ZoneLocations redirections 2024-11-14 13:01:56 +01:00
Javier Segarra 259f0e30af Merge branch 'master' into hotfix_termograph_filter 2024-11-14 11:59:33 +00:00
Javier Segarra faf307bc16 fix: #8192 find by thermographFk instead id 2024-11-14 12:59:18 +01:00
Alex Moreno 218d041000 fix(ZoneCard): fix ZoneLocations redirections 2024-11-14 12:58:41 +01:00
Javier Segarra 291e97e540 feat: #6943 use openURL quasar 2024-11-14 12:48:33 +01:00
Alex Moreno 55b4c07e80 fix(ZoneCard): fix ZoneLocations searchbar 2024-11-14 12:33:44 +01:00
Alex Moreno 73c6dcfdd1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-14 12:20:17 +01:00
Alex Moreno c65f15d0f0 fix(Zone): if route is null 2024-11-14 12:18:39 +01:00
Carlos Satorres 857136a866 Merge branch 'dev' into 7306-warningCustomerUnpaid 2024-11-14 11:08:37 +00:00
Javier Segarra ecf131ba78 feat: move buttons to DescriptorMenu 2024-11-14 12:06:12 +01:00
Javier Segarra 5af494e13c perf: refs #7346 #7346 use v-show instead v-if 2024-11-14 11:54:04 +01:00
Javier Segarra aa05b4b0cb perf: refs #7346 #7346 Imrpove interface dialog 2024-11-14 11:51:06 +01:00
Javier Segarra d284cec31a Merge branch '7346-manualInvoice' of https: refs #7346//gitea.verdnatura.es/verdnatura/salix-front into 7346-manualInvoice 2024-11-14 11:50:09 +01:00
Jorge Penadés 877497e8ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-useDefaultChannel 2024-11-14 11:29:58 +01:00
Jorge Penadés c4a4f7fcd6 refactor: refs #6818 change channel source 2024-11-14 11:20:16 +01:00
Carlos Satorres 5b444ef0f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7306-warningCustomerUnpaid 2024-11-14 10:54:22 +01:00
Javier Segarra 2bcd7061cb revert e57a253c6f 
revert Merge pull request '#7308 Remove console warnings' (!928) from 7308-warning_inject into dev

Reviewed-on: verdnatura/salix-front#928
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-14 09:50:00 +00:00
Javi Gallego c0ddc2c5b4 fix: refs #7346 traslations 2024-11-14 10:47:14 +01:00
Alex Moreno 94c7ee3ae3 fix: arrayData store shared 2024-11-14 10:36:42 +01:00
Javi Gallego 79ce2ad79e Merge branch 'dev' into 7346-manualInvoice 2024-11-14 09:22:18 +01:00
Carlos Satorres a115caac71 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7310-warningTravelTermographs 2024-11-14 08:34:56 +01:00
Jon Elias 8cfc2996d4 Merge branch 'dev' into 6999-AddTabToFilter 2024-11-14 07:32:07 +00:00
Jon Elias 7f4a73fd56 feat: refs #6999 added tab to search in VnTable filter 2024-11-14 08:30:55 +01:00
Javier Segarra 0fe5f6d54d Merge branch 'dev' into 7308-warning_inject 2024-11-14 07:20:28 +00:00
Javier Segarra 590d495dbd test: refs #7308 #7308 axios.spec.js 2024-11-14 08:19:41 +01:00
Javier Segarra ef415d080a feat: refs #7308 #7308 remove warnings related to useSession 2024-11-14 08:19:19 +01:00
Jon Elias f9ef50db02 Merge branch 'dev' into 7132-FixTranslations 2024-11-14 07:10:02 +00:00
Guillermo Bonet c2b6b816a4 fix: refs #7283 Account image resolution 2024-11-14 08:04:06 +01:00
Jon Elias bcb777d4bc Merge branch 'master' into Hotfix-CreateRequest 2024-11-13 13:18:00 +00:00
Jon Elias 540e0348a1 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations 2024-11-13 14:10:08 +01:00
Carlos Satorres 9e653b8c2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7310-warningTravelTermographs 2024-11-13 14:05:57 +01:00
Pablo Natek ddfea42c62 fix: add click stop on descriptorProxis 2024-11-13 13:51:37 +01:00
Jon Elias 75c33dabf1 Merge branch 'master' into Hotfix-CreateRequest 2024-11-13 12:41:40 +00:00
Jon Elias 244c23be1d fix: allow decimal numbers when creating a purchase request 2024-11-13 13:40:19 +01:00
Pablo Natek 1c5a02fe52 fix: customer last tickets 2024-11-13 13:17:15 +01:00
Pablo Natek bccfb161e6 Merge branch 'master' into 7404-fixFilterIsssues 2024-11-13 11:24:25 +00:00
Jorge Penadés b68868e103 feat: add city name 2024-11-13 12:11:15 +01:00
Jorge Penadés 9291c4dd6a feat: refs #6818 add icon 2024-11-13 11:50:08 +01:00
Pablo Natek 178753ddcc fix: add scope fields on filter 2024-11-13 10:11:14 +01:00
Pablo Natek 8eb76cd0fc fix: url name 2024-11-13 10:00:04 +01:00
Pablo Natek 81927c5af5 fix: zoneFilter 2024-11-13 09:58:41 +01:00
Jorge Penadés 96e9de519f Merge branch 'dev' into 6818-saySimpleIntegration 2024-11-13 08:22:44 +00:00
Pablo Natek 5c59ae8217 fix: refs #7404 some filter issues 2024-11-13 09:12:51 +01:00
Alex Moreno 9ac3316567 Merge branch 'dev' into 8087-nuevosCamposTravel 2024-11-13 07:56:33 +00:00
Alex Moreno 6f1e6a3bfa Merge branch 'dev' into 8036-arrayData_exprBuilder_after 2024-11-13 06:22:52 +00:00
Alex Moreno 2ae9d68fec Merge branch 'dev' into warmFix_order_equalSalix 2024-11-13 06:21:59 +00:00
Alex Moreno 8269037faa chore: perf 2024-11-13 07:21:42 +01:00
Guillermo Bonet 8db3ab4d47 Merge branch 'dev' into 7950-cmrModelUnify 2024-11-13 06:13:23 +00:00
Jorge Penadés 4572817699 feat: refs #8087 reactive data 2024-11-12 16:37:59 +01:00
Carlos Andrés b460a0be2f Merge branch '8087-nuevosCamposTravel' of https://gitea.verdnatura.es/verdnatura/salix-front into 8087-nuevosCamposTravel 2024-11-12 16:27:41 +01:00
Carlos Andrés 18593cc3f9 feat: refs #8087 refs#8087 Redadas en travel 2024-11-12 16:27:40 +01:00
Jorge Penadés 83be57a0c4 chore: refs #6818 drop useless code & comment 2024-11-12 15:01:17 +01:00
Jorge Penadés e29cd38ae9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration 2024-11-12 15:00:18 +01:00
Alex Moreno fc28639556 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-12 14:40:42 +01:00
Alex Moreno 3f15c3cce0 feat(VnSelect): order data equal salix 2024-11-12 14:35:55 +01:00
Jorge Penadés 90f04cc010 Merge branch 'dev' into 6919-reactiveDescriptor 2024-11-12 12:36:48 +00:00
Jorge Penadés 18f544f8dc fix: refs #7354 redirect to ticket 2024-11-12 13:23:28 +01:00
Jorge Penadés db8340bde5 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354-hotfix-zipFilter 2024-11-12 12:51:09 +01:00
Alex Moreno 26af102804 fix(CreateThermographForm): remove limit 2024-11-12 12:47:30 +01:00
Jorge Penadés 2afddeb063 fix: refs #7354 zip filter 2024-11-12 12:41:10 +01:00
Javier Segarra a7d53fcbe6 Merge branch 'dev' into fix/OrderCatalog 2024-11-12 11:30:36 +00:00
Javier Segarra 2139b7e8e8 Merge branch 'master' into hotFix-customer_sms 2024-11-12 11:12:46 +00:00