Commit Graph

6024 Commits

Author SHA1 Message Date
Joan Sanchez ab6ca12862 Merge branch 'dev' into 5266-image_fixes
gitea/salix/pipeline/head This commit looks good Details
2023-02-20 13:15:40 +00:00
Joan Sanchez 90e1136ee2 fix(image): store images with a name generated through uuid instead of url path
gitea/salix/pipeline/head This commit looks good Details
Refs: #5266
2023-02-20 12:40:13 +01:00
Vicent Llopis 26d72a7b3f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund 2023-02-20 11:49:17 +01:00
Joan Sanchez 86dd299292 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:52 +01:00
Joan Sanchez ceab11cc41 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:34 +01:00
Vicent Llopis 853e06f523 fix: card reload automatic
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 12:38:07 +01:00
Joan Sanchez 527caf9ca0 refactor(zerofill): deprecated zerofill and removed function
gitea/salix/pipeline/head This commit looks good Details
Refs: #5207
2023-02-17 11:19:35 +01:00
Vicent Llopis 4001a75916 Merge branch 'dev' into 5180-invoice-out_refund
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 08:57:48 +00:00
Vicent Llopis 874f459956 refactor: borrada variable innecesaria
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 09:49:47 +01:00
Alexandre Riera 8b088e831a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-16 14:43:51 +01:00
Vicent Llopis b5d2d53435 fix: test back
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 10:45:13 +01:00
Vicent Llopis 3096738b84 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-16 09:52:18 +01:00
Vicent Llopis 3dd870f7df fix: test e2e
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 09:44:20 +01:00
Vicent Llopis bb2eddc462 fix: test front
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 07:32:44 +01:00
Vicent Llopis 73ae45c2c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-15 15:08:58 +01:00
Alexandre Riera dca5ae0f72 refs #5223 added params
gitea/salix/pipeline/head This commit looks good Details
2023-02-15 13:14:52 +01:00
Alexandre Riera ea2fd59cdc refs #5223 changed ref and email text
gitea/salix/pipeline/head This commit looks good Details
2023-02-14 12:41:36 +01:00
Vicent Llopis a5a0256e44 feat: añadido parametro que indica si genera uno o multiples ticket de abono
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-14 10:58:41 +01:00
Alexandre Riera b1a6713a3d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-14 09:04:08 +01:00
Alexandre Riera 139dac0bc1 refs #4588 moved hook from entryObservation to entry
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-14 08:08:48 +01:00
Alexandre Riera e5e86de8d2 Merge branch 'dev' into 5152-ticketBasicData-stepTwo
gitea/salix/pipeline/head This commit looks good Details
2023-02-14 07:07:12 +00:00
Alexandre Riera f6ec6da1c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-13 13:48:12 +01:00
Alexandre Riera 76ed4d2d4b refs #5194 fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-02-13 10:16:28 +01:00
Vicent Llopis 4da8546bdf Merge branch 'dev' into 2952-ticket.sale-tracking_part2
gitea/salix/pipeline/head This commit looks good Details
2023-02-13 07:14:28 +00:00
Alexandre Riera a7e9e52ad4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-13 07:34:13 +01:00
Pau 294b4acbe2 Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-13 06:03:21 +00:00
Alexandre Riera 6cb815faaf .
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-10 10:13:41 +01:00
Alexandre Riera 4787de3df5 fixing merge
gitea/salix/pipeline/head This commit looks good Details
2023-02-10 09:04:49 +01:00
Alexandre Riera a468fb2c66 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head Build queued... Details
2023-02-10 09:02:44 +01:00
Alexandre Riera 9dc07d88d6 fixing e2e
gitea/salix/pipeline/head This commit looks good Details
2023-02-10 08:56:30 +01:00
Alexandre Riera 194069c0c2 refs #5194 fixed stock, lines 2023-02-10 08:46:54 +01:00
Joan Sanchez ebee9144b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 09:16:30 +01:00
Joan Sanchez 461799f137 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 08:56:30 +01:00
Alexandre Riera 725b7b9bce Merge branch 'master' into hotFix-ticketFutureAdvance-warehouse
gitea/salix/pipeline/head This commit looks good Details
2023-02-08 12:48:23 +00:00
Alexandre Riera ef5b29d6f3 hotfix ticketFutureAdvance warehouse
gitea/salix/pipeline/head This commit looks good Details
2023-02-08 13:47:35 +01:00
Alexandre Riera 4413c8828b refs #5152 added confirmation popup
gitea/salix/pipeline/head This commit looks good Details
2023-02-08 10:54:21 +01:00
Vicent Llopis b70311999d refactor: eliminado codigo innecesario y quitado update que se hará directamente en producción
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-08 09:41:09 +01:00
Pau 86e6672e49 Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-07 13:39:36 +00:00
Vicent Llopis cec7602e1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-07 13:44:53 +01:00
Vicent Llopis 6cb3930be0 feat: añadido icono info, que indica de que almacén se saca la información
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-07 13:40:39 +01:00
Alexandre Riera 9f2ff4e4b7 addFilter
gitea/salix/pipeline/head This commit looks good Details
2023-02-07 12:30:30 +01:00
Alexandre Riera d3564209ba findById
gitea/salix/pipeline/head This commit looks good Details
2023-02-07 08:05:48 +01:00
Vicent Llopis 2e8aabab14 fix: type relation in models
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 14:32:54 +01:00
Vicent Llopis 499c9fa706 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 14:03:38 +01:00
Vicent Llopis a2f93e68b1 feat: add 'parking' column
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 13:57:04 +01:00
Vicent Llopis 4f76465246 fix: no recarga cada vez
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-06 12:24:26 +01:00
Alexandre Riera 68b4d269ff Merge branch 'dev' into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 09:18:13 +00:00
Alexandre Riera 3879dfc89b Merge branch '5074-ticket-balance-null' of https://gitea.verdnatura.es/verdnatura/salix into 5074-ticket-balance-null
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 08:19:16 +01:00
Alexandre Riera f2f8a4eb04 fix test 2023-02-06 08:19:13 +01:00
Alexandre Riera 2c946b38d4 Merge branch 'dev' into 5074-ticket-balance-null
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-06 07:08:50 +00:00