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

4689 Commits

Author SHA1 Message Date
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
Carlos Andrés 8c20b8736b feat: refs #8087 refs#8087 Redadas en travel 2024-11-19 11:10:37 +01:00
Carlos Satorres af7f7aa8f3 fix: refs #6389 fix filter trad 2024-11-19 10:54:51 +01:00
Jon Elias 5acce4d61d Merge branch 'dev' into 6999-AddTabToFilter 2024-11-19 09:21:10 +00:00
Alex Moreno e7b431e9ec fix(VnPaginate): disable pagination 2024-11-19 09:32:35 +01:00
Carlos Satorres 1844e15239 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6389-changesMonitor 2024-11-19 08:52:02 +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
Carlos Satorres 2be55ca81c fix: refs #7304 fix list 2024-11-19 08:01:00 +01: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
Carlos Satorres be89f003a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7304-warningCustomerBasicData 2024-11-19 06:46:31 +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
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
William Buezas d8c1bd5b16 test: refs #8162 more tests 2024-11-17 15:24:46 -03:00
Javier Segarra ff9ff45cbc Merge branch 'master' into hotfix_itemFixedPrice 2024-11-17 16:27:26 +01:00
Javier Segarra 5e5d2f3c42 fix: #7671 apply sort-by itemFk and name 2024-11-17 13:44:44 +00:00
Javier Segarra 28cbe8bf3f fix: #7671 apply order 2024-11-17 14:42:36 +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
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
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
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
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
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
Javi Gallego c0ddc2c5b4 fix: refs #7346 traslations 2024-11-14 10:47:14 +01:00
Carlos Satorres fd71c597e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7304-warningCustomerBasicData 2024-11-14 10:44:10 +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
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
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
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 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
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 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
Carlos Satorres fefa61ea5c fix: fix termo 2024-11-12 12:07:02 +01:00
Javier Segarra 6355993c14 fix: mobile is more relevant than phone 2024-11-12 11:00:05 +00:00
Carlos Andrés 4a0c15ed90 Merge branch 'dev' into 8087-nuevosCamposTravel 2024-11-12 10:24:06 +00:00
Jorge Penadés b4d7653661 refactor: refs #6919 export filter 2024-11-12 11:15:34 +01:00
Jorge Penadés efd66ea02a feat: refs #6919 sync entry data 2024-11-12 11:08:45 +01:00
Alex Moreno 700fb7481b fix(CustomerBalance): getClientRisk 2024-11-12 10:15:31 +01:00
Guillermo Bonet 40ecd6e358 refactor: refs #7950 Created cmr model 2024-11-12 08:28:02 +01:00
Alex Moreno 8c78991163 fix(EntryStockBought): min width 2024-11-12 08:23:49 +01:00
Javi Gallego 8e4931516a feat: refs #7346 traducciones en cammelCase 2024-11-12 07:42:55 +01:00
Javi Gallego 76e35cc758 feat: refs #7346 address ordered 2024-11-12 07:28:51 +01:00
William Buezas 4bfbd1925e test: refs #8162 ticket list e2e tests 2024-11-11 15:18:29 -03:00
Jorge Penadés 7f1a4d6cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration 2024-11-11 16:42:20 +01:00
Carlos Andrés e9fad1a44e feat: refs #8087 refs#8087 Redadas en travel 2024-11-11 15:00:07 +01:00
Carlos Andrés fc73149dcf feat: refs #8087 refs#8087 Redadas en travel 2024-11-11 14:20:39 +01:00
Alex Moreno 777ac58f04 feat(Supplier): add companySize 2024-11-11 10:31:41 +01:00
Javier Segarra 669186a43a revert: #7679 improve changes 2024-11-11 09:56:03 +01:00
William Buezas ade90afd03 refactor: change keyup.enter for update:model-value 2024-11-08 10:13:35 -03:00
William Buezas c1d623622d refactor: remove unused variable 2024-11-08 10:11:15 -03:00
Javier Segarra 3825dc3851 feat: disabled buttons 2024-11-08 11:54:04 +01:00
Jorge Penadés a467c44b91 feat: refs #6818 saysimple integration 2024-11-08 11:51:13 +01:00
Javier Segarra e5a0c42352 perf: remove comment 2024-11-08 09:17:02 +01:00
Javier Segarra e8312701f4 Merge branch 'master' into hotfix_itemFixedPrice 2024-11-08 09:03:30 +01:00
Javier Segarra 96d68ed106 Merge branch 'dev' into fix/OrderCatalog 2024-11-08 06:59:26 +00:00
William Buezas 8bff7fc1d6 fix: reset category 2024-11-07 21:09:39 -03:00
William Buezas 52a2250acc refactor: apply QPopupProxy 2024-11-07 19:16:06 -03:00
William Buezas 498a52a3e5 refactor: small change 2024-11-07 19:07:03 -03:00
Carlos Satorres 04f6107909 fix: refs #7529 fix scss 2024-11-07 14:38:54 +01:00
Javier Segarra e210ad7de4 Merge branch 'dev' into fix_customer_issues 2024-11-07 13:06:33 +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
Carlos Satorres 780af58747 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-11-07 12:48:26 +01:00
Alex Moreno 18cc3888e5 Merge branch 'dev' into warmFix_invoiceOut_Global 2024-11-07 09:42:09 +00:00
Alex Moreno cc236cac03 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-07 10:19:02 +01:00
Alex Moreno 6c9627c6c5 fix(worker): add searchurls 2024-11-06 17:51:21 +01:00
Alex Moreno 2b02c9fbd3 Merge branch 'dev' into warmFix_invoiceOut_Global 2024-11-06 12:54:18 +00:00
Alex Moreno a2bbf4474d fix(InvoiceOutGlobal): parallelism 2024-11-06 13:52:59 +01:00
Jorge Penadés 9959fbf005 fix: refs #7273 use same filter 2024-11-05 12:23:11 +01:00
Jorge Penadés 4a95a0e39a chore: refs #7273 sticky add btn & refactor 2024-11-05 11:59:38 +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
Javi Gallego 4e957ed8a7 feat: refs #7346 style radioButton 2024-10-29 17:23:45 +01:00
Alex Moreno bf4bee0f95 feat(VnSelect): refs #7136 add scroll 2024-10-29 14:07:34 +01:00
Carlos Satorres 8b2fbefc35 fix: refs #7529 front 2024-10-29 14:00:04 +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
Jon Elias 9104e13a6d Merge branch 'dev' into Fix_OrderModuleProblems 2024-10-29 11:19:21 +00:00
Jon Elias 493e518339 feat: refs #6999 added search when user tabs on a filter with value 2024-10-29 12:15:40 +01:00
Jon Elias 1ff77abaf5 Merge branch 'dev' into Fix_OrderModuleProblems 2024-10-29 08:26:16 +00:00
Jon Elias 5663064dd8 refactor: modified composable 2024-10-29 09:23:49 +01:00
Carlos Satorres eea6276264 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-10-29 08:32:47 +01:00
Carlos Satorres 96f894cc6c fix: refs #7283 filter 2024-10-29 08:17:18 +01:00
Guillermo Bonet b8ecf40777 Merge branch 'dev' into 7266-buyLabelSupplier 2024-10-29 06:03:07 +00:00
Carlos Satorres adbf1af453 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-10-29 06:13:22 +01:00
Javier Segarra 0de4dfd4f8 feat: apply changes for customerModule 2024-10-29 02:15:02 +01:00
Carlos Andrés b8ba313132 Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!864) from 8087-nuevoCampoTravel into dev 
Reviewed-on: verdnatura/salix-front#864
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-28 13:29:05 +00:00
Guillermo Bonet 15977357d9 refactor: refs #7266 Changed method name 2024-10-28 14:11:34 +01:00
Jon Elias 76dd27638a Merge branch 'dev' into 7970-NotifySaleChanges 2024-10-28 12:40:47 +00:00
Carlos Satorres 847cf6a5b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-10-28 13:31:42 +01:00
Carlos Satorres d252f6d2a3 fix: refs #7283 fix preview 2024-10-28 13:22:33 +01:00
Carlos Satorres 965c2f7b20 fix: refs #7283 preview 2024-10-28 13:16:51 +01:00
Carlos Satorres f2803a6313 fix: refs #7283 item filters 2024-10-28 13:08:19 +01:00
Jon Elias c997081303 Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems 2024-10-28 12:59:26 +01:00
Jon Elias cab5a165d2 refactor: changed confirmOrder directory 2024-10-28 12:59:25 +01:00
Jon Elias ac3013205e Merge branch 'dev' into 7970-NotifySaleChanges 2024-10-28 11:46:02 +00:00
Jon Elias 639e08406e Merge branch 'dev' into Fix_OrderModuleProblems 2024-10-28 11:22:23 +00:00
Jon Elias ea05637bf2 Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems 2024-10-28 12:21:28 +01:00
Jon Elias 17b1921af6 feat: added composable to confirm orders 2024-10-28 12:21:26 +01:00
Jon Elias 18a71e63e1 Merge branch 'dev' into 7193-ParkingCreateScope 2024-10-28 09:41:08 +00:00
Jon Elias df1c123444 feat: refs #7193 modified parking to use the scope and corrected small errors 2024-10-28 10:39:45 +01:00
Alex Moreno ffee9fb27c Merge branch 'dev' into fix_itemType-redirection 2024-10-28 09:14:21 +00:00
Alex Moreno cca255507a fix: itemType redirection and fix filters 2024-10-28 09:57:25 +01:00
Carlos Satorres 8dd2c94b37 fix: refs #6389 packing 2024-10-28 09:01:00 +01:00
Jon Elias 454be43884 Merge branch 'dev' into 7970-NotifySaleChanges 2024-10-28 07:17:06 +00:00
Carlos Satorres c0c1d3e3a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6389-changesMonitor 2024-10-28 08:08:19 +01:00
Jon Elias ca6547e174 feat: refs #7970 notify changes 2024-10-28 07:48:11 +01:00
William Buezas c93f152060 fix: order catalog fixes 2024-10-27 15:27:53 -03:00
Jorge Penadés 1da86900e6 fix: refs #7524 e2e & worker module 2024-10-27 13:43:38 +01:00
Alex Moreno d14f2bd638 Merge branch 'dev' into 7006-itemTypeLog 2024-10-25 12:30:07 +00:00
Guillermo Bonet 494fc66c06 feat: refs #7006 itemType basic data new inputs 2024-10-25 14:14:51 +02:00
William Buezas 211da859bd fix: catalog view category and type filter 2024-10-25 08:57:16 -03:00
Guillermo Bonet 8edba36a74 feat: refs #7006 itemType basic data new inputs 2024-10-25 13:46:36 +02: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
Guillermo Bonet 57a3504a7f Merge branch 'dev' into 7006-itemTypeLog 2024-10-25 11:06:49 +00:00
Jorge Penadés cdb73f7a17 fix: refs #7943 use correct data-key 2024-10-25 11:50:20 +02:00
Jorge Penadés bb51a9e687 fix: refs #7943 use summary 2024-10-25 11:38:00 +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
Alex Moreno 100dfbec3e Merge branch 'dev' into 8087-nuevoCampoTravel 2024-10-25 08:14:09 +00:00
Carlos Andrés 9e57c5e452 feat: refs #8087 Traspasar redadas a travels 2024-10-25 10:13:09 +02:00
Carlos Andrés 4c1e4aedd2 feat: refs #8087 Traspasar redadas a travels 2024-10-25 10:03:09 +02:00
Jon Elias 139744d90b Merge branch 'test' into Fix-CustomerSummaryTable 2024-10-25 08:01:28 +00:00
Jon Elias 1daa8be635 perf: optimize get packing type function 2024-10-25 09:41:28 +02:00
Carlos Satorres 0cb5f34b15 Merge branch 'dev' into 7283-itemMigration 2024-10-25 07:08:16 +00:00
Carlos Satorres 69aec0cd83 Merge branch 'dev' into warmFix_accountAcls 2024-10-25 06:18:47 +00:00
Carlos Satorres e8d2a40daf fix: entryFilters 2024-10-25 08:11:31 +02:00
Jon Elias 1889dd02e4 Merge branch 'master' into Hotfix-RecalculatePriceReload 2024-10-25 04:49:34 +00:00
Jon Elias 9ba16e4116 Merge branch 'Hotfix-RecalculatePriceReload' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-RecalculatePriceReload 2024-10-25 06:48:11 +02:00
Jon Elias 994237260e refactor: changed name of emitted event 2024-10-25 06:48:09 +02:00
Carlos Andrés 12c236276d feat: refs #8087 Traspasar redadas a travels 2024-10-24 19:32:20 +02:00
Alex Moreno 92e147355f fix: better performance 2024-10-24 15:13:05 +02:00
Carlos Satorres 67a5d10a5e Merge branch 'dev' into 7283-itemMigration 2024-10-24 13:10:23 +00:00
Javier Segarra 855979d22d perf: refs #7283 #7283 i18n params 2024-10-24 14:59:14 +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
Jorge Penadés 4828e32c9e fix: refs #7652 datakey 2024-10-24 14:26:16 +02:00
Jon Elias 7a4e43a025 Merge branch 'master' into Hotfix-RecalculatePriceReload 2024-10-24 12:13:48 +00:00
Carlos Satorres 8cee3ac713 Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-24 14:08:14 +02:00
Carlos Satorres c2043902f8 fix: refs #7283 fix required 2024-10-24 14:08:11 +02:00
Carlos Satorres 92ff8c188e Merge branch 'dev' into 7283-itemMigration 2024-10-24 11:39:33 +00:00
Carlos Satorres 551b81e421 Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-24 13:38:16 +02:00
Carlos Satorres 671d9fd6fb fix: refs #7283 itemtype fix 2024-10-24 13:38:13 +02:00
Carlos Andrés 64f36c7d4b feat: refs #8087 Traspasar redadas a travels 2024-10-24 12:35:11 +02:00
Javier Segarra 3f640c650b perf: refs #7283 #7283 handle i18n 2024-10-24 12:32:15 +02:00
Jorge Penadés c9cfb2b1cf fix: refs #7524 changes 2024-10-24 12:29:46 +02:00
Jon Elias c9e82f2caf refactor: deleted log 2024-10-24 12:04:54 +02:00
Jon Elias b02199eb07 fix: reload window when price is recalculated 2024-10-24 12:03:49 +02:00
Jorge Penadés f1350dece5 fix: refs #7524 changes 2024-10-24 11:43:29 +02:00
Javier Segarra 87d2e0a39b perf: refs #7283 #7283 handle composable i18n 2024-10-24 10:36:48 +02:00
Javier Segarra 45e6d2011f Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-24 10:35:24 +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 d918b76010 chore: refs #7524 drop useless code 2024-10-24 10:24:28 +02:00
Jorge Penadés 6f57d9e490 refactor: refs #7524 use VnTable 2024-10-24 10:21:25 +02:00
Carlos Satorres fee51db30d Merge branch 'dev' of https: refs #6389//gitea.verdnatura.es/verdnatura/salix-front into 6389-changesMonitor 2024-10-24 08:09:09 +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 32b4636706 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-24 07:49:10 +02:00
Alex Moreno f26976b744 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-24 07:49:01 +02:00
Carlos Satorres 56ef811584 fix: refs #7283 order translation 2024-10-24 07:47:26 +02:00
Javier Segarra 1c8eabe293 perf: refs #7283 #7283 declare composable inst4ead code duplicated 2024-10-24 00:39:35 +02:00
Jorge Penadés 1bfede4a55 fix: refs #8083 drop useless code 2024-10-23 16:13:32 +02:00
Jorge Penadés 4e31566ddd fix: refs #8083 drop useless code 2024-10-23 16:13:04 +02:00
Jorge Penadés 33ee1ea01b fix: refs #8083 drop useless code 2024-10-23 16:11:58 +02:00
Jorge Penadés 126bb3f039 feat: refs #8083 insert 2024-10-23 16:10:14 +02:00
Jorge Penadés 9673f7be1e fix: refs #8083 update rightly 2024-10-23 15:17:06 +02:00
Carlos Satorres e8fd3c0a8f fix: refs #6389 fix front, filters, itp 2024-10-23 14:58:03 +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
Jon Elias 76ed5150a5 Merge branch 'dev' into Fix_OrderModuleProblems 2024-10-23 11:05:14 +00:00
Jon Elias 37b3affdbf refactor: revert catalog changes 2024-10-23 13:02:28 +02:00
Carlos Satorres d8b80cfa6d fix: refs #7283 fix pr 2024-10-23 12:30:04 +02:00
Carlos Satorres daf57c9b2b fix: refs #6389 front filters 2024-10-23 12:20:53 +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
Carlos Satorres d2da1e3544 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-23 09:54:25 +02:00
Carlos Satorres b40af0ce7b fix: refs #7283 fix pr 2024-10-23 09:49:48 +02:00
Jon Elias 4bde0dffa7 fix: fixed item packaging type field showing repetitive values 2024-10-23 09:17:14 +02:00
Carlos Satorres 84dae53d66 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-23 07:53:02 +02:00
Javi Gallego ae56c06628 feat: refs #7349 usa back con permisos 2024-10-23 07:45:00 +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
Carlos Satorres 861a507e10 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6389-changesMonitor 2024-10-22 14:52:10 +02:00
Jorge Penadés 033d6bddbe fix: refs #8083 move expeditions 2024-10-22 14:43:43 +02:00
Jorge Penadés da4c1e9c12 fix: refs #8083 add order 2024-10-22 14:36:30 +02:00
Jorge Penadés 9f3c834ce4 Merge branch 'master' of https: refs #8083//gitea.verdnatura.es/verdnatura/salix-front into 8083-hotfix-changeState 2024-10-22 14:24:41 +02:00
Jorge Penadés b1a511ff6f fix: refs #8083 delete btn & redirect 2024-10-22 14:21:03 +02:00
Alex Moreno dd2dc86eea fix: refs #8039 o not handle unnecessary errors 2024-10-22 14:05:15 +02:00
Alex Moreno cd00a3c67f test: refs #8039 fix WorkerNotification e2e 2024-10-22 13:55:35 +02:00
Alex Moreno 0c9c01b6e9 test: refs #8039 fix ZoneWarehouse e2e 2024-10-22 13:53:01 +02:00
Jorge Penadés f751408de2 feat: refs #8083 add change state btn 2024-10-22 13:22:43 +02:00
Javier Segarra 49c0d64c07 fix: refs #7283 #7283 ItemSummary bugs 2024-10-22 12:13:43 +02:00
Javier Segarra fff3310658 fix: refs #7283 tooltips !Item 2024-10-22 12:09:32 +02:00
Javier Segarra d6b8d41b6c fix: refs #7283 #7283 ItemSummary bugs 2024-10-22 12:09:19 +02:00
Jon Elias 1346a2e7fd fix: tag chips 2024-10-22 12:05:44 +02:00
Javier Segarra f3a6209189 fix: refs #7283 #7283 bugs 2024-10-22 12:00:11 +02:00
Jon Elias 5b116a7301 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems 2024-10-22 11:31:45 +02:00
Alex Moreno 36221121f5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-22 07:43:07 +02:00
Alex Moreno b4d4844100 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-22 07:42:54 +02:00
Jorge Penadés 0fbd5f45e1 fix: refs #7524 select department 2024-10-21 14:29:29 +02:00
Javi Gallego 69215851bb Merge branch 'dev' into 7346-manualInvoice 2024-10-21 14:01:18 +02:00
Javier Segarra 29a7f3b2fe fix: refs #7283 #7283 ItemDiary subToolbar 2024-10-21 13:48:43 +02:00
Jon Elias cd4b17048c Merge branch 'dev' into Fix-TicketsModule 2024-10-21 11:40:02 +00:00
Jon Elias df3b4e7a18 refactor: refs #7132 deleted useless code 2024-10-21 13:07:07 +02: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
Jorge Penadés a4358ec0ed chore: refs #7524 refactor order 2024-10-21 12:36:16 +02:00
Jorge Penadés 2b2ccbc6a1 feat: refs #7524 myTeam filter & default params 2024-10-21 12:14:54 +02:00
Alex Moreno f2147311d3 fix(TicketBasicData_zone): refs #6233 add acls and fix get zones 2024-10-21 08:41:19 +02:00
Carlos Satorres 1bafdf1b85 fix: refs #6389 ipt 2024-10-20 15:01:37 +02:00
Jon Elias fa0625aa86 Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems 2024-10-18 14:12:25 +02:00
Jon Elias 11bf70d76c fix: category and tags filters 2024-10-18 14:12:23 +02:00
Carlos Satorres 1aefad58e9 fix: refs #7529 fix front 2024-10-18 14:05:38 +02:00
Jon Elias 11092866b8 fix: merge conflicts 2024-10-18 13:33:28 +02:00
Jon Elias 64c0496f7a Merge branch 'dev' into Fix-ItemRequest 2024-10-18 11:20:43 +00:00
Jon Elias 89cb9aacec refactor: refs #7132 1st wave of changes in global translations files 2024-10-18 12:54:21 +02:00
Carlos Satorres 237b3ed4df Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-10-18 11:17:06 +02:00
Jon Elias 0e77d4b68f refactor: refs #7132 account's module translations 2024-10-18 10:40:40 +02:00
Jon Elias 7d78ce7781 Merge branch 'dev' into 7010-AddPackingField 2024-10-18 07:29:17 +00:00
Jon Elias 8eef9c0009 refactor: refs #7132 customer's module translations 2024-10-18 09:21:18 +02:00
Carlos Satorres 8bc06593c5 Merge branch '7986-workerMoto' of https://gitea.verdnatura.es/verdnatura/salix-front into 7986-workerMoto 2024-10-18 08:44:31 +02:00
Carlos Satorres 1f4b681b5b fix: refs #7986 clean code 2024-10-18 08:44:27 +02:00
Jon Elias 58e88f605c refactor: refs #7132 delete duplicate translations' keys 2024-10-18 08:04:52 +02:00
Jon Elias 98a380e026 Merge branch 'master' into Fix-InvoiceOutSummary 2024-10-17 08:58:49 +00:00
Carlos Satorres 608e6c717a fix: refs #7310 clean warning 2024-10-17 09:34:48 +02:00
Carlos Satorres 16ef5d3722 fix: refs #7306 clean warning 2024-10-17 08:30:45 +02:00
Carlos Satorres b82453582a fix: refs #7304 7304 clean warning 2024-10-17 07:44:31 +02:00
Carlos Satorres f2cb0111eb fix: refs #7283 fix image 2024-10-16 14:45:33 +02:00
Carlos Satorres 3cdba5dafa Merge branch 'dev' into 7986-workerMoto 2024-10-16 12:10:22 +00:00
Carlos Satorres d1c61c5aed Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-16 14:01:01 +02:00
Carlos Satorres e06ce4f8a4 fix: refs #7986 clean code 2024-10-15 14:56:32 +02:00
Carlos Satorres a30915f99e fix: refs #7986 fix operator, fix crudmodel update 2024-10-15 14:42:26 +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
Carlos Satorres b4245d05fb fix: refs #7986 crudModel 2024-10-15 13:00:01 +02:00
Carlos Satorres 3badfbcff9 Merge branch 'dev' into 7767-holidayDaysExceeded 2024-10-15 10:54:57 +00:00
Carlos Satorres af830591b3 fix: refs #7986 front fixed 2024-10-15 09:44:55 +02:00
Jon Elias d416a34560 refactor: use docuware in ticket descriptor menu 2024-10-15 08:48:30 +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
Carlos Satorres bc581caa4e fix: refs #7767 console remove 2024-10-15 07:57:19 +02:00
Carlos Satorres dfceb9403c fix: refs #7986 fix front 2024-10-15 07:54:52 +02:00
Carlos Satorres 85eed86ba8 Merge branch 'master' into #6898-&-#6899-hotfixFilterList 2024-10-15 05:41:32 +00:00
Jorge Penadés 37dfca3bce Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixScopeDays 2024-10-14 16:03:13 +02:00
Jorge Penadés 19545ca7e6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixScopeDays 2024-10-14 15:54:08 +02:00
Jorge Penadés 2d34921cf5 fix: refs #7524 paginate 2024-10-14 15:52:12 +02:00
Jorge Penadés 0fb9b22935 chore: refs #7874 refactor code 2024-10-14 14:09:52 +02:00
Carlos Satorres 1a2c5c96fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7986-workerMoto 2024-10-14 13:52:31 +02:00
Carlos Satorres 8258fbb91e refs #7767 remove onMounted 2024-10-14 13:24:12 +02:00
Jorge Penadés 0f3168456a chore: refs #7524 sort by firstName 2024-10-14 13:22:59 +02:00
Carlos Satorres b225f6a4c8 refs #7767 fix contractHolidays 2024-10-14 13:18:34 +02:00
Jon Elias 1183d86867 Merge branch 'master' into Fix-InvoiceOutSummary 2024-10-14 11:10:31 +00:00
Jon Elias 0aab17becc fix: fixed customer descriptor proxy 2024-10-14 13:08:16 +02:00
Jorge Penadés 4b78c1acd0 fix: refs #7524 dynamic 2024-10-14 12:00:05 +02:00
Jon Elias 720042bed9 feat: added new filter param and refactored link colors 2024-10-14 11:30:31 +02:00
Carlos Satorres 2edeb1043e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7767-holidayDaysExceeded 2024-10-14 10:24:49 +02:00
Carlos Satorres 85b068eddb refs #6898 #6899 hotfix lists 2024-10-14 10:21:02 +02:00
Guillermo Bonet 787ce2fc48 feat: refs #7006 itemTypeLog added 2024-10-14 09:33:00 +02:00
Carlos Satorres 6a624b12a5 refs: #6898 hotfix accounts 2024-10-14 09:28:51 +02:00
Jorge Penadés db5449444a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType 2024-10-14 08:37:44 +02:00
Alex Moreno 64c8d264af warmFix(TravelList): add daysOnward in travelFilter 2024-10-14 07:43:29 +02:00
Jorge Penadés 44c4c378f9 chore: refs #7874 add default ob type 2024-10-10 11:02:03 +02:00
Jon Elias 8b68c0afeb fix: improve geoFk for ZoneDeliveryPanel 2024-10-10 08:30:56 +00:00
Jorge Penadés 830decb6db Merge branch 'dev' into 7874-addObservationType 2024-10-10 08:16:36 +00:00