Commit Graph

17797 Commits

Author SHA1 Message Date
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
Alexandre Riera 48a7635449 refs #4893 regex changed
gitea/salix/pipeline/head This commit looks good Details
2022-12-02 09:18:52 +01:00
Pau 5235ed5499 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-02 08:05:04 +00: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
Pau 691d157da8 Merge branch 'dev' into 4875-skip-tests
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 13:33:52 +00:00
Pau c54844f7ff removed pending from working test
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 14:32:05 +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
Vicent Llopis 4c0effc48a refacor: description actualizada
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-01 07:25:18 +01:00
Vicent Llopis 6c59a3098d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel 2022-12-01 07:24:40 +01:00
Vicent Llopis 444d495b7f refactor: codigo reducido
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 07:22:13 +01:00
Vicent Llopis ba8fe7dfa8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 07:11:00 +01:00
Alex Moreno 8df7b91127 fix: entry ref
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 15:24:33 +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
Vicent Llopis c1089c637a fix: backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 13:43:29 +01:00
Vicent Llopis 1588492f9a feat: solo añade los logs de salix con el model 'Sale'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 13:29:39 +01:00
Pau 9ed9c1a82c Delete sendsms from core/components
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 13:13:06 +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
Vicent Llopis 68855add59 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 10:53:54 +01: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
Alex Moreno 67cf4ebbea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db 2022-11-30 10:28:21 +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
Vicent Llopis 5c1b88fa44 detele: fixtures en español
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 08:21:53 +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
Vicent Llopis 89e9722027 refactor: cambiados varchar por text, para q no falle en local
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 08:14:38 +01:00
Vicent Llopis f056c26b0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-11-30 08:03:16 +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
Pau 1c4dbb5b4d solve merge conflict
gitea/salix/pipeline/head This commit looks good Details
2022-11-30 07:28:48 +01:00
Pau a676351e5b Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 07:24:26 +01:00