Vicent Llopis
|
8cf988b7d2
|
refs #5638 refactor: code
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-19 08:02:17 +02:00 |
Vicent Llopis
|
d33a84c39f
|
refs #5638 feat: updated backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 09:30:21 +02:00 |
Vicent Llopis
|
463d209d77
|
refs #5638 refactor: eliminado if innecesario
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 09:21:30 +02:00 |
Vicent Llopis
|
9263684ec5
|
refs #5638 fix: contempla que se le pase un filtro del 'nombre'
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 08:58:13 +02:00 |
Vicent Llopis
|
b66362d313
|
refs #5638 fix: cambiado nombre de variable
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 08:33:17 +02:00 |
Alex Moreno
|
2ef922e80c
|
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-18 08:10:10 +02:00 |
Vicent Llopis
|
a9f71ccbc1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5638-ticket.summary_states
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 07:33:08 +02:00 |
Alex Moreno
|
ba763abc26
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 07:17:31 +02:00 |
Alex Moreno
|
6ddbd8b8ea
|
Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 11:43:25 +00:00 |
Alexandre Riera
|
0d980334b8
|
refs #5634 conditional merge
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 12:41:00 +02:00 |
Alex Moreno
|
08fcbebbaf
|
refs #5488 polish specifics acls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-15 14:14:08 +02:00 |
Carlos Satorres
|
ece2875b38
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-12 12:30:34 +02:00 |
Alex Moreno
|
7704256079
|
master to test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-11 08:00:49 +02:00 |
Vicent Llopis
|
461966d73e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-09 11:33:28 +02:00 |
Carlos Satorres
|
202544565e
|
refs #4764 mod query post
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-08 11:36:52 +02:00 |
Carlos Satorres
|
3d195bddb9
|
refs #4764 mod model post
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-05 14:39:46 +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 |
Alex Moreno
|
97da5e6e24
|
refs #5488 feat(isRoleAdvanced): use Acl instead of method
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-05 13:58:11 +02:00 |
Carlos Satorres
|
80ee73a59b
|
refs #4764 creacion de métodos y back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-05 10:01:15 +02:00 |
Vicent Llopis
|
404acdab6f
|
refs #5638 fix: solucionado problema con el limit
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-04 14:51:47 +02:00 |
Alexandre Riera
|
54eb0fc7a2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-04 09:59:05 +02:00 |
Alexandre Riera
|
ad3c6dcee2
|
wip #5595
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-03 14:34:36 +02:00 |
Carlos Satorres
|
dbd0e5138b
|
refs #5328 fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-03 14:12:26 +02:00 |
Carlos Satorres
|
3ac1ce403c
|
refs #5328 myOptions
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-03 14:06:57 +02:00 |
Carlos Satorres
|
566f03c497
|
refs #5328 commit prueba
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-03 13:03:14 +02:00 |
Carlos Satorres
|
3b2e1ca8d5
|
ref #5328 refundTicket.id
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-03 12:36:30 +02:00 |
Carlos Satorres
|
eaf425fb51
|
refs #5328 mod funcion createTicketRefund
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-03 12:30:33 +02:00 |
Alex Moreno
|
4a7902ae4d
|
Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-02 08:41:18 +00:00 |
Alexandre Riera
|
3bd5582794
|
Merge branch 'dev' into 5255-revisar-ticketBoxing
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-27 08:42:21 +00:00 |
Vicent Llopis
|
2d181139b4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 14:58:34 +02:00 |
Vicent Llopis
|
22b223038a
|
delete focus
|
2023-04-26 14:56:07 +02:00 |
Vicent Llopis
|
8bb8b8cfba
|
refs #5594 fix backTest
gitea/salix/pipeline/head Build queued...
Details
|
2023-04-26 14:55:37 +02:00 |
Vicent Llopis
|
09dbd29086
|
refs #5594 cuando se factura se envía automáticamente un mail y quitados logs duplicados
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-26 14:46:16 +02:00 |
Alexandre Riera
|
1219cfcc5c
|
refs #5255 fixed condition
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 12:03:17 +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 |
Alex Moreno
|
0c668c6ade
|
refs #5488 feat(): replace all hasRole to checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 14:17:36 +02:00 |
Alex Moreno
|
11d1900859
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 09:40:36 +02:00 |
Alex Moreno
|
4cb231759f
|
feat(State/Supplier): replace hasRole to acls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 09:15:05 +02:00 |
Vicent Llopis
|
4983aa1632
|
refs #5542 fix backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 09:11:09 +02:00 |
Vicent Llopis
|
9b432bac85
|
refs #5542 fix: test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 08:57:10 +02:00 |
Vicent Llopis
|
bf558761a4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 08:45:56 +02:00 |
Alexandre Riera
|
0a1583aa54
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 08:42:32 +02:00 |
Alexandre Riera
|
bbf1c40987
|
Merge branch 'master' into hotfix-dms-hasFile
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 12:48:06 +00:00 |
Alexandre Riera
|
2975e7fae3
|
hotfix savesign
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 14:46:46 +02:00 |
Vicent Llopis
|
38e5660e61
|
refs #5542 refactorizado "abono" para que siempre cree un único ticket abono
|
2023-04-21 13:59:28 +02:00 |
Alex Moreno
|
294bf2b8a8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
|
2023-04-21 13:30:34 +02:00 |
Alex Moreno
|
7a79dfd4d1
|
deploy: 231401 test to dev
|
2023-04-21 12:49:03 +02:00 |
Vicent Llopis
|
5af961ac69
|
fix: maneja si se elimina la sale
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 09:53:21 +02:00 |
Alex Moreno
|
63e0031bc6
|
deploy(231401): test to master
|
2023-04-20 08:24:43 +02:00 |
Alex Moreno
|
bde81e685f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-19 07:55:46 +02:00 |
Alex Moreno
|
db19f153fb
|
refs #5488 removes 'role =='
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 15:03:23 +02:00 |
Vicent Llopis
|
d99815356a
|
refs #5144 manejado que el usuario sea NULL
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 07:26:35 +02:00 |
Alex Moreno
|
0c475be10b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 14:23:02 +02:00 |
Joan Sanchez
|
3ee29553b4
|
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-04-17 09:00:52 +02:00 |
Joan Sanchez
|
610f51aaf8
|
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-04-17 08:59:49 +02:00 |
Alex Moreno
|
0bfdbcb750
|
refs #4617 use temporary instead of vn
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 08:44:24 +02:00 |
Juan Ferrer
|
add3a8b1fa
|
merge with dev
|
2023-04-15 01:49:23 +02:00 |
Juan Ferrer
|
b4ef49cf24
|
Merge branch 'dev' into 5546-codigo-registro
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-13 16:48:11 +00:00 |
Alexandre Riera
|
8ade602563
|
hotfix one sign for every ticket
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-13 14:18:01 +02:00 |
Joan Sanchez
|
6d5167ab7f
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-13 13:47:18 +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 |
Carlos Satorres
|
8741a9f913
|
Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-05 06:51:21 +00:00 |
Joan Sanchez
|
ca30aaa18a
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-05 08:39:43 +02:00 |
Carlos Satorres
|
77b91b77b2
|
refs #5439 requesterFk solve
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-05 08:19:50 +02:00 |
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 |
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 |
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 |
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
|
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
|
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
|
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 |
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 |
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 |
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 |
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 |
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 |
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 |
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
|
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
|
b5d2d53435
|
fix: test back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-16 10:45:13 +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 |
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 |
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 |
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 |
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 |
Alexandre Riera
|
5f656a894f
|
buscador
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-02 08:52:38 +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 |
Alexandre Riera
|
349829e5ed
|
refs #5131 fixed tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 15:29:00 +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
|
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 |
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 |
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 |
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
|
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
|
b1be6addd1
|
fix: delete unnecessary code
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-20 12:16:06 +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 |
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 |
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 |
Joan Sanchez
|
882cf6b9c1
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
|
2023-01-12 08:36:24 +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 |
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 |
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 |
Vicent Llopis
|
799c26796e
|
feat: añadidos chips
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 15:19:05 +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
|
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 |
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 |
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
|
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
|
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 |
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
|
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 |
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
|
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
|
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
|
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
|
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
|
0099b42fe3
|
requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 14:06:38 +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
|
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
|
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 |
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 |
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 |
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
|
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 |
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 |
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 |
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
|
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
|
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 |
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 |
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
|
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 |
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 |
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
|
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 |
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 |
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 |
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
|
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 |
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 |
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 |
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 |
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 |
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 |
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
|
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 |
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
|
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 |
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 |
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
|
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
|
990f7fe4b1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation
|
2022-05-13 18:37:48 +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 |
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 |
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
|
1766222c12
|
refactor: updated backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-26 13:25:12 +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 |
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
|
d88a404ce6
|
refactor: pull request changes
|
2022-04-11 10:01:00 +02:00 |
Vicent Llopis
|
655db502f7
|
refactor: pull request changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-11 09:04:05 +02:00 |
Joan Sanchez
|
0e75555bcd
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-07 08:51:07 +02:00 |
Alex Moreno
|
d616367714
|
fix(test): use static dates
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-05 07:46:49 +02:00 |
Vicent Llopis
|
c5efc17fe9
|
refactr: update test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-04 13:56:36 +02:00 |
Vicent Llopis
|
5f2424dc44
|
feat(ticket): add option 'refund all' in descriptor menu
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-04 13:26:53 +02:00 |
Alex Moreno
|
c904bf0bdf
|
feat(back): new Date mocked time
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-01 13:55:45 +02:00 |
Alex Moreno
|
eec1c1ff86
|
feat(db): static dates
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-03-30 12:45:01 +02:00 |
Vicent Llopis
|
86350b2afa
|
feat(ticket_sale): add backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-29 14:00:53 +02:00 |
Vicent Llopis
|
a5ca116571
|
feat(ticket_sale): add mana options
|
2022-03-29 13:42:37 +02:00 |
Joan Sanchez
|
52b61d16ac
|
Merge pull request '3638-export_database' (#899) from 3638-export_database into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #899
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-03-23 10:43:14 +00:00 |
Carlos Jimenez Ruiz
|
728a5de311
|
Merge branch 'dev' into 3625-ticket_log_routeFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-21 11:56:44 +00:00 |
Vicent Llopis
|
a9b6dcacfe
|
included sms test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-17 08:13:18 +01:00 |
Vicent Llopis
|
a3dbec82bd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database
|
2022-03-17 07:59:07 +01:00 |
Alex Moreno
|
4dea046c97
|
feat(ticket_log): add routeFk log
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-15 10:07:39 +01:00 |
Vicent Llopis
|
6a91fe6c11
|
solved backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-10 14:43:07 +01:00 |
Alex Moreno
|
e8d7ce7cc7
|
refactor(ticket): change role productionBoss to deliveryBoss
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-07 14:50:51 +01:00 |
Alex Moreno
|
a136d8b03d
|
accept array in params
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-07 10:10:45 +01:00 |
Carlos Jimenez Ruiz
|
2647b4e423
|
Merge branch 'dev' into 3595-item-waste-folding
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-28 10:05:07 +00:00 |
Carlos Jimenez Ruiz
|
bf0734ca67
|
excluded 3 test suites until db export
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-28 10:46:14 +01:00 |
Alex Moreno
|
4e5e6dccca
|
fix(test): change movable expeted
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-10 10:15:43 +01:00 |
Alex Moreno
|
dc47af7224
|
feat(ticket): isEmpty ticketRequest not necessary isOk
|
2022-02-03 11:51:50 +01:00 |
Alex Moreno
|
91b6dcee05
|
fix(test): fixed bugs non compatible ECMA options
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-02 14:33:16 +01:00 |
Joan Sanchez
|
8be7f9153e
|
Removed non compatible ECMA options
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-01 14:50:24 +01:00 |
Alex Moreno
|
60adb6f37c
|
translations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-01 07:21:34 +01:00 |
Alex Moreno
|
b25ffa8feb
|
feat(ticket_step-two): redirect to new ticket
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-28 09:15:41 +01:00 |
Alex Moreno
|
f8a0094321
|
word movible
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-26 08:54:48 +01:00 |
Alex Moreno
|
57e4b400c9
|
Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-26 07:12:57 +01:00 |
Alex Moreno
|
442d58f59b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
|
2022-01-26 07:11:22 +01:00 |
Alex Moreno
|
f67a4355db
|
refactor(ticket_sale): split e2e, change name backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-25 15:09:29 +01:00 |
Alex Moreno
|
6d9afd5f4c
|
feat(ticket_sale): role restriction to create payBack
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-21 11:40:48 +01:00 |
Alex Moreno
|
9ddf11c6bc
|
test(ticket): update to advanceable
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-18 12:49:16 +01:00 |
Alex Moreno
|
8e1c3e107c
|
refactor(ticket): advanceable code
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-18 12:48:39 +01:00 |
Alex Moreno
|
b8355320f2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-17 14:50:10 +01:00 |
Alex Moreno
|
83d2dd2d80
|
refacto(ticket_volume): tests and front js
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-17 13:17:06 +01:00 |
Alex Moreno
|
5824acf3bc
|
change tests to advanceable
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-17 10:12:13 +01:00 |
Alex Moreno
|
61859a23c9
|
feat(ticket): getAdvanceable
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-01-17 07:14:29 +01:00 |
Alex Moreno
|
c87e3e1210
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-13 07:20:23 +01:00 |
Alex Moreno
|
757fe73ecd
|
test(ticket_volume): backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-12 14:55:20 +01:00 |
Alex Moreno
|
fba09e8c40
|
feat(ticket_volume): volume for packingType
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-01-12 14:02:58 +01:00 |
Carlos Jimenez Ruiz
|
cc3e2fbc3a
|
can't transfer claimed sales without claimManager role
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-12 10:17:51 +01:00 |
Alex Moreno
|
5462af91ee
|
extract to variable
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-10 11:38:02 +01:00 |
Alex Moreno
|
860499db82
|
refactor(ticket): add more text in error when change zone
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-07 08:28:57 +01:00 |
Alex Moreno
|
e609994efa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 21:01:18 +01:00 |
Alex Moreno
|
18b6efe8f1
|
test(ticket_basic-data): test and fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 20:58:58 +01:00 |
Vicent Llopis
|
6bd48ab30b
|
delete comment
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 15:06:57 +01:00 |
Vicent Llopis
|
bdb42437ae
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 14:45:40 +01:00 |
Vicent Llopis
|
5c899d28c3
|
feat(ticket_sale): add tests and refactor backRoute name
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 14:43:53 +01:00 |
Alex Moreno
|
831bfb0352
|
change route for hasRoute
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 08:52:39 +01:00 |
Alex Moreno
|
405494c85b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index
|
2021-12-21 08:31:17 +01:00 |
Vicent Llopis
|
e30fb0fb37
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-12-21 07:10:19 +01:00 |
Alex Moreno
|
50db693e51
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-12-20 13:50:50 +01:00 |
Alex Moreno
|
b0019d09ad
|
feat(ticket_basic-data_step-two): adapted for available and transfer sales in back
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-12-20 13:50:31 +01:00 |
Joan Sanchez
|
872f5b488b
|
Merge branch 'dev' into 3411-route_ticket_fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-20 09:40:34 +00:00 |
Alex Moreno
|
850ea2ef39
|
getVisible sql
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-17 12:38:56 +01:00 |
Alex Moreno
|
87f994aa77
|
test(ticket_basci-data_step-two): back and front
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-16 08:14:27 +01:00 |
Vicent Llopis
|
a6b755138f
|
feat(abono): add option "abono" in ticket_sale
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-12-15 15:24:45 +01:00 |
Alex Moreno
|
3e91929d0d
|
half test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-15 15:16:21 +01:00 |
Alex Moreno
|
e01d676bb1
|
feat(ticket_basic-data_step-two): show visible and option withoutNegatives
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-15 14:45:45 +01:00 |
Alex Moreno
|
5960d40891
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-14 12:43:40 +01:00 |
Alex Moreno
|
9cfe6b5b7a
|
feat(ticket): filter by route
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-14 12:05:06 +01:00 |
Joan Sanchez
|
f2a8992410
|
fix(ticketIndex): excluded collectionFk property from date ranges
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3431
|
2021-12-14 09:17:00 +01:00 |
Vicent Llopis
|
ac3dc039fe
|
feat: add fixtures of ticket and update test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-01 12:49:53 +01:00 |
Alex Moreno
|
75e32feb16
|
refactor ticket_sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-01 11:39:48 +01:00 |
Alex Moreno
|
decd4b5a95
|
separate sql procedures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 15:13:20 +01:00 |
Alex Moreno
|
d5c0be5a9d
|
refactor(ticket_sale): logic and tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 13:47:16 +01:00 |
Alex Moreno
|
815826e891
|
refactor(ticket): modify transferSales.js for avoid unnecessary logs
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 11:23:18 +01:00 |
Joan Sanchez
|
8ede14ab40
|
fix(sales): update price on any change affecting the ticket total
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3363
|
2021-11-24 09:25:24 +01:00 |
Vicent Llopis
|
0849f40df7
|
feat: update backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-10 11:44:29 +01:00 |
Vicent Llopis
|
f60fa5a852
|
change receiver to requesterId
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-27 12:22:32 +02:00 |
Vicent Llopis
|
d94e2900d0
|
feat(ticket-request): send rocket message when ticket-reques is denied
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-27 12:16:37 +02:00 |
Carlos Jimenez Ruiz
|
c4c1aa929a
|
refactor(endpoints): corrected indentation and removed unused code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-15 16:00:50 +02:00 |
Carlos Jimenez Ruiz
|
de7af0fee2
|
fix(transaction): priceDifference now commits its created transaction
|
2021-10-15 15:59:59 +02:00 |
Carlos Jimenez Ruiz
|
270b2802c8
|
refactor(transactions): added transaction to sendChechingPresence and corrected a typo
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-15 15:31:13 +02:00 |
Carlos Jimenez Ruiz
|
580ba36357
|
refactor(jasmine): usage of done on async functions is deprecated
|
2021-10-15 14:45:41 +02:00 |
Carlos Jimenez Ruiz
|
35a2a71602
|
refactor(sales): transaction correctly passed to findById
|
2021-10-14 16:16:00 +02:00 |
Carlos Jimenez Ruiz
|
cb7d1b24e8
|
refactor(ticket): all ticket endpoints are using transactions now
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-07 09:57:07 +02:00 |
Carlos Jimenez Ruiz
|
392c4dcba3
|
refactor(sale): ticket.sale endpoints now use transactions
|
2021-09-29 08:27:18 +02:00 |
Carlos Jimenez Ruiz
|
cb3d0678ce
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
|
2021-09-24 10:09:51 +02:00 |
Carlos Jimenez Ruiz
|
8c446edc9e
|
Merge branch 'dev' into 3098-item_tag_productor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-24 08:02:19 +00:00 |
Carlos Jimenez Ruiz
|
23ba5657c5
|
refactor(sales): ticket sales now shows item.subName
|
2021-09-22 15:14:29 +02:00 |
Carlos Jimenez Ruiz
|
cc90a08f03
|
refactor(ticket): ticket endpoins now can receive transactions
|
2021-09-21 18:48:59 +02:00 |
Joan Sanchez
|
08cba0a9c8
|
fix(filter): search limit by date range was not being applied
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3059
|
2021-09-21 15:49:59 +02:00 |
Carlos Jimenez Ruiz
|
6b465f9150
|
Merge branch 'dev' into 3068-ticket_colletion
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-02 13:07:57 +00:00 |
Joan Sanchez
|
0b704db353
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-02 08:56:19 +02:00 |
Joan Sanchez
|
b68e99b412
|
fix(invoice): invoicing was throwing a transaction error
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3077
|
2021-09-02 08:55:41 +02:00 |
Joan Sanchez
|
7a98613ef8
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-01 11:48:21 +02:00 |
Joan Sanchez
|
0370cbf207
|
feat(Searchbar): You can now filter by a ticket collection
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3068
|
2021-09-01 11:27:24 +02:00 |
Joan Sanchez
|
a0efe5f896
|
Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-31 06:27:23 +00:00 |
Carlos Jimenez Ruiz
|
7a7bbe2ba8
|
more module transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-13 16:46:44 +02:00 |
Carlos Jimenez Ruiz
|
2b4afdd04d
|
ticket module transactions + tests
|
2021-08-12 11:21:59 +02:00 |
Carlos Jimenez Ruiz
|
708c0035c0
|
deprecated changeWorker as it is no longer in use
|
2021-08-12 11:06:49 +02:00 |
Javi Gallego
|
3b9bdc18bf
|
funciona
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-12 09:23:19 +02:00 |
Carlos Jimenez Ruiz
|
da7bda2d0e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions
|
2021-08-11 16:06:52 +02:00 |
Joan Sanchez
|
8e84f98629
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global
|
2021-08-09 12:59:00 +02:00 |
Carlos Jimenez Ruiz
|
870314277f
|
add sale and canbeInvoice refactor + tests
|
2021-08-05 13:32:35 +02:00 |
Joan Sanchez
|
41a1b3d909
|
2984 - Global invoicing endpoint
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-02 13:35:38 +02:00 |
Carlos Jimenez Ruiz
|
a771fd584f
|
minor refactors + missing transaction on discount
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-30 10:29:57 +02:00 |
Carlos Jimenez Ruiz
|
9578895f95
|
backend unit tests adapted
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-29 17:40:45 +02:00 |
Carlos Jimenez Ruiz
|
8d682f4e03
|
chat notifications for many sales modifications
|
2021-07-29 17:20:57 +02:00 |
Joan Sanchez
|
9d855a80d5
|
3028 - Added visible column on ticket sales
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 12:33:27 +02:00 |
Joan Sanchez
|
3246101574
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 14:03:28 +02:00 |
Joan Sanchez
|
319a168b89
|
Removed focus
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 13:43:13 +02:00 |
Joan Sanchez
|
7e836e570f
|
2983 - Invoice tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-30 16:10:26 +02:00 |
Joan Sanchez
|
33d03c8f21
|
Merge branch 'dev' into 2950-alertlevel_to_alertlevel_id
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-30 06:15:05 +00:00 |
Carlos Jimenez Ruiz
|
08360bfdc4
|
deprecated alertLevel.alertLevel now using alertLevel.id
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 18:01:33 +02:00 |
Carlos Jimenez Ruiz
|
0e47cf72e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing
|
2021-06-28 11:19:07 +02:00 |
Carlos Jimenez Ruiz
|
2548fdc891
|
#3000 add buyer to ticket isEditable
|
2021-06-25 09:46:18 +02:00 |
Carlos Jimenez Ruiz
|
8344a58ab8
|
updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 13:24:23 +02:00 |
Carlos Jimenez Ruiz
|
4656b2e25a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2960-ticket_basicdata_add_alias
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 15:54:41 +02:00 |
Joan Sanchez
|
8695fadc18
|
Merge branch 'dev' into 2948-ticket_sale_itemPackingType
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 05:21:01 +00:00 |
Joan Sanchez
|
bbbf008076
|
Added done() to async beforeAll()
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-17 16:09:17 +02:00 |
Carlos Jimenez Ruiz
|
b906a8e91d
|
added ticket.nickname to basicdata
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-17 11:52:12 +02:00 |
Javi Gallego
|
e2f32a60fd
|
cambio campos en front
|
2021-06-17 07:30:22 +02:00 |
Carlos Jimenez Ruiz
|
7370269e4d
|
ticket.sale now shows Packing type
|
2021-06-16 17:06:11 +02:00 |
Carlos Jimenez Ruiz
|
e85b7b9817
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination
|
2021-06-14 12:07:54 +02:00 |
Carlos Jimenez Ruiz
|
f36b54f97b
|
invoiceOut summary tickets pagination + refactor
|
2021-06-14 11:38:57 +02:00 |
Carlos Jimenez Ruiz
|
48f80fad8f
|
added postcode to summary + basic data translation
|
2021-06-13 19:11:05 +02:00 |
Carlos Jimenez Ruiz
|
fc3af7b6a6
|
ticket expedition now shows scan worker and scanned date
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-09 14:25:50 +02:00 |
Joan Sanchez
|
edf18938a6
|
HOTFIX: clientGetDebt
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-03 16:21:43 +02:00 |
Joan Sanchez
|
a24cfe0087
|
Merge branch 'dev' into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-27 09:42:27 +00:00 |
Joan Sanchez
|
920e7b1daf
|
E2E fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-26 13:05:58 +02:00 |
Carlos Jimenez Ruiz
|
3f167de10f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2801_ticket_sale_restrictions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-26 09:14:30 +02:00 |
Carlos Jimenez Ruiz
|
d6ef5352a2
|
sale module now has canEdit endpoint to check arrays of sales
|
2021-05-26 09:14:18 +02:00 |
Joan Sanchez
|
099ff657e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-25 14:08:02 +02:00 |
Joan Sanchez
|
f6a0bcb12c
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-25 13:33:17 +02:00 |
Joan Sanchez
|
26cc3a3dec
|
2891 - Show problems on tickets sales
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-25 10:01:18 +02:00 |
Joan Sanchez
|
60185bdf34
|
Merge branch 'dev' into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-21 07:24:34 +00:00 |
Joan Sanchez
|
a103c8d7fc
|
2891 - Get ticket problems for every sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-21 08:49:32 +02:00 |
Joan Sanchez
|
6f245698f2
|
Merge branch 'dev' into 2620-mostrar-disponible
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-21 06:29:43 +00:00 |
Joan Sanchez
|
fbc11b7a39
|
Merge branch 'dev' into 2921-notification_url
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-20 08:23:45 +00:00 |
Javi Gallego
|
df073cce2f
|
refactor tod usa get sales
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-19 17:04:13 +02:00 |
Carlos Jimenez Ruiz
|
2494af0113
|
removed unused relation from item @addSale
|
2021-05-19 15:33:35 +02:00 |
Carlos Jimenez Ruiz
|
5eb0ab8296
|
add and edit sales no longer intervene the prices
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-19 15:25:49 +02:00 |
Carlos Jimenez Ruiz
|
72a0b774de
|
add and get sales now sets item.price from packaging for EMB items
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-19 14:15:28 +02:00 |
Joan Sanchez
|
a5c3ba3926
|
2921 - Changed the ticket url of rocket notifications
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-19 10:26:58 +02:00 |
Carlos Jimenez Ruiz
|
1e8ab4d348
|
added transactions to several endpoints
|
2021-05-14 19:21:04 +02:00 |
Joan Sanchez
|
6fdb91fdc8
|
Removed line
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-13 10:20:22 +02:00 |
Joan Sanchez
|
e6e91ced99
|
2905 - Restore ticket shipped and landed
|
2021-05-13 08:56:26 +02:00 |
Joan Sanchez
|
88616862cb
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-12 09:12:46 +02:00 |
Carlos Jimenez Ruiz
|
420f05bb03
|
mocked api client due to service instability
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-16 12:40:41 +02:00 |
Carlos Jimenez Ruiz
|
847e0bd2c8
|
tests fixed for production sneaky changes
|
2021-03-30 14:43:21 +02:00 |
Joan Sanchez
|
e2a9a64f88
|
#2871 and #2868. Included ticket filter unit test
|
2021-03-30 11:20:26 +02:00 |
Joan Sanchez
|
eddd769af0
|
Excluded unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-29 08:39:33 +02:00 |
Joan Sanchez
|
dbb6ccd89d
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-29 07:50:16 +02:00 |
Joan Sanchez
|
320e3143cd
|
Ticket filter hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-26 12:51:14 +01:00 |
Joan Sanchez
|
4dbcc0dd5c
|
HOTFIX: Ticket filter changed ticketGetTotal() args
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-26 12:32:32 +01:00 |
jorgebl
|
e12be7bf0d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2817-translate_ticket_request_message
|
2021-03-18 13:40:56 +01:00 |
Joan Sanchez
|
565162740a
|
Updated unit tests
|
2021-03-15 16:35:55 +01:00 |
Joan Sanchez
|
0ec6d273e6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-03-15 13:49:16 +01:00 |
Joan Sanchez
|
bd081f9fd6
|
2734 - Make invoice PDF refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-03-15 13:43:22 +01:00 |
Joan Sanchez
|
92aa9eb933
|
Removed ticket total temporary table
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-15 06:52:15 +01:00 |
Joan Sanchez
|
c3bb099b85
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-03-15 06:50:42 +01:00 |
Joan Sanchez
|
6cb620a41d
|
Ticket filter fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-14 17:20:42 +01:00 |
Joan Sanchez
|
7b94cc2942
|
Ticket filter test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-14 17:12:31 +01:00 |
jorgebl
|
c74b635a1a
|
Translate and show url of item
|
2021-03-12 12:24:08 +01:00 |
Carlos Jimenez Ruiz
|
674b959bbc
|
minor refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-11 15:14:08 +01:00 |
Joan Sanchez
|
1719f53111
|
2734 - Recreate invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-11 08:58:34 +01:00 |
Carlos Jimenez Ruiz
|
0cb7ddd9ce
|
ticket.total with and witout VAT refactor
|
2021-03-10 19:25:26 +01:00 |
Carlos Jimenez Ruiz
|
3374356d58
|
both created tickets are now discarded after tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-11 11:53:30 +01:00 |
Javi Gallego
|
f87ea1b051
|
arrow-spacing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-10 08:13:45 +01:00 |
Javi Gallego
|
3a3dae179c
|
done
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-10 07:58:11 +01:00 |
Carlos Jimenez Ruiz
|
532cb582cf
|
columns moved and no refresh on stateState changes
|
2021-02-03 17:01:43 +01:00 |
Javi Gallego
|
7bdfb36f25
|
minor refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-22 14:30:46 +01:00 |
Javi Gallego
|
aab9797d3f
|
Merge branch 'dev' into 2479-factura-ticket
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 13:40:55 +01:00 |
Javi Gallego
|
3dc50e8a16
|
test ok
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-21 13:39:40 +01:00 |
Carlos Jimenez Ruiz
|
01191b3f0f
|
excluded faling tests for future fixing
|
2021-01-20 14:43:20 +01:00 |
Javi Gallego
|
4cdbb85e30
|
primer comit
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-20 13:53:49 +01:00 |
Carlos Jimenez Ruiz
|
7ec1e4272a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed
|
2021-01-19 20:56:40 +01:00 |
Joan Sanchez
|
8c8891f8e3
|
Requested changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-01-19 13:06:10 +01:00 |
Carlos Jimenez Ruiz
|
8d6dd3e03a
|
minor refactors
|
2021-01-18 14:17:01 +01:00 |
Carlos Jimenez Ruiz
|
4e7d64e5ca
|
re-enabled working unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-31 11:17:42 +01:00 |
Joan Sanchez
|
910caf5689
|
2661 - Added clone options
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-28 14:53:26 +01:00 |
Joan Sanchez
|
42cd2356a2
|
Refactor v2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-12-18 17:23:04 +01:00 |
Joan Sanchez
|
260b502cd6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader
|
2020-12-10 07:30:31 +01:00 |
Joan Sanchez
|
1ba1d27ba0
|
2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-27 13:10:39 +01:00 |
Bernat Exposito
|
78f25e0b46
|
export production
|
2020-11-25 12:37:44 +01:00 |
Joan Sanchez
|
ac5f30924a
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-18 08:20:46 +01:00 |
Joan Sanchez
|
0fc01b2316
|
1419 - Claim update discount hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-18 08:16:37 +01:00 |
Joan Sanchez
|
637116b17d
|
Added descriptor-menu component
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-09 14:52:25 +01:00 |
Javi Gallego
|
a472ce9a81
|
Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 17:24:20 +01:00 |
Javi Gallego
|
b50ae7b8ca
|
testback arreglados
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 15:50:59 +01:00 |
Carlos Jimenez Ruiz
|
2f6b3f0c38
|
small refactors for #2512
|
2020-10-30 10:45:55 +01:00 |
Javi Gallego
|
31b5a140d4
|
test completados
|
2020-10-30 10:07:53 +01:00 |
Javi Gallego
|
3fdc9c315d
|
Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 08:40:47 +01:00 |
Joan Sanchez
|
3779a7c7a5
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-10-22 13:00:48 +02:00 |
Joan Sanchez
|
f87a7664e5
|
Added loggable utils
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-22 11:24:53 +02:00 |
Joan Sanchez
|
fc9b9eb718
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-22 07:49:04 +02:00 |
Joan Sanchez
|
d3532608e1
|
Changed oldValue
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 14:05:14 +02:00 |
Joan Sanchez
|
628154b7e8
|
Trigger jenkins
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 13:40:54 +02:00 |
Joan Sanchez
|
c87783b446
|
2528 - Rocket notifications hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 13:25:52 +02:00 |
Javi Gallego
|
ef7a886d86
|
Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 10:13:04 +02:00 |
Joan Sanchez
|
3730bf86cc
|
Updated destinatary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 16:05:05 +02:00 |
Joan Sanchez
|
86d3e2d689
|
Changed message destinatary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 16:03:07 +02:00 |
Joan Sanchez
|
611e1a3802
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 15:13:12 +02:00 |
Joan Sanchez
|
f7e9372bf0
|
2525 - Change to past date
|
2020-10-20 15:12:00 +02:00 |
Joan Sanchez
|
ffcb3629c5
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 15:01:02 +02:00 |
Joan Sanchez
|
7d0790684b
|
2525 - Change to past date
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 14:54:23 +02:00 |
Javi Gallego
|
4aea284703
|
WIP: a falta de e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 14:42:23 +02:00 |
Carlos Jimenez Ruiz
|
b96007aa62
|
fixed login/out problems at random + others
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-16 11:16:24 +02:00 |
Carlos Jimenez Ruiz
|
c622175192
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-15 18:57:33 +02:00 |
Carlos Jimenez Ruiz
|
dd6035606f
|
some more tests fixed + refactors
|
2020-10-15 18:57:27 +02:00 |
Carlos Jimenez Ruiz
|
64b65d204a
|
excluded confirm with no easy fix for pollution
|
2020-10-14 11:16:23 +02:00 |
Carlos Jimenez Ruiz
|
b6b84cfea7
|
more tests fixed + small refactors
|
2020-10-08 16:00:19 +02:00 |
Joan Sanchez
|
355f95ae40
|
2473 - Added ticket restore option
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-08 13:42:20 +02:00 |
Joan Sanchez
|
eceb33cce0
|
2473 - Added restore method
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-07 11:00:26 +02:00 |
Carlos Jimenez Ruiz
|
89fb980f14
|
some tests fixed
|
2020-10-06 10:15:27 +02:00 |
Carlos Jimenez Ruiz
|
27d2c59358
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
|
2020-10-05 16:09:30 +02:00 |
Bernat Exposito Domenech
|
161313ad15
|
refactor getComponentSum
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-02 13:58:48 +02:00 |
Carlos Jimenez Ruiz
|
ff3b75267a
|
priceDifference test fix + refactor
|
2020-10-02 09:39:58 +02:00 |
Carlos Jimenez Ruiz
|
1e55632b94
|
refactor & fix regularize claim and prices Diff
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-29 13:28:02 +02:00 |
Carlos Jimenez Ruiz
|
40abd68734
|
fix byWarehouse and ticket.filter tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-29 13:11:11 +02:00 |
Carlos Jimenez Ruiz
|
6afee4924c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2457-fix_regularizeClaim_unit_test
|
2020-09-29 08:44:33 +02:00 |
Joan Sanchez
|
a1349de32d
|
Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-28 06:18:53 +00:00 |
Joan Sanchez
|
3e2f85dbd2
|
Merge branch 'dev' into 2458-ticket_index_pending
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-28 06:13:39 +00:00 |
Joan Sanchez
|
0438171a47
|
Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-28 06:09:48 +00:00 |
Bernat Exposito Domenech
|
790c9bfe6f
|
update models and fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-25 14:50:04 +02:00 |
Joan Sanchez
|
f1d36df558
|
#2458 - Removed states from pending tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-24 15:00:00 +02:00 |
Joan Sanchez
|
de3c7acb08
|
Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-24 12:30:44 +00:00 |
Carlos Jimenez Ruiz
|
87e4765a1c
|
fixed ticket-weekly backend unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-22 16:53:47 +02:00 |
Joan Sanchez
|
89667a18c9
|
Handle ticket without old state
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-22 07:50:30 +02:00 |
Juan Ferrer
|
6abd707a6d
|
Tests fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-21 19:16:51 +02:00 |
Juan Ferrer
|
3880e21ce3
|
Test fixes
|
2020-09-21 16:09:34 +02:00 |
Carlos Jimenez Ruiz
|
bde6c4495d
|
e2e path updated + 2 new tasks for broken tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-16 16:10:43 +02:00 |
Carlos Jimenez Ruiz
|
5b69ce983c
|
salesPersonUser replaces salesPerson relation
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-15 19:43:07 +02:00 |
Carlos Jimenez Ruiz
|
13a5c4c4c9
|
test enhanced
|
2020-09-14 13:58:42 +02:00 |
Carlos Jimenez Ruiz
|
0b4c53a655
|
added invoiceOut descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-14 13:11:53 +02:00 |
Bernat Exposito Domenech
|
0cf99a5a83
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-10 11:34:35 +02:00 |
Bernat Exposito Domenech
|
348412c5db
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
|
2020-09-09 15:50:06 +02:00 |
Bernat Exposito Domenech
|
d4b6d7cd96
|
cr changes
|
2020-09-09 15:49:59 +02:00 |
Bernat Exposito Domenech
|
9ff7232b50
|
export production and fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-09 12:54:10 +02:00 |
Bernat Exposito Domenech
|
5bb8aacfb0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
|
2020-09-09 11:12:18 +02:00 |
Joan Sanchez
|
d0ac1b621c
|
Merge branch 'dev' into 2385-worker_descriptor_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-09 09:06:11 +00:00 |
Bernat Exposito Domenech
|
f99fb69d48
|
front and back test
|
2020-09-09 08:20:27 +02:00 |
Joan Sanchez
|
db081501eb
|
2440 - Ticket filter hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-09 08:14:17 +02:00 |
Bernat Exposito Domenech
|
d79cffb2c3
|
back test for getComponentsSum
|
2020-09-08 08:13:54 +02:00 |
Bernat Exposito Domenech
|
174cea7bc3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-08 07:17:23 +02:00 |
Bernat Exposito Domenech
|
92e14d5292
|
update getComponentSum
|
2020-09-08 07:17:16 +02:00 |
Joan Sanchez
|
b848fa52f2
|
2385 - Replaced worker nickname
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-03 15:11:16 +02:00 |
Javi Gallego
|
b4952002a3
|
Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-01 06:49:09 +00:00 |
Joan Sanchez
|
6297d09de2
|
Updated syntax
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-31 12:14:39 +02:00 |
Joan Sanchez
|
baf9ec6e70
|
2416 - Item request - Added state filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-31 08:32:30 +02:00 |
Javi Gallego
|
8b26c41b7f
|
campo packageFk
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-28 17:06:27 +02:00 |
Joan Sanchez
|
4d8a84e774
|
Fixed back unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-20 08:45:03 +02:00 |
Joan Sanchez
|
f13c47ce6d
|
Ticket problems filter fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-17 14:31:26 +02:00 |
Bernat Exposito Domenech
|
0d689a8c01
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-13 10:43:25 +02:00 |
Joan Sanchez
|
88c5b6f8a6
|
Changed ticket problems min date
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-13 08:23:55 +02:00 |
Carlos Jimenez Ruiz
|
9402f368f6
|
ticket index and zone descriptor refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-30 12:51:19 +02:00 |
Bernat Exposito Domenech
|
b972353bb4
|
create method getComponentSum
|
2020-07-21 11:11:09 +02:00 |
Bernat Exposito Domenech
|
064b950773
|
export production
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-07-16 12:10:18 +02:00 |
Bernat Exposito Domenech
|
f7100f11ee
|
first step add right menu in ticket components
|
2020-07-16 07:43:07 +02:00 |
Joan Sanchez
|
6aca80b075
|
Merge branch 'dev' into 2338-ticket_weekly
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-07-07 12:34:04 +00:00 |
Joan Sanchez
|
53d672152b
|
Merge branch 'dev' into 2343-exportar_produccion
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-07 06:19:12 +00:00 |
Carlos Jimenez Ruiz
|
c801d8a969
|
Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-07-01 14:45:53 +02:00 |
Carlos Jimenez Ruiz
|
354123dc86
|
e2e toolkit 2.0 + refactors
|
2020-07-01 14:45:48 +02:00 |
Joan Sanchez
|
b40e09a6cb
|
Methods refactor & updated back unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-01 14:28:05 +02:00 |
Joan Sanchez
|
0a327087ce
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-07-01 11:57:16 +02:00 |
Javi Gallego
|
039eec7d26
|
test excepto fallo e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-30 10:16:22 +02:00 |
Javi Gallego
|
db06626675
|
refactor
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-06-29 14:26:27 +02:00 |
Bernat Exposito Domenech
|
faee28cb01
|
fix bugs in ticket weekly
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-29 09:35:18 +02:00 |
Bernat Exposito Domenech
|
ea1eb16060
|
export structure
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-29 07:32:08 +02:00 |
Javi Gallego
|
962436b8bb
|
2344 ticket sale descuento usuario
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-06-25 17:12:53 +02:00 |
Joan Sanchez
|
d4c78b46c1
|
1368 - First sale refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-23 13:40:49 +02:00 |
Carlos Jimenez Ruiz
|
e6a72d0f09
|
clean code refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-18 15:26:15 +02:00 |
Carlos Jimenez Ruiz
|
4d97357213
|
update estate without model.refresh()
|
2020-06-18 13:50:52 +02:00 |
Carlos Jimenez Ruiz
|
edea60dd94
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-17 15:38:49 +02:00 |
Carlos Jimenez Ruiz
|
2abd45f498
|
setDelivered and open delivery notes and tests
|
2020-06-17 15:38:37 +02:00 |
Joan Sanchez
|
fd97845979
|
Revert "Removed sms excluded tests"
This reverts commit 30912bd5e9 .
|
2020-06-17 14:00:04 +02:00 |
Joan Sanchez
|
30912bd5e9
|
Removed sms excluded tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-16 15:11:24 +02:00 |
Joan Sanchez
|
dddfe2773a
|
2293 - getVolume() call to saleVolume
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-12 11:26:32 +02:00 |
Carlos Jimenez Ruiz
|
538ae75b89
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2283_e2e_delete_ticket_with_stowaway
|
2020-06-10 16:24:17 +02:00 |
Joan Sanchez
|
5edfc59d97
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-10 13:57:32 +02:00 |
Joan Sanchez
|
461fec7e64
|
Updated unit test
|
2020-06-10 13:57:08 +02:00 |
Carlos Jimenez Ruiz
|
4b1e79a433
|
2314 server side unit test fixed
|
2020-06-10 13:50:03 +02:00 |
Joan Sanchez
|
3cfb8b4730
|
2323 - Filter by myTeam fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-10 12:13:07 +02:00 |
Joan Sanchez
|
1fed4c7913
|
Contextmenu fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-09 12:16:40 +02:00 |
Carlos Jimenez Ruiz
|
d8593ea3e0
|
Merge pull request '2176-contextmenu' (#302) from 2176-contextmenu into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
|
2020-06-08 12:59:59 +00:00 |
Joan Sanchez
|
ba9a44dec1
|
Updated back unit test
|
2020-06-08 13:06:33 +02:00 |
Joan Sanchez
|
ab1e8fb622
|
2176 First working version
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-06-08 12:14:27 +02:00 |
Joan Sanchez
|
181f2f0148
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-06-08 08:19:18 +02:00 |
Javi Gallego
|
faa053a3d2
|
Merge branch 'dev' into 2035-el-parametro-vShowExpiredZones
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-05 10:01:52 +02:00 |
Javi Gallego
|
b40be5cca9
|
2035
gitea/salix/pipeline/head Build queued...
Details
|
2020-06-05 10:01:21 +02:00 |
Bernat Exposito Domenech
|
a81862baad
|
set deleteded skiped
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-05 08:29:51 +02:00 |
Bernat Exposito Domenech
|
f340466daf
|
fix test 2296
|
2020-06-04 14:23:48 +02:00 |
Joan Sanchez
|
94dcf7679b
|
Merge pull request '2265-item_request_filters' (#289) from 2265-item_request_filters into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2020-06-03 10:54:41 +00:00 |
Joan Sanchez
|
613937dc8d
|
Fixed order
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-03 12:21:03 +02:00 |
Joan Sanchez
|
18edd523d2
|
Excluded failing test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-03 11:40:18 +02:00 |
Joan Sanchez
|
b7ceeae65a
|
Excluded back unit tests. TLS error
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-03 11:27:14 +02:00 |
Joan Sanchez
|
751f79373a
|
Merge pull request '2230-log_ticket_request' (#282) from 2230-log_ticket_request into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-02 09:28:14 +00:00 |
Bernat Exposito Domenech
|
aac47e52e9
|
update log
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 11:15:07 +02:00 |
Joan Sanchez
|
a0767a6ea2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2265-item_request_filters
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 10:56:40 +02:00 |
Joan Sanchez
|
1e4f36b775
|
Updated back unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 09:34:42 +02:00 |
Joan Sanchez
|
052c51cee5
|
2282 - Change stowaway state to FIXING
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2020-06-01 12:47:04 +02:00 |
Joan Sanchez
|
3f1109aee3
|
Test changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-29 12:10:04 +02:00 |
Joan Sanchez
|
90ae1562dd
|
Added filters
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-29 11:10:58 +02:00 |
Bernat Exposito Domenech
|
8be929c1da
|
log tiquet request
|
2020-05-27 08:07:14 +02:00 |
Javi Gallego
|
d8871c0bce
|
cr
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 10:37:52 +02:00 |
Joan Sanchez
|
4d2d57d646
|
2265 Changes to filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 08:08:09 +02:00 |
Javi Gallego
|
692af6078c
|
Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2020-05-19 10:21:33 +00:00 |
Javi Gallego
|
a7e6e3d4b7
|
cr juan
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 08:46:42 +02:00 |
Bernat Exposito Domenech
|
2681060878
|
update mehod ticket summary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 14:59:58 +02:00 |
Bernat Exposito Domenech
|
c205c173f8
|
invoiceOut descriptor popover in ticket summary
|
2020-05-18 10:28:33 +02:00 |
Javi Gallego
|
3815edfbea
|
falta CR
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-05-15 12:17:34 +02:00 |
Javi Gallego
|
6dacf20bd9
|
ticket.index modificar orden de las secciones
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-23 17:59:46 +02:00 |
Javi Gallego
|
dbb2257430
|
test de zone_getLanded y zone_getFromGeo
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-20 13:49:33 +02:00 |
Javi Gallego
|
09e425c33c
|
2174 ticket.weekly con campo agencyModeFk con E2E
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-08 12:33:36 +02:00 |
Joan Sanchez
|
59fadf410e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2208-ticket_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 11:45:10 +01:00 |
Joan Sanchez
|
d640b66ef5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 11:22:00 +01:00 |
Bernat Exposito Domenech
|
74b27778ab
|
add phones in ticket summary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 11:10:20 +01:00 |
Joan Sanchez
|
598ebe96d1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2203-ticket_sale
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 11:06:35 +01:00 |
Joan Sanchez
|
d4ca58edad
|
Updated back unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 09:10:30 +01:00 |