Alexandre Riera
|
7d1b8c8c56
|
refs #4971 itemSearchFunc added
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-23 12:11:24 +01:00 |
Vicent Llopis
|
16c20e4700
|
feat: add itemShelvingSale popup
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-23 12:08:16 +01:00 |
Alexandre Riera
|
53b5ef6d78
|
refs #4937 viewReceipt added
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-23 11:48:59 +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 |
Alexandre Riera
|
cf527dd8be
|
refs #4588 hook added
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-23 09:37:19 +01:00 |
Joan Sanchez
|
93c98e05fc
|
fix(discount): handle error for a worker without business contract
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-23 08:27:03 +01:00 |
Alexandre Riera
|
aec22fad9d
|
Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-23 08:16:36 +01:00 |
Joan Sanchez
|
606bacbad7
|
Merge branch 'dev' into 4531-monitor_duplicates
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-22 10:37:48 +00:00 |
Vicent Llopis
|
7f80c7ed2c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-22 09:30:35 +01:00 |
Pau
|
314bd69d6e
|
Merge branch 'master' into Hotfix-crear-report-Factura-Electronica
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-22 06:13:01 +00:00 |
Guillermo Bonet
|
5a25b0ef4c
|
refs #4975 Added model MdbVersionTree
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-22 07:12:44 +01:00 |
Guillermo Bonet
|
d97a2738a4
|
refs #4975 Upload method modified and addedd model
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-22 07:12:09 +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 |
Alex Moreno
|
7e6cdc9152
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-21 13:47:54 +01:00 |
Alex Moreno
|
502a692521
|
test(item_fixedPrice_rate2): backTest and e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-21 12:55:11 +01:00 |
Vicent Llopis
|
630890cd04
|
fix: colum name in model
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-21 12:23:16 +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
|
a1134879e6
|
Merge branch 'master' into hotfix_4961-travel.extra-community
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-21 08:57:59 +00:00 |
Vicent Llopis
|
7261415e16
|
fix: añadido length
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-21 09:36:31 +01:00 |
Alex Moreno
|
b4b7b8e204
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2
|
2022-12-21 09:08:39 +01:00 |
Alexandre Riera
|
081ef7fc99
|
Merge branch 'dev' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-21 07:30:17 +00:00 |
Vicent Llopis
|
1d7145d74b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-21 08:05:19 +01:00 |
Vicent Llopis
|
5a4a78d045
|
Merge branch 'dev' into 3951-invoiceOut.index_downloadZip
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-21 07:02:12 +00:00 |
Pau
|
c9b4e1ab9a
|
Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-21 06:38:20 +00:00 |
Vicent Llopis
|
799c26796e
|
feat: añadidos chips
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 15:19:05 +01:00 |
Pau
|
90b36bf1ab
|
Fix missing report for the invoice electronic notification
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 14:21:01 +01:00 |
Alexandre Riera
|
62152d1668
|
Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 12:16:40 +01:00 |
Alexandre Riera
|
721123381c
|
Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 11:54:22 +01:00 |
Alexandre Riera
|
4c6a735235
|
refs #4962 moved sql and methods to ticket
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 11:53:54 +01:00 |
Alexandre Riera
|
8403af7db5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 11:37:40 +01:00 |
Alexandre Riera
|
342eec1e41
|
refs #3963 autoload fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 11:36:58 +01:00 |
Alexandre Riera
|
b356839148
|
refs #3963 autoload fixed
|
2022-12-20 11:36:37 +01:00 |
Vicent Llopis
|
8b5f5d928e
|
fix: backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 10:40:39 +01:00 |
Vicent Llopis
|
b7100873a4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadZip
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-20 10:11:52 +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 |
Vicent Llopis
|
63343998d8
|
refactor: cambiada la forma en que se descarga el zip
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-20 09:48:58 +01:00 |
Joan Sanchez
|
c063c0e72f
|
fix(pagination): duplicated rows on paginate
gitea/salix/pipeline/head This commit looks good
Details
Refs: #4531
|
2022-12-20 09:48:41 +01:00 |
Vicent Llopis
|
1a616fa1d4
|
refactor: delete transaction
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 09:09:21 +01:00 |
Pau
|
d8cae400a8
|
Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 07:11:59 +00:00 |
Alexandre Riera
|
cd71a59dfe
|
Merge branch 'dev' into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 07:01:45 +00:00 |
Alex Moreno
|
5d2b69d063
|
test(item_fixedPrice): front recalculateRate2
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 15:06:59 +01:00 |
Alex Moreno
|
f82870bec6
|
feat(item_fixed-price): recalculate rate2 and when change item keep minPrice of item
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 14:39:38 +01:00 |
Pau
|
5a01e49f27
|
Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-19 12:25:58 +00:00 |
Guillermo Bonet
|
dc82e610b7
|
refs #4975 Minor changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 11:24:18 +01:00 |
Alex Moreno
|
17a3896c1c
|
Merge branch 'dev' into 4548-invoiceIn-pdf-2
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 07:32:52 +00:00 |
Guillermo Bonet
|
a46c2ced7c
|
refs #4975: Added last mdbVersion/last method
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 07:26:07 +01:00 |
Pau
|
28e0d0566c
|
Merge branch 'dev' into 4875-skip-tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 06:13:45 +00:00 |
Alexandre Riera
|
45b02c3bc6
|
Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 13:45:25 +01:00 |
Alexandre Riera
|
98c9e0ac50
|
refs #4962 autoload added and second header
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 13:42:23 +01:00 |
Alexandre Riera
|
fb4432b088
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-16 13:06:06 +01:00 |
Alexandre Riera
|
b72cb64bf8
|
refs #4928 findById
|
2022-12-16 12:50:09 +01:00 |
Alex Moreno
|
2a8a928ac5
|
feat: create invoiceIn
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 10:36:18 +01:00 |
Alexandre Riera
|
855f00b1c9
|
Merge branch '4700-split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 09:51:40 +01:00 |
Alexandre Riera
|
45317c0850
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-15 14:26:10 +01:00 |
Alexandre Riera
|
522000cd04
|
refs #4928 fix fixtures
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-15 09:52:34 +01:00 |
Alexandre Riera
|
5a975d0b05
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-15 09:22:36 +01:00 |
Alexandre Riera
|
33196acac6
|
refs #4928 fixture notification, fix test supplier
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-15 08:31:47 +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
|
3b9cd5be09
|
Merge pull request 'fixes #4859 export_db' (!1200) from 4859-export_db into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1200
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2022-12-15 07:21:01 +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 |
Vicent Llopis
|
4e8896202a
|
delete: transacción innecesaria
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-15 07:17:26 +01:00 |
Vicent Llopis
|
6793b8e9a0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
|
2022-12-15 07:13:09 +01: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 |
Alex Moreno
|
156f2b9129
|
feat: handle errors and autogenerate user and code
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-14 15:03:55 +01:00 |
Vicent Llopis
|
e616835600
|
delete: hasDateRange()
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-14 13:40:28 +01:00 |
Vicent Llopis
|
f7a97a8139
|
fix: siempre muestra el botón si hay datos
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-14 13:31:56 +01:00 |
Alexandre Riera
|
f80f851e8d
|
refs #4962 model TicketFuture deleted
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-14 13:10:33 +01:00 |
Alexandre Riera
|
2baa4a1954
|
refs #4962 ticket tour future refactor
|
2022-12-14 12:26:18 +01:00 |
Alex Moreno
|
b378598113
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-12-14 10:15:11 +01:00 |
Alex Moreno
|
c14059df75
|
fix(supplier_consumption): fix JOIN
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-14 10:12:51 +01:00 |
Guillermo Bonet
|
b7a369a41c
|
refs #4204 Added param URL labelCount and
gitea/salix/pipeline/head There was a failure building this commit
Details
changes in the css
|
2022-12-13 18:05:29 +01:00 |
Alexandre Riera
|
050010c09f
|
refs #4700 success translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-13 14:03:37 +01:00 |
Alexandre Riera
|
dce48a8a93
|
refs #4700 corrections
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-13 14:00:46 +01:00 |
Alex Moreno
|
1e0b0028f2
|
fix: only edit structure
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-13 13:37:25 +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 |
Alex Moreno
|
8900656b14
|
Merge branch 'dev' into 4859-export_db
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-13 08:29:32 +00:00 |
Alexandre Riera
|
86a58a26ea
|
Merge branch 'dev' into 4893-formato-correo
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-13 08:07:48 +00: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 |
Alex Moreno
|
bb944f9fee
|
feat(newWorker): use worker-welcome
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-12 15:05:49 +01:00 |
Alex Moreno
|
09edb99a1b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-12-12 13:48:06 +01:00 |
Alex Moreno
|
4cb8d8c763
|
test: enable one test and skip another
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-12 13:11:45 +01:00 |
Vicent Llopis
|
2e14e04ed0
|
Merge branch 'dev' into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-12 11:17:15 +00:00 |
Vicent Llopis
|
9bcef08397
|
feat: buscar por responsibleFk sin afectar a la consulta principal
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-12 12:08:30 +01:00 |
Alex Moreno
|
b2dcb84a7b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db
|
2022-12-12 11:57:27 +01:00 |
Joan Sanchez
|
f93398c783
|
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-12-12 10:27:28 +01:00 |
Alexandre Riera
|
704cb71b61
|
refs #4866 instance log added and e2e done
gitea/salix/pipeline/head Build queued...
Details
|
2022-12-07 13:53:59 +01:00 |
Alex Moreno
|
995fb6a5c3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-12-02 13:13:53 +01:00 |
Vicent Llopis
|
14a3a815da
|
fix(invoiceOut): pdf adjunto correcto. Corregido valor NaN en intrastat. Sólo muestra intrstar en fact CEE
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-02 12:05:25 +01:00 |
Joan Sanchez
|
6128414685
|
m3 decimal
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-02 11:26:21 +01:00 |
Joan Sanchez
|
0c4ab815fd
|
decimal
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-12-02 11:24:08 +01:00 |
Joan Sanchez
|
6562b68341
|
fix(agencyTerm): permitir decimales en m3 minimos
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-02 11:16:49 +01:00 |
Alexandre Riera
|
48a7635449
|
refs #4893 regex changed
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-02 09:18:52 +01:00 |
Pau
|
691d157da8
|
Merge branch 'dev' into 4875-skip-tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-01 13:33:52 +00:00 |
Pau
|
c54844f7ff
|
removed pending from working test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-01 14:32:05 +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 |
Joan Sanchez
|
6cb0e518d4
|
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-12-01 07:33:38 +01:00 |
Vicent Llopis
|
4c0effc48a
|
refacor: description actualizada
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-01 07:25:18 +01:00 |
Vicent Llopis
|
6c59a3098d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
|
2022-12-01 07:24:40 +01:00 |
Vicent Llopis
|
444d495b7f
|
refactor: codigo reducido
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-01 07:22:13 +01:00 |
Vicent Llopis
|
ba8fe7dfa8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-01 07:11:00 +01:00 |
Alex Moreno
|
8df7b91127
|
fix: entry ref
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 15:24:33 +01:00 |
Alex Moreno
|
43bd583d6f
|
Merge branch 'dev' into 4875-skip-tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-30 13:49:59 +00:00 |
Pau
|
79f8e30ded
|
add pending to the tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-30 14:49:00 +01:00 |
Pau
|
67384b724d
|
refs #4875 skipped failing test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-30 14:41:03 +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 |
Vicent Llopis
|
68855add59
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 10:53:54 +01:00 |
Pau
|
97baa89a71
|
Merge branch 'dev' into hotfix(#4914)-Bug-Client-Phone
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-30 09:52:19 +01:00 |
Alexandre Riera
|
492b852be8
|
delete orderBy
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 09:22:53 +01:00 |
Pau
|
bef1071316
|
refs #4914 @1h
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 09:22:03 +01:00 |
Alexandre Riera
|
27078595ce
|
fix balances
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 08:39:04 +01:00 |
Pau
|
02598ced92
|
solve merge conficts
|
2022-11-30 07:12:26 +01:00 |
Pau
|
2d7b3cc3a2
|
Merge branch 'dev' into 4871-socialName-on-client-filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 13:13:57 +00:00 |
Joan Sanchez
|
990dd88e2c
|
Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1186
|
2022-11-29 13:08:38 +00:00 |
Joan Sanchez
|
5f3e7c3384
|
Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 11:49:06 +00:00 |
Alexandre Riera
|
cd8d5efa88
|
corrections
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 10:29:18 +01:00 |
Pau
|
ddc543ad63
|
Merge branch 'dev' into 4557-duplicate-tickets-in-routes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 08:22:05 +00:00 |
Alexandre Riera
|
acbd0474a5
|
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-11-29 08:50:48 +01:00 |
Vicent Llopis
|
e3e337c02e
|
fix: backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-28 14:28:47 +01:00 |
Vicent Llopis
|
4b54cf954b
|
refactor: envia el email con formato Verdnatura
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-28 13:56:21 +01:00 |
Carlos Andrés
|
2a4e8cdde9
|
Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-28 12:19:58 +00:00 |
Pau
|
0d6e424a3e
|
allow client search by socialname
|
2022-11-28 10:21:01 +01:00 |
Alex Moreno
|
da2d1df522
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio
|
2022-11-28 10:14:16 +01:00 |
Alex Moreno
|
804db15ece
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-11-28 07:53:51 +01:00 |
Vicent Llopis
|
7f3265be55
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
|
2022-11-25 12:24:00 +01:00 |
Vicent Llopis
|
d15e2551a2
|
feat: add frontTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 12:16:01 +01:00 |
Vicent Llopis
|
af87fc2d53
|
fix: modelo incorrecto
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 11:51:07 +01:00 |
Vicent Llopis
|
bca79e1240
|
feat: add backTest
|
2022-11-25 11:50:54 +01:00 |
Alexandre Riera
|
8fec0670ea
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
|
2022-11-25 10:25:46 +01:00 |
Pau
|
8f98082910
|
refs #4791 @2h
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 09:59:02 +01:00 |
Vicent Llopis
|
e540bf7b31
|
feat: inserta en la nueva tabla ticketSms
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 09:38:34 +01:00 |
Carlos Andrés
|
8d2e532167
|
#4613 eliminar uso de portfolio
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 09:32:54 +01:00 |
Vicent Llopis
|
dbbce77cc8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 07:41:43 +01:00 |
Pau
|
65f82c8fc1
|
Merge branch 'dev' into 4557-duplicate-tickets-in-routes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-25 06:05:05 +00:00 |
Vicent Llopis
|
84c6604dd9
|
feat: enviar sms con cambios en el pedido
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-24 15:04:15 +01:00 |
Pau
|
7c71e40cc5
|
Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-24 13:15:54 +00:00 |
Joan Sanchez
|
0f40aa3e27
|
Merge pull request 'refs #4844' (!1175) from 4844-traduccion into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1175
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2022-11-24 12:49:53 +00:00 |
Pau
|
001c3ec2ac
|
requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 12:06:13 +01:00 |
Vicent Llopis
|
20d0d053ac
|
Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 11:03:23 +00:00 |
Vicent Llopis
|
74e8789439
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 10:54:40 +00:00 |
Pau
|
37a7a12f87
|
requested change
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 11:47:32 +01:00 |
Vicent Llopis
|
b8c6734798
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-24 09:40:43 +00:00 |
Pau
|
f74b257d75
|
Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 09:27:49 +00:00 |
Pau
|
6a30074a6a
|
Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 09:23:00 +00:00 |
Vicent Llopis
|
927b5a63ec
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-24 09:14:01 +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 |
Alexandre Riera
|
5124b3b681
|
Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 08:42:09 +00:00 |
Alexandre Riera
|
23cf2d9aaf
|
Merge branch 'dev' into 3949-invoiceIn-add-docFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 08:33:39 +00:00 |
Vicent Llopis
|
7ccf37c079
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-24 08:08:56 +00:00 |
Vicent Llopis
|
6f2a7a5cef
|
feat: enviar sms con cambios en las líneas
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 15:15:40 +01:00 |
Alex Moreno
|
f70a9cb785
|
feat(worker_new): use resetPassword funcionality
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 14:46:25 +01:00 |
Alex Moreno
|
cbdffc98a4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-11-23 14:16:42 +01:00 |
Vicent Llopis
|
14eba75a8e
|
feat: backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-23 14:08:43 +01:00 |
Vicent Llopis
|
1c6a5164d4
|
feat: buscar por itemFk y claimResponsibleFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 14:04:43 +01:00 |
Alexandre Riera
|
164b797ab8
|
front and e2e tests done
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-23 11:09:32 +01:00 |
Vicent Llopis
|
9a47b2fea4
|
Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-23 10:00:27 +00:00 |
Vicent Llopis
|
f313a53cde
|
refactor: cambiadas fixtures, backTest y traducciones
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 10:56:55 +01:00 |
Vicent Llopis
|
6a2af344aa
|
feat: antes de bloquear comprobar que no existe un bloqueo previo
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 10:41:32 +01:00 |
Vicent Llopis
|
9cfab2b3f4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
|
2022-11-23 10:23:17 +01:00 |
Vicent Llopis
|
bf782c3782
|
fix: añadido esquema account
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-23 10:09:09 +01:00 |
Vicent Llopis
|
e854fd248e
|
feat: add checkInBox
|
2022-11-23 10:08:58 +01:00 |
Pau
|
a8520f851c
|
Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 08:28:07 +00:00 |
Pau
|
ad38f50ae3
|
Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-23 08:55:46 +01:00 |
Pau
|
ade2e777d6
|
refs #4457 @30min requested changes
|
2022-11-23 08:55:44 +01:00 |
Pau
|
88db9c0d80
|
Merge branch '4789-search-ticket-without-invoice' of https://gitea.verdnatura.es/verdnatura/salix into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-23 08:25:20 +01:00 |
Pau
|
4c4e0e109d
|
refactor test to use toBeGreaterThan
|
2022-11-23 08:25:15 +01:00 |
Pau
|
b6ff1d99b1
|
Merge branch '4791-refactor-sendsms' of https://gitea.verdnatura.es/verdnatura/salix into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 08:20:13 +01:00 |
Pau
|
0b6d7eaffc
|
refs #4791 @30min fix broken test
|
2022-11-23 08:20:12 +01:00 |
Vicent Llopis
|
ccce6af021
|
fix: add translations
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 07:57:27 +01:00 |
Pablo Natek
|
83ed79569a
|
refs #4844
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 20:45:18 +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 |
Vicent Llopis
|
df4acb70a3
|
feat: add backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 14:43:21 +01:00 |
Vicent Llopis
|
e0ba7d523c
|
refacfor: add ctx
|
2022-11-22 14:43:15 +01:00 |
Alex Moreno
|
660648e01f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-11-22 14:35:25 +01:00 |
Alexandre Riera
|
8613b196d8
|
Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 13:31:04 +00:00 |
Vicent Llopis
|
32f28e91b5
|
feat: sistema de bloque para ficheros mdb
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 14:29:42 +01:00 |
Alexandre Riera
|
d7843f3298
|
Merge branch '4547-fix-compensation' of https://gitea.verdnatura.es/verdnatura/salix into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 14:24:55 +01:00 |
Alexandre Riera
|
34fb80beec
|
fix translations
|
2022-11-22 14:24:19 +01:00 |
Joan Sanchez
|
7e12938de3
|
Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 12:53:03 +00:00 |
Alexandre Riera
|
5552cd654e
|
Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 10:48:11 +00:00 |
Alexandre Riera
|
d5521adb6b
|
working on tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 11:44:36 +01: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 |
Alexandre Riera
|
c51354b13f
|
refs #3949 textfield, edit and create dialog added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 09:29:25 +01:00 |
Vicent Llopis
|
8876bc2b68
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 08:12:07 +00:00 |
Pau
|
3b66da20ca
|
Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 07:01:33 +00:00 |
Pau
|
4bd643143b
|
requested changes refs #4791 @1h
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 07:59:18 +01:00 |
Pau
|
cb6ae41c13
|
Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 13:45:28 +00:00 |
Pau
|
fc08b27fb6
|
Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 13:42:53 +00:00 |
Pau
|
3003290e61
|
refs #4551 @20min requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 14:38:51 +01:00 |
Pau
|
0099b42fe3
|
requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 14:06:38 +01:00 |
Alex Moreno
|
26be27c2ee
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 13:13:25 +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
|
40ea9805cf
|
fixes #4547 check compensation and tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 10:49:19 +01:00 |
Pau
|
b788415920
|
Merge branch 'dev' into 4767-route.index-delete-route
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 08:46:32 +00:00 |
Pau
|
cb0735d136
|
Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 08:34:18 +00:00 |
Pau
|
68e4eea2e3
|
Merge branch 'dev' into 4767-route.index-delete-route
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 08:32:39 +00:00 |
Pau
|
153f5f56fa
|
fix test refs #4791 @30min
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 09:11:17 +01:00 |
Vicent Llopis
|
3fde11c3ed
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 08:06:39 +00:00 |
Pau
|
4e97d931f7
|
refs #4791 @2h
|
2022-11-21 08:45:45 +01:00 |
Vicent Llopis
|
4c4482c40a
|
Merge branch 'dev' into 4832-refactor_workerTimeControl.sendMail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 06:09:05 +00:00 |
Pau
|
c320342476
|
Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 06:05:43 +00:00 |
Joan Sanchez
|
813cf78128
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-18 14:03:09 +00:00 |
Pau
|
0f17c082a3
|
refs #4557 @1h left join note only delivery
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-18 12:07:33 +01:00 |
Alex Moreno
|
ef6af87d89
|
feat: add supplier.isVies funcionality
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-18 09:21:21 +01:00 |
Pau
|
65fd5e2c8f
|
Possible change?
|
2022-11-18 08:51:17 +01:00 |
Alex Moreno
|
8e758f5456
|
invoiceIn-disable-options
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-18 06:36:30 +00:00 |
Joan Sanchez
|
d7729654ee
|
fix(ordersFilter): wrong table schema
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-17 16:48:31 +01:00 |
Joan Sanchez
|
f501707adf
|
fix(ordersFilter): wrong table schema
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-17 16:47:01 +01:00 |
Joan Sanchez
|
721f89b76c
|
fix(ordersFilter): wrong table schema
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-17 16:39:12 +01:00 |
Alexandre Riera
|
4a063cc310
|
refs #4780 verification deleted
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-17 09:25:18 +01:00 |
Alexandre Riera
|
c4430b4bca
|
fix acl
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-17 08:56:51 +01:00 |
Vicent Llopis
|
161886c936
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4832-refactor_workerTimeControl.sendMail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-17 07:22:26 +01:00 |
Pau
|
9257a02390
|
Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 13:34:49 +00:00 |
Pau
|
f56c226fba
|
Merge branch 'dev' into 4767-route.index-delete-route
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 13:32:32 +00:00 |
Pau
|
a733bc8c2f
|
refs #4789 hasInvoice on ticket searchbar @3h30m
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 13:36:26 +01:00 |
Alexandre Riera
|
66002968f6
|
Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 11:10:21 +01:00 |
Alexandre Riera
|
489df60afc
|
suggested filter added
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 11:10:00 +01:00 |
Alexandre Riera
|
4feb2bea2c
|
working on e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 10:57:15 +01:00 |
Alexandre Riera
|
294f806bd9
|
Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 09:52:13 +01:00 |
Alexandre Riera
|
78dc7db7a7
|
correcciones
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 09:46:35 +01:00 |
Vicent Llopis
|
9bbaa7c718
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 09:41:43 +01:00 |
Pau
|
7779059459
|
Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 08:05:19 +00:00 |
Pau
|
2a4af7ac78
|
Merge branch 'dev' into 4492-item.create-same-as-item.isLaid
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 07:29:09 +00:00 |
Pau
|
b21d4b698e
|
Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 07:29:03 +00:00 |
Vicent Llopis
|
0089b821cf
|
fix: corregido test intermitente
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 07:26:30 +01:00 |
Vicent Llopis
|
46c7aa24b8
|
fix: corregidas traducciones
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-16 07:14:45 +01:00 |
Pau
|
d7dc7c4329
|
Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 06:08:01 +00: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 |
Vicent Llopis
|
c200e1af32
|
refactor: optimizado select
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 15:09:41 +01:00 |
Pau
|
192d7336a4
|
change test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 14:22:09 +01:00 |
Pau
|
6e58b1de8b
|
refs #4511 Changed fixtures to fix broken test @30min
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 14:17:24 +01:00 |
Vicent Llopis
|
dd8117b6a4
|
feat: añadidas traducciones
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 14:02:31 +01:00 |
Pau
|
56893ea58b
|
Merge branch 'dev' into 4511-kkear-expedition.itemFk
|
2022-11-15 13:42:06 +01:00 |
Alex Moreno
|
8dcd567a68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 13:20:52 +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 |
Alex Moreno
|
7a7da9508f
|
feat: workerWelcomeEmail
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 12:56:30 +01:00 |
Alex Moreno
|
cba3c38ba6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-11-15 12:55:07 +01:00 |
Vicent Llopis
|
fc516d4029
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 12:23:59 +01:00 |
Vicent Llopis
|
843e5ae736
|
feat: traducciones en los modelos
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 11:41:57 +01:00 |
Pau
|
90f69da3ca
|
Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 10:30:14 +00:00 |
Pau
|
4e2741a9cd
|
Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 11:01:02 +01:00 |
Pau
|
31a0aae8e9
|
Fixed notification not getting inserted
|
2022-11-15 11:01:00 +01:00 |
Pau
|
2b3b2086d9
|
Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 09:39:03 +00:00 |
Alex Moreno
|
53fb575fc0
|
Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 09:38:52 +00:00 |
Pau
|
f1b706d178
|
Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 10:37:13 +01:00 |
Pau
|
6339634756
|
refs #4457 move sql, remove await on front @2h
|
2022-11-15 10:37:12 +01:00 |
Alex Moreno
|
31eb2c86b5
|
Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 09:20:26 +00:00 |
Alex Moreno
|
8f4ac8fcc9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-11-15 10:12:29 +01:00 |
Joan Sanchez
|
fdb35850ee
|
Merge branch 'dev' into 4811-invoice_storage
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 09:05:39 +00:00 |
Joan Sanchez
|
174dd1fe5c
|
feat(invoice): send invoice from stored PDF - closes #4811
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 10:00:21 +01:00 |
Vicent Llopis
|
b5f67425ff
|
Merge branch 'dev' into jenkins_backTest_solved
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 08:54:05 +00:00 |
Alex Moreno
|
6fdcb52e2a
|
Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 08:43:19 +00:00 |
Vicent Llopis
|
a58379579f
|
Merge branch 'dev' into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 08:38:53 +00:00 |
Pau
|
60d12826e4
|
Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 07:59:53 +00:00 |
Pau
|
9d0cd36afe
|
Merge branch 'dev' into 4457'
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 08:49:21 +01:00 |
Pau
|
dc64d619f6
|
Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 07:34:19 +00:00 |
Pau
|
5c249dcbcc
|
refs #4767 @1h30m
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 08:24:10 +01:00 |
Alex Moreno
|
bcab493f37
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
|
2022-11-15 07:33:53 +01:00 |
Pau
|
29b299f36a
|
Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 06:10:31 +00:00 |
Pau
|
e6e70703a6
|
Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 06:09:40 +00:00 |
Pau
|
3610b3bf19
|
Merge branch 'dev' into 4492-item.create-same-as-item.isLaid
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 06:07:56 +00:00 |
Alex Moreno
|
db3a6df23d
|
feat(worker): new worker
|
2022-11-14 15:19:16 +01:00 |
Vicent Llopis
|
63142a8861
|
refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 15:16:21 +01:00 |
Vicent Llopis
|
0637050375
|
fix: frontTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 15:11:33 +01:00 |
Vicent Llopis
|
216108a576
|
refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 15:01:22 +01:00 |
Vicent Llopis
|
386e304958
|
fix: modelo incorreto para la transacción
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 14:52:08 +01:00 |
Alexandre Riera
|
23ed6c6031
|
refs #3963 test front done
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 14:30:35 +01:00 |
Alexandre Riera
|
99aa674995
|
refs #3963 working on mockup
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 14:29:40 +01:00 |
Vicent Llopis
|
d6a0580203
|
feat: traducciones modelo Ticket
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 11:08:23 +01:00 |
Vicent Llopis
|
6e94d7f68e
|
fix: nombre variable incorrecto
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 11:00:13 +01:00 |
Alexandre Riera
|
dc06ba7d89
|
Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 09:58:18 +01:00 |
Alexandre Riera
|
7dd87b1ea8
|
refs #4700 icons future
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 09:56:23 +01:00 |
Alexandre Riera
|
05f0eba741
|
Merge branch 'split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 09:06:51 +01:00 |
Alexandre Riera
|
c16210dd8a
|
refs #4700 working on e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-11 15:58:11 +01:00 |
Alex Moreno
|
0f2c0fc490
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-11-11 12:48:32 +01:00 |
Vicent Llopis
|
7e50f23563
|
refacor code
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-11 08:55:56 +01:00 |
Vicent Llopis
|
a5b20bfb03
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
|
2022-11-11 08:53:10 +01:00 |
Vicent Llopis
|
9d06f5c0f0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-11 07:47:29 +01:00 |
Alexandre Riera
|
117e2c03f5
|
refs #4700 tests back y empezando e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-10 15:54:00 +01:00 |
Pau
|
9004839e00
|
Merge branch '4484-ticket-withOutNegatives-default-true' of https://gitea.verdnatura.es/verdnatura/salix into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 14:53:14 +01:00 |
Pau
|
01fe8c8997
|
requested changes
|
2022-11-10 14:53:08 +01:00 |
Vicent Llopis
|
918ea3030d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 14:41:12 +01:00 |
Alex Moreno
|
4c216c4556
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-10 14:40:55 +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 |
Alex Moreno
|
517422be8c
|
refactor: not use axios
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-10 13:32:07 +01:00 |
Pau
|
c15d40b237
|
Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 08:45:15 +00:00 |
Pau
|
2704017486
|
check default true
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 09:43:19 +01:00 |
Joan Sanchez
|
5a56fb4b6a
|
Merge pull request '4590-Refactor-isBox-freightItemFk' (!1079) from 4590-Refactor-isBox-freightItemFk into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1079
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-11-10 07:50:10 +00:00 |
Pau
|
c4044ff70d
|
Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-10 07:40:14 +00:00 |
Pau
|
8b06243041
|
Fix link being the whole column
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 08:36:26 +01:00 |
Pau
|
8dd6012b1f
|
Added worker descriptor popover
|
2022-11-10 08:27:47 +01:00 |
Pau
|
c53e309071
|
Fix typo
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 08:19:54 +01:00 |
Pau
|
1327f0ae9d
|
Added requested changes, refs #4507 @1:20h
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 08:18:05 +01:00 |
Pau
|
eab9289408
|
Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 06:26:05 +00:00 |
Pau
|
b1a068ea48
|
Merge branch '4157-send-sms-to-routes' of https://gitea.verdnatura.es/verdnatura/salix into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 07:23:10 +01:00 |
Pau
|
891cd6b474
|
Added requestes changes refs #4157
|
2022-11-10 07:23:08 +01:00 |
Pau
|
747404521a
|
Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 06:22:24 +00:00 |
Pau
|
da8ebf1509
|
Merge branch '4492-item.create-same-as-item.isLaid' of https://gitea.verdnatura.es/verdnatura/salix into 4492-item.create-same-as-item.isLaid
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 07:17:57 +01:00 |
Pau
|
638fd62aae
|
added requested changes, refs #4492 @40m
|
2022-11-10 07:17:54 +01:00 |
Pau
|
dd10ec3154
|
Merge branch 'dev' into 4492-item.create-same-as-item.isLaid
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 06:15:00 +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 |
Alex Moreno
|
5339bc1143
|
feat(recoverPassword): use loopback
|
2022-11-09 14:51:30 +01:00 |
Alex Moreno
|
cace29f75c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-11-09 14:20:17 +01:00 |
Alexandre Riera
|
ff2ee4401e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4547-informe-compensacion
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-09 13:26:54 +01:00 |
Vicent Llopis
|
0bd09ae366
|
fix: delete unnecessary column
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-09 12:06:51 +01:00 |
Vicent Llopis
|
1ea5ffa6d3
|
fix: backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-09 12:04:19 +01:00 |
Vicent Llopis
|
be46f30dd7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-09 10:32:24 +01:00 |
Vicent Llopis
|
574f2757f4
|
refactor code
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-09 10:19:27 +01:00 |
Vicent Llopis
|
79e9edcee9
|
delete: old code
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-09 09:26:28 +01:00 |
Vicent Llopis
|
2ab475791c
|
refactor code
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-09 09:16:58 +01:00 |
Vicent Llopis
|
dbd0e77e12
|
feat: send mail with the invoice pdf
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-09 09:14:32 +01:00 |
Vicent Llopis
|
9bcfebcae6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-09 07:26:56 +01:00 |
Alex Moreno
|
8c137b57f4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-11-09 07:10:35 +01:00 |
Alexandre Riera
|
ff00066138
|
refs #4700 tests front y fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 15:56:58 +01:00 |
Guillermo Bonet
|
6744b3f797
|
added collection-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 14:40:38 +01:00 |
Pau
|
2fc12dff52
|
#4457 @1h notifications working, need refactor ACL
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-08 13:59:00 +01:00 |
Pau
|
e85505ee8e
|
#4457 implement notification system, @1h 30m
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-08 12:26:01 +01:00 |
Pau
|
f21907855f
|
Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
|
2022-11-08 10:04:47 +01:00 |
Pau
|
f45eaa07f9
|
refs #4511 fixed test, changed drop to rename @1h
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 09:45:56 +01:00 |
Pau
|
f1e832ee66
|
Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 08:06:30 +00:00 |
Vicent Llopis
|
9cd57bfde9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 08:56:56 +01:00 |
Vicent Llopis
|
4d81991d86
|
delete focus test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 08:47:08 +01:00 |
Vicent Llopis
|
8d7296cc8f
|
feat: add backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 08:46:47 +01:00 |
Vicent Llopis
|
11459bbd56
|
refactor: change column name
|
2022-11-08 08:46:36 +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 |
Pau
|
ab3d0a2549
|
Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 06:59:45 +00:00 |
Vicent Llopis
|
51b047eacc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 07:40:31 +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
|
7fc18c89df
|
feat: error handlers
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-07 13:57:54 +01:00 |
Vicent Llopis
|
ffa0ff650e
|
feat: add time control
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-07 12:21:14 +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
|
2165ca0f34
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-11-07 09:34:24 +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
|
5051f8b590
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
|
2022-11-07 07:24:44 +01:00 |
Vicent Llopis
|
6858de83a3
|
feat: backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 14:55:47 +01:00 |
Vicent Llopis
|
892094f85c
|
feat: add backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 13:41:45 +01:00 |
Vicent Llopis
|
98cc2b5866
|
refactor: endpoint
|
2022-11-04 13:41:38 +01:00 |
Vicent Llopis
|
626355d251
|
fix: sustituido insert por insert ignore
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 12:37:07 +01:00 |
Vicent Llopis
|
ae513fb2b3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 09:12:16 +01:00 |
Vicent Llopis
|
158fc56555
|
Merge branch 'dev' into 3951-invoiceOut.index_downloadPdfs
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-04 08:03:55 +00:00 |
Joan Sanchez
|
f53b74c04c
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 09:02:33 +01:00 |
Joan Sanchez
|
16554c23a8
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 09:02:18 +01:00 |
Pau
|
6a5ba6a929
|
Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 07:36:46 +00:00 |
Pau
|
7ff4c4d33c
|
Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 07:35:01 +00:00 |
Pau
|
a975f37fc3
|
Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 07:27:15 +00:00 |
Pau
|
ae95b5d3ef
|
Merge branch 'dev' into 4492-item.create-same-as-item.isLaid
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 07:22:37 +00:00 |
Alexandre Riera
|
98dd5963bf
|
refs #4547 traduccion añadida
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-04 08:15:12 +01:00 |
Pau
|
37292cee89
|
remove comments
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 08:12:46 +01:00 |
Alex Moreno
|
28edb2e53a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
|
2022-11-04 08:09:15 +01:00 |
Vicent Llopis
|
e1d187ef68
|
Merge branch 'dev' into 3951-invoiceOut.index_downloadPdfs
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-04 07:01:45 +00:00 |
Pau
|
11cf1ba414
|
fix back test error
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 07:50:54 +01:00 |
Pau
|
42dd56a78c
|
Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 06:46:23 +00:00 |
Pau
|
7d7af6eb49
|
Modified model to allow modifications to isLaid
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 07:42:21 +01:00 |
Vicent Llopis
|
ab739f412f
|
feat: add test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-03 15:00:55 +01:00 |
Alexandre Riera
|
8e5f518eb6
|
refs #4753 texto y fecha sms cambiados
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-03 14:16:11 +01:00 |
Vicent Llopis
|
b6d3a08871
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-03 10:17:46 +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 |
Alex Moreno
|
36894c31de
|
Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-03 08:39:04 +00:00 |
Alexandre Riera
|
6663b600a7
|
Merge branch 'dev' into 4644-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-03 07:54:06 +00:00 |
Alex Moreno
|
e370f20cec
|
Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-03 07:49:18 +00:00 |
Alexandre Riera
|
3376f301b1
|
Merge branch 'dev' into 4644-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-03 07:49:02 +00:00 |
Alex Moreno
|
12df808844
|
Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-03 07:43:14 +00:00 |
Joan Sanchez
|
254a56cd78
|
Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-03 07:42:41 +00:00 |
Alex Moreno
|
d100ab4112
|
Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-03 07:39:47 +00:00 |
Joan Sanchez
|
009e9e3bb7
|
Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-03 07:35:02 +00:00 |
Alexandre Riera
|
8304c849e4
|
Merge branch 'dev' into 2818-sincronizar-usuarios
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-03 07:34:49 +00:00 |
Alexandre Riera
|
4be3106245
|
Merge branch 'dev' into 4645-refactor-entry.ref
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-03 07:29:49 +00:00 |
Alexandre Riera
|
0736fb4818
|
Merge branch 'dev' into 2818-sincronizar-usuarios
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-03 07:28:47 +00:00 |
Alex Moreno
|
ec9139f985
|
Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-03 07:24:05 +00:00 |
Alex Moreno
|
6d85cf7cf5
|
translations
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-03 08:21:03 +01:00 |
Alex Moreno
|
67697784cd
|
Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-03 06:48:38 +00:00 |
Vicent Llopis
|
35c50cb314
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs
|
2022-11-03 07:11:54 +01:00 |
Juan Ferrer
|
dc2b61a0a4
|
Merge branch 'dev' into 2818-sincronizar-usuarios
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 15:20:11 +00:00 |
Alexandre Riera
|
908908a643
|
refs #4547 correcciones
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-02 15:54:23 +01:00 |
Vicent Llopis
|
f96fc0f91e
|
Merge branch 'dev' into 3852-client.search-panel2
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 14:13:41 +00:00 |
Alex Moreno
|
621158badc
|
fix(checkInbox): fix condition
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 15:11:36 +01:00 |
Vicent Llopis
|
8c4e70c11d
|
Merge branch 'dev' into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 14:06:06 +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 |
Vicent Llopis
|
7eaafa36a0
|
Merge branch 'dev' into 4616-ticket.sale_mana
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 13:42:26 +00:00 |
Vicent Llopis
|
6df74facdc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
|
2022-11-02 14:23:20 +01:00 |
Vicent Llopis
|
57564325e1
|
feat: añadidas opciones para confirmar o no confirmar el registro de horas
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 14:22:18 +01:00 |
Alexandre Riera
|
8d8d217fe7
|
refs #4547 formateo arreglado
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-02 13:59:13 +01:00 |
Alex Moreno
|
59e66e1f49
|
typo
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-02 13:55:06 +01:00 |
Alex Moreno
|
2c3b735650
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf
|
2022-11-02 13:49:09 +01:00 |
Alex Moreno
|
6a9134d8f9
|
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-02 13:48:36 +01:00 |
Alex Moreno
|
9c671ed3a4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-02 13:47:00 +01:00 |
Alex Moreno
|
acf76aeeef
|
Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 12:25:38 +00:00 |
Alex Moreno
|
84a5f3986b
|
feat(worker): createWorker refs #4658
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 13:24:35 +01:00 |
Alex Moreno
|
2a8a8ed84a
|
Merge branch 'dev' into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 12:01:11 +00: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
|
4cded53347
|
Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-02 11:23:03 +00:00 |
Joan Sanchez
|
2fba17ab15
|
Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-02 09:33:27 +00:00 |
Alexandre Riera
|
dc3ee2c30d
|
refs #2818 sincronización quitada en test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 10:18:38 +01:00 |
Alex Moreno
|
9891f7060d
|
fix(smart-table): monitor only ticketFilter use url and add ?q in routes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 09:40:09 +01:00 |
Joan Sanchez
|
fe3ebe8e0c
|
Merge branch 'dev' into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 06:43:43 +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
|
755a1667dc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-02 07:35:04 +01:00 |
Joan Sanchez
|
33c92a0f24
|
Merge pull request '4563-Worker-Description-workerDisableExcluded-checkbox' (!1076) from 4563-Worker-Description-workerDisableExcluded-checkbox into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1076
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-11-02 06:34:49 +00:00 |
Alex Moreno
|
fc7a39e910
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 07:33:07 +01:00 |
Alex Moreno
|
e7047e982f
|
fix e2e
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-10-31 15:07:22 +01:00 |
Vicent Llopis
|
d9107719fa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
|
2022-10-31 15:04:33 +01:00 |
Vicent Llopis
|
3243d35bd7
|
feat: send email
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-31 14:48:37 +01:00 |
Pau
|
ff5e601a1e
|
Item islaid and test
|
2022-10-31 14:43:31 +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
|
36c0cc1a38
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
|
2022-10-31 14:12:40 +01:00 |
Vicent Llopis
|
1f2ea2c4d8
|
fix: incorrect number of params
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-31 13:30:08 +01:00 |
Vicent Llopis
|
273a8cd7c7
|
refactor code
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-31 13:00:32 +01:00 |
Joan Sanchez
|
231575d23e
|
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-10-31 12:40:07 +01:00 |
Joan Sanchez
|
d34936015b
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-31 12:39:54 +01:00 |
Joan Sanchez
|
463d3e6e12
|
Fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-31 12:39:26 +01:00 |
Vicent Llopis
|
b17fe0d18c
|
refator code
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-31 09:55:11 +01:00 |
Pau
|
0739608de3
|
Merge branch 'dev' into 4457-hasInvoiceElectronic
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-31 07:57:50 +01:00 |
Vicent Llopis
|
786ba0d614
|
feat: inserta fichadas de los teletrabajadores
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-31 07:34:34 +01:00 |
Alexandre Riera
|
1246a65f32
|
refs #4547 informe y email generados
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-28 14:49:22 +02: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 |
Alex Moreno
|
9170c22d6f
|
fix send email
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-28 09:21:28 +02:00 |
Alex Moreno
|
e9731c4ac0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
|
2022-10-28 09:11:40 +02:00 |
Alex Moreno
|
9225e8f176
|
fix tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-27 15:11:57 +02:00 |
Pau
|
00061caa65
|
Merge branch '4490-transfer-tickets-between-clients' of https://gitea.verdnatura.es/verdnatura/salix into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-27 09:05:06 +02:00 |
Alex Moreno
|
926ab0e35c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
|
2022-10-27 09:05:05 +02:00 |
Pau
|
c576e503cf
|
fix httpBack.flush error
|
2022-10-27 09:05:05 +02:00 |
Alex Moreno
|
3ffc098b56
|
feat(privileges): check if user has role from userToUpdate
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-27 09:01:09 +02:00 |
Pau
|
d64f0e4b34
|
Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-27 06:52:08 +00:00 |
Pau
|
04514804b7
|
fix tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-27 08:51:22 +02:00 |
Pau
|
bfb9484e02
|
Merge branch '4490-transfer-tickets-between-clients' of https://gitea.verdnatura.es/verdnatura/salix into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-27 08:46:24 +02:00 |
Pau
|
d4a22f7962
|
Apply requested changes
|
2022-10-27 08:46:22 +02:00 |
Alex Moreno
|
99fca9834f
|
Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-27 06:10:14 +00:00 |
Vicent Llopis
|
1d908002e2
|
feat: add backTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 14:25:27 +02:00 |
Vicent Llopis
|
c0b95564c3
|
refactor: borrado codigo sql innecesario
|
2022-10-26 14:25:17 +02:00 |
Alexandre Riera
|
bc6e639746
|
refs #4644 cambio en un test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 13:23:54 +02:00 |
Vicent Llopis
|
b39b28e43d
|
refactor: añadido salto de lineas
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-26 13:10:17 +02:00 |
Alexandre Riera
|
405bc8765a
|
refs #4645 valores ref cambiados
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-26 12:48:48 +02:00 |
Vicent Llopis
|
65e32f5e7f
|
feat: client search panel add find by zone
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 12:40:13 +02:00 |
Vicent Llopis
|
350c516bb1
|
feat: cancelar petición cuando esta calculando el packaging
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 10:36:41 +02:00 |
Alexandre Riera
|
d243f9a87d
|
refs #4644 checkbox añadido
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 10:03:13 +02:00 |
Vicent Llopis
|
e0e015c268
|
fix: backTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 09:49:58 +02:00 |
Vicent Llopis
|
ec81b12239
|
refactor: el UserError se lanza en back
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 09:33:03 +02:00 |
Vicent Llopis
|
21e2945d4f
|
refactor: delete destroyAll
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 09:30:17 +02:00 |
Vicent Llopis
|
c671540a7f
|
refactor: renombrada variable
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 09:04:53 +02:00 |
Vicent Llopis
|
d1e2b1f7d5
|
refactor: tranducciones
|
2022-10-26 09:02:54 +02:00 |
Alex Moreno
|
a07a45c1b6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-10-26 08:40:49 +02:00 |
Vicent Llopis
|
3110172c54
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3811-ticket.sale_updatePrice
|
2022-10-26 08:39:58 +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 |
Alex Moreno
|
f65d06fc7d
|
fixes #4073
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-26 08:27:28 +02:00 |
Vicent Llopis
|
1e1d4f00f1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
|
2022-10-26 08:26:23 +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
|
607e9010e6
|
Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 12:36:35 +00:00 |
Joan Sanchez
|
4334907d91
|
fix(database): updated sql files
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 14:09:21 +02:00 |
Pau
|
d83972d3fa
|
Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 12:07:32 +00:00 |
Pau
|
3cfa56d610
|
Add deliveryBoss ACL to the front
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 13:15:19 +02:00 |
Pau
|
e72d57150a
|
Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 10:40:57 +00:00 |
Alex Moreno
|
ac8c4b8ef0
|
Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 10:39:50 +00:00 |
Pau
|
296a743d8a
|
Fix test, remove console log
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 12:25:56 +02:00 |
Pau
|
7b04464848
|
Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 10:00:13 +00:00 |
Joan Sanchez
|
1196125350
|
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-10-25 11:58:47 +02:00 |
Alex Moreno
|
e1e13468a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 11:58:43 +02:00 |
Alex Moreno
|
3fd10dfc64
|
Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 09:58:17 +00:00 |
Pau
|
76d248131c
|
Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 09:45:25 +00:00 |
Pau
|
9089ba7346
|
requested changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 10:42:16 +02:00 |
Pau
|
ddbbfa4360
|
Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 07:46:39 +00:00 |
Pau
|
d937a1b505
|
Add acl
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 09:45:09 +02:00 |
Joan Sanchez
|
8f0b566935
|
Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-25 07:25:07 +00:00 |
Pau
|
a43e642ff7
|
Add transferclient
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 09:23:46 +02:00 |
Alex Moreno
|
e8500f926c
|
feat(invoiceIn): add email
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 08:19:56 +02:00 |
Vicent Llopis
|
931a891f71
|
fix: check client.email exists
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 08:09:23 +02:00 |
Vicent Llopis
|
8a3573474a
|
refactor: move 'lastEntries' to thrid position in descriptor
|
2022-10-25 07:40:32 +02:00 |
Alex Moreno
|
7cb8175b73
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf
|
2022-10-25 07:36:21 +02:00 |
Vicent Llopis
|
d18b22bb05
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 07:05:26 +02:00 |
Joan Sanchez
|
e80754f280
|
Added new SQL version
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-24 18:37:38 +02:00 |
Alex Moreno
|
9e0eab5a77
|
feat(invoiceIn): email
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-24 15:15:23 +02:00 |
Vicent Llopis
|
c77999871e
|
refs #3951
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-24 14:34:17 +02:00 |
Alex Moreno
|
6a17a634d4
|
hotFix(receipt): add receiptPdf
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-24 09:49:51 +02:00 |
Pau
|
30933220ac
|
#4507 greuge.js/json now insert userFk @2h
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-24 09:37:17 +02:00 |
Alex Moreno
|
d29d1ff538
|
Merge branch '4548-invoiceIn-pdf' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-24 08:27:12 +02:00 |
Pau
|
5bf425d8e3
|
Front test and sms require client #4157 @1h30m
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-24 08:22:04 +02:00 |
Alex Moreno
|
6c38835e8d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf
|
2022-10-24 08:20:25 +02:00 |
Alex Moreno
|
bcfbeb7032
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-10-21 12:41:39 +02:00 |
Joan Sanchez
|
cf0b750304
|
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-10-21 12:35:01 +02:00 |
Vicent Llopis
|
888f612dbb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-21 11:41:53 +02:00 |
Vicent Llopis
|
0f57a40aac
|
fix: backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-21 10:50:18 +02:00 |
Vicent Llopis
|
b06f5b7246
|
feat: cuando seleccionas 'allClients' no tiene en cuenta el 'clientsRange'
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-21 10:06:34 +02:00 |
Vicent Llopis
|
f968b19d1e
|
fix: testFront
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-21 09:08:17 +02:00 |
Vicent Llopis
|
c33cab7b10
|
fix: test back
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-21 09:01:08 +02:00 |
Vicent Llopis
|
2d0cb60b50
|
feat: check if uses mana
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-21 08:55:05 +02:00 |
Vicent Llopis
|
e7261573d7
|
delete focus
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-21 08:01:22 +02:00 |
Vicent Llopis
|
6f31bea21f
|
feat: update testBack
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-21 08:00:48 +02:00 |
Vicent Llopis
|
5da29fe381
|
refactor: unify duplicated code
|
2022-10-21 08:00:24 +02:00 |
Alex Moreno
|
066cf6f69b
|
add show dialog
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-20 15:11:56 +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
|
ca53ec7c23
|
Changed the location of the function
|
2022-10-20 15:04:59 +02:00 |
Pau
|
28bd535e2b
|
Implemented SMS to route clients
|
2022-10-20 15:04:25 +02:00 |
Vicent Llopis
|
29093d7d30
|
feat: en vez de consultar si el usuario está en la tabla workerMana, consultar es si el usuario está en un departamento que cuelga de ventas
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-20 14:25:55 +02:00 |
Vicent Llopis
|
b0471037a7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-20 08:49:08 +02:00 |
Vicent Llopis
|
bcc9acac0a
|
fix: tBack
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-20 08:41:00 +02:00 |
Vicent Llopis
|
51cad75298
|
fix: testFront
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-20 08:17:15 +02:00 |
Pau
|
8cbcb197bb
|
fix downloadPDF wrong method
|
2022-10-20 08:14:11 +02:00 |
Vicent Llopis
|
53112995bc
|
refactor: delete counter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-20 07:58:38 +02:00 |
Pau
|
2c98563cfa
|
Add buttons to bottom-right
|
2022-10-20 07:39:33 +02:00 |
Vicent Llopis
|
39f4445172
|
refator: endpoint name
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-20 07:23:57 +02:00 |
Vicent Llopis
|
abd2d9a849
|
fix: e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-19 15:10:43 +02:00 |
Alex Moreno
|
9ef835a077
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf
|
2022-10-19 15:10:22 +02:00 |
Joan Sanchez
|
7d502c6f57
|
Merge pull request 'Send delivery note to refund tickets' (!1086) from 3505-closure_refund into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1086
|
2022-10-19 13:00:18 +00:00 |
Alex Moreno
|
192e61a70d
|
hotFix(route_index): fix driverRoutePdf
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-19 14:54:13 +02:00 |
Vicent Llopis
|
390c5790d6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
|
2022-10-19 14:49:24 +02:00 |
Vicent Llopis
|
9d53360d50
|
feat: replaced await by recursive function
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-19 13:59:57 +02:00 |
Alex Moreno
|
ca138cc2be
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-19 08:23:19 +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
|
dc1b1bc1c3
|
Merge branch 'dev' into 4563-Worker-Description-workerDisableExcluded-checkbox
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-19 05:35:06 +00:00 |
Alex Moreno
|
c9073641aa
|
feat(invoiceInPdf): content
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 14:58:38 +02:00 |
Vicent Llopis
|
dc62841c3d
|
refator: trying to delete async and await
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 14:46:40 +02:00 |
Pau
|
9fa81fe9eb
|
Merge branch '2612-create-supplier' of https://gitea.verdnatura.es/verdnatura/salix into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 14:22:56 +02:00 |
Pau
|
c2fd1fa44d
|
fixed tests
|
2022-10-18 14:22:54 +02:00 |
Pau
|
73a69051a8
|
Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head Build queued...
Details
|
2022-10-18 12:01:04 +00: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 |
Pau
|
579299855f
|
Replaced one freightItemFk to IsBox
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-18 13:52:42 +02: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 |
Pau
|
db12ceb369
|
removed async from the redirect function
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 13:07:10 +02:00 |
Pau
|
470b4485d5
|
Fixed test and DB structure
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 12:58:44 +02:00 |
Vicent Llopis
|
ae3e3c3c49
|
fix: id model duplicated
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 12:37:06 +02:00 |
Pau
|
a204c6e2b0
|
Fixed the suppliers not appearing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 12:29:04 +02:00 |
Alex Moreno
|
a5ceee07e9
|
use loopback
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 11:50:16 +02:00 |
Vicent Llopis
|
5fce93abd5
|
refactor: change variables name
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 11:47:37 +02:00 |
Vicent Llopis
|
423454d19e
|
feat: add date-picker
|
2022-10-18 11:47:22 +02:00 |
Pau
|
f481cc3c97
|
Capitalizar
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-18 10:38:40 +02:00 |
Pau
|
89bbf35a87
|
Merge branch 'dev' into 4563-Worker-Description-workerDisableExcluded-checkbox
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 08:30:32 +00:00 |
Pau
|
1d8fb25325
|
Refactored according to the suggested changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 10:25:54 +02:00 |
Vicent Llopis
|
f95f977b69
|
fix: backTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 10:04:53 +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 |
Vicent Llopis
|
9f70a1d513
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 08:17:16 +02:00 |
Pau
|
047076f189
|
changed tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-18 07:14:40 +02:00 |
Alex Moreno
|
eb58839839
|
feat(invoiceIn): invoiceInPdf
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 15:13:27 +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 |
Pau
|
9290cd6fb6
|
Finished back tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 14:02:18 +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 |
Vicent Llopis
|
8ab6a50c73
|
try to fix frontTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 13:02:19 +02:00 |
Vicent Llopis
|
86d24ffede
|
refactor code
|
2022-10-17 13:02:03 +02:00 |
Pau
|
70c9c3d788
|
initial back test created, modified DB statetments
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 12:07:34 +02:00 |
Vicent Llopis
|
2d1b48280c
|
fix: backTest
|
2022-10-17 11:53:29 +02:00 |
Alex Moreno
|
57b2ae770d
|
fix(e2e)
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-17 11:44:29 +02:00 |
Vicent Llopis
|
dd10b79441
|
delete: throw error
|
2022-10-17 11:43:26 +02:00 |
Vicent Llopis
|
e5fd6adfe5
|
fix: delete throw error
|
2022-10-17 11:43:01 +02:00 |
Vicent Llopis
|
33092acee7
|
refactor: delete unnecessary code
|
2022-10-17 11:42:05 +02:00 |
Alex Moreno
|
79b970286c
|
refactor(claim_claimPickupEmail): use text template and external form
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 11:22:27 +02:00 |
Pau
|
cf50c4690a
|
Merge branch 'dev' into 4153-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-17 08:41:39 +00:00 |
Vicent Llopis
|
6924b05c8a
|
feat: add radio button
gitea/salix/pipeline/head Build queued...
Details
|
2022-10-17 10:19:07 +02:00 |
Pau
|
a4243e14c5
|
Created Back test for newSupplier
|
2022-10-17 10:17:56 +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
|
15ba6681af
|
refator: code unified
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 09:49:47 +02:00 |
Pau
|
dc53aac163
|
Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-17 07:32:50 +00:00 |
Pau
|
f0b1591b14
|
Remove debugging elements
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-17 09:22:50 +02:00 |
Pau
|
0cdee89ac3
|
Button removed when user does not have permissions
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-17 09:20:45 +02: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 |
Pau
|
1603619d81
|
removed debugging elements
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-17 07:38:54 +02:00 |
Pau
|
594cee12f3
|
add checks to the existence of object variables
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 07:35:02 +02:00 |
Alex Moreno
|
2b060a1437
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 07:32:32 +02:00 |
Pau
|
dc6c8f924d
|
feat: Create new Supplier
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-17 07:25:25 +02:00 |
Alex Moreno
|
6bfd54fc71
|
feat(verify): use user.verify
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 07:22:22 +02:00 |
Alex Moreno
|
3e746ceb7a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-10-14 14:47:42 +02:00 |
Vicent Llopis
|
a036578832
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-14 14:43:08 +02:00 |
Vicent Llopis
|
40075e7e21
|
fix: testFront
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-14 14:38:47 +02:00 |
Vicent Llopis
|
86b7e9cabe
|
fix: only can exists 'mana' or 'manaClaim' discount. Never both
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-14 14:30:37 +02:00 |
Vicent Llopis
|
2455a11c26
|
feat: changeMultipleDiscount uses the same popover than changeDiscount
|
2022-10-14 14:29:21 +02:00 |
Vicent Llopis
|
5918b3e0df
|
refactor: juan changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-14 09:30:09 +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 |
Vicent Llopis
|
50ec41dece
|
refator: cancel request
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-13 15:01:15 +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 |
Alex Moreno
|
74383b61e7
|
hotFix(monitor): use left join in ticketState
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-13 09:22:53 +02:00 |
Vicent Llopis
|
0d785695fe
|
feat: invoicing by (clientFk, addressFk)
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-11 12:24:06 +02:00 |
Pau
|
012cd68c89
|
Added menu to create a new supplier, not working
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-11 11:43:01 +02:00 |
Vicent Llopis
|
53f78a98d2
|
feat: update message while globalInvoicing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-11 10:04:13 +02:00 |
Vicent Llopis
|
4f5abb709a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-11 09:14:14 +02:00 |
Vicent Llopis
|
bfefec397e
|
feat: add testFront
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-11 09:13:29 +02:00 |
Vicent Llopis
|
1a38fc307f
|
delete: duplicated keybinding
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-11 08:42:59 +02:00 |
Vicent Llopis
|
9c52508a88
|
feat: add total labels
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-11 08:40:22 +02:00 |
Alex Moreno
|
c29b8c99d0
|
Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-11 05:43:15 +00:00 |
Alex Moreno
|
e80197bd6f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-11 07:22:10 +02:00 |
Vicent Llopis
|
7b7e01f49e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-11 07:09:20 +02:00 |
Vicent Llopis
|
dbfc3d335d
|
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-11 07:06:45 +02:00 |
Joan Sanchez
|
e3606c7273
|
Updated unit test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-10 14:46:06 +02:00 |
Alex Moreno
|
5c4daee35e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-10 14:20:22 +02:00 |
Alex Moreno
|
c7a06baa63
|
Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-10 11:47:09 +00: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 |
Alex Moreno
|
a6c171d00a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
|
2022-10-10 13:05:00 +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 |
Vicent Llopis
|
8130cf9e6a
|
feat: separate globalInvoicing in 2 parts
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-10 12:40:10 +02:00 |
Joan Sanchez
|
7f023d7456
|
Set user default warehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-10 12:23:40 +02:00 |
Joan Sanchez
|
990a1b3c67
|
250 nodes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-10 10:33:08 +02:00 |
Joan Sanchez
|
31d1b84bb9
|
Unfold when there's less than 100 nodes to show
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-10 10:25:59 +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 |
Alex Moreno
|
e497ddd664
|
fix: add td-editable
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-10 09:21:14 +02:00 |
Alex Moreno
|
18cd34bccb
|
fix(travel_extraCommunity): css
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-10 08:57:41 +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
|
9befa2531b
|
Merge branch 'hotFix_travel_extraCommunity-css' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travel_extraCommunity-css
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-10 07:29:26 +02:00 |
Joan Sanchez
|
934c0d0169
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-10 07:28:10 +02:00 |
Alex Moreno
|
49e82156cf
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travel_extraCommunity-css
|
2022-10-10 07:10:25 +02:00 |
Joan Sanchez
|
3dee50a796
|
Updated method accessType
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-09 20:14:14 +02:00 |
Alex Moreno
|
00d5876f88
|
hotFix(travel_extraCommunity): fix css
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-07 14:35:16 +02:00 |
Vicent Llopis
|
bb26fa6502
|
feat: add tFront
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-07 13:49:42 +02:00 |
Joan Sanchez
|
587da840c0
|
Fix
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-07 12:16:30 +02:00 |
Joan Sanchez
|
6c5acc75eb
|
Consumption fix
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-07 12:00:06 +02:00 |
Alex Moreno
|
94a51db3d5
|
hotFix(ticket_request): autocomplete buyer
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-07 10:56:12 +02:00 |
Vicent Llopis
|
deb8a00dfb
|
feat: add backRoutes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-07 10:47:54 +02:00 |
Vicent Llopis
|
1894492a2c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-07 09:26:51 +02:00 |
Vicent Llopis
|
3da948f3f9
|
refactor: delete unnecessary lines
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-07 09:17:14 +02:00 |
Pau
|
4f25961988
|
Created checkbox and logic, package-lock
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-07 08:33:45 +02:00 |
Vicent Llopis
|
2e91698c1e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-07 08:19:08 +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 |
Javi Gallego
|
d5592d6a0f
|
sin toClientId
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-06 15:19:55 +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
|
8ccb47d741
|
Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1073
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-10-06 11:54:16 +00: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 |
Javi Gallego
|
d73dab3454
|
Merge branch 'dev' into 4090-global_invoincing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 13:01:56 +02:00 |
Pau
|
3376293d1a
|
Added user icon and fixed icon not updating
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-10-06 11:54:14 +02:00 |
Vicent Llopis
|
c8d270499b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 11:50:11 +02:00 |
Vicent Llopis
|
d427c3a6db
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4369-ticket.request.create_getItemTypeWorker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 11:48:31 +02:00 |
Vicent Llopis
|
37601934f5
|
feat: first option to delete and update
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 11:40:46 +02:00 |
Joan Sanchez
|
8f3e09b88f
|
Merge branch 'dev' into 4033-route
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-06 08:23:19 +00:00 |
Vicent Llopis
|
a3a432c753
|
fix: delete one or more expeditions
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-06 10:18:19 +02:00 |
Pau
|
1165e050eb
|
feat: workerDisableExcluded update DB field
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-06 10:18:08 +02:00 |
Vicent Llopis
|
26d04ce2d2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 10:08:29 +02:00 |
Vicent Llopis
|
ddbe1057ad
|
feat: add new section
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 09:47:53 +02:00 |
Joan Sanchez
|
f2eaa9d0e5
|
Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 06:28:00 +00:00 |
Vicent Llopis
|
434db10ac9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 07:22:16 +02:00 |
Joan Sanchez
|
fd219f853f
|
Merge branch 'dev' into 4581-client.web-access
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-05 14:26:03 +00:00 |
Joan Sanchez
|
b134aeb0ea
|
Mock report pdf
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-05 16:19:07 +02:00 |
Vicent Llopis
|
2f17257e46
|
feat: add new sub section itemShelving
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-05 15:13:48 +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 |
Joan Sanchez
|
3d36c0339a
|
Merge branch 'dev' into 4592-jenkins_tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-05 12:05:10 +00: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 |