Commit Graph

21147 Commits

Author SHA1 Message Date
Alex Moreno cc06698214 hotFix(ticket): refs #7225 fix advanced and movable
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-23 15:37:04 +02:00
Juanjo Breso 9c306d4cc2 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 12:55:02 +00:00
Juanjo Breso 5efb6acafe feat: refs#6493 Cambios solicitados procedimientos
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 14:55:05 +02:00
Guillermo Bonet e0393a6e72 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-23 14:43:19 +02:00
Guillermo Bonet f5844ff426 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-23 14:42:57 +02:00
Guillermo Bonet ec23cc7619 hotfix: entry_checkBooked
gitea/salix/pipeline/head This commit looks good Details
2024-04-23 14:41:43 +02:00
Javier Segarra 0fd120676d Actualizar modules/ticket/back/methods/ticket-request/filter.js
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 12:29:40 +00:00
Juanjo Breso 022264ffff Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 14:05:51 +02:00
Juanjo Breso d1c72a0be3 feat: refs#6493 Cambios solicitados procedimientos 2024-04-23 14:05:48 +02:00
Juanjo Breso 9b2bb4be0e Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 12:04:19 +00:00
Guillermo Bonet afe2669b27 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 13:57:42 +02:00
Guillermo Bonet 36c8a8db0f Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-23 13:57:18 +02:00
Guillermo Bonet 8f6303e851 Merge pull request 'hotfix: Throw msg and entry_updateComission start transaction' (!2352) from ticket176792-hotfix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2352
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-23 11:55:00 +00:00
Javier Casado 69ea518a49 Merge branch 'dev' into 6697-removeClaimQuantity
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-23 10:55:45 +00:00
Ivan Mas 2291a92a43 Merge pull request 'refs #7032 Delete vn.recipe_Cook' (!2348) from 7032-Delete-vn.recipeCook into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2348
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-23 10:28:28 +00:00
Ivan Mas e7055e2428 Merge branch 'dev' into 7032-Delete-vn.recipeCook
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 10:26:42 +00:00
Juanjo Breso 79172ef288 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 10:16:27 +00:00
Carlos Andrés 2d5daf55c2 Merge pull request 'feat: Varias líneas farming en albaranes refs #7020' (!2349) from 7020-Varias-líneas-farming-en-albaranes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2349
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-23 10:04:08 +00:00
Guillermo Bonet 8dd4ac9119 hotfix: Throw msg and entry_updateComission start transaction
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-23 11:50:48 +02:00
Javier Segarra 27354e452f Merge pull request '#7190 - RenewTokenMultimedia' (!2335) from 7190_renewTokenMultimedia into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2335
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-23 08:28:08 +00:00
Javier Segarra 83d89d13ad Merge branch 'dev' into 7190_renewTokenMultimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 08:26:23 +00:00
Alex Moreno 6f0038e4cc fix: refs #7226 disable debug
gitea/salix/pipeline/head This commit looks good Details
2024-04-23 10:23:21 +02:00
Alex Moreno 7fd7acbb56 deploy: refs #7253 init version 2420
gitea/salix/pipeline/head This commit looks good Details
2024-04-23 10:06:22 +02:00
Alex Moreno fbf1b6e1af Merge pull request '7253-devToTest_2418' (!2350) from 7253-devToTest_2418 into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2350
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-23 08:02:45 +00:00
Pablo Natek 06e743f5da fix: refs #7253 check booked add new restriction to be tested
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-23 10:00:11 +02:00
Alex Moreno 60d5b9e4aa test: refs #7173 fix sql, adding alias
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-23 08:47:52 +02:00
Alex Moreno 85491613b0 test: refs #7173 fix fixtures 2024-04-23 08:47:28 +02:00
Juanjo Breso d7e4dd4fc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 08:03:17 +02:00
Alex Moreno e52322f649 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-04-23 07:42:56 +02:00
Alex Moreno 902be9e788 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-04-23 07:41:04 +02:00
Juan Ferrer 91608b9053 Merge pull request 'refs #4409 Remove old recalc code' (!2300) from 4409-binlog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2300
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-22 19:45:18 +00:00
Juan Ferrer d58607f26e Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 19:43:48 +00:00
Carlos Andrés 8bb331f0ed feat: Varias líneas farming en albaranes refs #7020
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 19:57:17 +02:00
Carlos Andrés c6a1ae338c Merge pull request 'Hot fix informe facturas recibidas Ticket #176640' (!2347) from Hotfix-informe-facturas-emitidas-Ticket-#176640 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2347
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-04-22 15:56:50 +00:00
Ivan Mas 9899efab97 refs #7032 Delete vn.recipe_Cook
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 17:55:49 +02:00
Carlos Andrés d249645c37 Hot fix informe facturas recibidas Ticket #176640
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-22 17:51:21 +02:00
Ivan Mas 6a3224dfcd Merge pull request 'refs #7021 Delete rfid schema' (!2340) from 7021-Delete_rfid_schema into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2340
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-22 11:19:39 +00:00
Ivan Mas f380e0d1ce Merge branch 'dev' into 7021-Delete_rfid_schema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 11:17:54 +00:00
Guillermo Bonet eb9f81c81d feat #7181 Rollback creditInsurance_getRisk
gitea/salix/pipeline/head This commit looks good Details
2024-04-22 13:05:16 +02:00
Ivan Mas 1ef98ecd8c Merge branch 'dev' into 7021-Delete_rfid_schema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 10:37:15 +00:00
Sergio De la torre ccc9251d39 Merge pull request '6921_addFromDelivery' (!2304) from 6921_addFromDelivery into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2304
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-22 10:33:33 +00:00
Sergio De la torre 0f05fe5d93 Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 10:32:03 +00:00
Robert Ferrús 88b71245a5 Merge pull request 'feat: refs #6777 change dependecies vn2008 to vn' (!2000) from 6777-changeDependenciesVn2008toVnPart7 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2000
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-22 10:20:50 +00:00
Robert Ferrús debd163b3f Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 10:16:01 +00:00
Robert Ferrús 2e1cb6e827 Merge pull request 'feat: refs #7029 packaging' (!2164) from 7029-packagingVolumeRestriction into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2164
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-22 09:55:46 +00:00
Robert Ferrús 6bb36e0d82 Merge branch 'dev' into 7029-packagingVolumeRestriction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 09:53:51 +00:00
Javi Gallego b0c4f7fd3c feat: moved files to invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 11:45:58 +02:00
Javi Gallego 4416790ce1 Merge branch 'dev' into 7108-exchange-rate 2024-04-22 11:45:02 +02:00
Robert Ferrús b0289d2e18 Merge pull request 'test' (!2344) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2344
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-22 09:34:45 +00:00
Robert Ferrús c109f3616e Merge pull request 'master' (!2343) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2343
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-22 09:24:59 +00:00