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 |
Pablo Natek
|
488181e1b6
|
feat(getUrl): se añade el metodo getUrl refs #5979
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 08:37:28 +02:00 |
Jorge Penadés
|
770aa60b69
|
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 08:26:22 +02:00 |
Jorge Penadés
|
7e25fac3e9
|
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 08:25:00 +02:00 |
Jorge Penadés
|
8917821ec0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 08:23:44 +02:00 |
Jorge Penadés
|
f5784eec01
|
Merge pull request 'ref #5417 date filters added' (!1773) from 5417-fixCustomerPayments into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1773
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-10-19 06:23:18 +00:00 |
Alex Moreno
|
daaf076133
|
Merge branch 'dev' into 6312
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 05:29:43 +00:00 |
Alex Moreno
|
4d3d38ebe3
|
refs #6014 feat: executeRoutine
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 15:22:04 +02:00 |
Alex Moreno
|
da20697052
|
refs #6199 feat(sale_updateQuantity): can upload
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 15:19:26 +02:00 |
Javi Gallego
|
44ce0a8730
|
refs #6312 no inserta el originalquantity
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 13:46:41 +02:00 |
Jorge Penadés
|
8fe911ee0b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 13:43:22 +02:00 |
Jorge Penadés
|
62d2c7e701
|
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-18 13:42:15 +02:00 |
Jorge Penadés
|
ea5597d3f3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 13:40:02 +02:00 |
Jorge Penadés
|
af0d5072ff
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 13:37:14 +02:00 |
Pablo Natek
|
3e96b3d0d2
|
Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 11:24:03 +00:00 |
Jorge Penadés
|
330fb08aac
|
ref #5417 fix back test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 13:23:00 +02:00 |
Pablo Natek
|
71937699a4
|
Merge pull request 'refs #6266 smsfix' (!1771) from 6266-minimumImprtSmsFix into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1771
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-10-18 11:21:41 +00:00 |
Pablo Natek
|
bf09f13aa2
|
Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 11:07:24 +00:00 |
Pablo Natek
|
44bc30adf7
|
Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 10:35:53 +00:00 |
Pablo Natek
|
2bb4300e1b
|
remove: se quita el console log refs #6278
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:35:45 +02:00 |
Pablo Natek
|
34c9d030e9
|
Merge branch 'dev' into 6266-minimumImprtSmsFix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 10:31:12 +00:00 |
Pablo Natek
|
5f49a4fe1d
|
fix: created -> shipped refs #6266
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:25:47 +02:00 |
Pablo Natek
|
1920a1b893
|
merge(dev): branch 'dev' into 6266-minimumImprtSmsFix refs #6266
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:23:23 +02:00 |
Jorge Penadés
|
251d71a437
|
ref #5417 refactor transactions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 12:05:33 +02:00 |
Alex Moreno
|
a84f6fe1da
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:05:04 +02:00 |
Alex Moreno
|
002329b0a1
|
refs 6199 add quantityLessThanMin translation
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:04:37 +02:00 |
Jorge Penadés
|
700caac641
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:03:07 +02:00 |
Alex Moreno
|
bd6c82d2fd
|
Merge pull request '5918-worker.time-control_resend' (!1685) from 5918-worker.time-control_resend into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1685
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-10-18 09:10:16 +00:00 |
Alex Moreno
|
4300b24c14
|
refs #5918 refactor(worker_timeControl): simplify ng-show
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 10:45:15 +02:00 |
Alex Moreno
|
d1cb2a1d9a
|
refs #5918 test: add updateWorkerTimeControlMail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 10:30:36 +02:00 |
Alex Moreno
|
a7b0ef1e4c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
|
2023-10-18 09:23:55 +02:00 |
Alex Moreno
|
b1c931a510
|
remove console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 08:52:17 +02:00 |
Alex Moreno
|
b3c7511e59
|
refs #6067 feat(url): getByUser
|
2023-10-18 08:52:06 +02:00 |
Alex Moreno
|
6871ce4b15
|
Merge branch '6067-vnUser_privileges_and_verifyEmail' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail
|
2023-10-18 07:29:03 +02:00 |
Alex Moreno
|
a916007314
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail
|
2023-10-18 07:20:34 +02:00 |
Carlos Andrés
|
92e76a6d44
|
Merge pull request 'refs #6199 fix(sale_hook): fix quantity case' (!1797) from 6119-better_sale_hook into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1797
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-10-17 13:34:26 +00:00 |
Pablo Natek
|
8d44bb8867
|
refactor(toggleIsIcluded): actualizo la versión y modifico el proc refs #5749
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 15:05:48 +02:00 |
Jorge Penadés
|
fdfa481d21
|
ref #5947 drop procedure
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 14:52:47 +02:00 |
Jorge Penadés
|
69a54be1a9
|
ref #5947 refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 14:02:08 +02:00 |
Pablo Natek
|
541926d3f7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5749-autoincrement-zoneIncluded
|
2023-10-17 13:57:32 +02:00 |
Pablo Natek
|
9870a0e60a
|
feat(origin): create method url_/geturl redf #5979
|
2023-10-17 13:56:49 +02:00 |
Alex Moreno
|
d4770c525e
|
refs #6199 test(sale): fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 11:00:41 +02:00 |
Alex Moreno
|
dbb2372cd3
|
Merge pull request 'hotFix: workerTimeControl' (!1796) from hotFix_workeTimeControl_sendMail into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1796
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2023-10-17 07:03:02 +00:00 |