Commit Graph

22790 Commits

Author SHA1 Message Date
Jorge Penadés 05e6e10337 fix: refs #6889 fix back tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-30 10:04:34 +02:00
Alex Moreno 9e384487cf Merge branch 'master' into 7268-hotFix_getChanges_datestring
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-30 08:01:33 +00:00
Javi Gallego 7186686548 Merge branch 'dev' into 4560-GastosReparto 2024-05-30 09:44:06 +02:00
Javi Gallego 5e55f2d92d feat: refs # 6408 test ok
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-30 09:35:42 +02:00
Jorge Penadés 4fa2a4d58c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-30 08:45:01 +02:00
Alex Moreno ce2721ca47 deploy: increase version
gitea/salix/pipeline/head This commit looks good Details
2024-05-30 08:16:57 +02:00
Alex Moreno f9d25ccd6c hotFix(updateClaim): salesPerson undefined
gitea/salix/pipeline/head This commit looks good Details
2024-05-30 08:14:10 +02:00
Guillermo Bonet d461b78c7b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-30 07:19:03 +02:00
Guillermo Bonet 255a2c5283 fix: refs #7258 Proc bs.claim_ratio_routine
gitea/salix/pipeline/head This commit looks good Details
2024-05-30 07:18:30 +02:00
Jorge Penadés d866ec6417 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 16:59:19 +02:00
Jorge Penadés a32db7840e feat: refs #6889 fixtures & models
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 16:54:24 +02:00
Javi Gallego d9d7904aaf refs: #7108 weekends
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 11:58:13 +02:00
Pako Natek dccfe4847b Merge pull request 'nuevo enfoque recipe y manejo de errores en order_confirm' (!2523) from 6021-floranet_beta into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2523
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-05-29 09:40:44 +00:00
Pako Natek a2029f7934 Merge branch 'dev' into 6021-floranet_beta
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 09:39:31 +00:00
Jorge Penadés fc606f7e36 fix: refs #6889 rollback
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 10:22:22 +02:00
Jorge Penadés 9d58c67b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 09:16:25 +02:00
Jorge Penadés b50b1f2b13 Merge pull request '#6942 toUnbook' (!2135) from 6942-improveInvoiceIn into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2135
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-29 07:03:34 +00:00
Jorge Penadés d35bbe5c06 Merge branch 'dev' into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 07:00:17 +00:00
Pako Natek 03fa06a9fb Merge branch 'dev' into 6021-floranet_beta
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 06:37:44 +00:00
Pako Natek e0d8a46cd6 nuevo enfoque recipe y manejo de errores en order_confirm
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 08:36:18 +02:00
Guillermo Bonet f87ee5cb91 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-29 08:09:53 +02:00
Guillermo Bonet f770bce54c fix: refs #7486 Deleted get_lock collection_assign
gitea/salix/pipeline/head This commit looks good Details
2024-05-29 07:55:33 +02:00
Jorge Penadés 885aa5208a feat : refs #6889 wip: check if is productionReviewer or owner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-28 17:23:58 +02:00
Carlos Andrés aefe6dc4f4 Merge pull request 'Hotfix payments ticket 188787' (!2521) from Hotfix-payments-Ticket-#188787 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2521
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-28 13:01:47 +00:00
Carlos Andrés a022ed0854 Hotfix payments ticket 188787
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 14:50:58 +02:00
Guillermo Bonet 7dd1ecfd67 fix: refs #6404 Version increased
gitea/salix/pipeline/head This commit looks good Details
2024-05-28 14:38:26 +02:00
Carlos Andrés dc3c92eef1 Merge pull request 'Hotfix contabilizar DUA Ticket #188682' (!2519) from Hotfix-contabilizar-DUA-Ticket-#188682 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2519
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-28 11:34:04 +00:00
Jorge Penadés 56407e12a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-28 13:22:33 +02:00
Jorge Penadés 44e71b303c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-28 13:14:31 +02:00
Carlos Andrés cf84aa7256 Hotfix contabilizar DUA Ticket #188682
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 13:01:27 +02:00
Pablo Natek c4e08a6f14 Merge pull request 'feat: refs #6404 default weight' (!2517) from 6404-add-default-weight-and-height into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2517
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-28 10:53:01 +00:00
Javi Gallego 1bcd7a9665 Merge branch 'dev' into 6408-rocketChat
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-28 12:46:37 +02:00
Carlos Andrés 6e5b41a886 Hotfix contabilizar DUA Ticket #188682
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 12:30:17 +02:00
Pablo Natek 49a243a6fd Merge branch 'master' into 6404-add-default-weight-and-height
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 10:24:05 +00:00
Carlos Satorres b95009899c refs #7406 fix back
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-28 12:22:11 +02:00
Javi Gallego 9ee05860f6 feat: #6408 tests 2024-05-28 12:19:54 +02:00
Alex Moreno 08856a9132 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-28 12:11:51 +02:00
Alex Moreno 113f210df2 Merge pull request 'deploy: dump' (!2518) from 7489-dump into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2518
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-05-28 10:11:16 +00:00
Alex Moreno 8ec2a10cbf deploy: dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 12:05:09 +02:00
Pablo Natek 33e823675e feat: refs #6404 default weight
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 10:08:15 +02:00
Alex Moreno 60ac8cf6fc Merge pull request '7489-testToMaster' (!2515) from 7489-testToMaster into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2515
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-05-28 05:30:18 +00:00
Carlos Satorres eb2dd5ba5b refs #7406 acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 16:17:44 +02:00
Jorge Penadés 7cc86d5af0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 14:36:18 +02:00
Carlos Satorres 578b8a2c71 refs #7406 changes sql, modelconfig model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 14:28:13 +02:00
Robert Ferrús b404c7d101 Merge pull request 'test' (!2514) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2514
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-05-27 12:11:12 +00:00
Robert Ferrús 1a96b96dd0 Merge pull request 'feat: refs #7296 fixAPPWarehouse' (!2513) from 7296-restoreExpeditionTruck into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #2513
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-05-27 12:07:13 +00:00
Robert Ferrús f4426f5863 Merge branch 'test' into 7296-restoreExpeditionTruck
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-27 12:05:49 +00:00
Robert Ferrús df5f4a5a42 feat: refs #7296 fixAPPWarehouse 2024-05-27 14:05:31 +02:00
Guillermo Bonet c7a324bc27 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-27 13:57:53 +02:00
Jorge Penadés 9ecba10446 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 13:57:35 +02:00