Commit Graph

2909 Commits

Author SHA1 Message Date
Alex Moreno 21ddcb7e8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-03 11:39:44 +02:00
Alex Moreno 8c39f65dc3 refs #6067 feat: url model to everyone
gitea/salix/pipeline/head This commit looks good Details
2023-10-03 09:36:11 +02:00
Pablo Natek 96769d9ff9 refs #6213 fixIntermitentError
gitea/salix/pipeline/head This commit looks good Details
2023-10-03 08:57:59 +02:00
Alex Moreno 62fa54e02f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail 2023-10-03 07:26:41 +02:00
Alex Moreno 9baa450298 Merge branch 'dev' into 6216-saleLog_open_ticketLog
gitea/salix/pipeline/head This commit looks good Details
2023-10-03 05:25:55 +00:00
Pablo Natek 7fd2d143c3 refs #6213 devMerge 2023-10-03 07:08:29 +02:00
Alex Moreno 4545a63214 refs #6067 feat(vnUser): verifyEmail redirect to lilium
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-02 14:51:19 +02:00
Sergio De la torre 3ba349b74a refs #5890 feat: itemShelvingSaleAsignado more calls
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 09:14:30 +02:00
Carlos Andrés 41ac907b05 refs #6254-collection_getTickets 2023-09-29 13:44:41 +02:00
Alex Moreno 10de00ea45 refs #5890 deploy: test to dev
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 12:37:53 +02:00
Alex Moreno 6e06d21f9e refs #5890 deploy: merge dev in test 234002
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 12:36:36 +02:00
Carlos Andrés 2820b0253f Merge branch 'test' into 6254-collection_getTickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-29 10:31:14 +00:00
Alex Moreno a0d705683b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail 2023-09-29 12:22:42 +02:00
Alex Moreno b33700abc9 refs #6216 feat(ticket_sale): open filtered ticketLog
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 11:57:25 +02:00
Jorge Penadés 6691cbf32f ref #5914 changes moved
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 11:24:24 +02:00
Carlos Andrés 934b4c4b36 refs #5890
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 10:53:06 +02:00
Jorge Penadés d4e78ea889 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-09-29 08:16:12 +02:00
Alex Moreno f3c55cdee9 refs #5929 fix(isEditable): can edit if is weekly
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-28 16:00:09 +02:00
Carlos Andrés 52cba80dc8 Merge branch 'dev' into 5890--itemShelvingAsignado 2023-09-28 15:13:37 +02:00
Alex Moreno 204770c2de refs #6224 deploy: init version 234201
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 13:53:46 +02:00
Alex Moreno 28dfb895ca refs #6224 deploy: correct sql folder and fix sql
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 13:49:58 +02:00
Jorge Penadés 4b213c1c9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 13:31:45 +02:00
Alex Moreno 75e54bd82f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado 2023-09-28 13:21:12 +02:00
Alex Moreno d4e5815d41 refs #6254 feat(collection_getTickets): refactor code and add test
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 08:30:50 +02:00
Jorge Penadés 463fc8ae95 ref #5914 added fixtures in English
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-28 08:20:59 +02:00
Sergio De la torre 22f71e6147 Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 08:18:15 +02:00
Sergio De la torre 65b0ec387f refs #5890 fix: format
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-28 08:09:54 +02:00
Sergio De la torre 4048627c76 refs #5890 fix: format
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-28 08:08:40 +02:00
Sergio De la torre 18de92f9e7 refs #5134 fix: format
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 07:51:54 +02:00
Sergio De la torre a86469ccd2 refs #5134 fix: format
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-28 07:42:44 +02:00
Alex Moreno 1307d4727c refs #6254 feat(collection): add getTickets
gitea/salix/pipeline/head This commit looks good Details
2023-09-27 15:08:36 +02:00
Sergio De la torre ac3e9c811d refs #5890 feat: itemShelvingSaleAsignado
gitea/salix/pipeline/head This commit looks good Details
2023-09-27 14:01:17 +02:00
Jorge Penadés 474399b383 ref #5914 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 15:23:51 +02:00
Alex Moreno 7a3d3d5e2a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-25 14:14:23 +02:00
Jorge Penadés 092180b3b2 Merge branch 'dev' into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-25 11:38:56 +00:00
Javi Gallego 2607c1d215 Merge pull request '4059-revocar-permisos-client-account' (!1760) from 4059-revocar-permisos-client-account into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1760
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-09-25 11:29:58 +00:00
Jorge Penadés 98ee9bbaf3 ref #5914 back test added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-25 12:54:31 +02:00
Alex Moreno 6cf1095b10 refs #6067 feat: vnUser use verify() and more security when update user and mailForward
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 08:33:16 +02:00
Jorge Penadés 731bad5981 ref #5914 create ticket with new and refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-22 14:52:56 +02:00
Jorge Penadés f64f7a975d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 14:51:20 +02:00
Alex Moreno d43b70c971 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 14:30:28 +02:00
Alex Moreno cf36b10763 refs #4815 feat: add serialNumber in deviceLog
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 14:29:48 +02:00
Alex Moreno db7f72e262 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail 2023-09-22 13:19:35 +02:00
Pablo Natek ed157d1fd1 Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-22 11:11:25 +00:00
Alex Moreno d16ae47712 Merge branch 'dev' into 5843-quitUserFk2
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 11:01:25 +00:00
Jorge Penadés 6bc9b7b232 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-09-22 12:05:12 +02:00
Pablo Natek a854fff94f refs #3126 changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-22 10:59:48 +02:00
Pablo Natek 3013e3cd9c refs #6159 removeSpaces
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 09:14:59 +02:00
Pablo Natek 1357b60b9b refs #6159 fixFixtures
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 09:14:08 +02:00
Pablo Natek 850df64348 refs #6159 moveChangefile
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-21 14:59:26 +02:00
Carlos Satorres 1f1dfae7e3 refs #5843 changes models
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 12:50:07 +02:00
Javi Gallego 4761b0f784 fixes #4059 añado comillas
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 10:41:20 +02:00
Pablo Natek e037b0074e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6159-businessAfterInsert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-21 09:24:18 +02:00
Jorge Penadés ac4aea7d38 ref #5914 created transfer issued invoice
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 09:14:46 +02:00
Pablo Natek acd4f398c7 refs #6159 procBasedUpdate
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 08:44:52 +02:00
Javi Gallego 4e6808ec4a fixes #4059 muevo archivos a changes actual
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 08:24:57 +02:00
Javi Gallego 7ec47f0cc3 Merge branch 'dev' into 4059-revocar-permisos-client-account 2023-09-21 07:34:12 +02:00
Carlos Satorres cd20a2d06d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 07:32:19 +02:00
Pablo Natek 324b3ed8ee Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 05:21:06 +00:00
Jorge Penadés 5b818cef0c 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-09-20 15:25:20 +02:00
Alex Moreno 3b90d7e5e5 refs #6067 refactor: vnUser and mailForward privileges. fix: emailVerification
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-20 15:10:28 +02:00
Carlos Satorres f60b6b84fe refs #5843 fix back
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 11:58:36 +02:00
Carlos Satorres f92acdfe6f Merge branch 'dev' into 5660-changeRolDeliveryAssistant
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 09:52:32 +00:00
Jorge Penadés 4870b0830b ref #5914 fix refund and change method name
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-20 11:06:30 +02:00
Jorge Penadés 87cee57e56 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-09-20 10:47:53 +02:00
Javi Gallego 29a186fa18 Merge branch 'dev' into 6241--arreglar--dbTest
gitea/salix/pipeline/head Build queued... Details
2023-09-20 08:18:46 +02:00
Javi Gallego 45cf1b1ff3 fixes #6241 dbTest fixed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-20 08:12:07 +02:00
Carlos Satorres daf5b343fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2 2023-09-19 13:58:13 +02:00
Carlos Satorres 9524ff6932 refs #5660 fix sql
gitea/salix/pipeline/head This commit looks good Details
2023-09-19 11:02:12 +02:00
Pablo Natek 361c2b4cad refs #6213 fixSpec
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-19 07:33:28 +02:00
Carlos Satorres 63068ddfb8 refs #5660 call and insert 2023-09-18 12:24:26 +02:00
Carlos Satorres cfd080530a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-09-18 11:49:03 +02:00
Pablo Natek c1da4815cb Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-18 08:12:08 +00:00
Pablo Natek 44ec197ea0 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-18 06:56:48 +00:00
Carlos Satorres fa87757d0f refs #5560 sql fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-18 08:56:25 +02:00
Carlos Satorres 0912bd40f3 refs #5660 sql fix
gitea/salix/pipeline/head This commit looks good Details
2023-09-15 09:15:48 +02:00
Sergio De la torre 0403c67bad Merge branch 'dev' into 5652-ItemTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-15 05:47:00 +00:00
Carlos Satorres 2a1e828e14 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-09-15 07:30:46 +02:00
Pablo Natek 191b254acc Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 16:05:25 +00:00
Sergio De la torre b756d2f938 refs #5652 modify
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 18:03:30 +02:00
Pablo Natek cf138a0814 Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 13:15:52 +00:00
Javi Gallego ca2257d29b subo version 2340
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 13:47:04 +02:00
Carlos Satorres 11109d72a6 move sql
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 11:36:09 +02:00
Javi Gallego e1b03172fb Merge pull request 'test' (!1744) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1744
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-09-14 07:32:24 +00:00
Sergio De la torre 43f5bbb04e Merge branch 'dev' into 5652-ItemTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 09:05:55 +02:00
Sergio De la torre d2cd522842 refs #5652 modify:without fit
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 07:47:10 +02:00
Pablo Natek 72026332ba Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 13:07:38 +00:00
Carlos Satorres a9b2aef27a refs #5660 join and value
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 12:02:25 +02:00
Pablo Natek 740514c5a8 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-12 13:46:58 +00:00
Carlos Satorres 0ddcb57209 refs #5660 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-09-12 10:40:10 +02:00
Pablo Natek 37c57af2ed Merge branch 'dev' into 6131-duplicatedProvince
gitea/salix/pipeline/head This commit looks good Details
2023-09-11 17:27:10 +00:00
Pablo Natek 1b158bea67 refs #6131 unique constraint country-name
gitea/salix/pipeline/head Build queued... Details
2023-09-11 19:28:05 +02:00
Pablo Natek 6a753d26af refs #6213 default account value
gitea/salix/pipeline/head This commit looks good Details
2023-09-11 18:28:47 +02:00
Javi Gallego 705505b931 fixes #4059 acl for address
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 16:24:47 +02:00
Sergio De la torre 5f5a0645be refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 16:16:49 +02:00
Carlos Satorres 49e635ff4b refs #5660 dump dumpedFixtures 2023-09-11 13:49:18 +02:00
Pablo Natek ccfd8fad05 refs #6213 fixCreateError
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 12:32:46 +02:00
Carlos Satorres 62a4469803 refs #5660 cambios structure
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 11:34:23 +02:00
Carlos Satorres 9d0e4e7558 refs #5660 change sql 2023-09-11 10:47:39 +02:00
Carlos Satorres 544259df9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-09-11 10:47:21 +02:00