verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

7642_createNewState #2736

Closed
sergiodt wants to merge 32 commits from 7642_createNewState into dev
pull from: 7642_createNewState
merge into: verdnatura:dev
Conversation 0 Commits 32 Files Changed 26 +310 -164

32 Commits

Author SHA1 Message Date
Sergio De la torre f72bddbc1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7642_createNewState
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 16:10:24 +02:00
Sergio De la torre bc86bde5a4 Revert "Revert "Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6861_reservas_retro"" 
This reverts commit fb9bf4126e.
 2024-07-15 16:09:13 +02:00
Sergio De la torre fb9bf4126e Revert "Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6861_reservas_retro" 
This reverts commit 8df64013ee.
 2024-07-15 16:08:11 +02:00
Sergio De la torre 1d66a2e752 Revert "feat newState refs #7642" 
This reverts commit a821aa317a.
 2024-07-15 16:07:59 +02:00
Sergio De la torre a821aa317a feat newState refs #7642 2024-07-15 16:03:28 +02:00
Sergio De la torre 8df64013ee Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6861_reservas_retro
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 13:00:16 +02:00
Sergio De la torre 4d8482c503 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7642_createNewState 2024-07-15 12:54:45 +02:00
Sergio De la torre 31a2c3bbd1 Merge pull request 'feat itemShelvingSale refs #6861' (!2729) from 6861_reservas_gettickets into master
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #2729
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
 2024-07-15 10:34:40 +00:00
Sergio De la torre 8dbdbdf23b feat newState refs #7642
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-15 12:30:09 +02:00
Sergio De la torre 573f5c8d28 feat newState refs #7642
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 12:28:30 +02:00
Sergio De la torre 689a88b75e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7642_createNewState
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-15 12:24:58 +02:00
Sergio De la torre 00a1a84205 Merge branch 'master' into 6861_reservas_gettickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-15 06:27:52 +00:00
Carlos Satorres 88dcbc726b Merge pull request 'fix(worker_new): fix countryFk' (!2728) from hotFix_workerNew_countryFk into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details 
Reviewed-on: #2728
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-07-15 06:26:20 +00:00
Alex Moreno aa3fbf0cb4 Merge branch 'master' into hotFix_workerNew_countryFk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-15 05:05:18 +00:00
Sergio De la torre 806dc40eb9 Merge branch 'master' into 6861_reservas_gettickets
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-15 05:05:17 +00:00
Carlos Andrés 67b19ee4ca hotfix: packaging ticket 199070
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-14 09:08:14 +02:00
Carlos Andrés 97e5bd7a31 Merge pull request 'hotfix: packaging ticket 199070' (!2727) from Hotfix-packaging-ticket-199070 into master
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #2727
Reviewed-by: Pako Natek <pako@verdnatura.es>
 2024-07-12 11:36:40 +00:00
Sergio De la torre cb107215b6 feat itemShelvingSale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-12 13:14:00 +02:00
Carlos Andrés d2e482d7cd hotfix: packaging ticket 199070
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-12 12:13:21 +02:00
Carlos Andrés 66959dd388 hotfix: packaging ticket 199070
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-12 12:10:43 +02:00
Alex Moreno 896d273da8 fix(worker_new): fix countryFk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-12 12:06:37 +02:00
Guillermo Bonet 323d26f226 Fix
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-12 10:37:39 +02:00
Carlos Andrés b93601d6d8 Actualizar db/routines/vn/procedures/itemShelvingSale_addBySale.sql
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head There was a failure building this commit Details
2024-07-12 08:27:24 +00:00
Carlos Andrés b883d0ee2b Merge pull request 'feat itemShelvingSale refs #6861' (!2721) from 6861_reservas_retro into master
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #2721
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
 2024-07-12 07:08:02 +00:00
Sergio De la torre 21987011b6 feat itemShelvingSale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-12 09:06:05 +02:00
Sergio De la torre 69bcad9ce0 feat itemShelvingSale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-11 18:09:00 +02:00
Sergio De la torre 97fe9debf6 feat newState refs #7642
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 12:57:15 +02:00
Carlos Satorres 741360cd63 Merge pull request 'hotfix routeSummary' (!2718) from hotfix-routeSummary into master
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #2718
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-11 07:17:26 +00:00
Carlos Satorres 0579e7dbbf hotfix routeSummary
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-11 09:14:14 +02:00
Sergio De la torre 8c8ec6192a feat newState refs #7642
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 13:53:38 +02:00
Pablo Natek 3d22192824 Merge pull request 'feat: refs #6403 add dynamic clientType' (!2714) from 6403-addDinamycClient into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details 
Reviewed-on: #2714
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-10 09:35:57 +00:00
Pablo Natek 64bddd4f63 feat: refs #6403 add dynamic clientType
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-10 10:41:52 +02:00