Commit Graph

18039 Commits

Author SHA1 Message Date
Alex Moreno 2edfacb91c refs #5979 fix(sendCheckingPresence)!
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 07:33:52 +02:00
Pablo Natek 59e91221cb Merge pull request '5979-getAppOrigin' (!1799) from 5979-getAppOrigin into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1799
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-23 05:06:41 +00:00
Pablo Natek a87698d2ba Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 13:08:53 +02:00
Pablo Natek 4df39272d6 remove: appiclation config refs #5979 2023-10-20 13:08:39 +02:00
Pablo Natek 0237517f0c Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 10:55:30 +00:00
Pablo Natek 8597c23fb3 Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 12:53:57 +02:00
Pablo Natek 5c69d9c7f0 fix: add await in async functions refs #5979 2023-10-20 12:53:54 +02:00
Pablo Natek 2a55adb8b8 Merge pull request 'refs #6278 fixFilter' (!1774) from 6278-ticketRequestFixFilter into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1774
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-20 10:45:03 +00:00
Alex Moreno 1eabad7f4b refs #6257 fix(saleQuantity): add isInPreparing restriction
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 12:37:44 +02:00
Pablo Natek 75cfea4a2e Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 10:18:43 +00:00
Pablo Natek 25c13e42ab Merge branch '6278-ticketRequestFixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 11:36:24 +02:00
Pablo Natek 243a32dff5 remove(expand): quito expand de la columna requester refs #6278 2023-10-20 11:36:11 +02:00
Alex Moreno c04ceeced2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6014-executeRoutineMethod 2023-10-20 09:52:00 +02:00
Alex Moreno ef1ddfd484 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 09:28:37 +02:00
Alex Moreno 84aed7ca21 refs #6257 fix(saleQuantity): newPrice correct restricction
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 09:26:56 +02:00
Alex Moreno d5f98700e7 refs #6287 fix: ticket new correct return type
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 08:32:35 +02:00
Pablo Natek 9cb4e57951 Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 05:31:12 +00:00
Pablo Natek 4dea8c59ac Merge pull request 'refs #3126 changes' (!1776) from 3126-changePackageFkTopackagingFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1776
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-20 05:13:42 +00:00
Pablo Natek dc93328bcf Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 18:24:04 +02:00
Pablo Natek 07fa011035 fix(updateClaim): el spec daba error refs #5979 2023-10-19 18:24:03 +02:00
Pablo Natek dad67539c5 Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 16:23:34 +00:00
Carlos Andrés 16f20cea70 refs #6199 fix(sale): get minim price without grouping
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 15:12:06 +02:00
Pablo Natek ecbc2fb7fc Merge branch '3126-changePackageFkTopackagingFk' of https://gitea.verdnatura.es/verdnatura/salix into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 15:05:21 +02:00
Pablo Natek 37209a223a feat(db): packagefk virtual column refs #3126 2023-10-19 15:05:19 +02:00
Pablo Natek f26595bb62 Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 12:15:43 +00:00
Alex Moreno 44b2155c2b Merge pull request '6067-vnUser_privileges_and_verifyEmail' (!1764) from 6067-vnUser_privileges_and_verifyEmail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1764
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-10-19 12:13:16 +00:00
Alex Moreno 2b3fb4f89e Merge pull request 'refs #6199 feat(sale_updateQuantity): can upload' (!1804) from 6199-saleUploadQuantity into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1804
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-19 12:10:52 +00:00
Alex Moreno a0e32cf455 Merge branch 'test' into 6199-saleUploadQuantity
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 12:05:25 +00:00
Alex Moreno cadec7d01f Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 11:36:14 +00:00
Guillermo Bonet 5c51d7fb04 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 13:22:33 +02:00
Alex Moreno d9ab607126 refs #6199 feat(sale): increase quantity if newPrice is higher
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 13:03:11 +02:00
Pablo Natek 68975e0412 Merge pull request 'fixes #5749 Añadir clave primaria autoincrementable a la tabla vn.zoneIncluded' (!1590) from 5749-autoincrement-zoneIncluded into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1590
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-10-19 11:03:09 +00:00
Pablo Natek 71182d8630 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 10:49:31 +00:00
Alex Moreno 1ea6b87266 Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 10:48:51 +00:00
Jorge Penadés f88e266933 Merge pull request 'ref #6138 setPasword created' (!1798) from 6138-setPassword into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1798
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-19 10:48:14 +00:00
Guillermo Bonet d85e896c51 Merge pull request 'ticket #125321 filter advance tickets fix' (!1805) from ticket125321-hotfix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1805
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-19 10:29:07 +00:00
Juan Ferrer 39a0f13500 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 10:14:29 +00:00
Guillermo Bonet 1b8f227c47 ticket #125321 filter advance tickets fix
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 11:58:15 +02:00
Pablo Natek e2f7ce8b35 Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 08:58:50 +00:00
Alex Moreno 3294937b54 Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 08:50:29 +00:00
Pablo Natek a5b6921592 refactor(changes): se mueven los sql a la ultima carpeta refs #3126
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 10:44:34 +02:00
Jorge Penadés e680a6a080 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 10:00:43 +02:00
Jorge Penadés 15890e80d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 09:59:19 +02:00
Jorge Penadés 52b14cf8b4 ref #6138 fix emailVerified
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 09:51:10 +02:00
Jorge Penadés 5b1e5743b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 09:35:37 +02:00
Pablo Natek f1b11fdca2 Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 06:51:50 +00:00
Javi Gallego df51b0ca99 Merge pull request 'fixes #6260 vn-user quito campos redundantes' (!1779) from 6260-User.password-NOT-NULL into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1779
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-19 06:47:47 +00:00
Javi Gallego 84fc0de4ea Merge pull request 'refs #6312 no inserta el originalquantity' (!1803) from 6312 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1803
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-19 06:41:43 +00:00
Pablo Natek d3a7b4ecb9 remove: console.log from updateClaim refs #5979 2023-10-19 08:41:26 +02:00
Pablo Natek f8889df903 remove(console.log): se quitan console.log que se utilizaron para dbuggear refs #5979
gitea/salix/pipeline/head Build queued... Details
2023-10-19 08:40:25 +02:00