Commit Graph

13576 Commits

Author SHA1 Message Date
Vicent Llopis 4490614f3b Merge pull request 'MASTER: hotfix_4961-travel.extra-community' (!1205) from hotfix_4961-travel.extra-community into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1205
2022-12-21 10:51:02 +00:00
Vicent Llopis a1134879e6 Merge branch 'master' into hotfix_4961-travel.extra-community
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:57:59 +00:00
Vicent Llopis 7261415e16 fix: añadido length
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 09:36:31 +01:00
Joan Sanchez 70b1854cc5 Added version
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 10:20:31 +01:00
Joan Sanchez 3524c027a0 Merge pull request 'TEST_hotFix_disable_outLayout' (!1210) from hotFix_disable_outLayout into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1210
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2022-12-19 06:30:24 +00:00
Alex Moreno 47f624ec04 skip e2e test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-16 09:01:30 +01:00
Alex Moreno 19cbd5b57b fix css
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-16 08:43:34 +01:00
Alex Moreno ed68637059 disable outLayout
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 15:05:17 +01:00
Alex Moreno 0ad4a1ae3a Merge pull request 'add reset-password' (!1207) from hotFix-reset-password into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1207
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:16:48 +00:00
Alex Moreno 8d7757ddbe add reset-password
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 07:40:51 +01:00
Vicent Llopis e616835600 delete: hasDateRange()
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:40:28 +01:00
Vicent Llopis f7a97a8139 fix: siempre muestra el botón si hay datos
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:31:56 +01:00
Joan Sanchez e000103ca4 Deleted version
gitea/salix/pipeline/head This commit looks good Details
2022-12-12 14:22:32 +01:00
Joan Sanchez f93398c783 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-12-12 10:27:28 +01:00
Vicent Llopis f7178f4e32 Merge pull request 'MASTER_hotfix_invoiceOut' (!1197) from MASTER_hotfix_invoiceOut into master
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1197
2022-12-02 12:25:33 +00:00
Vicent Llopis af9d52a367 Merge branch 'master' into MASTER_hotfix_invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2022-12-02 12:04:11 +00:00
Joan Sanchez 8a07e8810d Merge pull request 'MASTER_hotfix_deleteTrashFiles3' (!1194) from MASTER_hotfix_deleteTrashFiles3 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1194
2022-12-02 11:57:50 +00:00
Joan Sanchez ac447d4981 Updated SQL version nomenclature
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-02 12:48:12 +01:00
Vicent Llopis 14a3a815da fix(invoiceOut): pdf adjunto correcto. Corregido valor NaN en intrastat. Sólo muestra intrstar en fact CEE
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-02 12:05:25 +01:00
Joan Sanchez 6128414685 m3 decimal
gitea/salix/pipeline/head This commit looks good Details
2022-12-02 11:26:21 +01:00
Joan Sanchez 0c4ab815fd decimal
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-12-02 11:24:08 +01:00
Joan Sanchez 6562b68341 fix(agencyTerm): permitir decimales en m3 minimos
gitea/salix/pipeline/head This commit looks good Details
2022-12-02 11:16:49 +01:00
Joan Sanchez 12cfa05696 fix(invoicePdf): invoice correction
gitea/salix/pipeline/head This commit looks good Details
2022-12-02 08:33:56 +01:00
Vicent Llopis e7173fe156 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 11:59:30 +01:00
Vicent Llopis ede721a37b Merge branch 'master' into MASTER_hotfix_deleteTrashFiles3
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-01 10:57:44 +00:00
Joan Sanchez e815292d6b fix(componentUpdate): updated filter where sintax
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 09:24:56 +01:00
Vicent Llopis 2bb6c1c1da fix: borra registros aunq no tengan file adjunto
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-01 07:54:32 +01:00
Joan Sanchez 6cb0e518d4 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-12-01 07:33:38 +01:00
Joan Sanchez e9c189a963 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 07:31:45 +01:00
Pau d428753088 Merge pull request 'refs #4875 skipped failing test' (!1193) from 4875-skip-tests into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1193
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2022-11-30 13:56:01 +00:00
Joan Sanchez 9ab2144008 Merge pull request 'hotFix: not transfer all sales if all sales is negatives' (!1192) from hotFix_withoutNegatives into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1192
2022-11-30 13:53:11 +00:00
Alex Moreno 43bd583d6f Merge branch 'dev' into 4875-skip-tests
gitea/salix/pipeline/head This commit looks good Details
2022-11-30 13:49:59 +00:00
Pau 79f8e30ded add pending to the tests
gitea/salix/pipeline/head This commit looks good Details
2022-11-30 14:49:00 +01:00
Pau 67384b724d refs #4875 skipped failing test
gitea/salix/pipeline/head This commit looks good Details
2022-11-30 14:41:03 +01:00
Alex Moreno b769845a28 hotFix: not transfer all sales if all sales is negatives
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 14:29:44 +01:00
Juan Ferrer 204eb52f78 Merge pull request 'refs #4550 fixed no ellipsize in agencyDescription' (!1191) from 4550-HOTFIX-collection-label into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1191
2022-11-30 12:07:29 +00:00
Guillermo Bonet 23f429d94a refs #4550 fixed no ellipsize in agencyDescription
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 12:44:33 +01:00
Joan Sanchez 5423cc4298 Merge pull request 'refs #4550 changed font-family of collection-label' (!1187) from #4550-HOTFIX-collection-label-font into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1187
2022-11-30 10:35:35 +00:00
Guillermo Bonet 0c8b066bc4 Merge branch 'master' into #4550-HOTFIX-collection-label-font
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 10:32:49 +00:00
Guillermo Bonet 497e3e54a2 refs #4550 changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 10:52:52 +01:00
Pau c68aa890b9 Merge pull request 'refs #4914 @1h' (!1190) from hotfix(#4914)-Bug-Client-Phone into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1190
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2022-11-30 09:13:17 +00:00
Joan Sanchez 53dc9eb0c7 Merge pull request 'fix balances' (!1189) from fix-balance into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1189
2022-11-30 09:03:00 +00:00
Pau 97baa89a71 Merge branch 'dev' into hotfix(#4914)-Bug-Client-Phone
gitea/salix/pipeline/head This commit looks good Details
2022-11-30 09:52:19 +01:00
Alexandre Riera 492b852be8 delete orderBy
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 09:22:53 +01:00
Pau bef1071316 refs #4914 @1h
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 09:22:03 +01:00
Alexandre Riera 27078595ce fix balances
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 08:39:04 +01:00
Guillermo Bonet d0acd3e4c0 refs #4550 collection-label changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 08:18:37 +01:00
Pau 9d65d42922 Merge pull request 'fixes #4871 socialName-on-client-filter' (!1179) from 4871-socialName-on-client-filter into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1179
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2022-11-30 06:41:04 +00:00
Alex Moreno 2ce0cc0122 Merge branch 'dev' into 4871-socialName-on-client-filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-30 06:10:48 +00:00
Juan Ferrer ebc40c20bb Merge pull request 'refs #4613' (!1183) from 4613-Eliminar-calculo-portfoio into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1183
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2022-11-29 16:20:06 +00:00