Commit Graph

3046 Commits

Author SHA1 Message Date
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
Pablo Natek d29c37693d Merge branch 'dev' into 4131-unifyTicketStatusChanges
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 08:53:53 +00: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
Pablo Natek 90b3107537 refs #4131 grant and revoke
gitea/salix/pipeline/head This commit looks good Details
2023-09-19 07:07:52 +02:00
Pablo Natek 747ba0124c refs #4131 dumpedFixtures
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 13:53:56 +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 66e851b5ea refs #4131 changeStateRefactor
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 19:48:58 +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
Javi Gallego d602709679 refs #4059 changes en la carpeta actual 2023-09-11 08:46:26 +02:00
Javi Gallego 3e1f844288 Merge branch 'dev' into 4059-revocar-permisos-client-account 2023-09-11 08:44:30 +02:00
Carlos Andrés ea771cb910 refs #6176 book entry deleted
gitea/salix/pipeline/head This commit looks good Details
2023-09-07 11:30:01 +02:00
Pablo Natek da9182783d refs #5881 changes
gitea/salix/pipeline/head This commit looks good Details
2023-09-07 11:02:47 +02:00
Javi Gallego ee093bbd1c refs #4059 acls
gitea/salix/pipeline/head This commit looks good Details
2023-09-07 09:03:25 +02:00
Carlos Andrés 0465c2ca54 Merge branch 'dev' into 6176-book-entry-deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 19:27:02 +00:00
Carlos Andrés 0d2db7749f refs #6176 book entry deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 21:22:10 +02:00
Carlos Satorres 4918e3ccc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 14:02:53 +02:00
Pablo Natek 04d04e6598 refs #6159 fixtrigger
gitea/salix/pipeline/head This commit looks good Details
2023-09-06 13:59:28 +02:00
Sergio De la torre dd1f759e20 refs #5652 feat:itemTrash_new 2023-09-06 09:35:43 +02:00
Javi Gallego c6023e220c Merge branch 'dev' into 4059-revocar-permisos-client-account
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 08:35:33 +02:00
Javi Gallego 6a4d8fbfbf Merge branch 'dev' into 6173-dump-BBDD
gitea/salix/pipeline/head This commit looks good Details
2023-09-05 13:48:35 +02:00
Pablo Natek 0d05aa521b Merge branch 'dev' into 6159-businessAfterInsert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-04 10:35:39 +00:00
Carlos Andrés 40468b70e6 refs #6176 book entry deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-04 11:59:55 +02:00
Sergio De la torre 022d3d08e6 refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-01 12:34:33 +02:00
Javi Gallego 734b948aac refs #6173 back test fixed and fixtures refactored 2023-09-01 11:52:48 +02:00
Sergio De la torre 00201197cc Merge branch 'dev' into 4815-deviLogModel
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 05:24:55 +00:00
Sergio De la torre 473e710d1b refs #4815 feat:DeviceLogModel
gitea/salix/pipeline/head Build queued... Details
2023-09-01 07:22:15 +02:00
Sergio De la torre 281ae0eb04 refs #4815 feat:DeviceLogModel
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 07:21:15 +02:00
Javi Gallego 4eeae46683 post subida
gitea/salix/pipeline/head This commit looks good Details
2023-08-31 11:28:37 +02:00
Javi Gallego b1978b07bd changes path desactualizado
gitea/salix/pipeline/head This commit looks good Details
2023-08-31 11:06:47 +02:00
Javi Gallego 92789ba3de refs #6173 fixed backTest 2023-08-31 10:04:28 +02:00
Javi Gallego e498bba37b initial dump 2023-08-31 08:41:19 +02:00
Carlos Satorres 0b9199688e refs #5843 userFk remove and vchange
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-30 12:48:57 +02:00
Guillermo Bonet f38ff9ef9c refs #5300 calendar_employee depend. (refs #5378)
gitea/salix/pipeline/head This commit looks good Details
2023-08-28 12:00:35 +02:00
Guillermo Bonet 4d802182f5 refs #5300 calendar_employee depend. (refs #5378)
gitea/salix/pipeline/head Build queued... Details
2023-08-28 11:59:45 +02:00
Guillermo Bonet 7848634bff refs #5300 Deleted postgresql dependences
gitea/salix/pipeline/head This commit looks good Details
2023-08-28 11:51:25 +02:00
Guillermo Bonet de8aba289a refs #5991 Deleted view currentWorkersStats
gitea/salix/pipeline/head This commit looks good Details
2023-08-28 10:36:29 +02:00
Jorge Penadés 5fe12d9281 Merge branch 'dev' into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 12:43:26 +00:00
Vicent Llopis 00b1746fd8 Merge branch 'dev' into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-25 11:32:58 +00:00
Pablo Natek c06ee9c5b0 refs #6159 fixUserNoActiveOnNewBusiness
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-25 10:55:10 +02:00
Vicent Llopis b304210e8f Merge branch 'dev' into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 08:47:12 +00:00
Vicent Llopis c4cf5f3a4f Merge branch 'dev' into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-25 08:04:42 +00:00
Jorge Penadés 083f19fd41 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd 2023-08-25 08:11:44 +02:00
Pablo Natek 4ae06d4b6b refs #6159 fixBusinessAfterInsert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-25 07:36:52 +02:00
Jorge Penadés 386de69bce refs #5216 fix error handling
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 12:47:10 +02:00
Pablo Natek c5006b6be6 refs #5881 insertAcl
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 11:31:13 +02:00
Pablo Natek 3694fcbbfb refs #5881 fixCreateRol
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 10:04:33 +02:00
Vicent Llopis 1f63648697 refs #5918 fix: muestra los botones en una línea y no carga todos los datos de workerTimeControlMail de la semana
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-24 09:10:04 +02:00
Pablo Natek fb9b249c7b Merge branch 'dev' into 5881-createRolClaim
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 06:21:58 +00:00
Pablo Natek 470f511b30 refs #5881 createRolAndGrantAcl
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 08:05:27 +02:00
Vicent Llopis dad792cb76 refs #5244 move changes sql
gitea/salix/pipeline/head Build queued... Details
2023-08-24 07:40:37 +02:00
Jorge Penadés 82d08261e5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd 2023-08-23 10:25:48 +02:00
Vicent Llopis dd1dbcbd4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 13:39:09 +02:00
Carlos Satorres 91c6ab9e44 refs #5843 edit structure
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-22 12:50:27 +02:00
Vicent Llopis 2f2611a705 Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 10:31:17 +00:00
Jorge Penadés 040f5be85c 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-08-18 12:18:30 +02:00
Pablo Natek 0166ccb561 refs #6131 constraint
gitea/salix/pipeline/head This commit looks good Details
2023-08-17 20:00:53 +02:00
Alex Moreno 0f7f996e3a refs #6126 feat(deploy): init 2336 version
gitea/salix/pipeline/head This commit looks good Details
2023-08-17 09:34:53 +02:00
Juan Ferrer f9778c02b7 refs #5483 DB Dockerfile: STAMP removed, not needed anymore
gitea/salix/pipeline/head This commit looks good Details
2023-08-14 12:53:56 +02:00
Juan Ferrer 5924303ae2 refs #5483 Dumped fixtures for vn.time removed
gitea/salix/pipeline/head This commit looks good Details
2023-08-14 09:53:53 +02:00
Sergio De la torre 8d0b3efa11 refs #4815 feat:DeviceLog Model
gitea/salix/pipeline/head This commit looks good Details
2023-08-14 09:39:40 +02:00
Alex Moreno 1ec51d94cf refs #5134 feat: correct sql
gitea/salix/pipeline/head This commit looks good Details
2023-08-11 12:53:43 +02:00
Sergio De la torre a6047d257b refs #5134 feat:modelsSalix
gitea/salix/pipeline/head This commit looks good Details
2023-08-11 12:45:18 +02:00
Alex Moreno 9ef4ba9bef refs #5134 feat: add saleMistake model
gitea/salix/pipeline/head This commit looks good Details
2023-08-11 12:32:49 +02:00
Alex Moreno 00fa5b7ce3 Merge branch 'dev' into fix-fixtures_test
gitea/salix/pipeline/head This commit looks good Details
2023-08-11 07:38:53 +00:00
Jorge Penadés 27ab6639c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-08-10 13:26:42 +02:00
Alex Moreno afc0c98065 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 11:05:37 +02:00
Carlos Satorres a11905ee63 Merge branch 'dev' into fix-fixtures_test
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 08:00:07 +00:00
Carlos Satorres 8807b9f87f fix upper
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 09:58:48 +02:00
Carlos Satorres aff6668dc9 remove names upper
gitea/salix/pipeline/head This commit looks good Details
2023-08-09 13:33:06 +02:00
Carlos Satorres 5653a39e3b fix fixtures names, socialnames streets
gitea/salix/pipeline/head This commit looks good Details
2023-08-09 13:10:05 +02:00
Jorge Penadés 7ca6c6b96d refs #5914 fix merge 2023-08-08 15:10:15 +02:00
Alex Moreno c5e853b028 refs #5976 correct sql folder
gitea/salix/pipeline/head This commit looks good Details
2023-08-08 13:35:36 +02:00
Alex Moreno 8e961fc25c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5976-transferSale_call_setDeleted 2023-08-08 08:51:48 +02:00
Alex Moreno 61e3b71bbf init version 233401 after revert(version) in test
gitea/salix/pipeline/head This commit looks good Details
2023-08-08 08:51:03 +02:00
Alex Moreno bf5b421a43 refs #5976 warnFix(client_create): socialName to upperCase
gitea/salix/pipeline/head This commit looks good Details
2023-08-08 08:39:13 +02:00
Alex Moreno 0d5c6ffdbe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5976-transferSale_call_setDeleted
gitea/salix/pipeline/head This commit looks good Details
2023-08-08 07:10:25 +02:00
Alex Moreno abd6045bf6 warnFix: revert(version): remove changelog and change package.json
gitea/salix/pipeline/head This commit looks good Details
2023-08-07 13:52:46 +02:00
Carlos Satorres 4fb0ad415c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate
gitea/salix/pipeline/head Build queued... Details
2023-08-03 10:03:15 +02:00
Carlos Satorres 183fdacefc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-03 10:01:11 +02:00
Alex Moreno 4628450240 refs #6093 deploy: 2334 init version
gitea/salix/pipeline/head This commit looks good Details
2023-08-03 09:20:03 +02:00
Alex Moreno ca34065e89 refs #6093 deploy(2332): dev to test
gitea/salix/pipeline/head This commit looks good Details
2023-08-03 09:17:32 +02:00
Jorge Penadés 22f76ec6a9 refs #5914 WIP clone method created
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-31 10:33:51 +02:00
Jorge Penadés 7513323156 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-07-31 07:53:36 +02:00
Jorge Penadés 50155cea8d refs #5914 WIP transfer invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 15:21:43 +02:00
Vicent Llopis fbc1e28031 Merge branch 'dev' into 4734-addViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 07:54:26 +00:00
Carlos Satorres 0546ae99eb refs #5660 add fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 17:27:06 +02:00
Carlos Satorres d3aa6ddf6b refs change fixtures acls 2023-07-27 17:26:36 +02:00
Carlos Satorres af60412232 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-07-27 17:24:50 +02:00
Jorge Penadés 0b88194f09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 10:27:01 +02:00
Jorge Penadés 05eff94217 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 10:22:32 +02:00
Jorge Penadés fa9dfdf411 refs #5216 try ACL updateExpeditionState
gitea/salix/pipeline/head This commit looks good Details
2023-07-25 16:32:38 +02:00
Jorge Penadés 96483a827f Merge branch 'dev' into 5929-editTicketPrice
gitea/salix/pipeline/head This commit looks good Details
2023-07-25 13:40:08 +00:00
Jorge Penadés 9978db9d52 refs #5929 WIP test created
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-25 11:33:01 +02:00
Jorge Penadés 4f80221101 refs #5929 added ACL and accurate errors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-24 10:34:44 +02:00
Alex Moreno 203f6a5659 refs #5712 correct sql folder
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 12:41:16 +02:00
Alex Moreno 23308d7ae3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware 2023-07-21 12:40:59 +02:00
Vicent Llopis 9bf891fcec refs #5561 fixed
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 12:20:06 +02:00
Vicent Llopis cf0b6f8c6e refs #5561 fix: saleGroupDetail.saleFk UNIQUE
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 12:01:01 +02:00
Jorge Penadés 618989052a refs #5866 fix transferClient and test added
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 15:15:33 +02:00
Vicent Llopis 7d2e98267f refs #5561 eliminados valores a piñon
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 15:09:31 +02:00
Jorge Penadés 8281dbacd1 Merge branch 'dev' into 5866-addTicketTransfer
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 12:34:16 +00:00
Vicent Llopis 8f7caa1183 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-20 11:42:10 +02:00
Jorge Penadés 2fa1c4b6ca Merge branch 'dev' into 5866-addTicketTransfer
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 08:23:07 +00:00
Jorge Penadés 9db8ae237f refs #5866 addBackTransferClient
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 10:19:03 +02:00
Vicent Llopis 1215b8cd57 Merge branch 'dev' into 5849-makeInvoice_solved
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 08:15:57 +00:00
Vicent Llopis 04ca5743a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-20 09:40:41 +02:00
Alex Moreno 75ea594272 refs #6011 deploy(2332): init version
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 09:32:52 +02:00
Alex Moreno 0585080303 refs #6011 deploy 2330 version
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 09:26:40 +02:00
Alex Moreno 5771ccb488 Merge branch 'dev' into 5934-clientSms
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 06:50:56 +00:00
Alex Moreno aefcb8c49a Merge branch 'dev' into 5837-quitRestrictionFrance
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 06:40:23 +00:00
Vicent Llopis 4755c50cd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5849-makeInvoice_solved
gitea/salix/pipeline/head Build queued... Details
2023-07-20 07:22:30 +02:00
Vicent Llopis 6df1ef9d4c Merge branch 'dev' into 5934-clientSms
gitea/salix/pipeline/head Build queued... Details
2023-07-20 05:16:54 +00:00
Vicent Llopis ab95ef74a9 refs #5934 refactor: nombres variables
gitea/salix/pipeline/head Build queued... Details
2023-07-20 07:17:35 +02:00
Alex Moreno 8c84f006b0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 07:15:30 +02:00
Sergio De la torre 6344c11d1e Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 14:29:18 +00:00
Alex Moreno b188ae6f57 refs #5976 fix: e2e
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 14:14:35 +02:00
Sergio De la torre 7cff014988 refs #5983 fix(itemShelving): vn
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 13:27:31 +02:00
Carlos Satorres 579d6d53d8 Merge branch 'dev' into 5837-quitRestrictionFrance
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 10:46:17 +00:00
Jorge Penadés b17de86fb1 refs #6043 add ACL
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 12:15:52 +02:00
Sergio De la torre e2f50d63f6 Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 05:02:39 +00:00
Sergio De la torre 85c017431c refs #5983 fix(itemShelving): fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 07:01:43 +02:00
Carlos Satorres 36db2ee883 Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 15:05:56 +00:00
Alex Moreno 2f6c988005 Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 13:53:17 +00:00
Vicent Llopis 7bd378e9dd refs #
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 14:15:56 +02:00
Sergio De la torre 9076553070 refs #5983 test(itemShelving): add getInventory
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 14:11:50 +02:00
Vicent Llopis b3a7a170f0 refs #5934 feat: añadido clientSms log
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 11:54:43 +02:00
Sergio De la torre 93da129239 refs #5983 feat(itemShelving): add getInventory
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 08:54:45 +02:00
Vicent Llopis 09b00401ec Merge branch 'dev' into 4734-addViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 05:56:35 +00:00
Vicent Llopis 834e4b3723 refs #4734 refactor: variables definindas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 07:56:44 +02:00
Guillermo Bonet 3c013110d3 refs #5819 Changed structure sql
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 07:32:45 +02:00
Alex Moreno 15dee8bef4 refs #5976 refactor: transaferSale call setDeleted
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 15:19:36 +02:00
Sergio De la torre 639d5963a3 refs #6028 get_routes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-17 13:50:07 +02:00
Carlos Satorres 6f3cdd3508 refs #5640 fix e2e back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-17 12:30:48 +02:00
Carlos Satorres b2b335326e Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 11:49:26 +00:00
Carlos Satorres b113052b5c refs #5640 fixtures and test fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 13:48:36 +02:00
Vicent Llopis 6980392ba1 fix: tabulacion
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 13:11:09 +02:00
Vicent Llopis 28eedbfd23 Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 11:04:06 +00:00
Vicent Llopis 4f183d1c6a fix: worker.basic-data el boton guardar estava activo al hacer F5
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 12:18:41 +02:00
Carlos Satorres 765c22df96 refs #5837 new table
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 11:30:13 +02:00
Vicent Llopis 1d7f0e2135 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 11:42:49 +02:00
Carlos Satorres 191f478523 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5949-recycledPlasticItem
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 10:58:09 +02:00
Vicent Llopis 01dc26f64e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4770-routes_roadmap2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 09:42:53 +02:00
Vicent Llopis 17b2b02246 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 09:16:32 +02:00
Alex Moreno ac4e264d53 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 08:43:50 +02:00
Vicent Llopis 3a61bc6052 refs #5887 move changes sql
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 08:21:17 +02:00
Carlos Satorres 7da1824e89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5949-recycledPlasticItem
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 06:39:05 +02:00
Vicent Llopis 7aaaf5492c refs #5887 refacotr: move code to hook
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 15:07:06 +02:00
Vicent Llopis c0d329edca a
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 14:04:17 +02:00
Vicent Llopis aea5133f39 refs #5877 fix: aply changes 2023-07-12 14:01:39 +02:00
Vicent Llopis 551d06ee83 refs #5887 para eliminar sigue las mismas reglas que para añadir
gitea/salix/pipeline/head Build queued... Details
2023-07-12 13:55:57 +02:00
Alex Moreno 219a4fbca9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 13:09:58 +02:00
Alex Moreno 9cb29b9166 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-07-12 13:05:17 +02:00
Vicent Llopis bd85cf4e90 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 12:29:17 +02:00
Vicent Llopis a831a1534b Merge branch 'dev' into 4770-routes_roadmap2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-11 11:50:15 +00:00
Vicent Llopis 6655807d80 refs #4770 refactor: change acl
gitea/salix/pipeline/head Build queued... Details
2023-07-11 13:50:38 +02:00
Vicent Llopis d4a4e04f25 refs #5887 feat: cambiados permisos para añadir/quitar alias de correo 2023-07-11 12:33:34 +02:00
Vicent Llopis 56247b5012 add acl
gitea/salix/pipeline/head This commit looks good Details
2023-07-11 09:33:45 +02:00
Carlos Satorres d1c8f0ff11 refs #5949 itemRecycle
gitea/salix/pipeline/head This commit looks good Details
2023-07-11 07:37:51 +02:00
Alex Moreno 8922d27f20 refs #4614 fix e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-07 12:25:02 +02:00
Vicent Llopis 6fa6c21cb1 remove fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-07-07 09:31:26 +02:00
Alex Moreno 8fe9b387ce refs #4614 test: front and correct folder
gitea/salix/pipeline/head This commit looks good Details
2023-07-06 15:16:52 +02:00
Alex Moreno be0120728d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight 2023-07-06 15:15:36 +02:00
Alex Moreno d9d4441d59 refs #5970 deploy: 233001 init
gitea/salix/pipeline/head This commit looks good Details
2023-07-06 13:38:59 +02:00
Alex Moreno a665b6c060 refs #5970 fix sql
gitea/salix/pipeline/head This commit looks good Details
2023-07-06 11:51:04 +02:00
Alex Moreno 63a8f40443 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good Details
2023-07-06 10:42:53 +02:00
Alex Moreno 6530e87508 refs #4614 feat(ticket): prevent invoice without weight
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 15:20:51 +02:00
Alex Moreno 040e9e4197 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 12:50:45 +02:00
Alex Moreno d7fca07446 Merge branch 'dev' into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 10:17:42 +00:00
Alex Moreno 444b08c566 refs #5712 test(docuware)
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 12:09:52 +02:00
Vicent Llopis e58d4e5db3 refs #4770 feat: añadida sección 'Troncales'
gitea/salix/pipeline/head This commit looks good Details
2023-07-04 14:42:51 +02:00
Javi Gallego e4e7a9444a Merge branch 'dev' into 4059-revocar-permisos-client-account
gitea/salix/pipeline/head This commit looks good Details
2023-07-04 11:47:39 +02:00
Alex Moreno 4f616397a2 refs #5712 use dmsType readRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 15:05:39 +02:00
Pablo Natek 2ccf8d5197 refs #5347
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 14:49:21 +02:00
Pablo Natek 6b557d5d8a refs #5347 2023-07-03 14:14:25 +02:00
Pablo Natek 4d0ed75090 Merge branch '5347-clientCreateRefactor' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreateRefactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 14:08:53 +02:00
Pablo Natek 9fe7024d17 refs #5347 2023-07-03 14:08:50 +02:00
Alex Moreno c7b9d0827e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 13:42:54 +02:00
Pablo Natek 8ef6f0dd17 Merge branch 'dev' into 5347-clientCreateRefactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 11:35:50 +00:00
Alex Moreno 461e1d4d5d refs #5475 feat: userUses, fix forbiddenError and merge in dev
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 13:33:48 +02:00
Alex Moreno 7fe8698b6f refs #5753 fix ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 10:04:03 +02:00