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

5767 Commits

Author SHA1 Message Date
Alex Moreno 90853396ba Merge pull request 'fix #6898 SupplierFiscalData show fields' (!778) from hotfix_supplierFiscalData into master 
Reviewed-on: verdnatura/salix-front#778
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-30 13:16:11 +00:00
Javier Segarra 03450a86fb fix: SupplierFiscalData show data printing 2024-09-30 13:13:35 +00:00
Javier Segarra 4d4554a6ca fix(lilium): #6898 SupplierFiscalData show fields 2024-09-30 15:11:22 +02:00
Javier Segarra 48b7b879f2 Merge pull request 'Imrpove VnLocation to show less fields' (!738) from fix_8018 into master 
Reviewed-on: verdnatura/salix-front#738
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-30 11:14:30 +00:00
Javier Segarra 2812e6f456 Merge branch 'master' into fix_8018 2024-09-30 11:13:20 +00:00
Javier Segarra 36838f930c Merge pull request 'fix: onDataSaved VnTable' (!772) from fix_vnTable_onDataSaved into master 
Reviewed-on: verdnatura/salix-front#772
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-30 05:20:22 +00: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
Jon Elias 45c0d0ae3f Merge pull request 'Hotfix: fixed ticket state function' (!770) from Hotfix-ChangeTicketState into master 
Reviewed-on: verdnatura/salix-front#770
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-27 08:08:45 +00:00
Jorge Penadés b541ce4e56 fix: split params 2024-09-27 09:59:18 +02:00
Javier Segarra 2990d32705 fix: grafana url 2024-09-27 07:56:50 +00:00
Jon Elias 2be969339e Merge branch 'master' into Hotfix-ChangeTicketState 2024-09-27 07:26:16 +00:00
Jon Elias 6b0a0f71ce fix: fixed change state function 2024-09-27 08:24:58 +02:00
Jorge Penadés 2057189b8e Merge pull request '#7524 remove old filter' (!764) from 7524-hotfix-removeOldFilter into master 
Reviewed-on: verdnatura/salix-front#764
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-09-26 11:03:36 +00:00
Jorge Penadés c5766aa1b3 chore: refs #7524 remove old filter 2024-09-26 12:38:03 +02:00
Javier Segarra 0b47623011 Merge pull request 'HOTFIX: itemFixedPrice' (!755) from hotfix_itemFixedPrice into master 
Reviewed-on: verdnatura/salix-front#755
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-25 21:15:35 +00:00
Javier Segarra a8c96278de Merge branch 'master' into hotfix_itemFixedPrice 2024-09-25 21:04:13 +00:00
Jorge Penadés 0dec6edc68 Merge pull request 'fix: refs #6898 add role' (!757) from 6898-hotfix-addRole into master 
Reviewed-on: verdnatura/salix-front#757
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-25 10:48:16 +00:00
Jorge Penadés aab428494e fix: refs #6898 add role 2024-09-25 12:40:22 +02:00
Javier Segarra 53d5d123c2 feat: i18n 2024-09-25 11:36:44 +02:00
Javier Segarra fb180f0198 fix: apply order 2024-09-25 11:31:05 +02:00
Javier Segarra 77ad96a58b fix: itemfixedPrice inputs 2024-09-25 11:30:18 +02:00
Robert Ferrús d13cab0a24 Merge pull request 'feat: refs #8000 add column into zoneBasicData' (!741) from 8000-zoneBasicDataAddcolumn into master 
Reviewed-on: verdnatura/salix-front#741
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-23 11:43:14 +00:00
Robert Ferrús 5ebbb1cf73 feat: refs #8000 fix 2024-09-23 12:24:19 +02:00
Robert Ferrús 1ae20202cc feat: refs #8000 add column into zoneBasicData 2024-09-23 11:56:20 +02:00
Jorge Penadés e8beebff32 Merge pull request 'fix: refs #7353 horizontal scroll' (!735) from 7353-hotfix-fixUI into master 
Reviewed-on: verdnatura/salix-front#735
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-20 13:49:03 +00:00
Jorge Penadés df56eefe2f fix: refs #7353 fine tunning ui 2024-09-20 15:46:54 +02:00
Javier Segarra ddf42d9659 feat: update VnLocation instances 2024-09-20 13:46:07 +02:00
Javier Segarra b822c7722b feat: formatLocation when field is null 2024-09-20 13:45:43 +02:00
Jorge Penadés 6216eedd88 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixUI 2024-09-20 13:22:30 +02:00
Jorge Penadés 7a253d314c chore: refs #7353 drop useless code 2024-09-20 13:22:15 +02:00
Jorge Penadés 3e101242f6 chore: refs #7353 drop useless code 2024-09-20 13:20:40 +02:00
Jorge Penadés 87efc2f355 fix: refs #7353 responsive filters 2024-09-20 13:00:34 +02:00
Jorge Penadés e1f3589110 fix: refs #7353 horizontal scroll 2024-09-20 12:17:10 +02:00
Jorge Penadés ac6d98cd36 fix: refs #7353 horizontal scroll 2024-09-20 11:22:51 +02:00
Jorge Penadés 26f34619c0 Merge pull request 'fix: refs #7524 dynamic fetch' (!734) from 7524-hotfix-tooManyRecords into master 
Reviewed-on: verdnatura/salix-front#734
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-20 09:00:07 +00:00
Jorge Penadés b2cc74d890 fix: refs #7524 use id 2024-09-20 10:27:24 +02:00
Jorge Penadés 075c129036 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7524-hotfix-tooManyRecords 2024-09-20 10:05:44 +02:00
Jorge Penadés 3b709c20cf fix: refs #7524 use id 2024-09-20 10:05:28 +02:00
Jorge Penadés 2537e58ff3 fix: refs #7524 dynamic fetch 2024-09-20 09:56:04 +02:00
Carlos Satorres 28cd15508f Merge pull request 'refs #6898 fix filter' (!733) from 6898-fixSupplier2 into master 
Reviewed-on: verdnatura/salix-front#733
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-20 07:35:27 +00: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
Jorge Penadés 489b74fff8 Merge pull request 'feat: refs #7323 use scopes' (!732) from 7323-hotfix-advancedSummary into master 
Reviewed-on: verdnatura/salix-front#732
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2024-09-19 10:09:03 +00:00
Jorge Penadés 2e8397a34b feat: refs #7323 use scopes 2024-09-19 09:26:54 +02:00
Alex Moreno f86525e31d fix: not null variable 2024-09-18 13:24:21 +02:00
Alex Moreno 3906fc386f hotFix: supplierDescriptor not use same data-key 2024-09-18 12:49:45 +02:00
Jorge Penadés aa33e42701 Merge pull request 'fix: refs #7353 sales person filter and locale' (!724) from 7353-hotfix-fixFilter into master 
Reviewed-on: verdnatura/salix-front#724
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-18 07:19:45 +00:00
Jorge Penadés eb6f12ae3b fix: refs #7353 rollback 2024-09-17 12:58:06 +02:00
Jorge Penadés ed4a4e1e59 fix: refs #7353 rollback 2024-09-17 12:57:43 +02:00
Jorge Penadés 2cb2ce16ef fix: refs #7353 locale 2024-09-17 12:56:50 +02:00