Commit Graph

20710 Commits

Author SHA1 Message Date
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
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
Sergio De la torre 8ad61026ea Merge pull request 'refs #6312 hotFix fix:replaceItem' (!2367) from 6312_originalQuanitty into master
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-25 08:35:59 +02:00
Sergio De la torre 46f2d790db refs #6312 hotFix fix:replaceItem
gitea/salix/pipeline/pr-master There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
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
gitea/salix/pipeline/pr-master This commit looks good Details
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
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-24 10:42:50 +02:00
Alex Moreno 2e1ad0c000 Merge branch 'master' into 7225-hotFix_ticket_advanced_movable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-24 08:42:26 +00:00
Carlos Andrés 9823c22c66 Merge pull request 'hotfix importErrorNotification refs #6189' (!2357) from hotFix-6189-importErrorNotification into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
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
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-23 17:24:47 +02:00
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
Guillermo Bonet ec23cc7619 hotfix: entry_checkBooked
gitea/salix/pipeline/head This commit looks good Details
2024-04-23 14:41:43 +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
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
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
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
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
Robert Ferrús c44998e77b Merge pull request 'feat: refs #174903 item_getSimilar' (!2326) from 174903-item_getSimilar into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2326
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-22 08:53:58 +00:00
Robert Ferrús e8d7f20221 Merge branch 'master' into 174903-item_getSimilar
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-22 07:43:39 +00:00
Robert Ferrús a1a3470df4 feat: refs #174903
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-22 09:43:13 +02:00
Sergio De la torre e2a6f992cb Merge pull request 'refs #6413 hotFix fix:ubicadorChecking' (!2337) from hotFix_Ubicador into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2337
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-04-22 05:35:08 +00:00
Sergio De la torre 081c97828c Merge branch 'master' into hotFix_Ubicador
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-22 05:08:59 +00:00
Guillermo Bonet 6c552b9ee0 Merge pull request 'feat: #7231 Collection_assing more time and throw' (!2341) from 7231-collectionProcsThrow into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2341
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-19 12:37:30 +00:00
Guillermo Bonet 65892625d5 feat: #7231 Collection_assing more time and throw
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-19 14:17:49 +02:00
Carlos Andrés e3d96fef97 Merge pull request 'fix: hotfix importar A3 Ticket 175840' (!2339) from hotfix-importar-A3Ticket-#175840 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2339
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-19 12:12:58 +00:00
Carlos Andrés e0cd08b280 fix: hotfix importar A3 Ticket 175840
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-19 14:10:11 +02:00
Sergio De la torre e6258dc9e5 refs #6413 hotFix fix:ubicadorChecking
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-19 13:03:57 +02:00
Robert Ferrús 8be8dc8f74 Merge pull request 'feat: refs #7237 company_getSuppliersDebt' (!2336) from 7237-company_getSuppliersDebt into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2336
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-19 09:13:23 +00:00
Robert Ferrús 28c08d8b18 feat: refs #7237 company_getSuppliersDebt
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-19 10:58:19 +02:00
Alex Moreno 5e77d648fb Merge branch 'master' into 174903-item_getSimilar
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-19 07:39:06 +00:00
Javier Segarra 1b6f7a49fd Merge pull request 'hotFix: change require to import' (!2328) from hotFix_ImportUserError_front into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev Build started... Details
Reviewed-on: #2328
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-04-19 05:53:09 +00:00
Alex Moreno 91e13070c7 fix: try to fix puppeteer
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-19 07:27:54 +02:00
Alex Moreno 8b468b52ea fix: try to fix puppeteer
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-19 07:21:35 +02:00
Alex Moreno f766b9a3b1 fix: try to fix puppeteer
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-19 07:17:53 +02:00
Alex Moreno 9ec51e534d fix: jenkins puppeteer
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-18 15:39:25 +02:00
Alex Moreno 87e23b49e7 hotFix: change require to import
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-18 15:19:19 +02:00
Robert Ferrús f269d41596 Merge branch 'master' into 174903-item_getSimilar
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-18 12:52:52 +00:00
Guillermo Bonet 5c5d0ec9dc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 13:52:31 +02:00
Guillermo Bonet d5dc057c36 hotfix: changes 2024-04-18 13:52:30 +02:00
Robert Ferrús 9295bddaa8 feat: refs #174903 item_getSimilar
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-18 13:06:45 +02:00
Carlos Andrés 0ebdd032e5 Merge pull request 'testToMaster fix' (!2325) from test into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2325
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-18 10:39:19 +00:00
Guillermo Bonet d6ec84e1fe hotfix
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 12:07:00 +02:00
Alex Moreno 51d09b4f2a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-18 09:27:15 +02:00
Alex Moreno 1ea4aa9d05 Merge pull request 'deploy: refs #7226 dump' (!2324) from 7226-dump into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2324
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-04-18 07:25:49 +00:00
Alex Moreno 659adfd87d deploy: refs #7226 dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-18 09:20:47 +02:00
Alex Moreno 7a021c9ac6 fix(payrollCenter): refs #6738
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 09:13:15 +02:00
Alex Moreno af06ef30d4 hotFix(workerDms): document.isDocuware
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 08:50:17 +02:00