Commit Graph

21365 Commits

Author SHA1 Message Date
Guillermo Bonet c987bb6e66 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-30 11:47:35 +02:00
Guillermo Bonet d44b8f7c9a hotfix: ticket #179514 ticket_close packaging fix
gitea/salix/pipeline/head This commit looks good Details
2024-04-30 11:44:16 +02:00
Guillermo Bonet 110cae3171 Merge pull request 'refactor: #6997 Deleted vn.client.eypbc' (!2353) from 6997-eypbc into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2353
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-30 08:23:52 +00:00
Carlos Andrés 2b6d4198ad Merge pull request 'Hotfix-create-proc-to-kill-connection' (!2385) from Hotfix-create-proc-to-kill-connection into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2385
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-04-30 07:06:43 +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
Carlos Andrés e934b47e98 Hotfix feat: new function to kill connections
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-29 17:09:51 +02:00
Carlos Andrés e55658e6b3 Hotfix feat: new function to kill connections 2024-04-29 17:02:47 +02:00
Carlos Andrés 21a1e1eed3 Hotfix feat: new function to kill connections 2024-04-29 16:59:56 +02:00
Carlos Andrés 8c7f8a43a7 Merge pull request 'hotFix collection_assign' (!2384) from hotfix-eliminar-vLockTime-collection_assign into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2384
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-29 13:02:56 +00:00
Carlos Andrés 7b7afb05c5 hotfix collection_assign
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-29 15:01:20 +02:00
Carlos Andrés 51c8736da2 hotFix collection_assign
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-29 14:54:15 +02:00
Carlos Andrés dcb6f90ab3 hotfix collection_assign elimino vLockTime
gitea/salix/pipeline/head This commit looks good Details
2024-04-29 14:42:16 +02:00
Carlos Satorres ace39b92ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6870-modifyDefaulterNotification
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-29 12:14:38 +02:00
Carlos Satorres f3c7b1e89c refs #6870 add observationEmail 2024-04-29 11:59:51 +02:00
Sergio De la torre e1fe1cef7f Merge pull request '6275_getExpeditionSummary' (!2381) from 6275_getExpeditionSummary into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2381
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-04-29 09:24:50 +00:00
Sergio De la torre a180f54390 refs #6275 hotFix fix:getExpeditionSummary
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-29 08:59:12 +02:00
Sergio De la torre f4767728bc refs #6275 hotFix fix:getExpeditionSummary
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-29 08:20:57 +02:00
Sergio De la torre f2225b49a7 refs #6275 hotFix fix:getExpeditionSummary 2024-04-29 08:19:18 +02:00
Pako Natek bb4f97102e Merge pull request 'hotFix' (!2380) from hotFix-GET_LOCK into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2380
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-27 11:14:59 +00:00
Pako Natek 9aa6e3f80a hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-27 13:09:15 +02:00
Pako Natek 97142bf976 Merge pull request 'hotFix' (!2379) from hotFix-GET_LOCK-TEST into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2379
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-27 10:57:04 +00:00
Pako Natek 3440bb1725 hotFix
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-27 12:43:15 +02:00
Pako Natek 9e87b055b7 hotFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-27 12:36:21 +02:00
Jorge Penadés 7ee279cb31 Merge pull request '#7019 warmfix e2e' (!2376) from 7019-warmfix-createInvoiceOut into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2376
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-26 12:21:16 +00:00
Robert Ferrús b129d25230 Merge pull request 'fix: refs #177968 restore restriction' (!2375) from 177968-hotFixSale_replaceItem into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2375
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-26 08:54:36 +00:00
Jorge Penadés 1e5c90e921 fix: refs #7019 e2e
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 09:30:20 +02:00
Robert Ferrús c819b92141 fix: refs #177968 restore restriction
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-26 09:09:22 +02:00
Pablo Natek 17ed4b7f08 Merge pull request '#4988 - new-module-agency' (!2303) from 4988-new-module-agency into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2303
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-26 07:06:55 +00:00
Carlos Satorres dab69cc9a3 Merge pull request '6976-supplierConsumption' (!2365) from 6976-supplierConsumption into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2365
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-26 07:04:53 +00:00
Carlos Satorres e2696cd883 Merge branch 'dev' into 6976-supplierConsumption
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 06:58:36 +00:00
Carlos Satorres bc94850cc8 refs #6976 fix pr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 08:59:00 +02:00
Pablo Natek 51c42d09b2 fix: refs #4988 agency hook
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 08:39:05 +02:00
Pablo Natek 4693ba13fa Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-26 08:37:51 +02:00
Carlos Satorres e78b23a849 refs #6976 remove css
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 08:31:33 +02:00
Robert Ferrús 2cdc64cbe7 Merge pull request 'feat: refs #6223 ticketCalculateClon' (!2360) from 6223-ticketCalculateClon into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2360
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-26 05:23:11 +00:00
Robert Ferrús 30a905f40b Merge branch 'dev' into 6223-ticketCalculateClon
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 05:08:26 +00:00
Javi Gallego 63320af4c7 Merge pull request '#7108 - exchange-rate' (!2295) from 7108-exchange-rate into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2295
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-26 05:00:05 +00:00
Javi Gallego 94e04c1c2f Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 06:45:43 +02:00
Carlos Andrés a4417dde6c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-25 19:23:48 +02:00
Carlos Andrés e07655bcf3 Merge pull request 'Hotfix test farmingDeliveryNote' (!2372) from HotFix-test-farmingDeliveryNote into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Reviewed-on: #2372
Reviewed-by: Ivan Mas <ivanm@verdnatura.es>
2024-04-25 17:10:03 +00:00
Carlos Andrés f25d3c14c6 Hotfix test farmingDeliveryNote
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-25 19:06:06 +02:00
Carlos Andrés 326c5c97bd Hotfix test farmingDeliveryNote
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-04-25 19:02:05 +02:00
Jorge Penadés 86d8bc877a Merge pull request '#7019 fix(createManualInvoice): add throw error' (!2175) from 7019_fix_createManualInvoice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2175
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-25 15:30:17 +00:00
Jorge Penadés dd4762ad6e Merge pull request '#7211 check if there's available clockIn' (!2368) from 7211-fixWorkerTimeControl into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2368
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-25 15:23:16 +00:00
Jorge Penadés b09fa1e2fb feat: refs #7019 changelog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 17:22:30 +02:00
Pablo Natek d25c5eb327 fix: refs #4988 translates
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 17:22:22 +02:00
Pablo Natek af1abe934f fix: refs #4988 translates 2024-04-25 17:21:59 +02:00
Jorge Penadés b9de2b3ce6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 17:18:37 +02:00