Commit Graph

2193 Commits

Author SHA1 Message Date
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
Alexandre Riera b70557ee86 refs #5131 agencies icon
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:20:08 +01:00
Alexandre Riera 87bef62e35 refs #5131 hasStock refers to origin
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:21:51 +01:00
Alexandre Riera e5b7ebd8b4 refs #5131 IPT null or value
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:06:58 +01:00
Alexandre Riera 331b278726 refs #5131 checkbox pending origin destination
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 13:00:25 +01:00
Pau 20ffcff219 Merge branch 'dev' into 5174-refactor-ticket-weekly
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 10:57:56 +00:00
Alexandre Riera 9d0891e080 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:43:49 +01:00
Alexandre Riera c121f184b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:43:26 +01:00
Alex Moreno 4740cdbbb9 fix: e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 10:37:18 +01:00
Alexandre Riera 7d617c0ac4 refs #5129 translations and userErrors added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 09:04:45 +01:00
Alex Moreno d2b21d401a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-30 14:27:22 +01:00
Joan Sanchez 8969882793 Removed where property dependency
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 14:13:38 +01:00
Robert Ferrús 7614b48c9a refs #5115 transfer_sales
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 11:44:14 +01:00
Pau b1de5bc94e refs #5174, fix banch being created from another branch and not from dev
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 10:06:46 +01:00
Alexandre Riera 35157207dd refs #5077 hours set 00:00:00 only when date change
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-27 10:05:03 +01:00
Joan Sanchez 9bf4cd5cff Merge branch 'dev' into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-27 08:20:32 +00: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
Vicent Llopis 366748a136 fix: se la pasa la fecha shipped para calcular el visible y disponible
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 14:00:29 +01:00
Vicent Llopis caf1dcd690 feat: añadido almacén por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 15:19:33 +01:00
Alexandre Riera b72cce9d06 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-01-25 08:56:07 +01:00
Alex Moreno 1f52d04d4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-24 15:01:26 +01:00
Joan Sanchez 3076123c04 Updated models relation
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 09:05:50 +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 8a844917ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 08:07:14 +01:00
Vicent Llopis 9523991b04 fix: mostrar descriptor worker en vez de item
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 12:45:02 +01:00
Vicent Llopis ab1a9389cb fix: cambiados de donde coge el item id
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 12:37:41 +01:00
Vicent Llopis b1be6addd1 fix: delete unnecessary code
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 12:16:06 +01:00
Alexandre Riera e6d6e85217 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-01-18 13:19:56 +01:00
Alexandre Riera 98d6322b0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5020-borradoLogico-IPT
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 08:00:20 +01:00
Alexandre Riera 2b7383af74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:11:19 +01:00
Pau 3a1aea2afd Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:01:45 +00:00
Alexandre Riera c47cac7d55 refs #5020 isActive column added, filter in front
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 08:54:26 +01:00
Alexandre Riera fea76f29e7 Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 07:31:45 +00: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 4d12e29b3d refs #5061 fix filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 14:24:53 +01:00
Alexandre Riera b78bebf27c refs #5061 added hour in date, changed ipt filter
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 12:22:22 +01:00
Pau 34508425a9 Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 07:08:19 +00:00
Pau 05dfcfd864 Merge branch '4605-Create-Model-PackagingMistake' of https://gitea.verdnatura.es/verdnatura/salix into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 15:42:02 +01:00
Pau a8e4c9e1de cambiar fks por relaciones 2023-01-13 15:42:00 +01:00
Alex Moreno 9a3fea99ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send 2023-01-13 13:45:10 +01:00
Alex Moreno def41c011c feat(docuware_upload): send to trash last file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 13:33:59 +01:00
Joan Sanchez c489c4c6a9 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-01-13 08:55:01 +01:00
Alex Moreno 5bb66fec3f test(docuware): back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 15:16:38 +01:00
Pau d5a7691b9c add controller function
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 12:56:51 +01:00
Pau b6de50848a refs #5081 fix sms faltas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:48:44 +01:00
Joan Sanchez 882cf6b9c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-01-12 08:36:24 +01:00
Alex Moreno c2f4648b5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 07:54:09 +01:00
Alex Moreno 9f324483d6 refactor(docuware): only use axios and refactor all
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 15:19:09 +01:00
Alexandre Riera a0491de9f9 refs #5036 refactor transaction and fixing ticket logs
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 13:24:55 +01:00
Pau 30524e382b Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 09:23:40 +00:00
Alex Moreno b8fe919b2a feat(docuware): upload deliveryNote file
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 15:03:23 +01:00
Pau 4f2472ea90 Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-10 13:56:15 +01:00
Pau d540e278eb refs #4605 @30min
gitea/salix/pipeline/head This commit is unstable Details
2023-01-10 13:52:30 +01:00
Alex Moreno 382aad2622 feat(docuware): upload and send pdf
gitea/salix/pipeline/head This commit looks good Details
2023-01-09 15:11:53 +01:00
Alex Moreno 46f36e1de1 try
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-04 15:03:45 +01:00
Vicent Llopis 415fa04e3b refs #2952 feat: add chips
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 13:06:30 +01:00
Vicent Llopis fa58ac2462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 09:13:47 +01:00
Vicent Llopis d5b626434b refactor: add translations, change css...
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:42:51 +01:00
Vicent Llopis ab0af27f8b refactor: delete changes in ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:23:41 +01:00
Vicent Llopis d0ae97e41b refactor: move changes from ticket.sale-checked to ticket.sale-tracking
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:16:23 +01:00
Alexandre Riera 30197e9e15 Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 09:07:26 +00:00
Vicent Llopis 3dd0c79629 feat: add ItemShelvingSales/filter
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 15:00:49 +01:00
Alexandre Riera c06c3dc6a7 refs #4957 saleChecked deleted
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 11:50:58 +01:00
Pau 1c1cc93ef4 Merge branch 'master' into Hotfix-crear-report-Factura-Electronica
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-26 06:18:47 +00:00
Vicent Llopis d3a9e9ac89 delete: columnas que ya no existen en la tabla
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:17:24 +01:00
Vicent Llopis 16c20e4700 feat: add itemShelvingSale popup
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:08:16 +01:00
Vicent Llopis 682b6d8961 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-23 09:59:21 +01:00
Joan Sanchez 93c98e05fc fix(discount): handle error for a worker without business contract
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 08:27:03 +01:00
Alexandre Riera aec22fad9d Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 08:16:36 +01:00
Vicent Llopis 8880a83b89 feat: añadido saleTracking
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 15:03:41 +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
Vicent Llopis 3a33750890 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 10:11:37 +01:00
Alexandre Riera 081ef7fc99 Merge branch 'dev' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 07:30:17 +00:00
Pau c9b4e1ab9a Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 06:38:20 +00:00
Vicent Llopis 799c26796e feat: añadidos chips
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 15:19:05 +01:00
Pau 90b36bf1ab Fix missing report for the invoice electronic notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 14:21:01 +01:00
Alexandre Riera 62152d1668 Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 12:16:40 +01:00
Alexandre Riera 721123381c Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:54:22 +01:00
Alexandre Riera 4c6a735235 refs #4962 moved sql and methods to ticket
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:53:54 +01:00
Alexandre Riera 8403af7db5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:37:40 +01:00
Alexandre Riera 342eec1e41 refs #3963 autoload fixed
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:36:58 +01:00
Alexandre Riera b356839148 refs #3963 autoload fixed 2022-12-20 11:36:37 +01:00
Alexandre Riera 284f9f418b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 09:54:47 +01:00
Alexandre Riera 6ef282feda refs #4962 updated merge, changed autoload, changed tf->Future
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 09:54:28 +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 45b02c3bc6 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 13:45:25 +01:00
Alexandre Riera 98c9e0ac50 refs #4962 autoload added and second header
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 13:42:23 +01:00
Alexandre Riera fb4432b088 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-16 13:06:06 +01:00
Alex Moreno 2a8a928ac5 feat: create invoiceIn
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 10:36:18 +01:00
Alexandre Riera 855f00b1c9 Merge branch '4700-split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 09:51:40 +01:00
Alexandre Riera 45317c0850 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-12-15 14:26:10 +01:00
Joan Sanchez c004a2917d Merge pull request 'refs #4204 Added param URL labelCount and' (!1204) from 4204-collection-label-labelCount into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1204
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:24:34 +00:00
Joan Sanchez e6867f6004 Merge pull request '4898-expedition-pallet-label' (!1203) from 4898-expedition-pallet-label into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1203
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:20:00 +00:00
Guillermo Bonet 76001ec022 refs #4204 labelCount argument not required
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 16:15:41 +01:00
Alexandre Riera f80f851e8d refs #4962 model TicketFuture deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:10:33 +01:00
Alexandre Riera 2baa4a1954 refs #4962 ticket tour future refactor 2022-12-14 12:26:18 +01:00
Guillermo Bonet b7a369a41c refs #4204 Added param URL labelCount and
gitea/salix/pipeline/head There was a failure building this commit Details
changes in the css
2022-12-13 18:05:29 +01:00
Alexandre Riera 050010c09f refs #4700 success translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 14:03:37 +01:00
Alexandre Riera dce48a8a93 refs #4700 corrections
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 14:00:46 +01:00
Alexandre Riera 72c27f7176 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-12-13 12:37:56 +01:00
Guillermo Bonet d7a6350995 refs #4898 Created report expedition-pallet-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 18:27:45 +01:00
Alexandre Riera 704cb71b61 refs #4866 instance log added and e2e done
gitea/salix/pipeline/head Build queued... Details
2022-12-07 13:53:59 +01:00
Joan Sanchez e815292d6b fix(componentUpdate): updated filter where sintax
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 09:24:56 +01:00
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
Alexandre Riera cd8d5efa88 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 10:29:18 +01:00
Vicent Llopis d15e2551a2 feat: add frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 12:16:01 +01:00
Vicent Llopis af87fc2d53 fix: modelo incorrecto
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 11:51:07 +01:00
Vicent Llopis bca79e1240 feat: add backTest 2022-11-25 11:50:54 +01:00
Alexandre Riera 8fec0670ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-25 10:25:46 +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
Vicent Llopis 84c6604dd9 feat: enviar sms con cambios en el pedido
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 15:04:15 +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
Vicent Llopis 74e8789439 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 10:54:40 +00:00
Vicent Llopis b8c6734798 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 09:40:43 +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 6a30074a6a Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:23:00 +00:00
Alexandre Riera 32e4a7273c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:59:59 +01:00
Vicent Llopis 7ccf37c079 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 08:08:56 +00:00
Vicent Llopis 6f2a7a5cef feat: enviar sms con cambios en las líneas
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 15:15:40 +01:00
Pau a8520f851c Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 08:28:07 +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
Pau 88db9c0d80 Merge branch '4789-search-ticket-without-invoice' of https://gitea.verdnatura.es/verdnatura/salix into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 08:25:20 +01:00
Pau 4c4e0e109d refactor test to use toBeGreaterThan 2022-11-23 08:25:15 +01:00
Pau b6ff1d99b1 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-23 08:20:13 +01:00
Pau 0b6d7eaffc refs #4791 @30min fix broken test 2022-11-23 08:20:12 +01:00
Pau 51d3091a40 Merge branch 'dev' into 4511-kkear-expedition.itemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 13:45:03 +00:00
Pau bb640da8f0 Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 13:44:23 +00:00
Alexandre Riera 6656ea4f54 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:20:42 +01:00
Alexandre Riera 2651081838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:15:31 +01: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
Pau fc08b27fb6 Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 13:42:53 +00:00
Pau 3003290e61 refs #4551 @20min requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 14:38:51 +01:00
Pau 0099b42fe3 requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 14:06:38 +01:00
Alexandre Riera 6ddd2d95a5 insert acl
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:48:18 +01:00
Alexandre Riera 4c21ffac3b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:44:53 +01:00
Alexandre Riera 463e56b631 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:41:17 +01:00
Pau 153f5f56fa fix test refs #4791 @30min
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 09:11:17 +01:00
Pau 4e97d931f7 refs #4791 @2h 2022-11-21 08:45:45 +01:00
Joan Sanchez 813cf78128 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-18 14:03:09 +00:00
Joan Sanchez d7729654ee fix(ordersFilter): wrong table schema
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-17 16:48:31 +01:00
Alexandre Riera c4430b4bca fix acl
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 08:56:51 +01:00
Pau a733bc8c2f refs #4789 hasInvoice on ticket searchbar @3h30m
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 13:36:26 +01:00
Alexandre Riera 66002968f6 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 11:10:21 +01:00
Alexandre Riera 489df60afc suggested filter added
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 11:10:00 +01:00
Alexandre Riera 4feb2bea2c working on e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 10:57:15 +01:00
Alexandre Riera 294f806bd9 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 09:52:13 +01:00
Alexandre Riera 78dc7db7a7 correcciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 09:46:35 +01:00
Vicent Llopis 46c7aa24b8 fix: corregidas traducciones
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 07:14:45 +01:00
Alexandre Riera b7c9d6ea50 refs #3963 front and back tests fixed
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:30:00 +01:00
Pau 192d7336a4 change test
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 14:22:09 +01:00
Pau 6e58b1de8b refs #4511 Changed fixtures to fix broken test @30min
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 14:17:24 +01:00
Vicent Llopis dd8117b6a4 feat: añadidas traducciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 14:02:31 +01:00
Pau 56893ea58b Merge branch 'dev' into 4511-kkear-expedition.itemFk 2022-11-15 13:42:06 +01:00
Alexandre Riera 09d7c450a2 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:08:36 +01:00
Alexandre Riera 97a6aff499 fix workerFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:08:06 +01:00
Alexandre Riera 607f61092a Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:06:10 +01:00
Alexandre Riera 01607c71b6 fix rocket message and order table
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:03:55 +01:00
Vicent Llopis fc516d4029 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 12:23:59 +01:00
Vicent Llopis 843e5ae736 feat: traducciones en los modelos
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 11:41:57 +01:00
Pau 4e2741a9cd 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-15 11:01:02 +01:00
Pau 31a0aae8e9 Fixed notification not getting inserted 2022-11-15 11:01:00 +01:00
Pau 2b3b2086d9 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:39:03 +00:00
Pau f1b706d178 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-15 10:37:13 +01:00
Pau 6339634756 refs #4457 move sql, remove await on front @2h 2022-11-15 10:37:12 +01:00
Alex Moreno 31eb2c86b5 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:20:26 +00:00
Vicent Llopis b5f67425ff Merge branch 'dev' into jenkins_backTest_solved
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:54:05 +00:00
Alex Moreno 6fdcb52e2a Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:43:19 +00:00
Pau 60d12826e4 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 07:59:53 +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
Vicent Llopis 0637050375 fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 15:11:33 +01:00
Alexandre Riera 23ed6c6031 refs #3963 test front done
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 14:30:35 +01:00
Alexandre Riera 99aa674995 refs #3963 working on mockup
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 14:29:40 +01:00
Vicent Llopis d6a0580203 feat: traducciones modelo Ticket
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 11:08:23 +01:00
Vicent Llopis 6e94d7f68e fix: nombre variable incorrecto
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 11:00:13 +01:00
Alexandre Riera dc06ba7d89 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:58:18 +01:00
Alexandre Riera 7dd87b1ea8 refs #4700 icons future
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:56:23 +01:00
Alexandre Riera 05f0eba741 Merge branch 'split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:06:51 +01:00
Alexandre Riera c16210dd8a refs #4700 working on e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 15:58:11 +01:00
Alexandre Riera 117e2c03f5 refs #4700 tests back y empezando e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 15:54:00 +01:00
Pau 9004839e00 Merge branch '4484-ticket-withOutNegatives-default-true' of https://gitea.verdnatura.es/verdnatura/salix into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:53:14 +01:00
Pau 01fe8c8997 requested changes 2022-11-10 14:53:08 +01:00
Alex Moreno 37d412bf3b refactor: delete unnecessary test
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 14:38:37 +01:00
Alex Moreno 32701794bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:34:43 +01:00
Pau c15d40b237 Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:45:15 +00:00
Pau 2704017486 check default true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 09:43:19 +01:00
Joan Sanchez 5a56fb4b6a Merge pull request '4590-Refactor-isBox-freightItemFk' (!1079) from 4590-Refactor-isBox-freightItemFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1079
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-10 07:50:10 +00:00
Pau c4044ff70d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 07:40:14 +00:00
Guillermo Bonet 6804c1a756 Merge branch 'dev' into 4550-printServer
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 16:55:29 +01:00
Alexandre Riera ff00066138 refs #4700 tests front y fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 15:56:58 +01:00
Guillermo Bonet 6744b3f797 added collection-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 14:40:38 +01:00
Pau 2fc12dff52 #4457 @1h notifications working, need refactor ACL
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-08 13:59:00 +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 f45eaa07f9 refs #4511 fixed test, changed drop to rename @1h
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 09:45:56 +01:00
Pau f1e832ee66 Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:06:30 +00:00
Pau 0da6bd44e7 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 07:06:27 +00:00
Pau 2df195764d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:05:13 +01:00
Alexandre Riera 896a7eb6f0 refs #4700 arreglar filtro y traducciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 15:55:17 +01:00
Vicent Llopis b1eb7d469f fix: error duplicated key
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-07 09:51:33 +01:00
Alex Moreno 03ec8e27e6 feat(ticket_isEditable): use ticketWeekly
gitea/salix/pipeline/head This commit is unstable Details
2022-11-07 09:19:20 +01:00
Pau a975f37fc3 Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 07:27:15 +00:00
Alex Moreno 28edb2e53a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-04 08:09:15 +01:00
Pau 42dd56a78c Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 06:46:23 +00:00
Alexandre Riera 8e5f518eb6 refs #4753 texto y fecha sms cambiados
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 14:16:11 +01:00
Alex Moreno e6e8f15d64 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 08:39:10 +00:00
Vicent Llopis 3cc89c170c Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 13:55:07 +00:00
Vicent Llopis 8a4aa6285b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:49:39 +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
Joan Sanchez 177b448441 Merge branch 'dev' into 4616-ticket.sale_mana
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 06:42:35 +00:00
Alex Moreno e7047e982f fix e2e
gitea/salix/pipeline/head This commit is unstable Details
2022-10-31 15:07:22 +01:00
Alex Moreno b37c257885 feat(canEdit): use checkAccess
gitea/salix/pipeline/head This commit is unstable Details
2022-10-31 14:13:06 +01:00
Alex Moreno 445c6f1cc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-28 09:32:08 +02:00
Pau c576e503cf fix httpBack.flush error 2022-10-27 09:05:05 +02:00
Pau 04514804b7 fix tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 08:51:22 +02:00
Pau d4a22f7962 Apply requested changes 2022-10-27 08:46:22 +02:00
Vicent Llopis c671540a7f refactor: renombrada variable
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 09:04:53 +02:00
Vicent Llopis d1e2b1f7d5 refactor: tranducciones 2022-10-26 09:02:54 +02:00
Vicent Llopis d4e2783630 refactor: corregidas traducciones, eliminado destroyAll y añadida transacción
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:39:07 +02:00
Vicent Llopis 925565d3d2 refator: borrada variable global y añadida Promesa al array
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:23:36 +02:00
Vicent Llopis a8dfc9d06f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:11:15 +02:00
Alex Moreno 342832c475 try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 15:02:22 +02:00
Alex Moreno e1e13468a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 11:58:43 +02:00
Alex Moreno 3fd10dfc64 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:58:17 +00:00
Pau d937a1b505 Add acl
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:45:09 +02:00
Joan Sanchez 8f0b566935 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-25 07:25:07 +00:00
Pau a43e642ff7 Add transferclient
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:23:46 +02:00
Vicent Llopis f968b19d1e fix: testFront
gitea/salix/pipeline/head This commit looks good Details
2022-10-21 09:08:17 +02:00
Vicent Llopis c33cab7b10 fix: test back
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 09:01:08 +02:00
Vicent Llopis 2d0cb60b50 feat: check if uses mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:55:05 +02:00
Vicent Llopis e7261573d7 delete focus
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:01:22 +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
Vicent Llopis 5da29fe381 refactor: unify duplicated code 2022-10-21 08:00:24 +02:00
Vicent Llopis 6891190c72 refactor: create endpoint to unify code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 15:05:46 +02:00
Vicent Llopis 29093d7d30 feat: en vez de consultar si el usuario está en la tabla workerMana, consultar es si el usuario está en un departamento que cuelga de ventas
gitea/salix/pipeline/head This commit looks good Details
2022-10-20 14:25:55 +02:00
Vicent Llopis b0471037a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-10-20 08:49:08 +02:00
Vicent Llopis bcc9acac0a fix: tBack
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 08:41:00 +02:00
Vicent Llopis 51cad75298 fix: testFront
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 08:17:15 +02:00
Alex Moreno 508decaf0b try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-19 08:22:36 +02:00
Pau 8b07180890 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:56:56 +00:00
Vicent Llopis 9ea427dbfe refactor: move front to back funcionality
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 13:45:46 +02:00
Vicent Llopis ae3e3c3c49 fix: id model duplicated
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 12:37:06 +02:00
Alex Moreno a5ceee07e9 use loopback
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:50:16 +02:00
Vicent Llopis 5fce93abd5 refactor: change variables name
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:47:37 +02:00
Vicent Llopis 423454d19e feat: add date-picker 2022-10-18 11:47:22 +02:00
Alex Moreno 8985a678d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-18 09:49:06 +02:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:06:31 +02:00
Vicent Llopis f85c2e9700 refactor: delete code repeated
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:01:21 +02:00
Joan Sanchez cfdcf91be2 Merge branch 'dev' into 3505-closure_refund
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 08:15:16 +00:00
Vicent Llopis 787d10aac6 fix: select one result only
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:29:09 +02:00
Vicent Llopis cdce628038 refactor: delete line break
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:11:50 +02:00
Vicent Llopis 06ecceb478 refactor: lines to long
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:02:19 +02:00
Vicent Llopis a11ef73dfb refactor: code repetead 2022-10-17 08:01:55 +02:00
Vicent Llopis a036578832 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 14:43:08 +02:00
Vicent Llopis 40075e7e21 fix: testFront
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 14:38:47 +02:00
Vicent Llopis 86b7e9cabe fix: only can exists 'mana' or 'manaClaim' discount. Never both
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 14:30:37 +02:00
Vicent Llopis 2455a11c26 feat: changeMultipleDiscount uses the same popover than changeDiscount 2022-10-14 14:29:21 +02:00
Joan Sanchez 390ee60e59 Get first element in array
gitea/salix/pipeline/head This commit looks good Details
2022-10-14 07:26:34 +02:00
Joan Sanchez 67097970ed Incoterms required param
gitea/salix/pipeline/head This commit looks good Details
2022-10-13 10:44:20 +02:00
Joan Sanchez e81c39d8dc Send delivery note to refund tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 09:30:31 +02:00
Vicent Llopis 1f21fdeb65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition 2022-10-10 13:30:27 +02:00
Alex Moreno 99271f275f remove unnecessary isEditable
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 13:26:38 +02:00
Alex Moreno 376d46b67e feat(canEdit): integrate isWeekly and adapt back tests and e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 13:06:49 +02:00
Vicent Llopis 843f67919c feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 12:56:03 +02:00
Alex Moreno 3ac8e1d3bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-10 09:57:21 +02:00
Joan Sanchez 4ecbb59ac0 Closure hours
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-10 07:49:08 +02:00
Vicent Llopis bb26fa6502 feat: add tFront
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 13:49:42 +02:00
Alex Moreno 94a51db3d5 hotFix(ticket_request): autocomplete buyer
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 10:56:12 +02:00
Vicent Llopis deb8a00dfb feat: add backRoutes
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 10:47:54 +02:00
Vicent Llopis 1894492a2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 09:26:51 +02:00
Alex Moreno e7bafb1386 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-07 07:47:46 +02:00
Alex Moreno c29625f079 fix: funcionalityAcl
gitea/salix/pipeline/head This commit is unstable Details
2022-10-06 15:04:27 +02:00
Joan Sanchez dd9b517883 Merge pull request '4369-ticket.request.create_getItemTypeWorker' (#1061) from 4369-ticket.request.create_getItemTypeWorker into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1061
2022-10-06 11:30:49 +00:00
Vicent Llopis c8d270499b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 11:50:11 +02:00
Vicent Llopis d427c3a6db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4369-ticket.request.create_getItemTypeWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 11:48:31 +02:00
Vicent Llopis 37601934f5 feat: first option to delete and update
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 11:40:46 +02:00
Vicent Llopis a3a432c753 fix: delete one or more expeditions
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-06 10:18:19 +02:00
Vicent Llopis 26d04ce2d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 10:08:29 +02:00
Alex Moreno 9d482f7dfd test(ticket): fix tests and add funcionalityAcl
gitea/salix/pipeline/head This commit is unstable Details
2022-10-05 15:13:36 +02:00
Pau 940b431059 feat(model) Created the model for packagingMistake
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 14:04:30 +02:00
Alex Moreno 8b636497a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 13:47:25 +02:00
Alex Moreno 5f39249edb fix(ticket): canEdit use aclFunc
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 15:02:00 +02:00
Alex Moreno fe8ae164eb refactor(ticket): isEditable, canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 13:22:11 +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
Pau 3caf89bddb refactor: Replaced isBox with freightItemFk 2022-10-04 09:27:31 +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
Vicent Llopis 5c76437498 refator: delete unnecessary transaction
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 08:19:09 +02:00
Vicent Llopis f510e26141 refactor: translation
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 07:55:30 +02:00
Vicent Llopis 197bbf392b refator: updates translations
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 07:50:37 +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
Vicent Llopis 11484edd10 feat: create new ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 15:18:07 +02:00
Joan Sanchez a065d77929 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-10-03 13:37:59 +02:00
Joan Sanchez 21bb95fc88 CSV refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 08:28:47 +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
Alex Moreno eec1d6df4a add translation
gitea/salix/pipeline/head This commit is unstable Details
2022-09-30 09:06:43 +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 5aec280adb Closure migration
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 09:07:18 +02:00
Joan Sanchez fe5eb3e13d Changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 07:35:20 +02:00
Joan Sanchez d7ab95fcc8 closure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 15:00:12 +02:00
Alex Moreno 2c691eb796 feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 14:49:11 +02:00
Alex Moreno f698a22fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 09:25:43 +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
Vicent Llopis c4649352a9 feat: add totalChecked
gitea/salix/pipeline/head This commit looks good Details
2022-09-23 08:50:11 +02:00
Vicent Llopis 2a64fde57c feat: add option "move expedition"
gitea/salix/pipeline/head This commit is unstable Details
2022-09-22 14:58:38 +02:00
Vicent Llopis a486b1593b fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-09-22 13:55:09 +02:00
Vicent Llopis 95e5b1a970 fix: code for search-function 2022-09-22 13:54:58 +02:00
Joan Sanchez 8105c12a18 Campaign metrics 2022-09-22 08:48:29 +02:00
Vicent Llopis 0fb7487191 feat: add getItemTypeWorker endpoint
gitea/salix/pipeline/head This commit looks good Details
2022-09-22 08:32:18 +02:00
Vicent Llopis fae1516b33 refactor: correct bleeding
gitea/salix/pipeline/head This commit looks good Details
2022-09-21 14:55:43 +02:00
Vicent Llopis 65e15ada69 refator: delete line break
gitea/salix/pipeline/head This commit looks good Details
2022-09-21 14:53:02 +02:00
Joan Sanchez 5a43bdb6c9 Delivery note 2022-09-21 13:18:32 +02:00
Joan Sanchez 09bdee8b34 View & send PDF from loopback endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-19 12:59:32 +02:00
Alex Moreno 55d6dacebb test(ticket_listPackaging):enable back test
gitea/salix/pipeline/head This commit looks good Details
2022-09-19 10:11:44 +02:00
Alex Moreno b3aaa493d5 fix(): fix fixtures and all code needed for change the structure
gitea/salix/pipeline/head This commit looks good Details
2022-09-19 09:45:28 +02:00
Joan Sanchez 18ac0a0b61 Export Email and Report classes
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 23:13:37 +02:00
Alex Moreno c06d2970ae test(boxing): getVideoList
gitea/salix/pipeline/head This commit looks good Details
2022-09-07 13:58:39 +02:00
Alex Moreno 8dd02ab6ee quit console.logs
gitea/salix/pipeline/head This commit looks good Details
2022-09-06 15:08:28 +02:00
Alex Moreno 43df1e7e10 refactor(boxing): refactor getVideo
gitea/salix/pipeline/head This commit looks good Details
2022-09-05 12:06:14 +02:00
Alex Moreno 4a058faaf8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing 2022-09-05 08:12:07 +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 062806b3f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
2022-08-05 13:19:43 +02:00
Vicent Llopis c3d396b042 fix: test e2e
gitea/salix/pipeline/head This commit looks good Details
2022-08-04 13:52:59 +02:00
Vicent Llopis 020990dadc fix: backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-08-04 09:53:22 +02:00
Alex Moreno b4b6d61460 feat(ticket_boxing): fix getVideo
gitea/salix/pipeline/head This commit is unstable Details
2022-08-03 14:57:39 +02:00
Alex Moreno 8a08b6f399 feat(ticket_boxing): return video stream
gitea/salix/pipeline/head This commit looks good Details
2022-08-02 15:15:05 +02:00
Alex Moreno 7d4dd7bb52 feat(boxing): return stream video
gitea/salix/pipeline/head This commit looks good Details
2022-08-01 15:03:17 +02:00
Alex Moreno d040ecb743 feat(ticket): getVideo from shinobi
gitea/salix/pipeline/head This commit looks good Details
2022-08-01 07:59:04 +02:00
Carlos Jimenez Ruiz 333828c583 Moved invoiceOut, Ticket and Sales refund loginc to backend + tests
gitea/salix/pipeline/head This commit looks good Details
2022-07-14 13:40:50 +02:00
Carlos Jimenez Ruiz d0e06a46d0 removed deprecated stowaway comp and usages
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-01 09:15:07 +02:00
Carlos Jimenez Ruiz 57a2cd46ce ticket filter pending uses isNotValidated now
gitea/salix/pipeline/head This commit looks good Details
2022-06-29 12:55:11 +02:00
Joan Sanchez f7d64e89ab 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-06-22 08:59:06 +02:00
Joan Sanchez 004f1390fc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-06-22 08:58:51 +02:00
Joan Sanchez e7bf88c703 Fix order
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 14:26:34 +02:00
Vicent Llopis ec852b898c fix: check if services exists
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 12:44:19 +02:00
Joan Sanchez 16d677528a FIX: Sort by id as last field
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 12:18:33 +02:00
Carlos Jimenez Ruiz 7c580da6b8 refactor(ticket.create): display only active addresses
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 16:42:59 +02:00
Vicent Llopis 00e48f5257 feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-06-16 10:59:31 +02:00
Vicent Llopis 84ffe3f594 feat: delete from ticketCollection and sectorCollection when a ticket is deleted
gitea/salix/pipeline/head This commit looks good Details
2022-06-16 09:58:15 +02:00
Vicent Llopis 363c5f349a fix: solved bug to create temporary table
gitea/salix/pipeline/head This commit looks good Details
2022-06-13 10:04:12 +02:00
Alex Moreno f786cdd33d fix pass dates
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 14:39:51 +02:00
Alex Moreno eb9bd66ddb prepare for static dates
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 13:33:01 +02:00
Alex Moreno 7eec9de0aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 07:47:03 +02:00
Joan Sanchez 13e0772f0b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 14:28:39 +02:00
Alex Moreno 4e3380cf65 hotFix(ticket_expedition): delete e.checked in filter
gitea/salix/pipeline/head This commit looks good Details
2022-06-02 15:28:11 +02:00
Joan Sanchez f9b9dfaf4b 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
2022-05-24 14:54:06 +02:00
Joan Sanchez caa9a63c4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 08:45:37 +02:00
Joan Sanchez 4d093d37bd Merge branch 'dev' into 3905-invoice-out_refund
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 10:22:48 +00:00
Vicent Llopis c125fd54eb refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:08:12 +02:00
Vicent Llopis 0425b17b4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund 2022-05-20 11:57:20 +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
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 990f7fe4b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation 2022-05-13 18:37:48 +02:00
Joan Sanchez f8db3c31df Proper test result
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-13 10:02:34 +02:00
Joan Sanchez 6b18432f87 Force test to fail
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-13 09:53:47 +02: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
Vicent Llopis 6441393249 refactor: pull request changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 08:47:17 +02:00
Joan Sanchez d39147689d Merge branch 'dev' into 3771-ticket.expedition
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 12:47:33 +00:00
Alex Moreno d34a8629f7 fix(setSaleQuantity): save originalQuantity
gitea/salix/pipeline/head This commit looks good Details
2022-05-06 13:09:37 +02:00
Vicent Llopis 93e3ea103a added frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 12:05:46 +02:00
Vicent Llopis 9862960c99 comment frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 12:00:39 +02:00
Vicent Llopis 38f5541ef4 execute jenkins test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 11:27:03 +02:00
Vicent Llopis 66685e7541 feat(ticket.expedition): add popover
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 10:35:31 +02:00
Vicent Llopis 32ec755a35 fix: check if value.length
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 08:26:38 +02:00
Vicent Llopis 1766222c12 refactor: updated backTest
gitea/salix/pipeline/head This commit looks good Details
2022-04-26 13:25:12 +02:00
Vicent Llopis 7abceb8564 refactor: add frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-04-26 13:08:06 +02:00
Vicent Llopis 6d35200607 updated front test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-25 10:10:59 +02:00
Vicent Llopis 789365799e refactor: changed name
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-25 08:45:50 +02:00
Vicent Llopis 2b9c656d21 feat(invoiceOut): add refund option
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-22 11:46:28 +02:00
Vicent Llopis 4ffb61b75c refactor: refund 2022-04-22 11:45:14 +02:00
Vicent Llopis d1bd2f9c77 refactor: refund
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 14:59:41 +02:00
Alex Moreno e00d63d7af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 14:30:23 +02:00
Alex Moreno 7cecf1584b feat(ticket): change isAvailable to itemShortage
gitea/salix/pipeline/head This commit looks good Details
2022-04-19 12:04:06 +02:00
Carlos Jimenez Ruiz 6015050eed Merge branch 'dev' into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:12:14 +00:00
Carlos Jimenez Ruiz 080975208b Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 08:12:28 +00:00
Vicent Llopis 013390fae9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 12:49:34 +02:00
Carlos Jimenez Ruiz 56e52c35d8 Merge branch 'dev' into 3802-ticket_sale_mana
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:40:52 +00:00
Vicent Llopis fefff80af4 pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:01:15 +02:00
Vicent Llopis d88a404ce6 refactor: pull request changes 2022-04-11 10:01:00 +02:00