 Alexandre Riera
|
7720c32bc4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-13 09:58:03 +01:00 |
 Alex Moreno
|
d7e8c4fafd
|
fix(print_invoiceIn): translation invoice to receipt
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-13 09:28:44 +01:00 |
 Joan Sanchez
|
c489c4c6a9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-13 08:55:01 +01:00 |
 Guillermo Bonet
|
868c2aaaef
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-12 15:25:51 +01:00 |
|
Alex Moreno
|
5bb66fec3f
|
test(docuware): back tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-12 15:16:38 +01:00 |
|
Joan Sanchez
|
54356ece7d
|
fix(monitor): refresh monitor when using ng-for track
gitea/salix/pipeline/head This commit looks good
Details
Refs: #5083
|
2023-01-12 13:53:38 +01:00 |
 Pau
|
e05fa7c747
|
Merge branch 'master' into #5081-hotfix-sms-faltas
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-12 13:00:01 +01:00 |
|
Pau
|
d5a7691b9c
|
add controller function
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-12 12:56:51 +01:00 |
|
Pau
|
2678d59191
|
front test expected old value
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-12 11:57:20 +01:00 |
 Vicent Llopis
|
da8b6b7f2d
|
fix: comprueba que hay registros
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-12 11:52:27 +01:00 |
|
Pau
|
b6de50848a
|
refs #5081 fix sms faltas
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-12 11:48:44 +01:00 |
|
Vicent Llopis
|
4b60aacbbe
|
refactor: añadidos valores a piñon a la tabla workerTimeControlConfig
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-12 08:50:03 +01:00 |
|
Joan Sanchez
|
882cf6b9c1
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
|
2023-01-12 08:36:24 +01:00 |
|
Vicent Llopis
|
352fba9acf
|
Merge branch 'dev' into 5035-intermittent_backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-12 07:32:44 +00:00 |
|
Alex Moreno
|
c2f4648b5c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-12 07:54:09 +01:00 |
|
Guillermo Bonet
|
d448f41ac1
|
refs #4975 Changed description of last method
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-11 15:39:33 +01:00 |
|
Alex Moreno
|
9f324483d6
|
refactor(docuware): only use axios and refactor all
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-11 15:19:09 +01:00 |
|
Pau
|
c908a71ebf
|
Merge branch 'dev' into 4875-fix-back-tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-11 13:22:40 +00:00 |
|
Pau
|
30524e382b
|
Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-11 09:23:40 +00:00 |
|
Alex Moreno
|
b8fe919b2a
|
feat(docuware): upload deliveryNote file
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-10 15:03:23 +01:00 |
|
Vicent Llopis
|
6f94987392
|
Merge branch 'dev' into 2952-ticket.sale-checked
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-10 13:11:06 +00:00 |
|
Pau
|
e0cf45546e
|
Merge branch 'dev' into 4875-fix-back-tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-10 12:57:39 +00:00 |
|
Pau
|
4f2472ea90
|
Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-10 13:56:15 +01:00 |
|
Pau
|
d540e278eb
|
refs #4605 @30min
gitea/salix/pipeline/head This commit is unstable
Details
|
2023-01-10 13:52:30 +01:00 |
|
Vicent Llopis
|
984a3294f9
|
Merge branch 'dev' into 4846-claim.search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-10 11:58:00 +00:00 |
|
Alexandre Riera
|
9f1c6e6d1d
|
Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-10 10:48:10 +00:00 |
|
Alexandre Riera
|
6bdbd77640
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone
|
2023-01-10 10:15:41 +01:00 |
|
Vicent Llopis
|
ac3e68d846
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-intermittent_backTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-10 10:14:46 +01:00 |
|
Vicent Llopis
|
ff653ad834
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-10 09:18:02 +01:00 |
|
Alexandre Riera
|
28ac2677a3
|
Merge branch 'dev' into 4937-marcar-verRecibo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-10 08:02:51 +00:00 |
|
Joan Sanchez
|
4cfa63918f
|
Merge branch 'dev' into 4875-fix-back-tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-10 07:41:26 +00:00 |
|
Vicent Llopis
|
eb3ed95b22
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
|
2023-01-10 08:32:44 +01:00 |
|
Alexandre Riera
|
07fc5b69ad
|
Merge branch 'dev' into 4926-add-itemPackingOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-10 07:32:03 +00:00 |
|
Vicent Llopis
|
cdee85e1e8
|
refacotor: change description
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-10 08:31:32 +01:00 |
|
Guillermo Bonet
|
f23eb9f4ad
|
refs #4975 Added call to last method in upload
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-09 18:28:09 +01:00 |
|
Alex Moreno
|
382aad2622
|
feat(docuware): upload and send pdf
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-09 15:11:53 +01:00 |
|
Guillermo Bonet
|
2803de9445
|
refs #4975 Return JSON {version:xxx}
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-05 14:20:47 +01:00 |
 Robert Ferrús
