Javi Gallego
|
b4046de190
|
Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-10 08:17:17 +00:00 |
Jorge Penadés
|
7794f23c17
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-10 09:02:52 +02:00 |
Sergio De la torre
|
cac1278c08
|
feat hsItemOlder refs $6964
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-07 16:29:51 +02:00 |
Javi Gallego
|
f82f452423
|
Merge branch 'dev' into 7276_expeditionScanned
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-07 13:44:24 +00:00 |
Jorge Penadés
|
479e4f3f8a
|
feat: refs #6273 required payMethod for internals
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-07 13:55:56 +02:00 |
Jorge Penadés
|
ee1678ebb5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-07 12:14:18 +02:00 |
Jorge Penadés
|
faf450e075
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-07 11:45:51 +02:00 |
Javi Gallego
|
0c068ed126
|
Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-07 09:03:24 +00:00 |
Alex Moreno
|
379d7ef2ab
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-06-07 10:33:07 +02:00 |
Alex Moreno
|
ca6afb9c10
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-06-07 10:32:49 +02:00 |
Alex Moreno
|
6e17f3dca3
|
Merge branch 'master' into 6147-transferInvoice_split
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-06-07 08:14:38 +00:00 |
Sergio De la torre
|
268c0a984c
|
feat isScanned refs #7276
|
2024-06-06 12:28:34 +02:00 |
Javi Gallego
|
e77bc87a2a
|
Merge pull request 'feat: refs #7203 remove numbres alertLevel' (!2546) from 7203-alertLevel into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2546
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-06-06 09:48:29 +00:00 |
Jon Elias
|
c2e80060b3
|
Merge branch 'dev' into 6753-TicketsSaveSign
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-06 07:51:23 +00:00 |
Jorge Penadés
|
14afd8246a
|
feat: refs #6273 add back test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-05 17:38:48 +02:00 |
Jorge Penadés
|
8188bdbcb0
|
fix: refs #6273 use userId
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-05 17:12:37 +02:00 |
Jorge Penadés
|
a79285cd3d
|
feat: refs #6273 register freelance
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-05 16:27:00 +02:00 |
Alex Moreno
|
a33f14ffa5
|
feat(transferInvoice): makePdf of refund
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-06-05 12:44:28 +02:00 |
Javi Gallego
|
1fa22e71a9
|
feat: refs #7203 nombre variables
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-05 12:42:55 +02:00 |
Javi Gallego
|
9b8fef2f20
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-06-05 07:07:18 +02:00 |
Javi Gallego
|
143930bc86
|
fix: warmFix setDeleted checks ticketRequest not answered
|
2024-06-05 07:07:13 +02:00 |
Juan Ferrer
|
f903d7cd2a
|
Merge pull request 'master' (!2538) from master into test
gitea/salix/pipeline/pr-dev Build queued...
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2538
|
2024-06-04 21:05:27 +00:00 |
Carlos Andrés
|
3a68cfef77
|
Merge pull request 'hotfix: ledger_next transacciones refs #7523' (!2540) from 7523-ledger_next-transacciones into master
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
Reviewed-on: #2540
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-06-04 17:14:51 +00:00 |
Carlos Andrés
|
1927fbce45
|
hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-06-04 15:39:02 +02:00 |
Javi Gallego
|
4089c7deb3
|
feat: refs #4560 minorChanges
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-04 12:23:28 +02:00 |
Javi Gallego
|
da1b4649bb
|
feat: refs #4560 sin expeditionTruck
|
2024-06-04 11:58:39 +02:00 |
Javi Gallego
|
4230d46fe5
|
Merge branch 'dev' into 4560-GastosReparto
|
2024-06-04 09:47:58 +02:00 |
Alex Moreno
|
7a803cce37
|
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-06-04 09:38:50 +02:00 |
Alex Moreno
|
03201e1e2c
|
fix(ticket): throw error if id is null
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-06-04 09:10:47 +02:00 |
Juan Ferrer
|
1ec55c8850
|
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-06-03 17:38:39 +02:00 |
Jorge Penadés
|
a13581ed97
|
feat: refs #6243 Add warehouseFk parameter
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-03 16:31:38 +02:00 |
Jorge Penadés
|
58053d8286
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-03 15:22:08 +02:00 |
Alex Moreno
|
bbf027ede5
|
fix(operator): neq error
|
2024-06-03 15:01:06 +02:00 |
Alex Moreno
|
c445bcb0ba
|
build(operator): remove console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2024-06-03 14:39:32 +02:00 |
Alex Moreno
|
a73c98eebe
|
build(operator): console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2024-06-03 13:04:09 +02:00 |
Jorge Penadés
|
39dcb7d6a8
|
fix: refs #6889 check if has collection or sectorCollection
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-03 10:30:20 +02:00 |
Carlos Satorres
|
7a92963886
|
fix acls
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-06-03 10:21:25 +02:00 |
Jorge Penadés
|
ea7c2346d5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-03 10:13:59 +02:00 |
Jorge Penadés
|
1382b24c1d
|
refactor: refs #6600 add space
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-03 09:38:35 +02:00 |
Jon Elias
|
340a8c119e
|
refactor: refs #6753 fix saveSign
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-03 09:35:44 +02:00 |
Jorge Penadés
|
72630d613b
|
fix: refs #6600 rollback
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-03 09:32:03 +02:00 |
Jorge Penadés
|
790a637d4d
|
feat: refs #6600 Add photoMotivation column to item table and create itemPhotoComment table
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-03 09:25:48 +02:00 |
Jorge Penadés
|
084f31e441
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6600-createItemPhotoComment
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-03 08:34:10 +02:00 |
Jorge Penadés
|
68bb282659
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-03 08:30:41 +02:00 |
Sergio De la torre
|
1941d8f5b3
|
Merge branch 'dev' into 6832_refactorBackToItem
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-03 05:04:05 +00:00 |
Jorge Penadés
|
dc8696b422
|
feat: refs #6889 add back tests
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-31 16:31:36 +02:00 |
Jorge Penadés
|
836cfcbd07
|
refactor: refs #6889 sale tests e2e
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-31 13:58:26 +02:00 |
Jorge Penadés
|
9578c506b4
|
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 12:58:05 +02:00 |
Javi Gallego
|
6a08a806a9
|
Merge branch 'dev' into 6408-rocketChat
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-31 10:39:14 +00:00 |
Guillermo Bonet
|
7dc17cd4f6
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-31 12:29:32 +02:00 |
Robert Ferrús
|
85c328e522
|
fix: refs #7039 hotFixcountry
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-31 10:07:27 +02:00 |
Alex Moreno
|
788f334e70
|
intros
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-31 09:29:47 +02:00 |
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 |
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 |
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 |
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 |
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 |