 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 |