Commit Graph

21110 Commits

Author SHA1 Message Date
Robert Ferrús b8b055b86c hotFix(getBalance): date setHours to 0 2024-05-02 08:00:44 +02:00
Alex Moreno d18f08e676 hotFix(addSaleByCode) add userId 2024-04-30 12:15:27 +02:00
Guillermo Bonet c987bb6e66 Merge branch 'master' into test 2024-04-30 11:47:35 +02:00
Guillermo Bonet d44b8f7c9a hotfix: ticket #179514 ticket_close packaging fix 2024-04-30 11:44:16 +02:00
Carlos Andrés 2b6d4198ad Merge pull request 'Hotfix-create-proc-to-kill-connection' (!2385) from Hotfix-create-proc-to-kill-connection into master
Reviewed-on: #2385
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-04-30 07:06:43 +00:00
Carlos Andrés e934b47e98 Hotfix feat: new function to kill connections 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
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 2024-04-29 15:01:20 +02:00
Carlos Andrés 51c8736da2 hotFix collection_assign 2024-04-29 14:54:15 +02:00
Carlos Andrés dcb6f90ab3 hotfix collection_assign elimino vLockTime 2024-04-29 14:42:16 +02:00
Sergio De la torre e1fe1cef7f Merge pull request '6275_getExpeditionSummary' (!2381) from 6275_getExpeditionSummary into master
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 2024-04-29 08:59:12 +02:00
Sergio De la torre f4767728bc refs #6275 hotFix fix:getExpeditionSummary 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
Reviewed-on: #2380
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-27 11:14:59 +00:00
Pako Natek 9aa6e3f80a hotfix 2024-04-27 13:09:15 +02:00
Pako Natek 97142bf976 Merge pull request 'hotFix' (!2379) from hotFix-GET_LOCK-TEST into test
Reviewed-on: #2379
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-27 10:57:04 +00:00
Pako Natek 3440bb1725 hotFix 2024-04-27 12:43:15 +02:00
Pako Natek 9e87b055b7 hotFix 2024-04-27 12:36:21 +02:00
Robert Ferrús b129d25230 Merge pull request 'fix: refs #177968 restore restriction' (!2375) from 177968-hotFixSale_replaceItem into master
Reviewed-on: #2375
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-26 08:54:36 +00:00
Robert Ferrús c819b92141 fix: refs #177968 restore restriction 2024-04-26 09:09:22 +02:00
Carlos Andrés e07655bcf3 Merge pull request 'Hotfix test farmingDeliveryNote' (!2372) from HotFix-test-farmingDeliveryNote into test
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 2024-04-25 19:06:06 +02:00
Carlos Andrés 326c5c97bd Hotfix test farmingDeliveryNote 2024-04-25 19:02:05 +02:00
Sergio De la torre 8ad61026ea Merge pull request 'refs #6312 hotFix fix:replaceItem' (!2367) from 6312_originalQuanitty into master
Reviewed-on: #2367
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-25 07:10:50 +00:00
Sergio De la torre d4d31c6d9e refs #6312 hotFix fix:replaceItem 2024-04-25 08:35:59 +02:00
Sergio De la torre 46f2d790db refs #6312 hotFix fix:replaceItem 2024-04-25 08:01:32 +02:00
Alex Moreno f1f2dfea35 Merge pull request 'hotFix(ticket): refs #7225 fix advanced and movable' (!2356) from 7225-hotFix_ticket_advanced_movable into master
Reviewed-on: #2356
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-25 05:52:39 +00:00
Alex Moreno 69486fb29f fix(componentUpdate): refs #7225 fix transfer all lines to newTicket 2024-04-24 14:15:27 +02:00
Alex Moreno 2638b93299 Merge branch '7225-hotFix_ticket_advanced_movable' of https://gitea.verdnatura.es/verdnatura/salix into 7225-hotFix_ticket_advanced_movable 2024-04-24 11:40:25 +02:00
Alex Moreno eced03f69b fix(ticket_getMovable): refs #7225 stock add ifnull 2024-04-24 11:40:24 +02:00
Alex Moreno 0cd740ce0c test: refs #7225 fix back test 2024-04-24 10:42:50 +02:00
Alex Moreno 2e1ad0c000 Merge branch 'master' into 7225-hotFix_ticket_advanced_movable 2024-04-24 08:42:26 +00:00
Carlos Andrés a7f1188975 Merge pull request 'master' (!2358) from master into test
Reviewed-on: #2358
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-04-23 15:35:33 +00:00
Carlos Andrés 9823c22c66 Merge pull request 'hotfix importErrorNotification refs #6189' (!2357) from hotFix-6189-importErrorNotification into master
Reviewed-on: #2357
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-04-23 15:32:09 +00:00
Carlos Andrés 033bcf6b67 hotfix importErrorNotification refs #6189 2024-04-23 17:24:47 +02:00
Alex Moreno cc06698214 hotFix(ticket): refs #7225 fix advanced and movable 2024-04-23 15:37:04 +02:00
Guillermo Bonet f5844ff426 Merge branch 'master' into test 2024-04-23 14:42:57 +02:00
Guillermo Bonet ec23cc7619 hotfix: entry_checkBooked 2024-04-23 14:41:43 +02:00
Guillermo Bonet 36c8a8db0f Merge branch 'master' into test 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
Reviewed-on: #2352
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-23 11:55:00 +00:00
Guillermo Bonet 8dd4ac9119 hotfix: Throw msg and entry_updateComission start transaction 2024-04-23 11:50:48 +02:00
Alex Moreno 6f0038e4cc fix: refs #7226 disable debug 2024-04-23 10:23:21 +02:00
Alex Moreno fbf1b6e1af Merge pull request '7253-devToTest_2418' (!2350) from 7253-devToTest_2418 into test
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 2024-04-23 10:00:11 +02:00
Alex Moreno 60d5b9e4aa test: refs #7173 fix sql, adding alias 2024-04-23 08:47:52 +02:00
Alex Moreno 85491613b0 test: refs #7173 fix fixtures 2024-04-23 08:47:28 +02:00
Alex Moreno e52322f649 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-04-23 07:42:56 +02:00