|
6891da4863
|
refactor(invoiceOut): updated translation
gitea/salix/pipeline/head This commit looks good
Details
Refs #4857
|
2023-01-05 11:43:08 +01:00 |
|
Vicent Llopis
|
1aa21c16b5
|
refactor: borrado join a worker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-05 11:42:21 +01:00 |
|
Vicent Llopis
|
810a1afcd9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
|
2023-01-05 11:40:25 +01:00 |
|
Pau
|
f0761a92a2
|
reactivate working tests
|
2023-01-05 09:26:11 +01:00 |
|
Alex Moreno
|
46f36e1de1
|
try
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-04 15:03:45 +01:00 |
|
Alex Moreno
|
021c475de7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2
|
2023-01-04 09:39:26 +01:00 |
|
Pau
|
56354ba771
|
reactivate test
|
2023-01-03 13:24:44 +01:00 |
|
Alexandre Riera
|
ac56744244
|
Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-03 12:15:26 +00:00 |
|
Vicent Llopis
|
415fa04e3b
|
refs #2952 feat: add chips
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-03 13:06:30 +01:00 |
|
Vicent Llopis
|
25dad4b358
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
|
2023-01-03 13:03:36 +01:00 |
|
Alexandre Riera
|
c6ad9a6aff
|
Merge branch 'dev' into 4937-marcar-verRecibo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-03 12:00:39 +00:00 |
|
Pau
|
4dee2313f4
|
Merge branch 'dev' into 4875-fix-back-tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-03 12:53:03 +01:00 |
|
Alexandre Riera
|
2eea1e68e8
|
Merge branch 'dev' into 4926-add-itemPackingOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-03 11:45:35 +00:00 |
|
Vicent Llopis
|
fa58ac2462
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-03 09:13:47 +01:00 |
|
Vicent Llopis
|
fe7f388f3d
|
Merge branch 'dev' into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-03 08:07:31 +00:00 |
|
Alexandre Riera
|
9887f87dd3
|
refs #5051 pending added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-03 08:34:46 +01:00 |
|
Alexandre Riera
|
96f2e4b542
|
refs #5051 skipped tests and changed fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-02 13:35:33 +01:00 |
|
Alexandre Riera
|
7fcc787a69
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-02 07:14:59 +01:00 |
|
Alexandre Riera
|
f027a7b07f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4937-marcar-verRecibo
|
2023-01-02 07:12:10 +01:00 |
|
Pau
|
edcc55df26
|
refs #4875 @3h disable random to be able to test with some kind of reliability
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-29 10:01:38 +01:00 |
|
Alexandre Riera
|
502461fde5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4926-add-itemPackingOut
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-28 13:25:10 +01:00 |
|
Vicent Llopis
|
d5b626434b
|
refactor: add translations, change css...
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-28 12:42:51 +01:00 |
|
Vicent Llopis
|
ab0af27f8b
|
refactor: delete changes in ticket.sale-checked
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-28 12:23:41 +01:00 |
|
Vicent Llopis
|
d0ae97e41b
|
refactor: move changes from ticket.sale-checked to ticket.sale-tracking
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-28 12:16:23 +01:00 |
|
Vicent Llopis
|
ba7e5d6a91
|
refator: se usa loopback cuando se puede
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-28 11:56:34 +01:00 |
|
Alexandre Riera
|
9971611a0b
|
Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-28 09:31:33 +00:00 |
|
Alexandre Riera
|
b6e17d3489
|
Merge branch 'dev' into 4971-filtrar-articulo
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-28 09:16:14 +00:00 |
|
Alexandre Riera
|
30197e9e15
|
Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-28 09:07:26 +00:00 |
|
Vicent Llopis
|
eed6d05e23
|
delete console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-28 08:51:39 +01:00 |
|
Vicent Llopis
|
eb4cb318ed
|
refactor: evitar join innecesarios en el filter general
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-28 08:43:02 +01:00 |
|
Alex Moreno
|
bee65f9c69
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2
|
2022-12-28 07:24:08 +01:00 |
|
Vicent Llopis
|
3dd0c79629
|
feat: add ItemShelvingSales/filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-27 15:00:49 +01:00 |
|
Alexandre Riera
|
c06c3dc6a7
|
refs #4957 saleChecked deleted
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-27 11:50:58 +01:00 |
|
Alexandre Riera
|
96a6f0b9d9
|
refs #4926 packingOut added
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-27 07:48:09 +01:00 |
|
Pau
|
1c1cc93ef4
|
Merge branch 'master' into Hotfix-crear-report-Factura-Electronica
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-26 06:18:47 +00:00 |
|
Alexandre Riera
|
d827795441
|
refs #4930 agency changed for zone
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-23 12:38:05 +01:00 |
|
Vicent Llopis
|
fb325d5e65
|
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-12-23 12:34:51 +01:00 |
|
Vicent Llopis
|
29e66157ea
|
fix: se excluyen los test de back que fallan intermitente
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-23 12:29:28 +01:00 |
|
Vicent Llopis
|
d3a9e9ac89
|
delete: columnas que ya no existen en la tabla
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-23 12:17:24 +01:00 |
|
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 |
|
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 |