Commit Graph

1304 Commits

Author SHA1 Message Date
Carlos Satorres d8b5659a5d refs #5540 client vies 2023-04-21 09:14:30 +02:00
Pablo Natek de3b4f37c2 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 05:54:00 +00:00
Juan Ferrer 6f1744baff Merge branch 'dev' into 5517-improveLogs+translations 2023-04-20 16:30:24 +02:00
Vicent Llopis ec9a5722c2 refs #5128 añadido icono de grafana
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 13:58:49 +02:00
Alex Moreno 39333a9119 refs #5488 replace hasRole for checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 15:23:32 +02:00
Vicent Llopis f6bf92b74b refs #5128 intentando poner icono grafana
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 15:21:59 +02:00
Vicent Llopis 6fbb734a34 quitado salto de linea
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 14:43:23 +02:00
Vicent Llopis 187ba032d2 refs #5128 rol por ACL 2023-04-19 14:43:15 +02:00
Vicent Llopis 34b360040b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 12:18:45 +02:00
Joan Sanchez fded7d062b section fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:49:23 +02:00
Vicent Llopis b3e7cedd1e refs #5128 borrada línea por error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:49:12 +02:00
Vicent Llopis c5225cb632 refs #5128 borrado código innecesario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:23:19 +02:00
Vicent Llopis 48cd23750e refs #5128 add testBack
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:09:09 +02:00
Vicent Llopis c9dffe9175 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:39:43 +02:00
Joan Sanchez 6fd5c8ae2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-18 08:34:20 +02:00
Joan Sanchez 6d593a0937 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5213-minorBugs2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:32:22 +02:00
Pablo Natek 3636543f73 refs #5075
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:19:23 +02:00
Alex Moreno 560b5b374f Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 05:37:12 +00:00
Juan Ferrer c5dcfd3cab refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing
gitea/salix/pipeline/head This commit looks good Details
2023-04-15 14:24:50 +02:00
Juan Ferrer add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Vicent Llopis 4c18efa589 refs #5128 creado método setRating
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-14 13:05:57 +02:00
Vicent Llopis 83dd386eed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management 2023-04-14 10:39:16 +02:00
Pablo Natek 9594bd68b5 refs #4795
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 21:10:50 +02:00
Vicent Llopis 2a2d03e05a refs #5517 añadidas traducciones de algunos modelos
gitea/salix/pipeline/head This commit looks good Details
2023-04-12 15:02:21 +02:00
Carlos Satorres ef6e85532e refs #5213 cambios e2e, descriptor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 14:20:05 +02:00
Alexandre Riera 0666163ca0 refs #5546 deleted log property, fixed back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 12:33:14 +02:00
Pablo Natek 1456da58f5 refs #5075
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 15:41:45 +02:00
Pablo Natek c928274e24 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 13:19:54 +00:00
Vicent Llopis d03ca01b73 refs #5128 añadida subseccion "Gestión de crédito"
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 14:57:56 +02:00
Pablo Natek 1770b8c038 refs #5075
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 13:42:28 +02:00
Alexandre Riera 5cbc826281 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk
gitea/salix/pipeline/head This commit looks good Details
2023-04-06 07:16:00 +00:00
Joan Sanchez b71ad207ff Merge pull request 'fixes #5437 Desactivar correos "Cliente con email/teléfono/móvil duplicados"' (!1420) from 5437-deactivate-mail-duplicated-client into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1420
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-06 07:07:35 +00:00
Alexandre Riera eed1ecc208 refs #4954 trigger modified
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 14:47:13 +02:00
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
Vicent Llopis c89f95a33e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 13:40:12 +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
Alexandre Riera 05caf0c6d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 08:26:11 +02:00
Vicent Llopis f689d35100 refs #5410 fix test
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 10:05:17 +01:00
Vicent Llopis 1b1bca28bd refs #5410 add frontTest
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:13:59 +01:00
Vicent Llopis bf38098e5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked 2023-03-22 09:31:08 +01:00
Vicent Llopis 41c79263c4 refs #5410 feat: envia email cuando se añade una nota
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 14:53:36 +01: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
Vicent Llopis 5794ae5130 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked 2023-03-16 13:55:54 +01:00
Vicent Llopis bc47fc35d6 refs #5410 feat: añadido filtro a las columnas created y defaulterSinced
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 13:55:21 +01:00
Alexandre Riera c46e15c8e4 refs #5092 changed section name
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:35:00 +01:00
Alexandre Riera 0b4a6874d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 09:16:50 +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
Vicent Llopis 38bf49c0b6 refs #5410 fix: se mantenien los checkbox marcados al paginar
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 08:40:53 +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
Alexandre Riera eee4c815e7 Merge branch 'dev' into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head This commit looks good Details
2023-03-13 06:10:51 +00: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 a5f6d37f0f hotfix reload card, improved icon message 2023-03-09 09:29:11 +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
Alexandre Riera b1d5a2ba1a Merge branch 'dev' into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 10:46:16 +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
Alexandre Riera f2bd0253e2 refs #5092 added unbilled tickets section
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 09:27:53 +01: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
Joan Sanchez fafbfed189 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 07:23:38 +01:00
Alexandre Riera bca9e757d4 hotfix parsed description array to string
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 15:52:47 +01:00
Alexandre Riera 3a3dcc941b Merge branch '5172-cliente-impagado' of https://gitea.verdnatura.es/verdnatura/salix into 5172-cliente-impagado
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-22 14:24:33 +01:00
Alexandre Riera 0263a4833e refs #5172 added changelog 2023-02-22 14:24:31 +01:00
Alexandre Riera ca1f5480ae refs #5235 added setClientSample(), fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-02-22 13:04:27 +01: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 5c2c99e397 refs #5172 changed icon name
gitea/salix/pipeline/head This commit looks good Details
2023-02-20 09:44:14 +01: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 f2f8a4eb04 fix test 2023-02-06 08:19:13 +01:00
Alexandre Riera df3e818182 refs #5074 refactor this.receipt.description
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-06 08:07:50 +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
Alex Moreno 2528b2d3ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:10:51 +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
Alexandre Riera 1b12770655 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:31:01 +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
Alexandre Riera 9cb363e4e5 refs #5074 deleted null in reference
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 13:34:08 +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 fccfabdcd1 hotfix viewReceipt clientBalance
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:31:14 +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 12cf79ab39 Updated e2e 2023-01-25 14:14:55 +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
Alexandre Riera 53b5ef6d78 refs #4937 viewReceipt added
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 11:48:59 +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
Pau 5a01e49f27 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-19 12:25:58 +00: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
Pau 8f98082910 refs #4791 @2h
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:59:02 +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 7c71e40cc5 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 13:15:54 +00: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 3b66da20ca Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 07:01:33 +00:00
Pau 4bd643143b requested changes refs #4791 @1h
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 07:59:18 +01: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 4e97d931f7 refs #4791 @2h 2022-11-21 08:45:45 +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 8b06243041 Fix link being the whole column
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:36:26 +01:00
Pau 8dd6012b1f Added worker descriptor popover 2022-11-10 08:27:47 +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 98dd5963bf refs #4547 traduccion añadida
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-04 08:15:12 +01:00
Alex Moreno ec9139f985 Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:24:05 +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
Alexandre Riera 8d8d217fe7 refs #4547 formateo arreglado
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-02 13:59:13 +01: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
Alex Moreno 9891f7060d fix(smart-table): monitor only ticketFilter use url and add ?q in routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 09:40:09 +01: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
Vicent Llopis 3110172c54 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3811-ticket.sale_updatePrice 2022-10-26 08:39:58 +02:00
Alex Moreno f65d06fc7d fixes #4073
gitea/salix/pipeline/head This commit looks good Details
2022-10-26 08:27:28 +02:00
Vicent Llopis 931a891f71 fix: check client.email exists
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 08:09:23 +02:00
Alex Moreno 6a17a634d4 hotFix(receipt): add receiptPdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-24 09:49:51 +02:00
Pau 30933220ac #4507 greuge.js/json now insert userFk @2h
gitea/salix/pipeline/head This commit looks good Details
2022-10-24 09:37:17 +02:00
Vicent Llopis 6f31bea21f feat: update testBack
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:00:48 +02:00
Alex Moreno 9befa2531b Merge branch 'hotFix_travel_extraCommunity-css' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travel_extraCommunity-css
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 07:29:26 +02:00
Joan Sanchez 934c0d0169 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 07:28:10 +02:00
Joan Sanchez 587da840c0 Fix
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 12:16:30 +02:00
Joan Sanchez 6c5acc75eb Consumption fix
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 12:00:06 +02:00
Pau 4f25961988 Created checkbox and logic, package-lock
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 08:33:45 +02:00
Vicent Llopis aa51fa1722 feat: check the client to edit is in vn.client and not in account.account
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-05 12:36:36 +02:00
Joan Sanchez 377a0f7228 Attachments refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 13:41:37 +02:00
Joan Sanchez eadff3fff9 Updated back unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 09:46:44 +02:00
Joan Sanchez 1598b6c703 Back unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 09:39:42 +02:00
Joan Sanchez 3dbd304217 Updated unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 09:21:24 +02:00
Joan Sanchez c8bad23621 Tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 07:41:40 +02:00
Joan Sanchez 3b0f1efbf4 ACL's
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 13:54:20 +02:00
Joan Sanchez 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:52:31 +02:00
Joan Sanchez 3601881026 Client consumption queue
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:43:27 +02:00
Joan Sanchez 7f78286d6b Reports refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 13:33:27 +02:00
Joan Sanchez 85698410db Templates refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:07:45 +02:00
Joan Sanchez 664fd444cc Sample refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-22 15:44:35 +02:00
Joan Sanchez 68f3544477 Claim pickup order 2022-09-22 09:17:14 +02:00
Joan Sanchez 8105c12a18 Campaign metrics 2022-09-22 08:48:29 +02:00
Alex Moreno 8c984b5ebe refactor(client): change rol manager to financialBoss
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 12:32:19 +02:00
Joan Sanchez de3e14e739 4514 - Write permissions for rrhh
gitea/salix/pipeline/head This commit looks good Details
2022-09-12 10:23:17 +02:00
Joan Sanchez cceb456209 Filter by province
gitea/salix/pipeline/head This commit looks good Details
2022-08-12 15:31:59 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:13:31 +02:00
Alex Moreno de0f7c98fa Merge branch 'dev' into 3653-clientInsurance
gitea/salix/pipeline/head This commit looks good Details
2022-06-10 05:32:58 +00:00
Carlos Jimenez Ruiz 92088c00f7 Merge branch 'dev' into 4163-supplier.account
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 09:04:14 +00:00
Carlos Jimenez Ruiz ad8eace5cb Merge branch 'dev' into 3817-updatePortfolio
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 07:52:52 +00:00
Vicent Llopis fb7f26216c feat: update combo "Banck entity" 2022-06-09 08:43:33 +02:00
Alex Moreno 61cc3c19f3 refactor(client): creditInsuarnce change creditClassification for creditClassificationFk
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 07:13:54 +02:00
Vicent Llopis aa99424476 deleted unnecessary 'await'
gitea/salix/pipeline/head This commit looks good Details
2022-06-08 12:50:32 +02:00
Joan Sanchez c92f444776 Ammends
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 14:59:18 +02:00
Carlos Jimenez Ruiz 6ebcf4bc02 Merge branch 'dev' into 3817-updatePortfolio
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 12:35:31 +00:00
Joan Sanchez 4ecffc2448 Merge branch 'dev' into 4067-client_detail
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 11:45:02 +00:00
Joan Sanchez a4a9ea45b7 Removed front unit test
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 13:44:07 +02:00
Joan Sanchez 571e2f03d3 Removed focus
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-01 13:07:47 +02:00
Joan Sanchez 0faabeb145 Added back unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-01 13:07:28 +02:00
Joan Sanchez 0bc48dc27b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 09:39:53 +02:00
Joan Sanchez c369453bfc Added model fields
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-31 13:36:27 +02:00
Vicent Llopis 0c996f7915 fix: excluded backTest fixed
gitea/salix/pipeline/head This commit looks good Details
2022-05-31 12:23:56 +02:00
Joan Sanchez a5e833af2c feat(client): detail section with smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-31 07:56:17 +02:00
Alex Moreno ff264ab930 hotFix(client): fiscal-data edit by salesAssistant
gitea/salix/pipeline/head This commit looks good Details
2022-05-27 09:45:08 +02:00
Vicent Llopis 9736a68dd9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4022-client.balance.create
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:16:58 +02:00
Vicent Llopis 875e9503c3 refactor: request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:16:47 +02:00
Vicent Llopis 605ab2ec62 refactor: delete sms.detinationFk
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 12:37:54 +02:00
Vicent Llopis eeede417eb feat: update date depending of accountingType
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 12:24:35 +02:00
Carlos Jimenez Ruiz d31f7f1b6b all type Dates replaced to date as per convention
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz b5ccd32800 Merge branch 'dev' into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:23:08 +00:00
Carlos Jimenez Ruiz cce1d93dde jasmine reporters config for CI
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 11:43:41 +02:00
Alex Moreno 5021315ed4 refactor(clientCredit): test and types
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 09:47:47 +02:00
Alex Moreno 7f46d4e50a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 08:06:39 +02:00
Alex Moreno af1fa8051f refactor(clientCredit): refactor test 2022-05-12 08:06:30 +02:00
Carlos Jimenez Ruiz 833addcb75 gulp-jasmine replaced by jasmine
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 19:38:10 +02:00
Carlos Jimenez Ruiz a7b56b3b89 Merge branch 'dev' into 3327-global_invoicing
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 12:19:31 +00:00
Alex Moreno 5919c42df2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check 2022-05-10 11:42:35 +02:00
Joan Sanchez 7f19f0bebe Merge pull request '3795-client_administraive' (#938) from 3795-client_administraive into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #938
2022-05-10 08:26:38 +00:00
Joan Sanchez 93829eeff5 Merge branch 'dev' into 3948-invoceIn.index
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 08:22:06 +00:00
Alex Moreno fde73b35e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check 2022-05-10 08:57:28 +02:00
Alex Moreno 5bad0592a5 change errors
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 08:48:51 +02:00
Alex Moreno 263d0e3f79 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive 2022-05-10 07:55:41 +02:00
Carlos Jimenez Ruiz 93d29bb202 Merge branch 'dev' into 3900-client_credit
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 13:16:04 +00:00
Joan Sanchez f806a598ea Updated method path
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 13:15:48 +02:00
Alex Moreno 0cae852dea refactor
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 10:28:17 +02:00
Alex Moreno 1cc199e26b refactor(client-credit)
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 10:26:13 +02:00
Alex Moreno 800b4984ff fix(test): use ctx.options
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 07:46:47 +02:00
Alex Moreno e140c9d1f4 console.logs
gitea/salix/pipeline/head This commit looks good Details
2022-05-03 15:17:34 +02:00
Alex Moreno b40b8d931d feat(client_credit): remove de old rows
gitea/salix/pipeline/head This commit looks good Details
2022-05-02 11:18:39 +02:00
Alex Moreno d27a45522b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 12:49:42 +02:00
Vicent Llopis fec9554d5b feat(invoceIn.index): added 'file' and deleted 'account'
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 12:13:02 +02:00
Carlos Jimenez Ruiz b2f930911f fixed problems in two spec files
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 09:18:06 +02:00
Alex Moreno e7cb9cf2da fix
gitea/salix/pipeline/head This commit looks good Details
2022-04-25 10:30:44 +02:00
Alex Moreno 42f02c3b9e fix(client): socialName unique check client.fi 2022-04-25 08:09:58 +02:00