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

7344 Commits

Author SHA1 Message Date
Alex Moreno e8f0bc9965 Merge pull request 'feat(VnSelect): refs #7136 add scroll' (!890) from 7136-vnSelect_paginate_simplify_2 into dev 
Reviewed-on: verdnatura/salix-front#890
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-15 10:24:46 +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 c7c9c13944 test: refs #8061 #8061 updates 2024-11-15 10:28:52 +01: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 3c77076718 Merge pull request 'refactor: refs #7950 Created cmr model' (!911) from 7950-cmrModelUnify into dev 
Reviewed-on: verdnatura/salix-front#911
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-15 06:04:51 +00:00
Guillermo Bonet c607fc5f61 Merge branch 'dev' into 7950-cmrModelUnify 2024-11-15 06:03:30 +00:00
Javier Segarra 0a239e8c43 Merge pull request 'HOTFIX: customerFilter sales person input' (!939) from hotfix_customer_salesPerson_Filter into master 
Reviewed-on: verdnatura/salix-front#939
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-14 15:26:44 +00:00
Javier Segarra ca0d70933e Merge branch 'master' into hotfix_customer_salesPerson_Filter 2024-11-14 15:26:00 +00:00
Jorge Penadés 7626c777ed Merge pull request 'feat: refs #7874 improve vn-notes ui' (!938) from 7874-improveVnNotesUi into dev 
Reviewed-on: verdnatura/salix-front#938
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-14 15:21:24 +00:00
Javier Segarra 64c884693d Merge pull request 'HOTFIX #8192 Filter termopragh' (!934) from hotfix_termograph_filter into master 
Reviewed-on: verdnatura/salix-front#934
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-14 15:21:20 +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
Jorge Penadés 8d070edf8d Merge pull request 'feat: refs #6839 normalize search' (!936) from 6839-normalizeSearch into dev 
Reviewed-on: verdnatura/salix-front#936
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-14 14:06:03 +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 68994db6ff Merge pull request 'Change layout CustomerDescriptor Actions' (!931) from warmFix_customerDescriptorActions into dev 
Reviewed-on: verdnatura/salix-front#931
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-11-14 12:23:33 +00: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 27accd0e8b Merge pull request 'fix: refs #7306 clean warning' (!839) from 7306-warningCustomerUnpaid into dev 
Reviewed-on: verdnatura/salix-front#839
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-14 11:09:25 +00: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 84802cf267 Merge pull request 'refactor: refs #6818 change channel source' (!932) from 6818-useDefaultChannel into dev 
Reviewed-on: verdnatura/salix-front#932
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-14 10:31:15 +00: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
Alex Moreno e0e03526af Merge pull request 'warmFix: Revert previous commit e57a253c6f649382da187d1129449d265fb26d3b' (!930) from revert_warning_inject into dev 
Reviewed-on: verdnatura/salix-front#930
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-14 10:28:37 +00: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