Commit Graph

12676 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 136dcee214 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4265-refunds 2022-07-11 16:39:57 +02:00
Carlos Jimenez Ruiz 44c29aa489 updated file as per convention 2022-07-11 11:25:31 +02:00
Joan Sanchez d7ca5a8247 Merge pull request '4293-fix(timeEntry): fix back test' (#1024) from 4293-timeEntry_backTest into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1024
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-07-11 06:54:19 +00:00
Alex Moreno b3d001bb9d fix(timeEntry): fix back test
gitea/salix/pipeline/head This commit looks good Details
2022-07-11 08:17:32 +02:00
Vicent Llopis 4b65b531fd feat: add backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-08 10:09:03 +02:00
Vicent Llopis eb586643ca refactor: change name of endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-08 09:47:11 +02:00
Vicent Llopis 94872f8493 fix: show geos checked onSearch
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-07 13:37:36 +02:00
Vicent Llopis d9a12fd203 feat: update commissionWorkCenterFk where is not calculated
gitea/salix/pipeline/head This commit is unstable Details
2022-07-07 07:39:46 +02:00
Vicent Llopis 6f7a4fc5ff refactor title of test
gitea/salix/pipeline/head This commit is unstable Details
2022-07-05 12:08:16 +02:00
Vicent Llopis 189d0a27bc refactor: delete unnecessary sql
gitea/salix/pipeline/head This commit is unstable Details
2022-07-05 11:44:03 +02:00
Vicent Llopis 979ee1d956 feat: add backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-07-05 10:19:22 +02:00
Vicent Llopis 51bd18ac37 feat: update commissionWorkCenterFk when create a route 2022-07-05 10:19:06 +02:00
Vicent Llopis 5f2f5b9b25 feat: add sql changes 2022-07-05 10:18:26 +02:00
Joan Sanchez 2122f8adac Merge pull request 'feat: set daysInFuture value' (#1021) from 4276-accountingType.daysInFuture into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1021
2022-07-04 07:02:27 +00:00
Vicent Llopis e441c658fd feat: set daysInFuture value
gitea/salix/pipeline/head This commit looks good Details
2022-07-04 08:31:53 +02:00
Joan Sanchez fc87039571 Merge pull request '4213-item.summary' (#1011) from 4213-item.summary into dev
gitea/salix/pipeline/head This commit is unstable Details
Reviewed-on: #1011
2022-07-01 09:25:07 +00:00
Joan Sanchez b2c4ca4453 Merge pull request '4273-MASTER_hotFix(entry): isExcludedFromAvailable' (#1020) from 4273-master_hotFix_entry into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1020
2022-07-01 09:21:48 +00:00
Alex Moreno 169f39cf1a fix entry isExcludedFromAvailable
gitea/salix/pipeline/head This commit looks good Details
2022-07-01 09:53:44 +02:00
Joan Sanchez e85cf47f6f Merge pull request 'removed deprecated stowaway comp and usages' (#1019) from 3076-remove_stowaway into dev
gitea/salix/pipeline/head This commit is unstable Details
Reviewed-on: #1019
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-07-01 07:47:53 +00:00
Carlos Jimenez Ruiz d0e06a46d0 removed deprecated stowaway comp and usages
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-01 09:15:07 +02:00
Joan Sanchez d810b3712b Merge pull request 'added max width to email of 400px + title to overflowing content' (#1017) from 4268-client_list_scroll into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1017
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-06-30 12:22:41 +00:00
Joan Sanchez 305158a765 Merge pull request '4273-hotFix_entry_isInventory' (#1018) from 4273-hotFix_entry_isInventory into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1018
2022-06-30 12:22:29 +00:00
Alex Moreno c02433faab typo
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 13:24:26 +02:00
Alex Moreno c88df46b4f typo
gitea/salix/pipeline/head Build queued... Details
2022-06-30 13:23:57 +02:00
Alex Moreno ca767b84f0 fix(entry): change isInventory to isExcludedFromAvailable
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 13:21:07 +02:00
Joan Sanchez ae79163048 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 13:17:04 +02:00
Joan Sanchez 140af7e808 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 13:14:08 +02:00
Joan Sanchez ad021265c7 Deprecated field taxTypeFk
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 11:42:37 +02:00
Carlos Jimenez Ruiz dab8c60f77 Merge branch 'dev' into 4268-client_list_scroll
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 08:13:59 +00:00
Carlos Jimenez Ruiz 14350358d6 added max width to email of 400px + title to overflowing content
gitea/salix/pipeline/head This commit looks good Details
2022-06-29 15:21:30 +02:00
Vicent Llopis 748dc1b37e fix: delete engine memory to pass backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-29 14:36:17 +02:00
Vicent Llopis 24159cd3e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4213-item.summary
gitea/salix/pipeline/head Build queued... Details
2022-06-29 14:28:54 +02:00
Vicent Llopis d49a2666f1 refactor: don´t show 'description' if it is empty
gitea/salix/pipeline/head This commit is unstable Details
2022-06-29 14:28:23 +02:00
Vicent Llopis 459a1fe518 feat: update instrastat.sql
gitea/salix/pipeline/head This commit looks good Details
2022-06-29 14:15:22 +02:00
Joan Sanchez f15c37d5e1 Merge pull request 'ticket filter pending uses isNotValidated now' (#1016) from 4262-ticket_state_notValidated into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1016
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-06-29 11:34:00 +00:00
Carlos Jimenez Ruiz 57a2cd46ce ticket filter pending uses isNotValidated now
gitea/salix/pipeline/head This commit looks good Details
2022-06-29 12:55:11 +02:00
Carlos Jimenez Ruiz 1b39446552 Merge pull request '4258-worker_time-control_tests' (#1014) from 4217-worker_time-control_tests into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1014
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-06-29 07:20:05 +00:00
Alex Moreno f6b9327fb5 try
gitea/salix/pipeline/head This commit looks good Details
2022-06-29 08:43:43 +02:00
Carlos Jimenez Ruiz 06eddd8e47 Merge branch 'dev' into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-28 12:21:28 +00:00
Joan Sanchez 121efcca2f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit is unstable Details
2022-06-28 12:57:01 +02:00
Carlos Jimenez Ruiz 1981232df4 Merge branch 'dev' into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-28 10:45:16 +00:00
Joan Sanchez ebac2c17f8 Merge pull request '4098-rename_procedures' (#1015) from 4098-rename_procedures into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1015
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-06-28 10:28:50 +00:00
Joan Sanchez df2be27dd3 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-06-28 12:28:19 +02:00
Alex Moreno 22fd0e91b0 title translations, and getWorkedHours test
gitea/salix/pipeline/head This commit looks good Details
2022-06-28 12:10:37 +02:00
Joan Sanchez ae8aae6c20 Changed scope
gitea/salix/pipeline/head This commit looks good Details
2022-06-28 11:58:01 +02:00
Joan Sanchez 5714eb80f2 fix(closure): Wrong error handler scope
gitea/salix/pipeline/head This commit looks good Details
2022-06-28 11:21:47 +02:00
Alex Moreno a3f1c36226 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests 2022-06-28 11:12:06 +02:00
Carlos Jimenez Ruiz a52748348b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4098-rename_procedures
gitea/salix/pipeline/head This commit is unstable Details
2022-06-28 11:09:24 +02:00
Carlos Jimenez Ruiz f9dd4f19d0 Merge pull request '4223-claim_observations' (#1012) from 4223-claim_observations into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1012
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-06-28 09:00:22 +00:00
Carlos Jimenez Ruiz bdf4ecdf50 Merge branch 'dev' into 4223-claim_observations
gitea/salix/pipeline/head This commit looks good Details
2022-06-28 07:03:44 +00:00