Commit Graph

1703 Commits

Author SHA1 Message Date
Vicent Llopis e148284332 jenkins test
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 11:02:19 +01:00
Vicent Llopis 8876bc2b68 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 08:12:07 +00:00
Alexandre Riera 8e1505d5ee Merge branch 'dev' into 3557-back-missingTrash
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 07:02:56 +00:00
Pau cb0735d136 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 08:34:18 +00:00
Vicent Llopis 3fde11c3ed Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 08:06:39 +00:00
Alexandre Riera a952fc0330 space fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 09:38:22 +01:00
Alexandre Riera 67f0346980 space fixtures
gitea/salix/pipeline/head Build queued... Details
2022-11-18 09:37:38 +01:00
Alexandre Riera fd58eaf838 drop procedure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-18 09:36:38 +01:00
Alexandre Riera 153cb48ff0 fix test
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 08:55:35 +01:00
Alexandre Riera 566d384483 Merge branch '3557-back-missingTrash' of https://gitea.verdnatura.es/verdnatura/salix into 3557-back-missingTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 13:46:20 +01:00
Alexandre Riera e4a6585b6a fix test back 2022-11-16 13:46:16 +01:00
Pau 7b3a1bfb22 requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 08:28:12 +01:00
Alexandre Riera 7c8178b423 Merge branch 'dev' into 3557-back-missingTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 07:07:20 +00:00
Pau d7dc7c4329 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 06:08:01 +00:00
Vicent Llopis c200e1af32 refactor: optimizado select
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:09:41 +01:00
Vicent Llopis fc516d4029 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 12:23:59 +01:00
Vicent Llopis 843e5ae736 feat: traducciones en los modelos
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 11:41:57 +01:00
Alex Moreno 31eb2c86b5 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:20:26 +00:00
Alex Moreno 72400ebf02 change folder db
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 09:37:14 +01:00
Alexandre Riera 5acbaf036a refs #3557 back and test done
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 09:30:36 +01:00
Alex Moreno bcab493f37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-15 07:33:53 +01:00
Pau 29b299f36a Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 06:10:31 +00:00
Vicent Llopis 7e50f23563 refacor code
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 08:55:56 +01:00
Vicent Llopis a5b20bfb03 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing 2022-11-11 08:53:10 +01:00
Joan Sanchez 163f7fd284 Added version 10503
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 08:31:45 +01:00
Joan Sanchez 5e0a31f244 Merge pull request '3928-worker.time-control_sendMail' (!1129) from 3928-worker.time-control_sendMail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1129
2022-11-11 07:30:01 +00:00
Vicent Llopis 9d06f5c0f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 07:47:29 +01:00
Vicent Llopis 918ea3030d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:41:12 +01:00
Alex Moreno 37d412bf3b refactor: delete unnecessary test
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 14:38:37 +01:00
Joan Sanchez 6a2977a2cf Fixed SQL changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:19:20 +01:00
Alex Moreno 32701794bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:34:43 +01:00
Joan Sanchez 5a56fb4b6a Merge pull request '4590-Refactor-isBox-freightItemFk' (!1079) from 4590-Refactor-isBox-freightItemFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1079
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-10 07:50:10 +00:00
Pau 1327f0ae9d Added requested changes, refs #4507 @1:20h
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:18:05 +01:00
Guillermo Bonet 6804c1a756 Merge branch 'dev' into 4550-printServer
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 16:55:29 +01:00
Vicent Llopis 79e9edcee9 delete: old code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-09 09:26:28 +01:00
Vicent Llopis 9bcfebcae6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 07:26:56 +01:00
Guillermo Bonet 6744b3f797 added collection-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 14:40:38 +01:00
Vicent Llopis 11459bbd56 refactor: change column name 2022-11-08 08:46:36 +01:00
Pau 0da6bd44e7 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 07:06:27 +00:00
Pau 2df195764d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:05:13 +01:00
Vicent Llopis 51b047eacc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 07:40:31 +01:00
Vicent Llopis ffa0ff650e feat: add time control
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 12:21:14 +01:00
Joan Sanchez 92a2367db2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 10:52:53 +01:00
Joan be1fbc4d68 Added version 10502
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 10:49:17 +01:00
Joan 17d6308126 Already on prod 2022-11-07 10:48:38 +01:00
Alex Moreno c3ee9da6c6 hotFix: force apply changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 10:18:32 +01:00
Alex Moreno 03ec8e27e6 feat(ticket_isEditable): use ticketWeekly
gitea/salix/pipeline/head This commit is unstable Details
2022-11-07 09:19:20 +01:00
Alex Moreno 5051f8b590 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-07 07:24:44 +01:00
Vicent Llopis 98cc2b5866 refactor: endpoint 2022-11-04 13:41:38 +01:00
Joan Sanchez 1bcde47ab1 Merge pull request '3951-invoiceOut.index_downloadPdfs' (!1110) from 3951-invoiceOut.index_downloadPdfs into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1110
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-04 10:42:32 +00:00