Commit Graph

7580 Commits

Author SHA1 Message Date
Joan Sanchez 2c23f3417a Sale selection fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-29 11:43:53 +02:00
Joan Sanchez 789769ad7d Destroy edit prop fix
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-29 09:38:42 +02:00
Joan Sanchez beb1dd4973 absenceType fixture
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-27 12:16:56 +02:00
Joan Sanchez a8377950f5 Fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-23 16:39:20 +02:00
Joan Sanchez d4c78b46c1 1368 - First sale refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-23 13:40:49 +02:00
Joan Sanchez 356c1a7b45 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-06-22 11:54:50 +02:00
Joan Sanchez a55981adea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-06-22 11:53:48 +02:00
Joan Sanchez 4ad3334de6 Allow change to discount 0%
gitea/salix/pipeline/head This commit looks good Details
2020-06-22 11:49:44 +02:00
Joan Sanchez 8729d1c765 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-19 10:35:57 +02:00
Joan Sanchez 7bd26c0d8d Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2020-06-19 10:33:33 +02:00
Joan Sanchez 2930b60adc Entitlement rate
gitea/salix/pipeline/head This commit looks good Details
2020-06-19 10:28:08 +02:00
Joan Sanchez 41eeaeef0b Entitlement rate
gitea/salix/pipeline/head This commit looks good Details
2020-06-19 09:58:09 +02:00
Carlos Jimenez Ruiz b8f03f20e1 Merge pull request '2319_show_delivery_note' (#320) from 2319_show_delivery_note into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-18 13:40:28 +00:00
Carlos Jimenez Ruiz e6a72d0f09 clean code refactor
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 15:26:15 +02:00
Carlos Jimenez Ruiz 3c2a392cb8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 13:51:00 +02:00
Carlos Jimenez Ruiz 4d97357213 update estate without model.refresh() 2020-06-18 13:50:52 +02:00
Joan Sanchez 322085ffd7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-18 13:15:45 +02:00
Joan Sanchez fcec710d7c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 13:13:47 +02:00
Joan Sanchez 7c45858764 Sms dialog fix
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 12:59:37 +02:00
Joan Sanchez 765d3c7553 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 07:19:57 +02:00
Joan Sanchez 6ab6fc20ca Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 07:19:30 +02:00
Joan Sanchez 43a48994e0 Image path fix
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 16:33:58 +02:00
Carlos Jimenez Ruiz edea60dd94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 15:38:49 +02:00
Carlos Jimenez Ruiz 2abd45f498 setDelivered and open delivery notes and tests 2020-06-17 15:38:37 +02:00
Joan Sanchez 24d3cd74d9 Upgrade Node version
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 15:13:11 +02:00
Joan Sanchez 1d484d4fdf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 15:03:14 +02:00
Joan Sanchez ac6a7e122c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 15:02:57 +02:00
Joan Sanchez 7f3a431ae8 PM2 Min TLS v1.0
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 14:07:14 +02:00
Joan Sanchez b46cc20511 Min TLS v1.0
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 14:03:14 +02:00
Joan Sanchez fd97845979 Revert "Removed sms excluded tests"
This reverts commit 30912bd5e9.
2020-06-17 14:00:04 +02:00
Joan Sanchez 1ab61fbc07 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-06-17 13:43:44 +02:00
Joan Sanchez e1ab2881f0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 13:43:05 +02:00
Juan Ferrer 8e51104e1b Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-17 13:31:54 +02:00
Joan Sanchez 01a09926e3 NodeJs version downgrade to 10 LTS
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 13:30:59 +02:00
Juan Ferrer 032e78664c Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 13:29:24 +02:00
Juan Ferrer 063571cb3c Jenkins fix
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 13:14:59 +02:00
Juan Ferrer fa882ebde6 Skip tests on master/test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-17 13:14:28 +02:00
Juan Ferrer d1bedfdb22 Skip tests on master/test
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-06-17 13:13:13 +02:00
Juan Ferrer 8ece348b30 Language bug fix
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-17 13:09:40 +02:00
Carlos Jimenez Ruiz fb37e156d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note 2020-06-17 09:22:09 +02:00
Joan Sanchez 686203db18 Merge pull request '2275-claim_detail' (#311) from 2275-claim_detail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-17 05:44:17 +00:00
Bernat Exposito Domenech 930e167a8e fix test
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 07:25:05 +02:00
Joan Sanchez 30912bd5e9 Removed sms excluded tests
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 15:11:24 +02:00
Carlos Jimenez Ruiz 7d2e11863f Merge pull request '2300 - WaitForHealthy' (#316) from 2300-docker_waitForHealthy into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-06-16 11:44:36 +00:00
Joan Sanchez 9970bb2c38 Debug logs
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 13:20:18 +02:00
Carlos Jimenez Ruiz 98300b2fec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note 2020-06-16 13:10:56 +02:00
Carlos Jimenez Ruiz b44942c7d7 open delivery notes on ticket index 2020-06-16 12:36:34 +02:00
Joan Sanchez dd7e6e5716 2300 - WaitForHealthy
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-16 12:27:17 +02:00
Carlos Jimenez Ruiz d5c366b1da Merge pull request 'edit e2e client web access' (#314) from 2327-e2e_edit_web-access into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-06-16 10:14:44 +00:00
Bernat Exposito Domenech d80d520fba fix claim.beggining
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-16 12:00:38 +02:00