Commit Graph

18246 Commits

Author SHA1 Message Date
Alex Moreno ae160890a8 refs #6335 feat(ticketAdvance): use componentUpdate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-27 15:06:20 +02:00
Pablo Natek 42bbdf9814 feat(ticket.state): refs #4131 convert changeState to State
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 13:41:32 +02:00
Pablo Natek 9708f66cef merge(dev): refs #4131 merge dev move sql files
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 12:36:28 +02:00
Sergio De la torre 60ffc21d5a Merge branch 'dev' into 5867-Driver-Route-Pdf
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 04:49:16 +00:00
Pablo Natek 524ac4d99d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4131-unifyTicketStatusChanges 2023-10-26 22:16:06 +02:00
Pablo Natek 3584b15c19 Merge branch 'dev' into 4131-unifyTicketStatusChanges 2023-10-26 22:10:35 +02:00
Jorge Penadés 7fe0641817 Merge pull request '5914-transferInvoiceOut' (!1761) from 5914-transferInvoiceOut into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1761
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-26 12:39:07 +00:00
Alex Moreno 55d80458cc refs #6065 warmFix(workerTimeControl): set date
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 14:37:42 +02:00
Alex Moreno 30895f444f Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 12:14:31 +00:00
Alex Moreno 6b94ea7d11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate 2023-10-26 09:48:35 +02:00
Jorge Penadés e0b4ac733e ref #5914 move changes
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 09:30:48 +02:00
Jorge Penadés 56c431888f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head Build queued... Details
2023-10-26 09:29:13 +02:00
Alex Moreno cecdf8633c refs #6350 deploy: init version 23.46
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 09:27:32 +02:00
Jorge Penadés 3a1227bdc2 ref #5914 fix ticketrefund
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 09:20:25 +02:00
Jorge Penadés da2bc416f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 08:26:35 +02:00
Alex Moreno 83cff37422 refs #6350 fix: 00-dropWorkerCreate.sql
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 08:23:18 +02:00
Alex Moreno 013b010c22 refs #6278 test(itemRequest): fix e2e, correct selector
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 07:56:57 +02:00
Alex Moreno 26bdbabff5 refs #6335 feat(ticketAdvanced): show all tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-25 15:48:19 +02:00
Carlos Andrés 6e7b41fbfa Merge pull request '4707-test-workerTimeControl' (!1813) from 4707-test-workerTimeControl into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1813
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-25 09:16:04 +00:00
Carlos Andrés acfec8681d Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-25 09:04:16 +00:00
Carlos Andrés 3906b9fd9c Merge branch '4707-test-workerTimeControl' of https://gitea.verdnatura.es/verdnatura/salix into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-25 11:02:55 +02:00
Carlos Andrés b461f63e2c refs #4707 fix: correct sqlVersion 2023-10-25 11:02:53 +02:00
Carlos Andrés 3ba4e72359 Merge pull request 'refs #4707 fix: problemas fichadas y test' (!1808) from 4707-test-workerTimeControl into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1808
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-25 08:54:37 +00:00
Alex Moreno a501d577f8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-25 09:23:00 +02:00
Alex Moreno efa9f16452 fix: remove unnecessary UserError
gitea/salix/pipeline/head This commit looks good Details
2023-10-25 09:22:44 +02:00
Carlos Andrés 001d7cd574 Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 15:03:38 +00:00
Carlos Andrés 800bbd74c8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 4707-test-workerTimeControl 2023-10-24 14:35:36 +02:00
Alex Moreno 9c689c194f Merge pull request 'testToMaster' (!1812) from testToMaster into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1812
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2023-10-24 12:25:51 +00:00
Alex Moreno 9865af8f81 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 14:20:02 +02:00
Alex Moreno 59aa738f38 Merge pull request 'fix: ticket_canAdvance correct worker. fix(dockerFIle)! dockerFile debian version' (!1811) from warmFix_ticketAdvance_salesPerson into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1811
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-24 12:11:14 +00:00
Alex Moreno 22fdcef7bb fix(dockerFIle)! front debian version
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 14:07:05 +02:00
Alex Moreno 589d7cbbb8 fix: ticket_canAdvance correct worker. fix(dockerFIle)! dockerFile debian version
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 12:02:21 +02:00
Jorge Penadés 9f141238bc ref #5216 add userFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 11:47:54 +02:00
Alex Moreno 5442476f05 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-10-24 10:35:11 +02:00
Jorge Penadés 24b6dcc606 Merge pull request 'ref #5947 refactorWorkerCreate' (!1802) from 5947-refactorWorkerCreate into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1802
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-24 08:14:26 +00:00
Jorge Penadés 35bb949fcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 10:13:38 +02:00
Alex Moreno 201241e2dc Merge pull request 'refs #6335 feat(ticketAdvance): add zone field' (!1810) from 6335_ticketAdvance_zone into test
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1810
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-24 07:51:22 +00:00
Jorge Penadés f1deeb69ca ref #5914 add ticketrefund and fix text
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 09:34:04 +02:00
Alex Moreno 22b7c59812 refs #6335 feat(ticketAdvance): add zone field
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 09:23:03 +02:00
Jorge Penadés 5529f08ce6 ref #5914 fix locale
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-24 08:35:45 +02:00
Jorge Penadés 1231d6dd1d 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-24 08:34:42 +02:00
Carlos Andrés 2fa2e7f099 Merge branch '4707-test-workerTimeControl' of https://gitea.verdnatura.es/verdnatura/salix into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 16:58:58 +02:00
Carlos Andrés 4ff0bb94c0 refs #4707 2023-10-23 16:58:56 +02:00
Carlos Andrés 08431e94c6 Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 13:52:52 +00:00
Carlos Andrés 0055abc0a8 refs #4707 fix: problemas fichadas y test
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 15:52:05 +02:00
Alex Moreno 483526c970 refs #6015 feat(executeRoutine): check db restrictions. test: add executeRoutine tests
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 15:03:05 +02:00
Carlos Andrés 6e3517b40f refs #4707 fix: problemas fichadas y test
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 14:51:09 +02:00
Jorge Penadés a630d28f07 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 11:37:36 +02:00
Alex Moreno 26aaaff21c Merge pull request '6199_hotFix_isReduction' (!1807) from 6199_hotFix_isReduction into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1807
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-23 08:52:55 +00:00
Alex Moreno ae27aa5b1e fix: test to dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 10:08:26 +02:00