Commit Graph

359 Commits

Author SHA1 Message Date
Juan Ferrer 9a63ce86aa refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 23:54:27 +02:00
Vicent Llopis 0dbd3abd65 refs #5808 fix: corregido el condicional
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 15:06:37 +02:00
Alex Moreno bca7224f74 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 08:09:16 +02:00
Alex Moreno 0aed2c2c08 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 13:10:25 +02:00
Pablo Natek a232e9ecea refs #5153
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 09:26:36 +02:00
Alex Moreno c7b8e57d95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 07:41:48 +02:00
Carlos Satorres 4f5bd95d21 refs #5639 order
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:23:46 +02:00
Carlos Satorres 7fd2927ec9 refs #5639 smart-table country
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 11:26:31 +02:00
Alex Moreno 456e1d5912 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-05 14:11:47 +02:00
Alexandre Riera 13c37e88ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 11:38:07 +02:00
Carlos Satorres 5436eec63e Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 10:00:50 +02:00
Carlos Satorres 8156c17c7d refs #5540 del jasmine 2023-05-02 10:00:47 +02:00
Alexandre Riera c2de5c5ff4 refs #4797 added redirection section
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-02 07:28:59 +02:00
Carlos Satorres 06c01f3e94 Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 13:02:10 +00:00
Carlos Satorres fb59371d54 refs #5540 quit logs 2023-04-28 14:38:49 +02:00
Carlos Satorres 0e0db960af refs #5540 supplier 2023-04-28 14:23:44 +02:00
Carlos Satorres c0deb745d6 refs #5540 arreglo en supplier 2023-04-28 14:03:21 +02:00
Carlos Satorres 38142c121d refs #5540 mods client 2023-04-28 12:12:26 +02:00
Carlos Satorres cdbbec9d36 refs #5540 validate
gitea/salix/pipeline/head Build queued... Details
2023-04-28 10:21:54 +02:00
Carlos Satorres b8f7f7bd69 refs #5540 create validateIban
gitea/salix/pipeline/head This commit looks good Details
2023-04-28 09:07:06 +02:00
Juan Ferrer 2cfd2d9dda Merge branch 'dev' into 5517-improveLogs+translations
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-27 18:13:24 +02:00
Carlos Satorres 08c173acf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies 2023-04-27 12:49:01 +02:00
Alex Moreno 28ead70615 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:17:46 +02:00
Juan Ferrer 49368a837b refs #5517 Filter improved
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 19:10:04 +02:00
Pablo Natek 3e15728db4 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 15:33:28 +00:00
Alex Moreno 8502b74dee feat(): replace hasRole to checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 11:07:04 +02:00
Carlos Satorres 67db2f0476 Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 06:51:41 +00:00
Carlos Satorres 397d8f658e refs #5540 error trad
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 10:41:50 +02:00
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
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
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
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 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
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 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
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
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 3881e435f4 Renamed method
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 09:55:45 +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
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 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 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 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 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
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 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 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
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 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
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
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 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 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
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