Commit Graph

12857 Commits

Author SHA1 Message Date
Pau a4243e14c5 Created Back test for newSupplier 2022-10-17 10:17:56 +02:00
Joan Sanchez cfdcf91be2 Merge branch 'dev' into 3505-closure_refund
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 08:15:16 +00:00
Pau dc53aac163 Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:32:50 +00:00
Pau f0b1591b14 Remove debugging elements
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 09:22:50 +02:00
Pau 0cdee89ac3 Button removed when user does not have permissions
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 09:20:45 +02:00
Pau 42583a4a16 Merge pull request 'Added webp to the list of allowed images' (!1080) from 4124-webp-images into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1080
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2022-10-17 06:59:32 +00:00
Pau d91814473e Merge branch 'dev' into 4124-webp-images
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 06:45:49 +00:00
Pau 1603619d81 removed debugging elements
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:38:54 +02:00
Pau 594cee12f3 add checks to the existence of object variables
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 07:35:02 +02:00
Alex Moreno 991893837c correct fixutures from dev
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:34:22 +02:00
Alex Moreno 2b060a1437 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 07:32:32 +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 6bfd54fc71 feat(verify): use user.verify
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 07:22:22 +02:00
Alex Moreno 3e746ceb7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-10-14 14:47:42 +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
Alex Moreno de44ce6bd4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue 2022-10-14 12:44:42 +02:00
Joan Sanchez 9a0d98bbe4 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-14 09:55:22 +02:00
Alex Moreno c3d6eac4f8 Merge branch '4320-notificationQueue' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue 2022-10-14 08:05:48 +02:00
Alex Moreno c2d37dadf7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue 2022-10-14 08:01:06 +02:00
Joan Sanchez 390ee60e59 Get first element in array
gitea/salix/pipeline/head This commit looks good Details
2022-10-14 07:26:34 +02:00
Alex Moreno e240702884 use user
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 14:55:34 +02:00
Joan Sanchez 67097970ed Incoterms required param
gitea/salix/pipeline/head This commit looks good Details
2022-10-13 10:44:20 +02:00
Joan Sanchez b96af0ad4d Merge pull request 'MASTER-hotFix(monitor): use left join in ticketState' (#1085) from hotFix-monitor_leftJoin into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1085
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-13 07:37:49 +00: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 74383b61e7 hotFix(monitor): use left join in ticketState
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 09:22:53 +02:00
Alex Moreno acc88c8239 use ejs template
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 14:56:33 +02:00
Joan Sanchez b2e98c9d73 Transaction
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 14:39:57 +02:00
Joan Sanchez d06492d367 Transaction error
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 14:28:14 +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
Pau 012cd68c89 Added menu to create a new supplier, not working
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 11:43:01 +02:00
Alex Moreno c78e222ee0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 10:09:57 +02:00
Alex Moreno 2e36164a98 fix(recover-password): use pint/Email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 10:06:25 +02:00
Alex Moreno e80197bd6f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 07:22:10 +02:00
Alex Moreno ce2ad32ac9 add email template
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 15:16:56 +02:00
Joan Sanchez e3606c7273 Updated unit test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 14:46:06 +02:00
Joan Sanchez a4549a9f4e Merge pull request 'MASTER-test(travel_extraCommunity): fix e2e' (#1083) from hotFix_travel_extraCommunity-e2e into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1083
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-10 12:25:30 +00:00
Alex Moreno 5c4daee35e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 14:20:22 +02:00
Alex Moreno e85d6bec8c fix e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 14:03:29 +02:00
Joan Sanchez 38a6e24455 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-10 13:25:55 +02:00
Joan Sanchez 7f023d7456 Set user default warehouse
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 12:23:40 +02:00
Joan Sanchez 4d4e446ff6 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-10 10:55:09 +02:00
Joan Sanchez 990a1b3c67 250 nodes
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 10:33:08 +02:00
Joan Sanchez 31d1b84bb9 Unfold when there's less than 100 nodes to show
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 10:25:59 +02:00
Joan Sanchez d104a048d8 Merge pull request 'MASTER-hotFix_travel_extraCommunity-css2' (#1081) from hotFix_travel_extraCommunity-css2 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1081
2022-10-10 07:47:50 +00:00
Alex Moreno e497ddd664 fix: add td-editable
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 09:21:14 +02:00
Pau 452745b04a Added webp to the list of allowed images
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 09:01:52 +02:00
Alex Moreno 18cd34bccb fix(travel_extraCommunity): css
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 08:57:41 +02:00
Joan Sanchez e42aae747f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 08:10:45 +02:00
Joan Sanchez bdf156638d Merge pull request 'MASTER-hotFix(travel_extraCommunity): fix css' (#1078) from hotFix_travel_extraCommunity-css into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1078
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-10 05:51:15 +00:00
Joan Sanchez 4ecbb59ac0 Closure hours
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-10 07:49:08 +02:00