Commit Graph

14151 Commits

Author SHA1 Message Date
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
Pau 25e58f4f66 fix merge conflicts
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 07:21:30 +01:00
Pau cb7aa48fde Solve merge conflicts
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 07:13:56 +01:00
Pau ace153996a Merge branch '4791-refactor-sendsms' of https://gitea.verdnatura.es/verdnatura/salix into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 07:12:27 +01:00
Pau 02598ced92 solve merge conficts 2022-11-30 07:12:26 +01: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
Juan Ferrer ba55ef04e3 Merge branch 'dev' into 4613-Eliminar-calculo-portfoio
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 16:19:44 +00:00
Vicent Llopis c258587e02 feat: plantilla email para asientos contables importados incorrectamente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 15:06:21 +01:00
Guillermo Bonet b7fa4dca4c refs #4550 changed font-family of collection-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 14:16:44 +01:00
Pau cc87565190 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 14:16:15 +01:00
Pau 2d7b3cc3a2 Merge branch 'dev' into 4871-socialName-on-client-filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 13:13:57 +00:00
Joan Sanchez 990dd88e2c Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1186
2022-11-29 13:08:38 +00:00
Joan Sanchez 60d8eafa0f Merge pull request 'master → test (Hacer primero)' (!1185) from master into test
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1185
2022-11-29 13:08:07 +00:00
Pau 18a23cf8b5 add some right padding to prevent the printer from cutting the label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 13:47:53 +01:00
Joan Sanchez 5f3e7c3384 Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 11:49:06 +00:00
Guillermo Bonet a9b4526493 Merge pull request 'refs #4550 collection-label fixes' (!1184) from #4550-HOTFIX-collection-label into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1184
2022-11-29 11:23:27 +00:00
Pau 3596700513 Merge pull request 'fixes #4557 duplicate-tickets-in-routes' (!1169) from 4557-duplicate-tickets-in-routes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1169
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-29 11:07:32 +00:00
Guillermo Bonet 2faacb169a refs #4550 collection-label more fixes
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 11:56:05 +01:00
Alexandre Riera cd8d5efa88 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 10:29:18 +01:00
Pau ddc543ad63 Merge branch 'dev' into 4557-duplicate-tickets-in-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 08:22:05 +00:00
Vicent Llopis 5e864a672b Merge pull request 'DEV_fix_deleteTrashFiles' (!1177) from DEV_fix_deleteTrashFiles into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1177
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-29 08:08:01 +00:00
Alexandre Riera acbd0474a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 08:50:48 +01:00
Vicent Llopis 2801e11965 Merge branch 'dev' into DEV_fix_deleteTrashFiles
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 07:43:50 +00:00
Vicent Llopis 1c0d90cdf8 Merge pull request '4903-sendMail_refactor' (!1181) from 4903-sendMail_refactor into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1181
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-29 07:42:47 +00:00
Vicent Llopis a218c086ce Merge pull request 'TEST_fix_log' (!1182) from TEST_fix_log into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1182
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-29 07:42:30 +00:00
Guillermo Bonet b262b29627 refs #4550 collection-label fixes
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 08:22:32 +01:00