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

7130 Commits

Author SHA1 Message Date
Jorge Penadés cc12250109 Merge pull request 'feat: refs #6839 module searching' (!910) from 6839-addSearchMenu into dev 
Reviewed-on: verdnatura/salix-front#910
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-12 08:35:42 +00: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
Alex Moreno 87b7fd6db4 Merge pull request '8179-testToMaster' (!909) from 8179-testToMaster into master 
Reviewed-on: verdnatura/salix-front#909
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-11-12 07:01:11 +00: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
Jorge Penadés 07e7cbc355 feat: refs #6839 module searching 2024-11-11 16:36:18 +01:00
Alex Moreno e21087e645 Merge pull request 'feat(Supplier): add companySize' (!906) from 6828-supplier_companySize into dev 
Reviewed-on: verdnatura/salix-front#906
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-11-11 12:48:16 +00:00
Alex Moreno 777ac58f04 feat(Supplier): add companySize 2024-11-11 10:31:41 +01:00
Jorge Penadés 462382ecb5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration 2024-11-08 17:49:35 +01:00
Jorge Penadés 7fb3e71688 feat: refs #6818 fetch url & default channel 2024-11-08 17:41:27 +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
Jorge Penadés 3bae121ed7 fix: refs #6818 use right icon 2024-11-08 13:04:40 +01: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 c22c8d9f11 Merge pull request 'Improve required attrs for VnInput*' (!886) from improve_isRequired_input into dev 
Reviewed-on: verdnatura/salix-front#886
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-08 10:47:56 +00: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
Alex Moreno dce57f4638 Merge branch 'dev' into improve_isRequired_input 2024-11-08 07:32:07 +00:00
Alex Moreno 0c6d6d6925 Merge pull request 'refs: #7782 Cypress features' (!891) from cypress_features into dev 
Reviewed-on: verdnatura/salix-front#891
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-08 07:31:46 +00:00
Javier Segarra 0a5c3bfe5b Merge branch 'dev' into improve_isRequired_input 2024-11-08 07:29:54 +00:00
Javier Segarra 570c09bab5 Merge branch 'dev' into cypress_features 2024-11-08 07:27:26 +00: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
Alex Moreno 624ba2c13d Merge pull request 'FIX: #6943 Customer issues' (!885) from fix_customer_issues into dev 
Reviewed-on: verdnatura/salix-front#885
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-07 16:20:22 +00:00
Alex Moreno 0b5be9e67f chore: correct checkNotification 2024-11-07 17:19:35 +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
Alex Moreno 5d0c91187e Merge pull request 'fix(InvoiceOutGlobal): parallelism' (!900) from warmFix_invoiceOut_Global into dev 
Reviewed-on: verdnatura/salix-front#900
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-11-07 09:43:18 +00: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 dd2ee2a7de Merge pull request 'fix(worker): add searchurls' (!901) from warmFix_worker_searchUrls into test 
Reviewed-on: verdnatura/salix-front#901
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-11-07 09:17:18 +00: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 ead241e7da chore: remove console.log 2024-11-06 13:53:58 +01:00
Alex Moreno a2bbf4474d fix(InvoiceOutGlobal): parallelism 2024-11-06 13:52:59 +01:00
Alex Moreno 473b0808e8 Merge pull request 'feat(VnInput): empty to null' (!898) from 6766-vnInput_emptyToNull into dev 
Reviewed-on: verdnatura/salix-front#898
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-11-05 14:05:01 +00:00
Alex Moreno abd7b76636 feat(VnInput): empty to null 2024-11-05 13:50:25 +01:00
Jorge Penadés ec88bcbc44 Merge pull request '#7273 fixItemTags' (!895) from 7273-fixItemTags into dev 
Reviewed-on: verdnatura/salix-front#895
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-05 11:56:14 +00: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
Jorge Penadés 9ee05721a4 Merge pull request '#8078 enable multi choice' (!848) from 8078-enableMultiSelection into dev 
Reviewed-on: verdnatura/salix-front#848
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-05 10:20:04 +00:00
Jorge Penadés ca9a7f2932 Merge branch 'dev' into 8078-enableMultiSelection 2024-11-05 10:18:46 +00:00
Alex Moreno 14498a78b2 Merge pull request '6920-invoiceInBasicData_useVnDms' (!892) from 6920-invoiceInBasicData_useVnDms into dev 
Reviewed-on: verdnatura/salix-front#892
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-11-05 09:57:31 +00:00
Jorge Penadés 86e6bef90f chore: refs #8078 fiz tests 2024-11-05 10:37:35 +01:00
Jorge Penadés a4a4190e4e Merge branch '8078-enableMultiSelection' of https://gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection 2024-11-05 10:02:33 +01:00
Jorge Penadés 1f9d850fbe chore: refs #8078 rollback ref 2024-11-05 10:02:29 +01: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