Commit Graph

4965 Commits

Author SHA1 Message Date
Jorge Penadés ab9c11ef84 fix: refs #6889 modify fixtures 2024-05-31 12:56:22 +02:00
Jorge Penadés 4772509b67 fix: refs #6889 e2e tests 2024-05-31 12:51:06 +02:00
Jorge Penadés 38bea60776 refactor: refs #6889 script sql 2024-05-31 09:49:58 +02:00
Jorge Penadés eb15262fb0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode 2024-05-31 08:37:28 +02:00
Jorge Penadés 002111d8d1 fix: refs #6889 allocate 'productionReviewer' role to revision dep. workers & check if is owner or reviewer 2024-05-30 11:47:12 +02:00
Robert Ferrús 467383d7f4 feat: refs #6477 productionConfig add column 2024-05-30 10:32:17 +02:00
Jorge Penadés 05e6e10337 fix: refs #6889 fix back tests 2024-05-30 10:04:34 +02:00
Jorge Penadés 4fa2a4d58c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode 2024-05-30 08:45:01 +02:00
Guillermo Bonet d461b78c7b Merge branch 'test' into dev 2024-05-30 07:19:03 +02:00
Guillermo Bonet 255a2c5283 fix: refs #7258 Proc bs.claim_ratio_routine 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 2024-05-29 16:59:19 +02:00
Jorge Penadés a32db7840e feat: refs #6889 fixtures & models 2024-05-29 16:54:24 +02:00
Pako Natek a2029f7934 Merge branch 'dev' into 6021-floranet_beta 2024-05-29 09:39:31 +00:00
Jorge Penadés 9d58c67b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode 2024-05-29 09:16:25 +02:00
Jorge Penadés d35bbe5c06 Merge branch 'dev' into 6942-improveInvoiceIn 2024-05-29 07:00:17 +00:00
Pako Natek 03fa06a9fb Merge branch 'dev' into 6021-floranet_beta 2024-05-29 06:37:44 +00:00
Pako Natek e0d8a46cd6 nuevo enfoque recipe y manejo de errores en order_confirm 2024-05-29 08:36:18 +02:00
Guillermo Bonet f87ee5cb91 Merge branch 'test' into dev 2024-05-29 08:09:53 +02:00
Guillermo Bonet f770bce54c fix: refs #7486 Deleted get_lock collection_assign 2024-05-29 07:55:33 +02:00
Jorge Penadés 885aa5208a feat : refs #6889 wip: check if is productionReviewer or owner 2024-05-28 17:23:58 +02:00
Carlos Andrés a022ed0854 Hotfix payments ticket 188787 2024-05-28 14:50:58 +02:00
Carlos Andrés dc3c92eef1 Merge pull request 'Hotfix contabilizar DUA Ticket #188682' (!2519) from Hotfix-contabilizar-DUA-Ticket-#188682 into master
Reviewed-on: #2519
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-28 11:34:04 +00:00
Jorge Penadés 44e71b303c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn 2024-05-28 13:14:31 +02:00
Carlos Andrés cf84aa7256 Hotfix contabilizar DUA Ticket #188682 2024-05-28 13:01:27 +02:00
Carlos Andrés 6e5b41a886 Hotfix contabilizar DUA Ticket #188682 2024-05-28 12:30:17 +02:00
Pablo Natek 49a243a6fd Merge branch 'master' into 6404-add-default-weight-and-height 2024-05-28 10:24:05 +00:00
Alex Moreno 08856a9132 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-05-28 12:11:51 +02:00
Alex Moreno 8ec2a10cbf deploy: dump 2024-05-28 12:05:09 +02:00
Pablo Natek 33e823675e feat: refs #6404 default weight 2024-05-28 10:08:15 +02:00
Jorge Penadés 7cc86d5af0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn 2024-05-27 14:36:18 +02:00
Robert Ferrús b404c7d101 Merge pull request 'test' (!2514) from test into dev
Reviewed-on: #2514
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-05-27 12:11:12 +00:00
Robert Ferrús f4426f5863 Merge branch 'test' into 7296-restoreExpeditionTruck 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 55fd94a12a Merge branch 'test' into dev 2024-05-27 13:51:16 +02:00
Guillermo Bonet 086c2291d1 Merge branch 'master' into test 2024-05-27 13:50:59 +02:00
Guillermo Bonet 2498849ed0 hotfix: refs #7486 Added tmp debug insert 2024-05-27 13:43:55 +02:00
Jorge Penadés 1b4b8668be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn 2024-05-27 13:34:53 +02:00
Jorge Penadés 1af24e8473 fix : refs #6942 remove grafana update priv 2024-05-27 13:34:00 +02:00
Jorge Penadés 1671423d23 fix: refs #6942 add deleteById acl 2024-05-27 12:53:25 +02:00
Jorge Penadés c136f2783a refactor: refs #6942 toUnbook & drop buyer acls 2024-05-27 12:34:27 +02:00
Ivan Mas 6222d2657b Merge branch 'dev' into 7217-Unify_errorMessageAWB 2024-05-27 10:33:02 +00:00
Jorge Penadés 0fa6074278 fix: refs #6942 drop quotes 2024-05-27 12:03:07 +02:00
Jorge Penadés dc90ad6595 fix: refs #6942 acls & back 2024-05-27 10:48:32 +02:00
Jorge Penadés f209718383 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn 2024-05-27 09:03:34 +02:00
Robert Ferrús 846ba9ef66 Merge branch 'dev' into 6281_buyFk 2024-05-27 05:30:33 +00:00
Pako Natek 4550d3719c Merge branch 'dev' into 6021-floranet_beta 2024-05-27 05:17:27 +00:00
Robert Ferrús b02995918e Merge branch 'dev' into 6281_buyFk 2024-05-27 05:04:40 +00:00
Pako Natek ab3b58ec3c modificacion recipe y element 2024-05-24 13:41:02 +02:00
Pako Natek 49a2e6fc84 tickets y email 2024-05-24 11:44:58 +02:00
Guillermo Bonet 2c87730dba Merge pull request 'feat: refs #7438 Added volume to item_valuateInventory' (!2505) from 7438-item_ValuateInventory into dev
Reviewed-on: #2505
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-24 09:30:54 +00:00