Commit Graph

1876 Commits

Author SHA1 Message Date
Carlos Andrés 0372d44415 fixes #5529 Fixes: missing awaits, buffer-to-file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 15:00:28 +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
Joan Sanchez ea60e31361 Merge pull request '5432-propiedadesBotonMas' (!1396) from 5432-propiedadesBotonMas into dev
Reviewed-on: #1396
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-03-30 05:19:28 +00:00
Carlos Satorres bf5f1011e8 refs #5490 traducción corregida
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 14:56:20 +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 4e5364dc0b refs #5036 fix tests logs
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 10:05:02 +01:00
Vicent Llopis 34126119e2 fix errors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 09:02:22 +01:00
Joan Sanchez 7b5e0bae8e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 08:20:33 +01:00
Vicent Llopis 0579c563b9 refs #5327 ordernar por columnas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 15:03:12 +01:00
Alexandre Riera 60eabbf7a0 Merge branch 'test' into hotfix-added-grabUser-logs
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 10:37:57 +00:00
Alexandre Riera 81472a5e50 removed duplicated log
gitea/salix/pipeline/head Build queued... Details
2023-03-22 11:36:28 +01:00
Alexandre Riera 59c3ef23de grabUser added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 11:03:13 +01:00
Carlos Satorres f0f2a8c731 refs #5432 quitar comentario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-20 13:41:32 +01:00
Carlos Satorres a670795f9d refs #5432 mod ng-show, add tooltip and disabled 2023-03-20 13:22:21 +01:00
Alexandre Riera 668fa73386 refs #4632 deleted return in definition
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 10:32:00 +01:00
Alexandre Riera 60162fe71f refs #4632 removed return
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 10:30:53 +01:00
Alexandre Riera c0094d8047 Merge branch '4632-guardarFirmas-salix' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 09:07:21 +01:00
Alexandre Riera a0be5c50fc refs #4632 changed packed from boxed 2023-03-16 09:07:19 +01:00
Alexandre Riera f037575428 Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head Build queued... Details
2023-03-16 08:06:17 +00:00
Alexandre Riera 6e2269b428 refs #4632 removed alert level id from code
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:04:57 +01:00
Alexandre Riera a99bd2577a refs #4632 changed route from TicketDms to Ticket
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 08:24:34 +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 dc936fe690 Merge branch 'dev' into 5182-print_publish
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-15 07:05:14 +00:00
Carlos Andrés 67f9cae2f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:04:45 +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 0cac62da76 Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 09:02:54 +00:00
Alexandre Riera 4f78eaa14c Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head This commit looks good Details
2023-03-09 08:29:43 +00:00
Alexandre Riera 7c3c3a2d66 refs #4632 added userError
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 08:31:38 +01:00
Vicent Llopis e20464cc7c update css
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 13:14:06 +01:00
Alexandre Riera 423ae85212 refs #4632 dmsRecover deprecated
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:29:09 +01:00
Alexandre Riera 06dd72f30c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix 2023-03-08 12:13:48 +01:00
Carlos Satorres 955e55a7f4 refs #5284 new onCreateClaimAccepted y createClaim
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 15:43:48 +01:00
Alexandre Riera 59a3ff0f7b Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 12:10:24 +00:00
Alexandre Riera 21c7b18de9 refs #5036 make logs/querys only when grabUser is disabled
gitea/salix/pipeline/head Build queued... Details
2023-03-07 13:10:02 +01:00
Vicent Llopis e39690c2c9 merge with dev
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 10:21:10 +01:00
Vicent Llopis 5248fd7fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-03-06 10:20: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
Joan Sanchez 32b3284e40 Merge pull request 'refs #5115 transfer_sales' (!1344) from 5115-transfer_sales into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1344
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-02 06:31:20 +00:00
Joan Sanchez 84dc95621d Merge pull request 'fixes #5149 ticket.descriptor-menu Eliminar ticket, debe comprobar que no existe un abono' (!1348) from 5149-check-ticket.refund into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1348
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-02 06:30:17 +00:00
Joan Sanchez d819a13597 Merge pull request '5240-ticket.sale-tracking' (!1353) from 5240-ticket.sale-tracking into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1353
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-02 06:28:01 +00:00
Guillermo Bonet 707ae232a7 refs #5193 ticketCreateWithUser to ticket_add
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 12:24:36 +01:00
Alexandre Riera 915c598c0c fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 09:04:53 +01:00
Alexandre Riera 2e09845dbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund
gitea/salix/pipeline/head Build queued... Details
2023-03-01 08:29:58 +01:00
Vicent Llopis 8a1a7d7159 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5240-ticket.sale-tracking
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 08:20:28 +01:00
Alexandre Riera b2bf7f2727 refs #5149 fixing e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 14:29:31 +01:00
Alexandre Riera e9dca9211c refs #5149 checked if ticket has refunds, added translations
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 13:42:18 +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 2a4d41cbca refs #4632 saveSign refactored, working on tests, check if dmsRecover is needed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-24 14:41:02 +01:00
Alexandre Riera 6590c6f1fa refs #5036 transferSales also transfer sale's logs
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 08:55:04 +01:00
Robert Ferrús 1e23dfe34e Merge branch 'dev' into 5115-transfer_sales
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 10:00:32 +00:00
Carlos Andrés 4cc6485cbd refs #5000 Invoicing RC
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-23 09:25:23 +01:00
Alexandre Riera 42b8f08a4d refs #5168 checked sales with logs
gitea/salix/pipeline/head This commit looks good Details
2023-02-22 12:14:17 +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
Vicent Llopis 432c8a9ab8 refactor: cambiados estilos de los chips
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 10:56:46 +01:00
Joan Sanchez 4c2878e232 Updated unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 09:48:47 +01:00
Vicent Llopis 26d72a7b3f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund 2023-02-20 11:49:17 +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 86dd299292 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:52 +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
Joan Sanchez 527caf9ca0 refactor(zerofill): deprecated zerofill and removed function
gitea/salix/pipeline/head This commit looks good Details
Refs: #5207
2023-02-17 11:19:35 +01:00
Vicent Llopis 4001a75916 Merge branch 'dev' into 5180-invoice-out_refund
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 08:57:48 +00:00
Vicent Llopis b5d2d53435 fix: test back
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 10:45:13 +01:00
Vicent Llopis 73ae45c2c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-15 15:08:58 +01:00
Vicent Llopis a5a0256e44 feat: añadido parametro que indica si genera uno o multiples ticket de abono
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-14 10:58:41 +01:00
Alexandre Riera e5e86de8d2 Merge branch 'dev' into 5152-ticketBasicData-stepTwo
gitea/salix/pipeline/head This commit looks good Details
2023-02-14 07:07:12 +00:00
Alexandre Riera 76ed4d2d4b refs #5194 fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-02-13 10:16:28 +01:00
Vicent Llopis 4da8546bdf Merge branch 'dev' into 2952-ticket.sale-tracking_part2
gitea/salix/pipeline/head This commit looks good Details
2023-02-13 07:14:28 +00:00
Pau 294b4acbe2 Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-13 06:03:21 +00:00
Alexandre Riera 6cb815faaf .
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-10 10:13:41 +01:00
Alexandre Riera a468fb2c66 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head Build queued... Details
2023-02-10 09:02:44 +01:00
Alexandre Riera 9dc07d88d6 fixing e2e
gitea/salix/pipeline/head This commit looks good Details
2023-02-10 08:56:30 +01:00
Alexandre Riera 194069c0c2 refs #5194 fixed stock, lines 2023-02-10 08:46:54 +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
Joan Sanchez 461799f137 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 08:56:30 +01:00
Alexandre Riera ef5b29d6f3 hotfix ticketFutureAdvance warehouse
gitea/salix/pipeline/head This commit looks good Details
2023-02-08 13:47:35 +01:00
Alexandre Riera 4413c8828b refs #5152 added confirmation popup
gitea/salix/pipeline/head This commit looks good Details
2023-02-08 10:54:21 +01:00
Pau 86e6672e49 Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-07 13:39:36 +00:00
Vicent Llopis cec7602e1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-07 13:44:53 +01:00
Vicent Llopis 2e8aabab14 fix: type relation in models
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 14:32:54 +01:00
Vicent Llopis 499c9fa706 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 14:03:38 +01:00
Vicent Llopis a2f93e68b1 feat: add 'parking' column
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 13:57:04 +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 575784c870 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-03 10:03:59 +01:00
Pau 6c8609e180 Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 07:52:14 +00:00
Vicent Llopis 508bce73bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-03 08:41:35 +01:00
Pau 199dd2ba8d Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 06:09:38 +00: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 eded1ebf20 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 11:42:48 +01:00
Pau cadd525380 Merge branch 'dev' into 5174-refactor-ticket-weekly
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:36:07 +00:00
Alexandre Riera 5f656a894f buscador
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 08:52:38 +01:00
Alexandre Riera 52a3f77bc5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:39:28 +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
Pau dcd74bacc0 refs #5181 @1h30
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-01 08:32:22 +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
Alexandre Riera 349829e5ed refs #5131 fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:29:00 +01:00
Alexandre Riera 3622eda589 refs #5131 added lines liters to origin ticket
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:09:16 +01:00
Pau 5c0354bc17 add method to check if the ticket has refunds
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 14:26:57 +01:00
Alexandre Riera 19d7e7e610 refs #5131 totalWithVat order
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:23:40 +01:00