Commit Graph

926 Commits

Author SHA1 Message Date
Vicent Llopis f96fc0f91e Merge branch 'dev' into 3852-client.search-panel2
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:13:41 +00:00
Vicent Llopis 8c4e70c11d Merge branch 'dev' into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:06:06 +00:00
Vicent Llopis 3cc89c170c Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 13:55:07 +00:00
Alex Moreno c1ed0f2226 Merge branch 'dev' into changesInCorrectFolder
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 12:58:32 +00:00
Alex Moreno 2a8a8ed84a Merge branch 'dev' into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 12:01:11 +00:00
Joan Sanchez 34997b72f5 Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 11:55:47 +00:00
Joan Sanchez e2101db706 Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 11:53:47 +00:00
Joan Sanchez fe3ebe8e0c Merge branch 'dev' into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 06:43:43 +00:00
Joan Sanchez 33c92a0f24 Merge pull request '4563-Worker-Description-workerDisableExcluded-checkbox' (!1076) from 4563-Worker-Description-workerDisableExcluded-checkbox into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1076
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-02 06:34:49 +00:00
Alex Moreno a7b1ee85fe fix changes folder
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 07:27:57 +01:00
Alex Moreno e9731c4ac0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order 2022-10-28 09:11:40 +02:00
Vicent Llopis 264b56378a Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-28 06:31:12 +00:00
Alex Moreno 9eb3b09be1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
2022-10-28 08:26:45 +02:00
Alex Moreno 80617dd578 Merge branch 'dev' into 4320-notificationQueue
gitea/salix/pipeline/head This commit looks good Details
2022-10-28 05:33:45 +00:00
Alex Moreno 9225e8f176 fix tests
gitea/salix/pipeline/head This commit looks good Details
2022-10-27 15:11:57 +02:00
Vicent Llopis fa89d1f944 fix: comentario corregido
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 13:10:50 +02:00
Vicent Llopis 65e32f5e7f feat: client search panel add find by zone
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 12:40:13 +02:00
Vicent Llopis 3110172c54 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3811-ticket.sale_updatePrice 2022-10-26 08:39:58 +02:00
Vicent Llopis 5e0f976ad2 Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 06:25:18 +00:00
Vicent Llopis 07a18dc736 delete sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:05:11 +02:00
Alex Moreno 607e9010e6 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 12:36:35 +00:00
Joan Sanchez 4334907d91 fix(database): updated sql files
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 14:09:21 +02:00
Alex Moreno ac8c4b8ef0 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 10:39:50 +00:00
Pau 7b04464848 Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 10:00:13 +00:00
Joan Sanchez 1196125350 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 11:58:47 +02:00
Alex Moreno 3fd10dfc64 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:58:17 +00:00
Pau 76d248131c Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:45:25 +00:00
Pau 9089ba7346 requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 10:42:16 +02:00
Pau 23598c993b Change ACL from employee to hr
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:25:15 +02:00
Vicent Llopis 7f1dd801a5 refactor: change ACLs
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 07:56:17 +02:00
Vicent Llopis d18b22bb05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 07:05:26 +02:00
Joan Sanchez e80754f280 Added new SQL version
gitea/salix/pipeline/head This commit looks good Details
2022-10-24 18:37:38 +02:00
Alex Moreno a66c5e6798 acl
gitea/salix/pipeline/head This commit looks good Details
2022-10-24 11:30:17 +02:00
Vicent Llopis 888f612dbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good Details
2022-10-21 11:41:53 +02:00
Vicent Llopis 18c119c62a change acl
gitea/salix/pipeline/head This commit looks good Details
2022-10-21 09:20:27 +02:00
Vicent Llopis 6f31bea21f feat: update testBack
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:00:48 +02:00
Vicent Llopis 6891190c72 refactor: create endpoint to unify code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 15:05:46 +02:00
Vicent Llopis 6f7ec12cb2 feat: response as 'reply' and not as 'internNote'
gitea/salix/pipeline/head This commit looks good Details
2022-10-19 10:35:41 +02:00
Pau 470b4485d5 Fixed test and DB structure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 12:58:44 +02:00
Pau a204c6e2b0 Fixed the suppliers not appearing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 12:29:04 +02:00
Pau 81088bc495 Fixed ACL
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 10:46:14 +02:00
Pau f481cc3c97 Capitalizar
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 10:38:40 +02:00
Pau c9e9e3545d Added ACL
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 10:33:48 +02:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:06:31 +02:00
Pau 9290cd6fb6 Finished back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:02:18 +02:00
Pau 70c9c3d788 initial back test created, modified DB statetments
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 12:07:34 +02:00
Pau dc6c8f924d feat: Create new Supplier
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:25:25 +02:00
Alex Moreno c637f2c879 feat(send): use vn-print libary and adapt test
gitea/salix/pipeline/head This commit looks good Details
2022-10-14 13:22:53 +02:00
Joan Sanchez e81c39d8dc Send delivery note to refund tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 09:30:31 +02:00
Alex Moreno 24cb8e00bb creates notification sql in changes
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 13:20:25 +02:00