Commit Graph

15298 Commits

Author SHA1 Message Date
Vicent Llopis a6dbc64ef6 Merge pull request 'hotfix_item.getVisible&Available' () from hotfix_item.getVisible&Available into test
Reviewed-on: 
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-21 12:04:27 +00:00
Vicent Llopis c30242f9cc fix: front test 2023-02-21 12:17:16 +01:00
Joan Sanchez 65a251ab03 Updated e2e 2023-02-21 11:59:53 +01:00
Vicent Llopis eda70b009b fix: cuando haces F5 en cualquier sección que no sea Diary, te coge el warehouse por defecto 2023-02-21 11:48:56 +01:00
Vicent Llopis 432c8a9ab8 refactor: cambiados estilos de los chips 2023-02-21 10:56:46 +01:00
Joan Sanchez f88c9b904c Updated fixtures 2023-02-21 10:38:23 +01:00
Joan Sanchez 58548164d2 Merge branch 'dev' into 5192-db_export 2023-02-21 09:20:30 +00:00
Alex Moreno bcfa762038 typo 2023-02-21 10:17:25 +01:00
Joan Sanchez c5c76984ff Merge pull request 'fix(image): store images with a name generated through uuid instead of url path' () from 5266-image_fixes into dev
Reviewed-on: 
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-02-21 08:56:19 +00:00
Joan Sanchez 4c2878e232 Updated unit tests 2023-02-21 09:48:47 +01:00
Joan Sanchez 45c4f2ff45 Updated test 2023-02-21 08:51:50 +01:00
Joan Sanchez c9840f6985 Updated entry structure 2023-02-21 08:32:46 +01:00
Joan Sanchez 94acd80531 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5192-db_export 2023-02-21 08:23:14 +01:00
Joan Sanchez a04c8ed8d8 Updated structure 2023-02-21 08:17:52 +01:00
Joan Sanchez 0a7b3647b8 Updated fixtures 2023-02-21 07:57:35 +01:00
Alex Moreno cc5a867bf4 feat(claim_model): add claimDms relations 2023-02-20 15:16:19 +01:00
Alexandre Riera 063c60b4a1 Merge branch 'dev' into 5172-cliente-impagado 2023-02-20 13:58:31 +00:00
Alexandre Riera cfad03efbe Merge pull request 'fixes #5220 Actualizar fuentes' (!1336) from 5220-actualizar-fuentes into dev
Reviewed-on: #1336
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-20 13:57:47 +00:00
Joan Sanchez 39527cbc50 Updated structure & data 2023-02-20 14:46:38 +01:00
Joan Sanchez 251c7b54ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5192-db_export 2023-02-20 14:36:47 +01:00
Joan Sanchez 28b8af2802 Merge branch 'dev' into 5220-actualizar-fuentes 2023-02-20 13:17:47 +00:00
Joan Sanchez 0393d9cb6a Removed commented block code 2023-02-20 14:17:18 +01:00
Joan Sanchez ab6ca12862 Merge branch 'dev' into 5266-image_fixes 2023-02-20 13:15:40 +00:00
Vicent Llopis 7a812551b3 delete seed 2023-02-20 13:56:17 +01:00
Vicent Llopis 0b240e7925 add console.log 2023-02-20 13:35:50 +01:00
Alexandre Riera 271a6d898d Merge branch 'dev' into 5063-item-module-doPhoto 2023-02-20 12:17:03 +00:00
Alexandre Riera 04877c1425 refs #5063 refactor hook 2023-02-20 13:15:47 +01:00
Vicent Llopis f7cf6e26fc Merge pull request '5180-invoice-out_refund' (!1325) from 5180-invoice-out_refund into dev
Reviewed-on: #1325
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-02-20 12:08:17 +00:00
Vicent Llopis 3ef0b3a68b feat: add acl 2023-02-20 12:42:42 +01:00
Joan Sanchez 90e1136ee2 fix(image): store images with a name generated through uuid instead of url path
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
Alexandre Riera c7f22a10ba refs #5063 refactored hook 2023-02-20 10:39:12 +01:00
Alexandre Riera 5c2c99e397 refs #5172 changed icon name 2023-02-20 09:44:14 +01:00
Alexandre Riera b926666b25 refs #5220 fonts updated 2023-02-20 09:38:24 +01:00
Alexandre Riera 0a81f78a72 Merge branch '5036-regularizar-historicos' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos 2023-02-20 09:20:37 +01:00
Alexandre Riera 77066b2005 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos 2023-02-20 09:20:30 +01:00
Alexandre Riera 2a8cb17297 Merge branch '5063-item-module-doPhoto' of https://gitea.verdnatura.es/verdnatura/salix into 5063-item-module-doPhoto 2023-02-20 08:32:41 +01:00
Alexandre Riera c1fe09ab5d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5063-item-module-doPhoto 2023-02-20 08:32:33 +01:00
Alexandre Riera 08476fe2a6 Merge branch 'dev' into 5063-item-module-doPhoto 2023-02-17 13:30:47 +00:00
Joan Sanchez 86dd299292 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-02-17 13:33:52 +01:00
Joan Sanchez ceab11cc41 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-02-17 13:33:34 +01:00
Joan Sanchez 46fdaab649 Merge pull request 'test -> dev' (!1335) from test into dev
Reviewed-on: #1335
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-02-17 12:23:11 +00:00
Vicent Llopis e57cef4e5c Merge pull request 'hotfix_test_item.avilable' (!1334) from hotfix_test_item.avilable into test
Reviewed-on: #1334
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-02-17 12:09:42 +00:00
Vicent Llopis 677840e7cf Merge pull request 'hotfix-item.tags_card_reload' (!1332) from hotfix-iten.tags_card_reload into master
Reviewed-on: #1332
2023-02-17 12:08:53 +00:00
Vicent Llopis 39a3c8a7fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies 2023-02-17 13:06:30 +01:00
Vicent Llopis cc942e9000 Merge pull request 'move changes sql' (!1333) from move_changes_sql into dev
Reviewed-on: #1333
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-02-17 12:06:23 +00:00
Vicent Llopis c1b6d949dd delete changelog 2023-02-17 13:03:02 +01:00
Vicent Llopis c6304898b4 refactor: borrado insert, se ha hecho directamente sobre produccion 2023-02-17 13:00:02 +01:00
Vicent Llopis 1db23b83c8 delete changelog 2023-02-17 12:56:47 +01:00
Vicent Llopis 7883723b8c move changes sql 2023-02-17 12:54:59 +01:00