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

6193 Commits

Author SHA1 Message Date
Jon Elias 7a4e43a025 Merge branch 'master' into Hotfix-RecalculatePriceReload 2024-10-24 12:13:48 +00:00
Jorge Penadés e26692fa51 Merge pull request '#7524 hotfix-vnProgressModal' (!866) from 7524-hotfix-vnProgressModal into master 
Reviewed-on: verdnatura/salix-front#866
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-24 12:10:26 +00:00
Jorge Penadés 823c354ef1 fix: refs #7524 vnProgressModal 2024-10-24 13:27:08 +02:00
Jorge Penadés f52b4c9a59 fix: refs #7524 vnProgressModal 2024-10-24 13:24:45 +02:00
Alex Moreno cb2780fe6f Merge pull request 'refactor: refs #7524 use VnTable' (!861) from 7524-hotfix-useVnTable into master 
Reviewed-on: verdnatura/salix-front#861
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-24 10:31:44 +00: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 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
Javi Gallego a0a37a68a0 Merge pull request '#8083 hotfix-insertRecord' (!859) from 8083-hotfix-insertRecord into master 
Reviewed-on: verdnatura/salix-front#859
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-10-23 14:25:00 +00: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
Alex Moreno 81a55a9e7a chore: test gitea 2024-10-22 14:55:47 +02:00
Jorge Penadés 41509c60dd Merge pull request '#8083 add change state btn' (!854) from 8083-hotfix-changeState into master 
Reviewed-on: verdnatura/salix-front#854
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-22 12:47:58 +00: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
Javi Gallego 93025007f1 Merge pull request '#7524 add my team filter' (!849) from 7524-hotfix-myTeamFilter into master 
Reviewed-on: verdnatura/salix-front#849
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-10-22 12:00:03 +00:00
Jorge Penadés f751408de2 feat: refs #8083 add change state btn 2024-10-22 13:22:43 +02:00
Jorge Penadés 0fbd5f45e1 fix: refs #7524 select department 2024-10-21 14:29:29 +02: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
Jon Elias e47cdff4ca Merge pull request 'Hotfix: InvoiceOut summary' (!829) from Fix-InvoiceOutSummary into master 
Reviewed-on: verdnatura/salix-front#829
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
 2024-10-17 09:00:06 +00:00
Jon Elias 98a380e026 Merge branch 'master' into Fix-InvoiceOutSummary 2024-10-17 08:58:49 +00:00
Carlos Satorres 29770c57bd Merge pull request 'refs #6898 #6899 hotfix lists' (!826) from #6898-&-#6899-hotfixFilterList into master 
Reviewed-on: verdnatura/salix-front#826
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-15 05:42:40 +00:00
Carlos Satorres 85eed86ba8 Merge branch 'master' into #6898-&-#6899-hotfixFilterList 2024-10-15 05:41:32 +00:00
Jorge Penadés 53fe6b0c3c Merge pull request 'fix: refs #7353 scopeDays' (!795) from 7353-hotfix-fixScopeDays into master 
Reviewed-on: verdnatura/salix-front#795
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-14 14:11:06 +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 12e1d9c389 Merge pull request 'fix: refs #7524 dynamic fetch' (!828) from 7524-hotfix-dynamicFetch into master 
Reviewed-on: verdnatura/salix-front#828
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-14 14:02:02 +00:00
Jorge Penadés 1c7ec6af41 Merge branch '7353-hotfix-fixScopeDays' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixScopeDays 2024-10-14 15:54:19 +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 0f3168456a chore: refs #7524 sort by firstName 2024-10-14 13:22:59 +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
Carlos Satorres 85b068eddb refs #6898 #6899 hotfix lists 2024-10-14 10:21:02 +02:00
Alex Moreno 29651b425e Merge pull request 'refs: #6898 hotfix accounts' (!824) from 6898-fixSupplierAccounts into master 
Reviewed-on: verdnatura/salix-front#824
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-14 07:46:30 +00:00
Carlos Satorres 6a624b12a5 refs: #6898 hotfix accounts 2024-10-14 09:28:51 +02:00
Javier Segarra 09d40b844c Merge pull request 'fix: Use geoFk for ZoneDeliveryPanel' (!819) from hotfix_zoneDeliveryPanel into master 
Reviewed-on: verdnatura/salix-front#819
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-10 08:33:58 +00:00
Jon Elias 8b68c0afeb fix: improve geoFk for ZoneDeliveryPanel 2024-10-10 08:30:56 +00:00
Jon Elias e58818e891 fix: Use geoFk for ZoneDeliveryPanel 2024-10-10 08:14:24 +00:00
Jorge Penadés 9c6b4f28d7 Merge pull request '#7524 use dynamic load' (!818) from 7524-hotfix-dynamicFetch into master 
Reviewed-on: verdnatura/salix-front#818
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-10 08:00:56 +00:00
Jorge Penadés cfe95df9e8 fix: refs #7524 use dynamic load 2024-10-10 09:46:07 +02:00
Alex Moreno 6108a26e93 Merge pull request 'fix(VnPaginate): use default value' (!805) from hotFix_VnPaginate_offset into master 
Reviewed-on: verdnatura/salix-front#805
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-10-08 10:19:32 +00:00