Commit Graph

186 Commits

Author SHA1 Message Date
Guillermo Bonet 0d7d4917a7 Merge branch 'master' into test 2024-05-07 13:18:28 +02:00
Guillermo Bonet cc8873f48a hotfix: #7173 Rollback
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-07 13:08:44 +02:00
Guillermo Bonet da8378d422 hotfix: refs #7173 Deleted restriction invoiceInDueDay_beforeUpdate
gitea/salix/pipeline/head This commit looks good Details
2024-05-07 12:15:28 +02:00
Guillermo Bonet e44568ff4b feat: refs #6585 Added call ticket_afterUpdate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 08:00:26 +02:00
Sergio De la torre e8a30c1df8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-06 10:30:19 +02:00
Robert Ferrús 87e85e4a4e Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 05:08:07 +00:00
Ivan Mas 5d3235977f Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 12:57:26 +00:00
Robert Ferrús 82ee8d2209 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 09:25:06 +00:00
Guillermo Bonet 0ab79728b5 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-02 08:10:20 +02:00
Guillermo Bonet 7eb2e8f218 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-02 08:09:59 +02:00
Guillermo Bonet b926725021 hotfix: ticket#179915 Fix no worker exists
gitea/salix/pipeline/head This commit looks good Details
2024-05-02 08:04:44 +02:00
Ivan Mas de5e43fb05 Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 12:41:54 +00:00
Ivan Mas 3167bdcdd0 refs #7191 message modification
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 14:37:06 +02:00
Jon Elias 2b9bfb5d85 Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2364
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-30 10:19:29 +00:00
Guillermo Bonet 80b44ccace Merge pull request 'refactor: refs #7258 Deleted all dependences of vn2008 schema' (!2362) from 7258-lastChangesMigrationVn2008 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2362
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-30 05:37:33 +00:00
Ivan Mas a33cbb0a7c Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-29 17:46:26 +00:00
Ivan Mas 30f6a9324d refs #7191 SQL conventions mod
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-29 19:40:43 +02:00
Robert Ferrús d2c3034ec6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 12:07:53 +02:00
Pablo Natek c5b02dc239 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-25 09:46:53 +02:00
Pablo Natek a15970c95f fix: refs #7187 sql for pdaFreelancer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 11:08:57 +02:00
Guillermo Bonet 71e1e53ccd refactor: #7258 Fixes 2024-04-24 10:57:35 +02:00
Jon Elias 6706974784 fix: refs #6731 fix ticketRequest
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 10:31:26 +02:00
Guillermo Bonet f7ebd071bf refactor: #7258 Deleted all dependences of vn2008 schema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 09:53:31 +02:00
Robert Ferrús ffe56edc9c feat: refs #7039 country
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 09:24:42 +02:00
Pablo Natek 71a9aed1bb fix: refs #7187 check for multiple device on freelancer 2024-04-22 18:03:17 +02:00
Ivan Mas 0284b138d7 refs #7191 requested modifications
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 15:03:08 +02:00
Juan Ferrer bc45cafb40 Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-22 08:54:14 +02:00
Ivan Mas 7e488ee601 refs #7191 check isBooked in entry_BeforeUpdate
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 16:09:05 +02:00
Sergio De la torre ad13ad856b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 09:13:48 +02:00
Pablo Natek eee7062e3f Merge pull request 'test' (!2319) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2319
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-18 05:05:40 +00:00
Jorge Penadés b83e0a4ae2 fix: refs #6492 castToInt
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-17 16:43:17 +02:00
Juan Ferrer 7cda14c424 Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-17 13:24:32 +02:00
Juan Ferrer ae326e6e2e feat(binlog): refs #4409 Old recalc code removed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Queues: orderTotal, ticketTotal and travelEntries
2024-04-17 13:21:27 +02:00
Guillermo Bonet 9f9662924d Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!2306) from 6968-groupingModeRefactor into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2306
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-17 06:48:43 +00:00
Pablo Natek d0dfdc668b feat(agency): refs #4988 add new agency
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 16:25:27 +02:00
Guillermo Bonet 7a557be09a feat: refs #6968 Changed groupingMode to enum
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 11:07:57 +02:00
Jorge Penadés 976b18203e feat: refs #7187 check if is freelancer on insert & update
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 10:49:17 +02:00
Guillermo Bonet 45fac06c6b feat: refs #7173 Added restrictions in invoiceIn structure 2024-04-16 08:58:26 +02:00
Guillermo Bonet 93abfdd8a1 feat: refs #7173 Added restrictions in invoiceIn structure 2024-04-16 08:44:50 +02:00
Pablo Natek 336c3274ea feat(agency): refs #4988 add summary 2024-04-16 07:38:48 +02:00
Sergio De la torre 09812c24dd refs #5890 feat: triggers
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-08 09:54:23 +02:00
Juan Ferrer 283d8b1241 feat: refs #4409 Disable old available triggers 2024-04-08 09:11:40 +02:00
Carlos Andrés d18721f50d feat: bloquear facturas recibidas contabilizadas refs #7173
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-04 18:05:45 +02:00
Carlos Andrés bd661befb6 feat: bloquear facturas recibidas contabilizadas refs #7173
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-04 15:04:23 +02:00
Sergio De la torre c066462c10 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-04 07:09:16 +02:00
Sergio De la torre 6db1696094 refs #5890 feat:trigger 2024-04-03 07:04:12 +02:00
Alex Moreno f1931fce69 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-28 08:19:26 +01:00
Sergio De la torre 9698c049fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-28 07:35:37 +01:00
Carlos Andrés 4ac418111b fix: TRIGGER incorrecto en travel refs #7148
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-27 14:12:34 +01:00
Guillermo Bonet bde8742147 fix: refs #7024 entry_checkBooked
gitea/salix/pipeline/head This commit looks good Details
2024-03-25 12:51:47 +01:00
Guillermo Bonet 17e61b9caa feat: refs #7024 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-25 08:50:18 +01:00
Guillermo Bonet 4005fe9064 feat: refs #7024 Added entry_checkBooked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-25 08:47:06 +01:00
Sergio De la torre d7d47da3e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado 2024-03-21 11:19:16 +01:00
Guillermo Bonet cdaa7999d1 Merge branch 'dev' into 6395-buyBuyerFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 07:55:05 +00:00
Javier Segarra bfdbbc0fdf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-03-15 12:22:57 +01:00
Carlos Andrés 3999533707 Merge branch 'test' into 6960-restricciones-AWB
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-14 11:33:14 +01:00
Carlos Andrés 1e29b6c1ed merge test
gitea/salix/pipeline/pr-master There was a failure building this commit Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-03-14 11:30:07 +01:00
Guillermo Bonet 184a3a3c7a refs #6395 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 10:05:25 +01:00
Guillermo Bonet 166b74c70d Merge branch 'dev' into 6395-buyBuyerFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 08:59:22 +00:00
Alex Moreno 0ad052c34a refs #7033 deploy(2412): dev to test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-14 08:36:19 +01:00
Sergio De la torre bfcfd2245b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado 2024-03-14 07:40:30 +01:00
Javier Segarra 63a22a50f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-03-12 09:37:41 +01:00
Sergio De la torre 61de81254a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado 2024-03-11 08:11:00 +01:00
Javier Segarra 18773f34de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-09 11:27:57 +01:00
Jorge Penadés 1e3967a4fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 15:56:02 +01:00
Javier Segarra 2f0c8d96d2 refs 5858 fix: resolve breaklines 2024-03-06 11:41:25 +01:00
Carlos Andrés 66b7a3e8f5 feat: restricciones AWB para travel y entry refs #6960
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-03-05 17:30:29 +01:00
Guillermo Bonet e0732835d0 refactor: refs #6948 Bank to Accouting
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 10:25:23 +01:00
Carlos Andrés 292b77d57e feat: restricciones AWB para travel y entry refs #6960
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-01 14:36:49 +01:00
Carlos Andrés b9e774cea0 feat: restricciones AWB para travel y entry refs #6960
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-01 14:26:36 +01:00
Jorge Penadés c54c9ce913 fix: refs #5186 create parkingLog & add sector relation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 14:43:37 +01:00
Javier Segarra 8e976d2e4f refs #5858 feat: remove Schedule system
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 09:28:27 +01:00
Javier Segarra becd2e6f48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-29 07:49:24 +01:00
Sergio De la torre fd077ae60f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado 2024-02-28 07:45:39 +01:00
Carlos Andrés 7ffc11e45a Merge pull request 'feat: comprobaciones facturas contabilizadas refs #6932' (!2091) from 6932-cambios-en-ENT-con-facturas-contabilzadas into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2091
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-26 16:22:26 +00:00
Carlos Andrés dcb09cd9f9 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 15:54:13 +01:00
Carlos Andrés 9cbcd70d4d feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-26 15:44:34 +01:00
Carlos Andrés f1329a4624 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-26 15:43:17 +01:00
Jorge Penadés 085e231142 Merge branch 'dev' into 6513-createSupplierDms
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 12:29:44 +00:00
Carlos Andrés bfd86c8972 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 12:18:57 +01:00
Carlos Andrés a19ce04a40 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 12:18:02 +01:00
Jorge Penadés 910cc41beb fix: refs #6513 trigger & alter table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 09:35:06 +01:00
Jorge Penadés 9df91a33b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6513-createSupplierDms
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 08:26:17 +01:00
Alex Moreno d37802fda8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-26 07:21:47 +01:00
Carlos Andrés 4cc950011e feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 18:15:07 +01:00
Carlos Andrés 55bc6418f5 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 18:13:01 +01:00
Carlos Andrés 5fe4f794cc feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-23 18:10:23 +01:00
Carlos Andrés bed4faceb7 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-23 18:04:43 +01:00
Jorge Penadés 3c038a060c feat: refs #6513 WIP triggers & logger
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 16:27:49 +01:00
Carlos Andrés c18b42a717 feat: validar caracteres invocieIn.supplierref #6931
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 16:01:55 +01:00
Carlos Andrés 29a96ede56 feat: validar caracteres invocieIn.supplierref #6931
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-23 15:58:00 +01:00
Carlos Andrés e0cee8f559 feat: validar caracteres invocieIn.supplierref #6931
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 15:41:30 +01:00
Alex Moreno 033b176e72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-22 09:06:03 +01:00
Alex Moreno 01f1bd0088 Revert "Merge branch 'dev' into test"
gitea/salix/pipeline/pr-test This commit looks good Details
This reverts commit c4a64b93cc, reversing
changes made to 2ab1cebb31.
2024-02-21 14:44:34 +01:00
David Domenech 5bef3989cd refs #6372
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 14:07:52 +01:00
Javier Segarra 791687f271 refs #5878 feat: comments
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 14:27:22 +01:00
Javier Segarra 811a49275d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-20 13:53:18 +01:00
Alex Moreno e8a945ba51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-19 11:49:20 +01:00
David Domenech cc600542ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008 2024-02-19 10:58:36 +01:00
Jorge Penadés 556a67ecfc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 08:26:32 +01:00