 Jorge Penadés
|
0b88194f09
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-26 10:27:01 +02:00 |
|
Jorge Penadés
|
fa9dfdf411
|
refs #5216 try ACL updateExpeditionState
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-25 16:32:38 +02:00 |
|
Jorge Penadés
|
543fbf3c0a
|
refs #5929 isEditableOrThrow created, tests passed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-25 15:35:08 +02:00 |
|
Jorge Penadés
|
ea4190f15c
|
refs #5216 update expedition state added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-24 13:32:28 +02:00 |
 Vicent Llopis
|
f926c60017
|
remove file
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-21 12:02:02 +02:00 |
|
Jorge Penadés
|
9db8ae237f
|
refs #5866 addBackTransferClient
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-20 10:19:03 +02:00 |
|
Vicent Llopis
|
28eedbfd23
|
Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-14 11:04:06 +00:00 |
 Alex Moreno
|
219a4fbca9
|
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-07-12 13:09:58 +02:00 |
|
Vicent Llopis
|
93e70e699a
|
refs #5874 feat: refactorizado proceso facturación
|
2023-07-11 09:19:15 +02:00 |
|
Alex Moreno
|
040e9e4197
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-05 12:50:45 +02:00 |
 Juan Ferrer
|
e32a29fc09
|
refs #5900 Remove duplicated logs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-25 19:08:13 +02:00 |
 Sergio De la torre
|
c62e6fa0eb
|
refs #5651 packingSiteAdvanced
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-14 10:51:22 +02:00 |
|
Juan Ferrer
|
9a63ce86aa
|
refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 23:54:27 +02:00 |
|
Vicent Llopis
|
024cb1e3f4
|
refs #5561 feat: permite modificar registros
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-06 11:56:14 +02:00 |
|
Vicent Llopis
|
67413360c6
|
refs #5561 feat: utilizar métodos bd
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 13:31:41 +02:00 |
|
Vicent Llopis
|
ba64dbbe46
|
refs #5561 refactor: actualizados nombres
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 12:20:29 +02:00 |
|
Vicent Llopis
|
d727ea83ab
|
refs # 5561 feat: cambiar url del crud-model
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-01 15:31:16 +02:00 |
|
Vicent Llopis
|
0d85069e0f
|
refs #5561 feat: permite colorear
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-01 15:01:38 +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 |
|
Alex Moreno
|
c1ea1acc8c
|
refs #4614 fear(ticket): add 'set weight' funcionality
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 13:49:08 +02:00 |
|
Juan Ferrer
|
49368a837b
|
refs #5517 Filter improved
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 19:10:04 +02:00 |
 Joan Sanchez
|
02c573bd23
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
|
2023-04-17 08:57:24 +02:00 |
|
Joan Sanchez
|
51e42e485b
|
Merge pull request 'refs #5284 new onCreateClaimAccepted y createClaim' (!1372) from 5284-fueraPlazo into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1372
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-04-17 06:44:17 +00:00 |
|
Juan Ferrer
|
add3a8b1fa
|
merge with dev
|
2023-04-15 01:49:23 +02:00 |
 Carlos Satorres
|
44eab101cc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo
|
2023-04-13 08:44:56 +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 |
|
Joan Sanchez
|
8b4c70e8ba
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-30 14:57:00 +02:00 |
|
Joan Sanchez
|
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
|
59c3ef23de
|
grabUser added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-22 11:03:13 +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 |
|
Carlos Satorres
|
955e55a7f4
|
refs #5284 new onCreateClaimAccepted y createClaim
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-07 15:43:48 +01:00 |
|
Joan Sanchez
|
37043beb68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-03 07:44:31 +01:00 |
|
Alexandre Riera
|
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 |
|
Vicent Llopis
|
2e8aabab14
|
fix: type relation in models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 14:32:54 +01:00 |
|
Vicent Llopis
|
a2f93e68b1
|
feat: add 'parking' column
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 13:57:04 +01:00 |
|
Joan Sanchez
|
3076123c04
|
Updated models relation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-24 09:05:50 +01:00 |
 Pau
|
05dfcfd864
|
Merge branch '4605-Create-Model-PackagingMistake' of https://gitea.verdnatura.es/verdnatura/salix into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-13 15:42:02 +01:00 |
|
Pau
|
a8e4c9e1de
|
cambiar fks por relaciones
|
2023-01-13 15:42:00 +01:00 |
|
Pau
|
30524e382b
|
Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-11 09:23:40 +00:00 |
|
Pau
|
4f2472ea90
|
Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-10 13:56:15 +01:00 |
|
Pau
|
d540e278eb
|
refs #4605 @30min
gitea/salix/pipeline/head This commit is unstable
Details
|
2023-01-10 13:52:30 +01:00 |
|
Vicent Llopis
|
fa58ac2462
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-03 09:13:47 +01:00 |
|
Alexandre Riera
|
c06c3dc6a7
|
refs #4957 saleChecked deleted
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-27 11:50:58 +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 |
|
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
|
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 |
|
Alexandre Riera
|
f80f851e8d
|
refs #4962 model TicketFuture deleted
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-14 13:10:33 +01:00 |
 Guillermo Bonet
|
d7a6350995
|
refs #4898 Created report expedition-pallet-label
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-12 18:27:45 +01:00 |
|
Alexandre Riera
|
cd8d5efa88
|
corrections
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 10:29:18 +01: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
|
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 |
|
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
|
3003290e61
|
refs #4551 @20min requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 14:38:51 +01:00 |
|
Alexandre Riera
|
6ddd2d95a5
|
insert acl
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 11:48:18 +01:00 |
|
Alexandre Riera
|
4c21ffac3b
|
Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 11:44:53 +01:00 |
|
Alexandre Riera
|
463e56b631
|
corrections
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 11:41:17 +01:00 |
|
Alexandre Riera
|
c4430b4bca
|
fix acl
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-17 08:56:51 +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 |
|
Pau
|
56893ea58b
|
Merge branch 'dev' into 4511-kkear-expedition.itemFk
|
2022-11-15 13:42:06 +01:00 |
|
Alexandre Riera
|
23ed6c6031
|
refs #3963 test front done
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 14:30:35 +01:00 |
|
Alexandre Riera
|
99aa674995
|
refs #3963 working on mockup
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 14:29:40 +01:00 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
Pau
|
940b431059
|
feat(model) Created the model for packagingMistake
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-05 14:04:30 +02:00 |
|
Alex Moreno
|
8b636497a4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-05 13:47:25 +02:00 |
|
Alex Moreno
|
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 |
|
Pau
|
3caf89bddb
|
refactor: Replaced isBox with freightItemFk
|
2022-10-04 09:27:31 +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
|
5aec280adb
|
Closure migration
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-29 09:07:18 +02:00 |