Alex Moreno
|
bd82bb011a
|
fix(transferInvoice): separate invoice functionality from generating PDF and adapt tests
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-31 08:44:30 +02:00 |
Sergio De la torre
|
1944a4f308
|
Merge branch 'dev' into 4021_packaging
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-31 06:43:20 +00:00 |
Jorge Penadés
|
eb15262fb0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-31 08:37:28 +02:00 |
Sergio De la torre
|
db1c352be3
|
feat: packaging refs #4021
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-30 18:06:35 +02:00 |
Jorge Penadés
|
002111d8d1
|
fix: refs #6889 allocate 'productionReviewer' role to revision dep. workers & check if is owner or reviewer
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-30 11:47:12 +02:00 |
Jorge Penadés
|
5158017edd
|
fix: refs #6889 fix back tests
|
2024-05-30 11:21:42 +02:00 |
Jorge Penadés
|
05e6e10337
|
fix: refs #6889 fix back tests
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-30 10:04:34 +02:00 |
Javi Gallego
|
7186686548
|
Merge branch 'dev' into 4560-GastosReparto
|
2024-05-30 09:44:06 +02:00 |
Javi Gallego
|
5e55f2d92d
|
feat: refs # 6408 test ok
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-30 09:35:42 +02:00 |
Alex Moreno
|
f9d25ccd6c
|
hotFix(updateClaim): salesPerson undefined
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-30 08:14:10 +02:00 |
Jorge Penadés
|
a32db7840e
|
feat: refs #6889 fixtures & models
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-29 16:54:24 +02:00 |
Javi Gallego
|
d9d7904aaf
|
refs: #7108 weekends
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-29 11:58:13 +02:00 |
Jorge Penadés
|
fc606f7e36
|
fix: refs #6889 rollback
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-29 10:22:22 +02:00 |
Jorge Penadés
|
9d58c67b4a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-29 09:16:25 +02:00 |
Jorge Penadés
|
d35bbe5c06
|
Merge branch 'dev' into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-29 07:00:17 +00:00 |
Guillermo Bonet
|
f87ee5cb91
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-29 08:09:53 +02:00 |
Jorge Penadés
|
885aa5208a
|
feat : refs #6889 wip: check if is productionReviewer or owner
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-28 17:23:58 +02:00 |
Carlos Andrés
|
dc3c92eef1
|
Merge pull request 'Hotfix contabilizar DUA Ticket #188682' (!2519) from Hotfix-contabilizar-DUA-Ticket-#188682 into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2519
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-05-28 11:34:04 +00:00 |
Jorge Penadés
|
56407e12a3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-28 13:22:33 +02:00 |
Jorge Penadés
|
44e71b303c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-28 13:14:31 +02:00 |
Javi Gallego
|
1bcd7a9665
|
Merge branch 'dev' into 6408-rocketChat
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-28 12:46:37 +02:00 |
Carlos Andrés
|
6e5b41a886
|
Hotfix contabilizar DUA Ticket #188682
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-28 12:30:17 +02:00 |
Carlos Satorres
|
b95009899c
|
refs #7406 fix back
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-28 12:22:11 +02:00 |
Javi Gallego
|
9ee05860f6
|
feat: #6408 tests
|
2024-05-28 12:19:54 +02:00 |
Alex Moreno
|
08856a9132
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-28 12:11:51 +02:00 |
Alex Moreno
|
8ec2a10cbf
|
deploy: dump
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-28 12:05:09 +02:00 |
Jorge Penadés
|
7cc86d5af0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-27 14:36:18 +02:00 |
Carlos Satorres
|
578b8a2c71
|
refs #7406 changes sql, modelconfig model
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-27 14:28:13 +02:00 |
Robert Ferrús
|
b404c7d101
|
Merge pull request 'test' (!2514) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2514
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
|
2024-05-27 12:11:12 +00:00 |
Robert Ferrús
|
f4426f5863
|
Merge branch 'test' into 7296-restoreExpeditionTruck
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-05-27 12:05:49 +00:00 |
Robert Ferrús
|
df5f4a5a42
|
feat: refs #7296 fixAPPWarehouse
|
2024-05-27 14:05:31 +02:00 |
Guillermo Bonet
|
c7a324bc27
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-27 13:57:53 +02:00 |
Jorge Penadés
|
9ecba10446
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-27 13:57:35 +02:00 |
Guillermo Bonet
|
d384c5624f
|
refactor: refs #7486 Deleted unused debugAll
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-27 13:57:27 +02:00 |
Jorge Penadés
|
c136f2783a
|
refactor: refs #6942 toUnbook & drop buyer acls
|
2024-05-27 12:34:27 +02:00 |
Carlos Satorres
|
208409acb2
|
refs #7406 add relation
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-27 11:50:15 +02:00 |
Jorge Penadés
|
dc90ad6595
|
fix: refs #6942 acls & back
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-27 10:48:32 +02:00 |
Carlos Satorres
|
723327918b
|
refs #7406 worker formation
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-24 15:55:23 +02:00 |
Javi Gallego
|
0e5a15dd4e
|
con addressFk
|
2024-05-24 15:14:20 +02:00 |
Jorge Penadés
|
c76fd15f07
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-24 08:46:16 +02:00 |
Carlos Satorres
|
2fc6f6356f
|
Merge branch 'dev' into 7292-createAddresUEEMember
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-24 06:38:27 +00:00 |
Carlos Satorres
|
a435d88e55
|
refs #7292 fix tback
|
2024-05-24 08:37:46 +02:00 |
Carlos Satorres
|
a5079a5ae0
|
Merge branch 'dev' into 6095-refFk-null-on-search
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-24 06:26:46 +00:00 |
Sergio De la torre
|
cee8fdd784
|
refs #6832 fix: ToItem
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-23 16:56:35 +02:00 |
Carlos Satorres
|
84582120d1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-23 16:12:55 +02:00 |
Jorge Penadés
|
798b4f9df0
|
fix: refs #6942 toBook/toUnbook
|
2024-05-23 16:12:21 +02:00 |
Jorge Penadés
|
3e2abfea2c
|
fix: refs #6942 merge
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-23 16:08:48 +02:00 |
Jorge Penadés
|
2cd3002d06
|
Merge pull request 'test' (!2506) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2506
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
|
2024-05-23 14:07:21 +00:00 |
Carlos Andrés
|
14f243f251
|
Merge pull request 'fix: refs #7400 ledger_next' (!2495) from 7400-warmfix-ledger into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
Reviewed-on: #2495
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-05-23 14:03:22 +00:00 |
Carlos Satorres
|
f45f909995
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-23 14:46:33 +02:00 |
Carlos Satorres
|
ee010a3bb3
|
refs #7296 fix pr errors, trad
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-23 14:44:47 +02:00 |
Jorge Penadés
|
4219b22553
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-23 14:13:17 +02:00 |
Sergio De la torre
|
0914925a86
|
refs #6964 feat: hasItemOlder
|
2024-05-23 13:43:00 +02:00 |
Carlos Andrés
|
35a583d6d8
|
Merge pull request 'test' (!2504) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2504
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
|
2024-05-23 11:42:23 +00:00 |
Pablo Natek
|
86a6211cd8
|
fix: refs #7187 fix duplicate
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-05-23 12:23:31 +02:00 |
Carlos Satorres
|
49c105ae09
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6095-refFk-null-on-search
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-23 11:54:48 +02:00 |
Carlos Satorres
|
83f638323a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-22 16:09:52 +02:00 |
Sergio De la torre
|
49fed4e51e
|
refs #6964 feat: hasItemOlder
|
2024-05-22 12:23:33 +02:00 |
Jorge Penadés
|
60fa55566c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-22 09:13:58 +02:00 |
Pablo Natek
|
2142b78deb
|
feat: refs #7187 Add support for multiple PDAs per user
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-05-21 19:25:18 +02:00 |
Jorge Penadés
|
365e5a3ba3
|
fix: refs # 7400 ledger_next
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-05-21 17:31:29 +02:00 |
Alex Moreno
|
28279b0782
|
Merge branch 'dev' into 7421-fix_checking_NODE_ENV
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-21 13:12:30 +00:00 |
Alex Moreno
|
ff33c926af
|
fix: move to boot
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-21 15:11:32 +02:00 |
Alex Moreno
|
18bb8a4ea5
|
fix: checking process.env.NODE_ENV
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-21 13:50:45 +02:00 |
Guillermo Bonet
|
6e06891937
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-21 11:44:26 +02:00 |
Guillermo Bonet
|
d672385776
|
hotfix: Rectificación Pepe
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-21 11:44:11 +02:00 |
Pablo Natek
|
b39f953898
|
Merge branch 'dev' into 7187-redirect
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-21 08:21:40 +00:00 |
Carlos Satorres
|
9bd5244f64
|
refs #7292 hook ueemember
|
2024-05-21 10:19:21 +02:00 |
Guillermo Bonet
|
6f9826421d
|
refactor: refs #7422 Fix e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-05-21 09:39:09 +02:00 |
Pablo Natek
|
8e5d12a6cb
|
Merge branch 'dev' into 7187-redirect
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-21 07:18:06 +00:00 |
Pablo Natek
|
1fef00789f
|
fix: refs #7187 remove bindings
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-21 08:54:53 +02:00 |
Javier Casado
|
d0bb9d7690
|
Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-21 05:50:49 +00:00 |
Pablo Natek
|
335b9caaa4
|
fix: refs #7187 got summary before lilium
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-21 01:10:53 +02:00 |
Jorge Penadés
|
50dbc5c515
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 15:36:09 +02:00 |
Ivan Mas
|
52400ab626
|
refs #7393 Modify night ticket closing report
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 15:17:41 +02:00 |
Robert Ferrús
|
823e8fd7a1
|
feat: refs #7296 requested changes3
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 13:27:38 +02:00 |
Robert Ferrús
|
34f48e46e7
|
feat: refs #7296 requested changes2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 13:19:01 +02:00 |
Jorge Penadés
|
40762ba4aa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 12:34:37 +02:00 |
Robert Ferrús
|
996f14341d
|
Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 10:31:13 +00:00 |
Robert Ferrús
|
62ca4885c4
|
feat: refs #7296 requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 12:28:27 +02:00 |
Alex Moreno
|
9cba2be00d
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-20 11:31:24 +02:00 |
Alex Moreno
|
f82b105430
|
fix: TicketLog res.data
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-20 11:30:43 +02:00 |
Carlos Satorres
|
6d66c0f71f
|
hotfix TicketLog filter
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-20 11:14:30 +02:00 |
Jorge Penadés
|
741c995c31
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-20 10:30:38 +02:00 |
Jorge Penadés
|
480daea26f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 08:54:17 +02:00 |
Robert Ferrús
|
e67981b382
|
Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 06:44:31 +00:00 |
Carlos Satorres
|
cbbd488674
|
Merge pull request 'refs #7396 fix worker model' (!2474) from 7396-addBasicDataWorker into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2474
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-20 06:27:33 +00:00 |
Guillermo Bonet
|
18ce388944
|
Merge branch 'test' into dev
|
2024-05-20 06:59:42 +02:00 |
Carlos Satorres
|
05f09d0b87
|
refs #7187 fix workerPda
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-17 14:56:40 +02:00 |
Pablo Natek
|
7fb6ecd617
|
feat: refs #7187 redirect to lilium
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-17 14:46:49 +02:00 |
Jorge Penadés
|
f36f5fa5df
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-17 14:39:35 +02:00 |
Carlos Satorres
|
dd7ee27e9b
|
refs #7396 fix worker model
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-17 14:28:28 +02:00 |
Jorge Penadés
|
1f1a49d0a5
|
refactor: refs #6889 use addSale
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-17 14:20:33 +02:00 |
Javier Casado
|
5ee550ebf7
|
Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-17 12:08:41 +00:00 |
Guillermo Bonet
|
968effc936
|
hotfix: ticket 135539 Unroute tickets
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-17 11:56:04 +02:00 |
Pablo Natek
|
47c573a324
|
fix: refs #6095 filter by refFk null
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-17 10:51:37 +02:00 |
Pablo Natek
|
1372f817bd
|
fix: refs #7187 model
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-16 14:05:22 +02:00 |
Pablo Natek
|
b299e842b9
|
fix: refs #7187 model foreignKey
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-16 14:04:21 +02:00 |
Pablo Natek
|
4cf5457690
|
fix: refs #7187 remove focus on spec
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-16 14:01:41 +02:00 |
Pablo Natek
|
1abacdc42b
|
fix: refs #7187 method
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-16 14:00:42 +02:00 |
Pablo Natek
|
b41104432c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-16 13:57:55 +02:00 |
Pablo Natek
|
bcb3ea4837
|
feat: refs #7187 new method available pda
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-16 10:23:33 +02:00 |
Robert Ferrús
|
11a0b98495
|
feat: refs #7296 roadmapStop
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-05-16 10:20:08 +02:00 |
Alex Moreno
|
8260016da5
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-15 13:53:07 +02:00 |
Carlos Satorres
|
4b8cad9aef
|
hotfix accessScopes
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-15 13:23:36 +02:00 |
Carlos Satorres
|
a4e1b1931c
|
hotfix accessScopes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-15 12:38:30 +02:00 |
Juan Ferrer
|
e469fb2da4
|
Merge pull request 'test' (!2456) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2456
|
2024-05-15 06:57:05 +00:00 |
Javi Gallego
|
0894cbd38c
|
Merge pull request 'feat: #7333 ticket with refund' (!2422) from 7333-ClaimRefund into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #2422
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-14 13:45:11 +00:00 |
Sergio De la torre
|
edb024a1f9
|
refs #6106 hotFix: getTickets
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-14 10:14:53 +02:00 |
Robert Ferrús
|
eeb36a6810
|
Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-14 06:32:45 +00:00 |
Alex Moreno
|
3798509206
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-05-14 07:51:04 +02:00 |
Robert Ferrús
|
c6f7a0768a
|
Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-14 05:49:39 +00:00 |
Alex Moreno
|
6251493adb
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-master This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-13 14:24:31 +02:00 |
Jorge Penadés
|
b902a1a7f7
|
Merge branch 'dev' into 5919-locker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-13 12:02:17 +00:00 |
Jorge Penadés
|
1f39330041
|
fix: refs #5919 drop focus
|
2024-05-13 14:00:19 +02:00 |
Jorge Penadés
|
5d5f1ef7c5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
|
2024-05-13 13:20:32 +02:00 |
Jorge Penadés
|
e16e5e3db3
|
feat: refs #5919 back test
|
2024-05-13 13:19:28 +02:00 |
Carlos Satorres
|
ac4cc1506b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7360-errorWeeklyHourEmail
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-13 12:18:03 +02:00 |
Guillermo Bonet
|
799108f041
|
fix: refs #7345 Fixed e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-13 11:23:29 +02:00 |
Pablo Natek
|
a797fca2dd
|
feat: refs #7187 merge dev
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-13 08:30:20 +02:00 |
Javier Casado
|
03f0de489e
|
Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-13 05:40:25 +00:00 |
Jorge Penadés
|
cbb7cb18eb
|
fix: refs #5919 delete locker field
|
2024-05-10 16:02:50 +02:00 |
Alex Moreno
|
a7910d9894
|
hotFix(invoiceInPdf): fix accessScopes
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-10 14:58:52 +02:00 |
Jorge Penadés
|
8943bc7115
|
fix: refs #5919 back tests
|
2024-05-10 14:04:34 +02:00 |
Jorge Penadés
|
af11bb8663
|
feat: refs #5919 hook
|
2024-05-10 13:04:12 +02:00 |
Guillermo Bonet
|
13ed86d26d
|
Fix: refs #7126 Tests back
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-10 11:06:49 +02:00 |
Guillermo Bonet
|
b1e136aa47
|
Fix: refs #7126 Tests back
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-10 11:05:20 +02:00 |
Robert Ferrús
|
35f69b8692
|
Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-10 07:21:05 +00:00 |
Jorge Penadés
|
4e7d0e6469
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
|
2024-05-10 08:28:06 +02:00 |
Jon Elias
|
6207d79244
|
Merge pull request 'feat: refs #6739 transferInvoice new functionality' (!2412) from 6739-transferInvoiceOut into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #2412
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-05-10 04:51:41 +00:00 |
Jorge Penadés
|
7f4965879c
|
fix: refs #5919 get locker by relation
|
2024-05-09 15:54:34 +02:00 |
Carlos Satorres
|
fcd1b5e351
|
Merge pull request 'refs #6877 add attenderFk' (!2427) from 6877-modPeticionesCompra into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2427
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-09 10:53:10 +00:00 |
Robert Ferrús
|
0498b425b3
|
Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-09 10:51:18 +00:00 |
Jorge Penadés
|
035782414f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
|
2024-05-09 12:47:25 +02:00 |
Carlos Satorres
|
0f52fe65d3
|
refs #7360 fix error weekly
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-09 09:46:40 +02:00 |
Pablo Natek
|
98e28b8d50
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers
|
2024-05-09 09:09:00 +02:00 |
Jorge Penadés
|
dc45527e1d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
|
2024-05-09 08:45:17 +02:00 |
Jon Elias
|
620dd3d836
|
Merge branch '6739-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-09 08:05:24 +02:00 |
Jon Elias
|
58aedf160b
|
refactor: refs #6739 changed translations' keys
|
2024-05-09 08:05:23 +02:00 |
Jon Elias
|
0f973baa65
|
Merge branch 'dev' into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-08 12:31:32 +00:00 |
Jon Elias
|
77c2f61f47
|
refs #6739 move petitions
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-08 14:30:20 +02:00 |
Jon Elias
|
72da046ead
|
Merge branch '6739-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-08 14:12:11 +02:00 |
Jon Elias
|
9d75ba0bc5
|
refactor: refs #6739 default params
|
2024-05-08 14:12:10 +02:00 |
Carlos Satorres
|
0d43d9a982
|
refs #6877 remove restriction
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-08 13:20:45 +02:00 |
Carlos Satorres
|
f64e899061
|
Merge pull request 'refs #6882 absence' (!2271) from 6682-notHolidays into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2271
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-08 10:27:20 +00:00 |
Carlos Satorres
|
7b298c1baf
|
refs #6882 fix tback
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-08 12:24:05 +02:00 |
Carlos Satorres
|
fa2c4de562
|
Merge pull request 'refs #6842 worker' (!2404) from 6842-errorCalendar into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2404
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-08 10:21:19 +00:00 |
Carlos Satorres
|
8a7d124066
|
refs #6882 fix traductions
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-08 12:17:44 +02:00 |
Carlos Satorres
|
0709a64dca
|
refs #6882 fix back
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-08 12:05:47 +02:00 |
Carlos Satorres
|
269c42e5c9
|
Merge branch '6682-notHolidays' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-08 11:47:06 +02:00 |
Carlos Satorres
|
c355595384
|
refs #6882 fix back, tback te2e
|
2024-05-08 11:47:04 +02:00 |
Jorge Penadés
|
26ff5e8fa9
|
feat; refs #5919 WIP acls
|
2024-05-08 11:03:18 +02:00 |
Jorge Penadés
|
d0c9e83504
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
|
2024-05-08 10:35:07 +02:00 |
Carlos Satorres
|
c0b4a931a6
|
Merge branch 'dev' into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-08 07:55:26 +00:00 |
Carlos Satorres
|
8637488fc1
|
refs #6882 fix pr
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-08 08:48:19 +02:00 |
Javi Gallego
|
8e1c84ec4b
|
feat: #7333 ticket with refund
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-07 15:33:18 +02:00 |
Carlos Satorres
|
5e8e09cbae
|
refs #6877 add attenderFk
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-07 13:42:58 +02:00 |
Guillermo Bonet
|
6e9ea9665d
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-07 13:18:46 +02:00 |
Guillermo Bonet
|
0d7d4917a7
|
Merge branch 'master' into test
|
2024-05-07 13:18:28 +02:00 |
Jorge Penadés
|
7d07c513b1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-07 13:06:47 +02:00 |
Jorge Penadés
|
0f5e2dcc54
|
fix: refs #6938 rollback
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-07 11:47:22 +02:00 |
Jon Elias
|
5e96049e65
|
Merge branch 'dev' into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-07 09:36:26 +00:00 |
Jon Elias
|
d4f734455d
|
refactor: refs #6739 transferInvoice() refactor
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-07 11:35:05 +02:00 |
Carlos Satorres
|
19c729d5fd
|
Merge branch 'dev' into 6842-errorCalendar
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-07 06:55:05 +00:00 |
Robert Ferrús
|
1610b9bd0a
|
Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-07 05:11:02 +00:00 |
Jon Elias
|
4e78307a8d
|
feat: refs #6739 transferInvoice new functionality
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-06 14:51:53 +02:00 |
Alex Moreno
|
f23924e792
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-06 14:31:41 +02:00 |
Carlos Andrés
|
14a1c5cbbb
|
Merge pull request 'master' (!2408) from master into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/pr-master This commit looks good
Details
Reviewed-on: #2408
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
|
2024-05-06 12:22:04 +00:00 |
Robert Ferrús
|
b57be129e3
|
Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-06 08:27:21 +00:00 |
Carlos Satorres
|
bc5f78827c
|
Merge branch 'dev' into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-06 08:09:21 +00:00 |
Javi Gallego
|
633a3c481c
|
Merge branch 'dev' into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-06 07:42:38 +00:00 |
Carlos Satorres
|
fe300f0f24
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-05-06 09:26:14 +02:00 |
Robert Ferrús
|
87e85e4a4e
|
Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-06 05:08:07 +00:00 |
Jorge Penadés
|
40b2c32a00
|
feat: refs #6243 show all cmr
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-03 17:37:36 +02:00 |
Carlos Satorres
|
e15b8eee30
|
refs #6842 worker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-03 14:54:12 +02:00 |
Pablo Natek
|
699684bd65
|
feat: refs #7187 add sim column to the model and id
|
2024-05-03 14:22:48 +02:00 |
Pablo Natek
|
95aba9e7b3
|
Merge pull request 'feat(collection-label): refs #6602 add qr to the report' (!2292) from 6602-barcode-to-qr into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
Reviewed-on: #2292
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-05-03 11:52:22 +00:00 |
Pablo Natek
|
4c55ae40ef
|
Merge pull request 'test' (!2402) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
Reviewed-on: #2402
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-03 10:58:42 +00:00 |
Pablo Natek
|
3ae192c761
|
fix: refs #6005 fix test
|
2024-05-03 12:52:12 +02:00 |
Pablo Natek
|
6152820078
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6005-fix-runtime-error
|
2024-05-03 12:47:14 +02:00 |
Pablo Natek
|
48bfba71de
|
fix: refs #6005 runtime
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-05-03 12:33:59 +02:00 |
Carlos Satorres
|
f77cf619db
|
refs #6682 holidays conditional
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-03 12:27:19 +02:00 |
Pablo Natek
|
8b11a4a290
|
fix: refs #6005 time issue
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-05-03 12:08:22 +02:00 |
Robert Ferrús
|
82ee8d2209
|
Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-03 09:25:06 +00:00 |
Jorge Penadés
|
74b04d98f5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 16:38:56 +02:00 |
Pablo Natek
|
ddc4d4a08e
|
Merge branch 'dev' into 6602-barcode-to-qr
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 12:37:34 +00:00 |
Carlos Satorres
|
11ffc3a652
|
Merge branch 'dev' into 6895-removeShelving
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 11:40:55 +00:00 |
Carlos Satorres
|
ee41e5b6ac
|
Merge branch 'dev' into 6895-removeShelving
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 10:47:38 +00:00 |
Carlos Satorres
|
9e2332ca4a
|
refs #6895 state home
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-05-02 12:48:11 +02:00 |
Carlos Satorres
|
a43593f63b
|
Merge branch 'dev' into 6870-modifyDefaulterNotification
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 10:42:00 +00:00 |
Carlos Satorres
|
def1521131
|
refs #6870 defaulter id
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 12:42:17 +02:00 |
Pablo Natek
|
d45d53d665
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6602-barcode-to-qr
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 10:26:46 +02:00 |
Pablo Natek
|
bd1499a6f7
|
feat(collection-label): new option barcode-qr
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-02 10:25:46 +02:00 |
Jorge Penadés
|
63655a4dd1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
|
2024-05-02 08:58:51 +02:00 |
Robert Ferrús
|
a00dd82f14
|
hotFix(getBalance): if null
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-02 08:21:39 +02:00 |
Guillermo Bonet
|
0ab79728b5
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-02 08:10:20 +02:00 |
Guillermo Bonet
|
7eb2e8f218
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-02 08:09:59 +02:00 |
Robert Ferrús
|
77a1b4bb57
|
hotFix(getBalance): simplify
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-02 08:02:17 +02:00 |
Robert Ferrús
|
b8b055b86c
|
hotFix(getBalance): date setHours to 0
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-02 08:00:44 +02:00 |
Carlos Satorres
|
b66111a032
|
refs #6895 remove tfront
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-30 13:33:46 +02:00 |
Carlos Satorres
|
b0b8f12ca9
|
refs #6895 remove code
|
2024-04-30 13:17:19 +02:00 |
Carlos Satorres
|
e546a13e5d
|
refs #6895 redirect lilium
|
2024-04-30 12:41:29 +02:00 |
Jon Elias
|
2b9bfb5d85
|
Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2364
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-30 10:19:29 +00:00 |
Alex Moreno
|
d18f08e676
|
hotFix(addSaleByCode) add userId
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-30 12:15:27 +02:00 |
Guillermo Bonet
|
f10ecf4f00
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-30 11:47:55 +02:00 |
Guillermo Bonet
|
c987bb6e66
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-30 11:47:35 +02:00 |
Guillermo Bonet
|
110cae3171
|
Merge pull request 'refactor: #6997 Deleted vn.client.eypbc' (!2353) from 6997-eypbc into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2353
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-04-30 08:23:52 +00:00 |
Carlos Satorres
|
ace39b92ac
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6870-modifyDefaulterNotification
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-29 12:14:38 +02:00 |
Jorge Penadés
|
be69b5e2c4
|
fix: refs #5919 rollback
|
2024-04-29 12:04:31 +02:00 |
Carlos Satorres
|
f3c7b1e89c
|
refs #6870 add observationEmail
|
2024-04-29 11:59:51 +02:00 |
Jorge Penadés
|
f6e89c9049
|
fix: refs #5919 rollback
|
2024-04-29 11:46:58 +02:00 |
Jorge Penadés
|
7240269f5b
|
fix: refs #5919 rollback
|
2024-04-29 11:45:54 +02:00 |
Jorge Penadés
|
50ea41f99a
|
fix: refs #5919 rollback
|
2024-04-29 11:43:56 +02:00 |
Jorge Penadés
|
8adb52aac4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
|
2024-04-29 09:24:10 +02:00 |
Sergio De la torre
|
a180f54390
|
refs #6275 hotFix fix:getExpeditionSummary
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-29 08:59:12 +02:00 |
Sergio De la torre
|
f4767728bc
|
refs #6275 hotFix fix:getExpeditionSummary
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-04-29 08:20:57 +02:00 |
Sergio De la torre
|
f2225b49a7
|
refs #6275 hotFix fix:getExpeditionSummary
|
2024-04-29 08:19:18 +02:00 |
Jorge Penadés
|
b9d3684db2
|
feat: refs #6600 add column
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-26 15:48:30 +02:00 |
Robert Ferrús
|
d2c3034ec6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-26 12:07:53 +02:00 |
Robert Ferrús
|
fd7dcf2781
|
fix: refs #7039 fixpr
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-26 10:26:20 +02:00 |
Robert Ferrús
|
2d0d4b5643
|
Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-26 06:48:01 +00:00 |
Pablo Natek
|
4693ba13fa
|
Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency
|
2024-04-26 08:37:51 +02:00 |
Javi Gallego
|
94e04c1c2f
|
Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-26 06:45:43 +02:00 |
Jorge Penadés
|
b9de2b3ce6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 17:18:37 +02:00 |
Jorge Penadés
|
32da39899a
|
fix: refs #7211 test e2e
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 17:16:43 +02:00 |
Pablo Natek
|
5c45dd6c17
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency
|
2024-04-25 16:18:18 +02:00 |
Jorge Penadés
|
180a484c55
|
fix: refs #7211 rollback
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 16:14:34 +02:00 |
Jorge Penadés
|
f7cdbd39f0
|
fix: refs #7211 tests
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 16:08:52 +02:00 |
Jorge Penadés
|
edeed037a2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7211-fixWorkerTimeControl
|
2024-04-25 15:38:40 +02:00 |
Jorge Penadés
|
4e864fed52
|
fix: refs #7211 tests
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 15:38:21 +02:00 |
Javi Gallego
|
2e2bc3d594
|
Merge branch 'dev' into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 12:31:06 +00:00 |
Javi Gallego
|
4f20224acc
|
Merge branch '6382-regularizar-Shelving-Parking' of https://gitea.verdnatura.es/verdnatura/salix into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 14:28:53 +02:00 |
Javi Gallego
|
7d3870e4a1
|
feat: refs#6382 test fixed
|
2024-04-25 14:28:47 +02:00 |
Javier Casado
|
a9e4b2cd36
|
Merge branch 'dev' into 6697-removeClaimQuantity
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 11:46:53 +00:00 |
Jorge Penadés
|
931c2c4f5e
|
feat: refs #7211 error & locale
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-25 13:12:06 +02:00 |
Robert Ferrús
|
8153a526ce
|
feat: refs #7039 country-name
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 12:35:21 +02:00 |
Jorge Penadés
|
6749722634
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-25 10:10:06 +02:00 |
Pablo Natek
|
c5b02dc239
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency
|
2024-04-25 09:46:53 +02:00 |
Jorge Penadés
|
c9dfccbc53
|
feat: refs #7211 add test & changelog
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-25 09:35:53 +02:00 |
Alex Moreno
|
917592cdad
|
Merge pull request '7225-hotFix_ticket_advanced_movable a dev para probar' (!2366) from 7225-hotFix_ticket_advanced_movable into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2366
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-24 12:34:46 +00:00 |
Alex Moreno
|
69486fb29f
|
fix(componentUpdate): refs #7225 fix transfer all lines to newTicket
gitea/salix/pipeline/pr-master This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 14:15:27 +02:00 |
jcasado
|
aeee012c2b
|
refs #6697 fix sql test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 11:43:10 +02:00 |
jcasado
|
87d5e0a311
|
Merge branch '6697-removeClaimQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 6697-removeClaimQuantity
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-24 11:19:17 +02:00 |
jcasado
|
d1659ce04c
|
refs #6697 fix claimQuantity
|
2024-04-24 11:19:15 +02:00 |
Alex Moreno
|
0cd740ce0c
|
test: refs #7225 fix back test
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-04-24 10:42:50 +02:00 |
Jon Elias
|
6706974784
|
fix: refs #6731 fix ticketRequest
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 10:31:26 +02:00 |
Javier Segarra
|
f7d9cc8102
|
Merge pull request 'FIX bug Ticket-Request Filter' (!2355) from fix_itemFk_ticketRequest_filter into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2355
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-04-24 07:56:03 +00:00 |
Jon Elias
|
88ba6833be
|
Merge pull request 'refactor: refs #6899 corrected Lilium styles and functionalities' (!2322) from 6899-endInvoiceOutMigration into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2322
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-24 07:36:55 +00:00 |
Javi Gallego
|
dcc46494bc
|
Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 07:45:02 +02:00 |
Javier Segarra
|
0fd120676d
|
Actualizar modules/ticket/back/methods/ticket-request/filter.js
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-23 12:29:40 +00:00 |
Javier Casado
|
69ea518a49
|
Merge branch 'dev' into 6697-removeClaimQuantity
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-23 10:55:45 +00:00 |
Guillermo Bonet
|
1044a24bc7
|
refactor: #6997 Deleted vn.client.eypbc
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-23 12:00:23 +02:00 |
Alex Moreno
|
60d5b9e4aa
|
test: refs #7173 fix sql, adding alias
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-04-23 08:47:52 +02:00 |
Alex Moreno
|
85491613b0
|
test: refs #7173 fix fixtures
|
2024-04-23 08:47:28 +02:00 |
Javi Gallego
|
b0c4f7fd3c
|
feat: moved files to invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 11:45:58 +02:00 |
Sergio De la torre
|
23fa74a5ad
|
Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 08:11:37 +00:00 |
Javier Segarra
|
f6199f8f8e
|
Actualizar modules/worker/back/models/worker.json
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 06:56:05 +00:00 |
Javier Segarra
|
283d27e1c5
|
Actualizar modules/worker/back/models/worker.json
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 06:22:36 +00:00 |
Jon Elias
|
fa653f630c
|
Merge branch '6899-endInvoiceOutMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6899-endInvoiceOutMigration
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 07:37:49 +02:00 |
Jon Elias
|
9759ee4bd0
|
refactor: refs #6899 requested changes
|
2024-04-22 07:37:47 +02:00 |
Javier Segarra
|
b4503afc47
|
Merge branch 'dev' into 6930_scope_Default_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-19 10:50:45 +02:00 |
Javier Segarra
|
30d0db163e
|
feat(salix): refs #6930 minor updates
|
2024-04-19 10:50:14 +02:00 |
Javier Segarra
|
322d91d814
|
feat(salix): refs #6930 Add DEFAULT scope
|
2024-04-19 10:49:57 +02:00 |
Alex Moreno
|
da7ab00c73
|
Merge branch 'dev' into 6899-endInvoiceOutMigration
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-19 07:22:33 +00:00 |
Alex Moreno
|
5b5ec11973
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-19 08:58:17 +02:00 |
Jon Elias
|
9dedd5383c
|
Merge branch 'dev' into 6899-endInvoiceOutMigration
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-19 06:10:49 +00:00 |
Jon Elias
|
f40c730f6e
|
refactor: refs #6899 changed comercial value in negativeBases
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-19 07:52:43 +02:00 |
Sergio De la torre
|
f4afda8cb2
|
Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-18 14:52:57 +00:00 |
Alex Moreno
|
87e23b49e7
|
hotFix: change require to import
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-04-18 15:19:19 +02:00 |
Jon Elias
|
08ca1a302b
|
Merge pull request 'refactor: refs #7139 replace warehouse with ticket' (!2323) from 7139-changeColumnsInRouteSummary into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
Reviewed-on: #2323
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-18 12:55:58 +00:00 |
Sergio De la torre
|
279c300fbf
|
Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-18 11:08:15 +00:00 |
Guillermo Bonet
|
2b11f85b67
|
Merge pull request 'feat: refs #6724 permissions to vn.entry.isBooked' (!2147) from 6724-permisos-vn.entry.isBooked into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2147
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-18 11:06:47 +00:00 |
Jon Elias
|
f7a6d47c04
|
Merge pull request 'feat: #7130 added "served" field to RouteList table(Salix).' (!2219) from 7130-addFieldInRoutes into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2219
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-18 09:34:35 +00:00 |
Sergio De la torre
|
958759dc80
|
Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-18 08:12:46 +00:00 |
Sergio De la torre
|
e909d64757
|
refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-18 10:01:22 +02:00 |
Alex Moreno
|
9143447eb8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-18 09:27:46 +02:00 |
Alex Moreno
|
af06ef30d4
|
hotFix(workerDms): document.isDocuware
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-18 08:50:17 +02:00 |
Jon Elias
|
d42aab346f
|
refactor: refs #7139 replace warehouse with ticket
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-18 08:17:43 +02:00 |
Jon Elias
|
f41177643f
|
refactor: refs #6899 corrected Lilium styles and functionalities
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-18 08:01:16 +02:00 |
Sergio De la torre
|
32e2827287
|
refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-17 13:55:07 +02:00 |
Sergio De la torre
|
a3c8532661
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-17 13:27:00 +02:00 |
Javier Segarra
|
6214da2c42
|
feat(salix): refs #6930 Undo rollback salix-back
|
2024-04-17 09:52:53 +02:00 |
Guillermo Bonet
|
9f9662924d
|
Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!2306) from 6968-groupingModeRefactor into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
Reviewed-on: #2306
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-17 06:48:43 +00:00 |
Sergio De la torre
|
ae88a8a281
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-17 07:44:08 +02:00 |
Guillermo Bonet
|
36bf770ed4
|
Merge pull request 'feat: refs #7173 Bloquear facturas recibidas contabilizadas' (!2258) from 7173-Restricción-eliminar/modificar-vn.invoiceIn into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2258
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-17 05:17:36 +00:00 |
Guillermo Bonet
|
d92d373db4
|
Merge branch 'dev' into 6968-groupingModeRefactor
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-17 05:15:37 +00:00 |
Guillermo Bonet
|
56dc0ddb68
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-16 12:32:53 +02:00 |
Guillermo Bonet
|
9ea1ac2a56
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-16 12:32:27 +02:00 |
Guillermo Bonet
|
7a557be09a
|
feat: refs #6968 Changed groupingMode to enum
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 11:07:57 +02:00 |
Guillermo Bonet
|
d88957d157
|
Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 06:45:04 +00:00 |
Guillermo Bonet
|
91d5f51e73
|
Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 08:44:51 +02:00 |
Guillermo Bonet
|
93abfdd8a1
|
feat: refs #7173 Added restrictions in invoiceIn structure
|
2024-04-16 08:44:50 +02:00 |
Sergio De la torre
|
d24de61213
|
refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-16 08:29:39 +02:00 |
Pablo Natek
|
0418540ef9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-16 07:39:13 +02:00 |
Jorge Penadés
|
3c9ac9634b
|
fix: refs #6938 front tests
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 15:02:45 +02:00 |
Jorge Penadés
|
3e1218463c
|
fix: refs #6938 filters & scope
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-15 14:44:18 +02:00 |
Guillermo Bonet
|
339c349ed0
|
feat: refs #6724 Added admon acl to vn-check
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 14:00:54 +02:00 |
Guillermo Bonet
|
5c524ecc7d
|
rollback: refs #6724 entry.js
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 13:13:40 +02:00 |
Guillermo Bonet
|
78bd561122
|
Merge branch 'dev' into 6724-permisos-vn.entry.isBooked
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-15 11:11:55 +00:00 |
Sergio De la torre
|
4cb79956a6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
|
2024-04-15 13:03:47 +02:00 |
Jorge Penadés
|
d7b06fe637
|
fix: refs #6938 scope
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 12:47:27 +02:00 |
Jorge Penadés
|
200cbd8d74
|
fix: refs #6938 acls & scope
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 11:03:57 +02:00 |
Jorge Penadés
|
0219fa105e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6938-hideWorkerPhone
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 10:22:44 +02:00 |
Jorge Penadés
|
a68b8431c5
|
feat: refs #6938 add scope & acls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 10:21:59 +02:00 |
jcasado
|
dc8a6d1274
|
Merge branch 'dev' into 6641-checkboxMyTeam
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 10:11:36 +02:00 |
Alex Moreno
|
b4862a8ce9
|
hotFix(claimBegginingModel): enable claimIsEditable and &&
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-12 11:35:21 +02:00 |
Pablo Natek
|
726b1ddc07
|
Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-12 05:14:29 +00:00 |
Jorge Penadés
|
c161c122d0
|
feat: refs #6449 add column
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-11 15:56:17 +02:00 |
Guillermo Bonet
|
2226922366
|
Merge branch 'master' into test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-04-11 14:52:16 +02:00 |
Guillermo Bonet
|
4449441cbf
|
Merge pull request 'hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod' (!2279) from ticket168996-hotfix into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2279
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-11 12:42:44 +00:00 |
Alex Moreno
|
99d80d4d30
|
hotFix(closeAll): continue loop
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-11 13:51:33 +02:00 |
Alex Moreno
|
3635a4b6d0
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-11 07:46:16 +02:00 |
Ivan Mas
|
83befbd120
|
Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-10 15:21:42 +00:00 |
jcasado
|
0cf1ced747
|
remove focus
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-10 13:17:43 +02:00 |
jcasado
|
7d925bac87
|
refs #6641 fix PR changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-10 13:16:41 +02:00 |
Pablo Natek
|
c581deef66
|
refactor: refs #6005 refactor spec
|
2024-04-10 13:09:31 +02:00 |
Sergio De la torre
|
9c373d9ef3
|
refs #6921 feat: getTicketsObservations
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-04-10 12:02:25 +02:00 |
Guillermo Bonet
|
1fe783cf0e
|
hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-10 12:00:52 +02:00 |
Alex Moreno
|
51e7045e8b
|
hotFix(workerTimeControl): getWeekNumber
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-10 09:44:09 +02:00 |
Ivan Mas
|
eedf30a2dd
|
refs #6732 salix dependencies and undo changes Proveedores
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 17:31:34 +02:00 |
Pablo Natek
|
ed517399dc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
|
2024-04-09 15:04:04 +02:00 |
Pablo Natek
|
ac9732606c
|
remove(focus): refs #6005 from spec
|
2024-04-09 14:55:29 +02:00 |
Ivan Mas
|
f02c4354ba
|
Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 14:45:29 +02:00 |
Ivan Mas
|
521033edd2
|
Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 11:54:41 +00:00 |
Pablo Natek
|
da037c5235
|
refactor: refs #6005 delay on productionConfig
|
2024-04-09 13:34:33 +02:00 |
Guillermo Bonet
|
0e2e68488d
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 13:08:54 +02:00 |
Carlos Satorres
|
de75d811c3
|
refs #6682 absence
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-09 12:30:25 +02:00 |
Alex Moreno
|
c69a4e1c98
|
Merge pull request 'refactor(workerDms): adapat to lilium' (!2269) from 6551-workerDms_refactor into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2269
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-04-09 08:21:20 +00:00 |
Guillermo Bonet
|
c42e00f11e
|
Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 07:43:51 +00:00 |
Pablo Natek
|
7cb40f5d89
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-09 09:42:39 +02:00 |
Pablo Natek
|
638b715ee5
|
fix: refs #6005 move logic to hook
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-09 09:30:28 +02:00 |
Alex Moreno
|
500244dbed
|
fix id
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 07:51:57 +02:00 |
Sergio De la torre
|
75293fbb9a
|
refs #6276 hotFix:itemShelving_add
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-09 07:38:28 +02:00 |
Alex Moreno
|
0ecc09fcc4
|
Merge branch 'dev' into 6551-workerDms_refactor
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-08 12:50:05 +00:00 |
Alex Moreno
|
9134216332
|
refactor(workerDms): adapat to lilium
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-04-08 14:46:35 +02:00 |
jcasado
|
a30c0ee675
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-08 14:39:00 +02:00 |
jcasado
|
84997eacd5
|
refs: 6697 remove claim quantity
|
2024-04-08 14:38:54 +02:00 |
jcasado
|
26c74a3e71
|
refs #6641 fix test
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-08 13:03:15 +02:00 |
Guillermo Bonet
|
e27279e20e
|
Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-08 05:18:36 +00:00 |
Alex Moreno
|
93000aaecf
|
Merge branch 'dev' into 6549-ticket_close
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-05 12:20:09 +00:00 |
Guillermo Bonet
|
16a6e3d8a6
|
feat: refs #6636 Requested change
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-05 08:18:38 +02:00 |
Pablo Natek
|
4b4aaa9e10
|
feat: refs #6005 move logic from report to hook
|
2024-04-05 08:04:53 +02:00 |
Guillermo Bonet
|
0cd4013f5e
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-05 07:51:19 +02:00 |
Guillermo Bonet
|
1656c8db63
|
Merge branch '6636-pickup' of https://gitea.verdnatura.es/verdnatura/salix into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-05 07:42:04 +02:00 |
Guillermo Bonet
|
23db6a41be
|
feat: refs #6636 Minor change
|
2024-04-05 07:42:03 +02:00 |
Guillermo Bonet
|
ac658fb6af
|
Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-05 05:29:26 +00:00 |
Carlos Andrés
|
fe0afe30bf
|
fix: closeTicket idem salix Refs: #6549
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-04 17:50:39 +02:00 |
Sergio De la torre
|
2ed5237568
|
Merge branch 'dev' into 6964_itemOlder
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-04 13:45:20 +00:00 |
jcasado
|
84e6e7f7bf
|
refs #6641 test fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-04 14:53:26 +02:00 |
Carlos Andrés
|
9fcad457a7
|
fix: closeTicket idem salix Refs: #6549
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-04 14:46:51 +02:00 |
jcasado
|
1c6d913926
|
refs #6641 addFilterCollegues
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-04 14:28:39 +02:00 |
Guillermo Bonet
|
fcb4fe92e8
|
Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-04 12:14:23 +00:00 |
Guillermo Bonet
|
f44e19cae3
|
feat: refs #6636 Modified updateClaim, model and tests
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-04-04 14:15:20 +02:00 |
jcasado
|
5acef1fcc0
|
refs #6641 add button my team
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-04 13:53:23 +02:00 |
Alex Moreno
|
20e4ab1d2c
|
Merge pull request 'hotFix: handle mail error' (!2253) from hotFix_handleMailErrors into master
gitea/salix/pipeline/pr-test This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2253
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
|
2024-04-04 11:35:09 +00:00 |
Alex Moreno
|
dd9c7283c3
|
hotFix: handle mail error
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-04 13:32:39 +02:00 |
Guillermo Bonet
|
29eee4e8a7
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-04 11:30:03 +02:00 |
Sergio De la torre
|
9423a2d043
|
refs #3520 hotFix: hasUncheckedTickets
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-04 10:38:55 +02:00 |
Guillermo Bonet
|
c685000b47
|
hotfix: refs #6930 Rollback tokenMultimedia
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-04 10:13:56 +02:00 |
Jon Elias
|
3e044a8efe
|
fix: refs #7152 add supplier storage
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-04 08:16:37 +02:00 |
Pablo Natek
|
2efd1945f8
|
feat: refs #4988 add agency
|
2024-04-04 07:27:27 +02:00 |
Alex Moreno
|
ff2e00c51c
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-master This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-03 16:24:45 +02:00 |
Alex Moreno
|
59ead0c2e5
|
debug(closure): add log
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-03 15:29:56 +02:00 |
Javier Casado
|
3968d88a8d
|
Merge branch 'master' into hotfix_languageClaimNotification
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-03 11:37:15 +00:00 |
jcasado
|
09f023090e
|
hotfix claimStateLanguage
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-03 13:33:56 +02:00 |
Javier Segarra
|
8ab9063b50
|
refs #6436 feat: use mocks
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-01 11:00:55 +02:00 |
Jorge Penadés
|
a62e189e47
|
feat: refs #6724 hook added
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-28 16:10:52 +01:00 |
Sergio De la torre
|
b62905c5ef
|
Merge branch 'dev' into 6964_itemOlder
gitea/salix/pipeline/pr-test This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-28 10:08:56 +00:00 |
Alex Moreno
|
a376003da6
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-28 10:10:22 +01:00 |
Alex Moreno
|
ed46ad03d2
|
refs #7152 warmFix
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-28 09:33:57 +01:00 |
Carlos Satorres
|
9f438751d3
|
Merge branch 'dev' into 6074-KkearisBlocked
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-28 08:13:37 +00:00 |
Alex Moreno
|
f1931fce69
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-03-28 08:19:26 +01:00 |
Alex Moreno
|
c47989c6fe
|
Merge pull request '3520_wareshouse_back' (!2218) from 3520_wareshouse_back into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2218
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-03-28 07:16:56 +00:00 |
Alex Moreno
|
0b764ebc1b
|
Merge pull request '#6514 - gestDocSupplier' (!2209) from 6514-gestDocSupplier into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2209
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-03-28 07:12:51 +00:00 |
Sergio De la torre
|
4ca3e8f650
|
Merge branch 'dev' into 3520_wareshouse_back
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-28 07:12:24 +00:00 |
Sergio De la torre
|
8e6416d59c
|
refs #3520 feat:uncheckedTicket
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-28 08:08:32 +01:00 |
Alex Moreno
|
6853454d30
|
Merge pull request '#7002 update direction if device exists' (!2206) from 7002-fixUpdateTimeEntry into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2206
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-03-28 07:04:17 +00:00 |
Alex Moreno
|
8cccc78b88
|
Merge branch 'dev' into 6532-deleteMermas
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-28 06:42:39 +00:00 |
Javier Segarra
|
d30cac971f
|
refs #6930 updates
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-28 07:22:28 +01:00 |
Sergio De la torre
|
7634d82d8b
|
refs #6964 feat:hasItemOlder
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-28 07:15:30 +01:00 |
Carlos Satorres
|
f4915fbe2e
|
Merge branch 'dev' into 6074-KkearisBlocked
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-27 16:50:03 +00:00 |
Jorge Penadés
|
e7a29119d0
|
feat: refs #7002 add test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-27 13:38:04 +01:00 |
Jorge Penadés
|
227d123247
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7002-fixUpdateTimeEntry
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-27 12:24:19 +01:00 |
Sergio De la torre
|
483345666e
|
refs #3520 feat:back WarehouseFk
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-27 11:01:32 +01:00 |
Jon Elias
|
562dd4034f
|
feat: #7130 added "served" field to RouteList table(Salix).
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-27 07:58:35 +01:00 |
Sergio De la torre
|
9240732c00
|
refs #6964 feat:advice for olderItem
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-27 07:49:51 +01:00 |
Sergio De la torre
|
2cf572baf8
|
refs #3520 hasUncheckedTicket
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-27 07:48:16 +01:00 |
Sergio De la torre
|
a983f25c57
|
refs #3520 hasUncheckedTicket
|
2024-03-27 07:47:36 +01:00 |
Sergio De la torre
|
39b1e9ff7b
|
refs #3520 hasUncheckedTicket
|
2024-03-27 07:26:11 +01:00 |
Sergio De la torre
|
eaf3749440
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3520_wareshouse_back
|
2024-03-27 07:11:16 +01:00 |
Sergio De la torre
|
ff8522cfd1
|
refs #6964 feat:advice for olderItem
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-27 07:09:18 +01:00 |
Sergio De la torre
|
43b042a616
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-27 07:08:47 +01:00 |
Javier Segarra
|
38c5209c33
|
refs #6930 fix more endpoints
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-26 15:01:28 +01:00 |
Jorge Penadés
|
6ded14b593
|
feat: refs #7002 update direction if it was not manual
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-26 14:25:25 +01:00 |
Sergio De la torre
|
b805a5de0a
|
refs #3520 feat:uncheckedTicket
|
2024-03-26 12:40:44 +01:00 |
Robert Ferrús
|
3e2e0ccadb
|
Merge branch 'master' into 7141-sale_replaceItem
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-03-26 11:00:44 +00:00 |
Sergio De la torre
|
caf99a9738
|
refs #3520 feat:uncheckedTicket
|
2024-03-26 11:06:14 +01:00 |
Sergio De la torre
|
678eb2928f
|
refs #6964 feat:hasItemOlder
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-26 10:30:17 +01:00 |
Sergio De la torre
|
c265896224
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-26 10:24:27 +01:00 |
Sergio De la torre
|
dc5f588c8e
|
refs #3520 feat: backWarehouse in Salix
|
2024-03-26 10:13:57 +01:00 |