Commit Graph

606 Commits

Author SHA1 Message Date
Vicent Llopis 3630c7d398 refs #5410 creada ruta de back para enviar emails
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 14:09:55 +02:00
Alexandre Riera 9380b88460 refs #5437 back and test deprecated
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 12:40:03 +02:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:57:00 +02:00
Pablo Natek 2c01ebf681 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 13:26:17 +02:00
Joan Sanchez 12a9ff599b Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 10:05:27 +01:00
Joan Sanchez 3881e435f4 Renamed method
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 09:55:45 +01:00
Joan Sanchez 634db7c7fc refactor(getTransactions): lilium customer transactions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-20 23:09:17 +01:00
Alexandre Riera 387576d63a Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 06:42:39 +00:00
Joan Sanchez d373d80b12 Merge pull request '5120-reports_loopback' (!1389) from 5120-reports_loopback into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1389
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-16 06:34:02 +00:00
Joan Sanchez e911f7a127 Merge pull request '4980-travel.extra-community_filterToReport' (!1391) from 4980-travel.extra-community_filterToReport into dev
Reviewed-on: #1391
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-16 06:27:33 +00:00
Joan Sanchez 1f52326091 Merge pull request 'feat(print): added reusable pdf print functions' (!1390) from 5182-print_publish into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1390
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-03-16 06:22:45 +00:00
Joan Sanchez 4f0ad00a6f 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
2023-03-16 07:20:18 +01:00
Joan Sanchez f052af92cd Proper template name 2023-03-15 08:07:14 +01:00
Vicent Llopis 50ccb61728 refactor: el report llama directamente al filtro de extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:59:29 +01:00
Joan Sanchez 6495e016a8 Endpoints refactor
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 08:17:46 +01:00
Joan Sanchez 63d7dafcde feat(print): added reusable pdf print functions
gitea/salix/pipeline/head There was a failure building this commit Details
Refs #5182
2023-03-13 15:05:19 +01:00
Vicent Llopis 5cb28036c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 14:25:55 +01:00
Joan Sanchez 9bc86b1617 Added missing relation
gitea/salix/pipeline/head This commit looks good Details
2023-03-10 13:29:11 +01:00
Vicent Llopis b24b6d4121 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback 2023-03-10 07:46:16 +01:00
Alexandre Riera 2363828092 hotfix clientUnpaid
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 08:54:03 +01:00
Alexandre Riera 9ff920c67e Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 06:50:33 +00:00
Juan Ferrer 47f1ad9a0c Merge pull request 'master' (!1367) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1367
2023-03-06 08:28:29 +00:00
Juan Ferrer 99f8bc6bac refs #5174 TpvTransaction.confirm code refator to improve debugging
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 18:55:58 +01:00
Juan Ferrer 6eaf4bdd1b refs #5174 tpvTransaction: Añadidas columnas para depuración 2023-03-03 10:57:57 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 07:44:31 +01:00
Alexandre Riera 76cd2d160e Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-02-27 06:05:21 +00:00
Alexandre Riera ed7f3f5d63 Merge branch 'dev' into 5172-cliente-impagado
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 08:34:41 +00:00
Alexandre Riera be8d19a9f8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-22 09:27:38 +01:00
Joan Sanchez 45c4f2ff45 Updated test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 08:51:50 +01:00
Alexandre Riera 063c60b4a1 Merge branch 'dev' into 5172-cliente-impagado
gitea/salix/pipeline/head This commit looks good Details
2023-02-20 13:58:31 +00:00
Alexandre Riera 77066b2005 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos 2023-02-20 09:20:30 +01:00
Joan Sanchez ceab11cc41 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:34 +01:00
Vicent Llopis 885a98457e feat: sustido sql por loopback del report 'balance-compensation'
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 09:11:20 +01:00
Alexandre Riera dca5ae0f72 refs #5223 added params
gitea/salix/pipeline/head This commit looks good Details
2023-02-15 13:14:52 +01:00
Alexandre Riera ea2fd59cdc refs #5223 changed ref and email text
gitea/salix/pipeline/head This commit looks good Details
2023-02-14 12:41:36 +01:00
Alexandre Riera 4c7aae95aa refs #5172 added default icon
gitea/salix/pipeline/head This commit looks good Details
2023-02-13 13:04:22 +01:00
Alex Moreno f496242fcb fix description
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-09 10:28:37 +01:00
Alex Moreno bbf68a88a7 feat: sendEmail checkBox and docuware open clientBalanceCreate with default data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-09 10:26:55 +01:00
Joan Sanchez ebee9144b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 09:16:30 +01:00
Alexandre Riera 0c91f95762 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos 2023-02-03 12:03:16 +01:00
Alex Moreno 6c772643a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-02 11:55:11 +01:00
Joan Sanchez 4477486f8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-02-02 08:58:44 +01:00
Joan Sanchez 7a700de5c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 08:23:17 +01:00
Joan Sanchez e34d64361b Account refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 14:57:24 +01:00
Juan Ferrer 5045a8f670 #5175 TpvTransaction.confirm(): Return response
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:00:10 +01:00
Juan Ferrer 5a4ae7d742 refs #5174 TpvTransaction: Methods start & end added, fixes & refactor
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:29:17 +01:00
Juan Ferrer 82bc7307f0 #5174 Signature verification fixed & enabled
gitea/salix/pipeline/head Build queued... Details
2023-01-31 00:41:36 +01:00
Juan Ferrer 424dcb954c refs #5174 Hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 20:23:52 +01:00
Juan Ferrer 64d8ae1f49 refs #5174 Hotfix
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-01-30 20:22:52 +01:00
Juan Ferrer 339cdab3c4 refs #5174 Debug enabled
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 19:59:46 +01:00
Juan Ferrer d6794cb4c8 #5174 Hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 19:51:01 +01:00
Juan Ferrer b20194b6d0 #5174 Hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 17:45:36 +01:00
Juan Ferrer 5744759d53 refs #5122 Hotfix: Signature verification
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 17:33:15 +01:00
Juan Ferrer 109556ae2e refs #5122 Hotfix: Basic implementation for payment confirmation
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 12:39:47 +01:00
Alexandre Riera 7e5f50e637 refs #5072 email validation added
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 08:30:39 +01:00
Alexandre Riera d69b204c4c refs #5036 loggable refactored, tests fixed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 15:49:30 +01:00
Joan Sanchez 0208b31f44 Naming rollback
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 09:12:26 +01:00
Joan Sanchez 89eb065f6d Updated models 2023-01-24 09:04:43 +01:00
Joan Sanchez ee1ce21bb9 refactor(account): account model refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 15:24:00 +01:00
Alex Moreno e27a559416 refactor: replace all Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 15:18:24 +01:00
Vicent Llopis 630890cd04 fix: colum name in model
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 12:23:16 +01:00
Vicent Llopis 06075aa17b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms 2022-12-21 12:15:21 +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
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
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
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
Pau 0d6e424a3e allow client search by socialname 2022-11-28 10:21:01 +01:00
Alex Moreno da2d1df522 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio 2022-11-28 10:14:16 +01:00
Vicent Llopis e540bf7b31 feat: inserta en la nueva tabla ticketSms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:38:34 +01:00
Carlos Andrés 8d2e532167 #4613 eliminar uso de portfolio
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:32:54 +01:00
Pau f74b257d75 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:27:49 +00:00
Pau ad38f50ae3 Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 08:55:46 +01:00
Pau ade2e777d6 refs #4457 @30min requested changes 2022-11-23 08:55:44 +01:00
Alexandre Riera d7843f3298 Merge branch '4547-fix-compensation' of https://gitea.verdnatura.es/verdnatura/salix into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 14:24:55 +01:00
Alexandre Riera 34fb80beec fix translations 2022-11-22 14:24:19 +01:00
Alexandre Riera 5552cd654e Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:48:11 +00:00
Pau cb6ae41c13 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 13:45:28 +00:00
Alexandre Riera 40ea9805cf fixes #4547 check compensation and tests
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 10:49:19 +01:00
Pau c320342476 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 06:05:43 +00:00
Alexandre Riera 4a063cc310 refs #4780 verification deleted
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 09:25:18 +01:00
Pau 9d0cd36afe Merge branch 'dev' into 4457'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:49:21 +01:00
Pau c53e309071 Fix typo
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:19:54 +01:00
Pau 1327f0ae9d Added requested changes, refs #4507 @1:20h
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:18:05 +01:00
Pau eab9289408 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 06:26:05 +00:00
Alexandre Riera ff2ee4401e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4547-informe-compensacion
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 13:26:54 +01:00
Pau e85505ee8e #4457 implement notification system, @1h 30m
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-08 12:26:01 +01:00
Pau f21907855f Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente 2022-11-08 10:04:47 +01:00
Pau 7ff4c4d33c Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 07:35:01 +00:00
Alexandre Riera 908908a643 refs #4547 correcciones
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-02 15:54:23 +01:00
Vicent Llopis f96fc0f91e Merge branch 'dev' into 3852-client.search-panel2
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:13:41 +00:00
Joan Sanchez 34997b72f5 Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 11:55:47 +00:00
Pau 0739608de3 Merge branch 'dev' into 4457-hasInvoiceElectronic
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 07:57:50 +01:00
Alexandre Riera 1246a65f32 refs #4547 informe y email generados
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-28 14:49:22 +02:00
Vicent Llopis 1d908002e2 feat: add backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 14:25:27 +02:00
Vicent Llopis c0b95564c3 refactor: borrado codigo sql innecesario 2022-10-26 14:25:17 +02:00
Vicent Llopis b39b28e43d refactor: añadido salto de lineas
gitea/salix/pipeline/head This commit looks good Details
2022-10-26 13:10:17 +02:00
Vicent Llopis 65e32f5e7f feat: client search panel add find by zone
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 12:40:13 +02:00