Commit Graph

6775 Commits

Author SHA1 Message Date
Javier Segarra e06d567e3c test: refs #7679 #7679 remove comment 2024-09-27 10:35:39 +02:00
Jon Elias 45c0d0ae3f Merge pull request 'Hotfix: fixed ticket state function' (!770) from Hotfix-ChangeTicketState into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #770
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-27 08:08:45 +00:00
Jorge Penadés b541ce4e56 fix: split params
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-27 09:59:18 +02:00
Javier Segarra 2990d32705 fix: grafana url
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-27 07:56:50 +00:00
Jon Elias 2be969339e Merge branch 'master' into Hotfix-ChangeTicketState
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-27 07:26:16 +00:00
Jon Elias 6b0a0f71ce fix: fixed change state function
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-27 08:24:58 +02:00
Javier Segarra 6b2e0df9c2 test: refs #7679 #7679 improve test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 23:39:14 +02:00
Javier Segarra d2067c633d feat: refs #7679 #7679 use country or province to retrieve cities 2024-09-26 23:38:22 +02:00
Javier Segarra 807827c97c Merge branch 'test' into warmfix_customerModule
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-26 16:25:27 +00:00
Javier Segarra d5253149ed Merge pull request 'fix: split params' (!768) from warmfix-addSearchUrl into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #768
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-26 16:21:48 +00:00
Javier Segarra 3caeb9e738 Merge branch 'dev' into 7323-fineTunningWorker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 16:21:22 +00:00
Jorge Penadés 71201f1007 feat: refs #7874 required fields banner
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 17:19:05 +02:00
Javi Gallego a2b7e81982 feat: warehouse
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 16:23:18 +02:00
Jorge Penadés 11c135e8c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 16:01:40 +02:00
Jorge Penadés ba9f1407ac Merge branch 'dev' into 7524-dynamicFetch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 13:53:54 +00:00
Jorge Penadés 353116a7a0 fix: split params
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-26 15:49:12 +02:00
Jorge Penadés 7eb951ef13 fix: refs #7323 use right locale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 15:28:00 +02:00
Jorge Penadés 14b7654db3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 15:16:32 +02:00
Jorge Penadés 18ea23adf1 refactor: refs #7323 pr request
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 15:03:22 +02:00
Pablo Natek 6e6b88d340 Merge pull request '7129-fixMigrationIssues' (!754) from 7129-fixMigrationIssues into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #754
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-26 12:53:44 +00:00
Javier Segarra 428c6966f2 Merge branch 'dev' into 8018_location_label
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 14:48:47 +02:00
Jorge Penadés 01b62adba9 fix: refs #7524 dynamic fetch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 14:30:19 +02:00
Javier Segarra bbf3b6d4b7 fix: #6943 show nickname salesPerson
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-26 12:29:03 +00:00
Javier Segarra a0b3e933a8 Merge branch 'dev' into 8031_notify_dataSaved
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 12:17:40 +00:00
Alex Moreno f00db79d47 fix(VnTable): header background-color
gitea/salix-front/pipeline/head This commit looks good Details
2024-09-26 14:14:27 +02:00
Jon Elias 9386d648d0 Merge branch '7010-AddPackingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 14:13:00 +02:00
Jon Elias 1c99c01d1d refactor: refs #7010 modified front 2024-09-26 14:12:59 +02:00
Jorge Penadés 2057189b8e Merge pull request '#7524 remove old filter' (!764) from 7524-hotfix-removeOldFilter into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #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
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-26 12:38:03 +02:00
Jon Elias 51aae0f726 Merge branch 'dev' into 7010-AddPackingField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 08:22:02 +00:00
Jon Elias 6d5a8cba6f refactor: refs #7010 modified customer summary table
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 10:20:50 +02:00
Jorge Penadés c2b52473a1 fix: refs #7323 align tables
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 10:04:16 +02:00
Jorge Penadés e827d3aabf fix: refs #7323 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 09:47:54 +02:00
Jorge Penadés 478d4695b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 09:16:59 +02:00
Jorge Penadés 0cffe0b586 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 09:08:53 +02:00
Jorge Penadés 709a662ceb feat: refs #7874 select observation type 2024-09-26 09:08:12 +02:00
Pablo Natek 6e6b65771a Merge branch 'dev' into 7129-fixMigrationIssues
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 06:09:21 +00:00
Javi Gallego 9095c579db Merge pull request '6722-thermograph' (!761) from 6722-thermograph into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #761
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-26 06:07:26 +00:00
Pablo Natek c388d5ab2a Merge branch 'dev' of https: refs #7129//gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 07:57:59 +02:00
Javier Segarra 0b47623011 Merge pull request 'HOTFIX: itemFixedPrice' (!755) from hotfix_itemFixedPrice into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #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
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-25 21:04:13 +00:00
Jon Elias 56af4d3736 feat: refs #7010 added packing type field in customer summary and ticket list
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-25 14:18:34 +02:00
Javi Gallego dcfdabde32 feat: tabulation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-25 14:17:26 +02:00
Javier Segarra 73c45b8c4a Merge branch 'dev' into 8031_notify_dataSaved
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-25 12:08:40 +00:00
Jorge Penadés 68ebda625b fix: refs #7874 refs #6943 ui 2024-09-25 14:02:11 +02:00
Javi Gallego eb0e18bf58 Merge branch 'dev' into 6722-thermograph 2024-09-25 13:48:12 +02:00
Javi Gallego bd2fa37450 feat: maxTemperature and minTemperature 2024-09-25 13:34:43 +02:00
Alex Moreno 8c13ceb3fe Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-25 13:28:13 +02:00
Alex Moreno 5f4df6eb96 Merge pull request '7155-travel_daysOnward_2' (!759) from 7155-travel_daysOnward_2 into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #759
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2024-09-25 11:27:25 +00:00
Alex Moreno bcada72f04 fix: refs #7155 use chip-locale
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-25 13:24:22 +02:00