Commit Graph

414 Commits

Author SHA1 Message Date
Javier Segarra ab85b8e703 Merge branch 'dev' into 6321_negative_tickets 2024-06-12 22:37:14 +02:00
Javi Gallego 4744f57269 Merge pull request 'feat: refs #7548 link a grafana' (!2568) from 7548-ticketSummaryCollection into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2568
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-11 12:54:06 +00:00
Javier Segarra 02bc3afcda Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 13:53:30 +02:00
Alex Moreno 9c2ccc5df4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-11 09:59:09 +02:00
Guillermo Bonet 873f36fef6 refactor: refs #7503 Added relations and ACLs
gitea/salix/pipeline/head This commit looks good Details
2024-06-11 08:50:32 +02:00
Javi Gallego e081c4504d feat: refs #7548 link a grafana
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 14:51:48 +02:00
Sergio De la torre 268c0a984c feat isScanned refs #7276 2024-06-06 12:28:34 +02:00
Javier Segarra 149aeac54e Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-04 09:26:15 +02:00
Jorge Penadés dc8696b422 feat: refs #6889 add back tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 16:31:36 +02:00
Jorge Penadés 836cfcbd07 refactor: refs #6889 sale tests e2e
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-31 13:58:26 +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
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 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
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
Javier Segarra 8366cfa348 Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-24 11:12:52 +02:00
Robert Ferrús 34f48e46e7 feat: refs #7296 requested changes2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 13:19:01 +02:00
Jorge Penadés 40762ba4aa 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-20 12:34:37 +02:00
Robert Ferrús 996f14341d Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 10:31:13 +00:00
Robert Ferrús 62ca4885c4 feat: refs #7296 requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 12:28:27 +02:00
Carlos Satorres 6d66c0f71f hotfix TicketLog filter
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-20 11:14:30 +02:00
Jorge Penadés 1f1a49d0a5 refactor: refs #6889 use addSale
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 14:20:33 +02:00
Robert Ferrús 11a0b98495 feat: refs #7296 roadmapStop
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-16 10:20:08 +02:00
Javier Segarra befc128950 feat(salix): refs #6321 Sale_itemReplace 2024-05-15 08:36:13 +02:00
Javier Segarra 63d07cb082 Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-02 12:47:59 +02:00
Jon Elias 6706974784 fix: refs #6731 fix ticketRequest
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 10:31:26 +02:00
Javier Segarra 68158f341d feat(salix): refs #6321 #6331 publish negativeOrigin model 2024-04-22 14:09:27 +02:00
Javier Segarra 5a5032f6e6 Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets 2024-04-22 13:34:06 +02:00
Sergio De la torre 32e2827287 refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-17 13:55:07 +02:00
Javier Segarra 2cff160c6a Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-28 23:50:51 +00:00
Javier Segarra e6fe245b27 refs #6321 feat: new split method
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-27 14:09:25 +01:00
Sergio De la torre 483345666e refs #3520 feat:back WarehouseFk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-27 11:01:32 +01:00
Javier Segarra d8d0ced918 Merge branch 'dev' into 6321_negative_tickets 2024-03-27 09:54:02 +01:00
Sergio De la torre b805a5de0a refs #3520 feat:uncheckedTicket 2024-03-26 12:40:44 +01:00
Sergio De la torre dc5f588c8e refs #3520 feat: backWarehouse in Salix 2024-03-26 10:13:57 +01:00
Javier Segarra a943e39ba7 refs #6321 feat: negativeOrigin 2024-03-22 22:44:37 +01:00
Jorge Penadés e8d1967e11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 15:14:12 +01:00
Pablo Natek f7b458d368 feat: refs #6302 delete after add to turn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-20 20:54:24 +01:00
Jorge Penadés f044809f30 feat: refs #6951 to create back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 15:45:47 +01:00
Javier Segarra 44c4e6a16e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-15 09:47:10 +01:00
Javier Segarra f83f7808c8 refs #6321 feat: negativeOrigin method 2024-03-15 09:32:36 +01:00
Carlos Satorres 33bd21d40b refs #6755 fix model
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 16:29:05 +01:00
Carlos Satorres 64d82d92d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor 2024-03-07 09:28:32 +01:00
Javier Segarra 7c8fa52da0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets 2024-03-06 14:30:02 +01:00
Carlos Satorres 1b3a8ddbdd refs #6755 fix restore 2024-03-06 12:03:35 +01:00
Carlos Satorres 893320b114 refs #6755 model ticketlog, restore 2024-03-04 15:00:43 +01:00
Jorge Penadés 70c400c5f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 12:51:22 +01:00
Ivan Mas 03fc7cfb4e Merge branch 'dev' into 6784-delete-clientTypeFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 08:24:12 +00:00
Ivan Mas a0cb32ea10 refs #6784 Delete unnecessary JOINs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 14:01:19 +01:00
Ivan Mas f592045925 refs #6784 Delete clientType.id and modify relationships in json and js 2024-02-21 11:49:27 +01:00
Ivan Mas 3813dbb9fd refs #6784 Delete clientTypeFk 2024-02-20 13:10:03 +01:00