Alex Moreno
|
7ad9e2cb5a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4858-chat_realTime
|
2023-02-06 10:05:17 +01:00 |
Alexandre Riera
|
7af9aa46e9
|
Merge pull request 'fixes #5074 ticket balance pone null' (!1308) from 5074-ticket-balance-null into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1308
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-02-06 09:02:42 +00:00 |
Joan Sanchez
|
9b177a17a7
|
Merge pull request 'hotfix itemConfig' (!1309) from hotfix-itemConfig into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1309
|
2023-02-06 08:13:43 +00:00 |
Alexandre Riera
|
0a9d37ca08
|
hotfix itemConfig
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-06 09:01:13 +01:00 |
Alexandre Riera
|
3879dfc89b
|
Merge branch '5074-ticket-balance-null' of https://gitea.verdnatura.es/verdnatura/salix into 5074-ticket-balance-null
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 08:19:16 +01:00 |
Alexandre Riera
|
f2f8a4eb04
|
fix test
|
2023-02-06 08:19:13 +01:00 |
Alexandre Riera
|
2c946b38d4
|
Merge branch 'dev' into 5074-ticket-balance-null
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-06 07:08:50 +00:00 |
Alexandre Riera
|
df3e818182
|
refs #5074 refactor this.receipt.description
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-06 08:07:50 +01:00 |
Alexandre Riera
|
b5b2e429e5
|
Merge pull request 'fixes #3291 entry.latest-buys añadir el buscador de la cesta' (!1298) from 3291-entryLatestBuys-buscador into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1298
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-02-06 06:42:06 +00:00 |
Alex Moreno
|
c11df75a82
|
Merge branch 'master' into hotFix_invoiceIn_supplier_email
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 06:30:56 +00:00 |
Alexandre Riera
|
fd31547b22
|
Merge branch 'dev' into 3291-entryLatestBuys-buscador
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 06:00:41 +00:00 |
Alexandre Riera
|
546b3f6c9b
|
refs #3291 lateral menu added, fixed tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 15:21:27 +01:00 |
Joan Sanchez
|
8158cb6860
|
feat(db): export prod structure & data
gitea/salix/pipeline/head There was a failure building this commit
Details
Refs: #5192
|
2023-02-03 15:08:41 +01:00 |
Alex Moreno
|
2717c6420c
|
fix(invoiceIn_descriptor): supplier.email
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 14:58:58 +01:00 |
Joan Sanchez
|
d773837740
|
Removed user model
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-03 14:44:00 +01:00 |
Vicent Llopis
|
ba5616055b
|
feat: item.descriptor en summary coge el warehouse por defecto
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-03 14:31:50 +01:00 |
Joan Sanchez
|
38f34adc9a
|
Merge pull request 'master → test' (!1305) from master into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1305
|
2023-02-03 12:44:42 +00:00 |
Vicent Llopis
|
065f91afcf
|
Merge pull request '4873-zone.delivery-day' (!1248) from 4873-zone.delivery-day into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1248
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-02-03 12:28:35 +00:00 |
Vicent Llopis
|
e69a6ae0dc
|
add changelog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 13:25:38 +01:00 |
Vicent Llopis
|
c32a627fe5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4873-zone.delivery-day
|
2023-02-03 13:23:42 +01:00 |
Guillermo Bonet
|
220f7ee0f8
|
Merge pull request '4975-mdbBranch-dsName' (!1304) from 4975-mdbBranch-dsName into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1304
|
2023-02-03 12:09:27 +00:00 |
Guillermo Bonet
|
ca24de7ee5
|
refs #4975 Changed description
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 12:50:19 +01:00 |
Guillermo Bonet
|
dddeca0832
|
refs #4975 Added property dsName in mdbBranch tab
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 12:46:01 +01:00 |
Alexandre Riera
|
e78ccd963e
|
Merge branch '5036-regularizar-historicos' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 12:04:05 +01:00 |
Alexandre Riera
|
0c91f95762
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
|
2023-02-03 12:03:16 +01:00 |
Alex Moreno
|
cf9338e891
|
Merge pull request '5043-mock_Date' (!1260) from 5043-mock_Date into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1260
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2023-02-03 10:57:49 +00:00 |
Alexandre Riera
|
141ae7b11c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 11:56:09 +01:00 |
Alex Moreno
|
03d7a2908b
|
refactor: only mock vn.time from 2000 to 2002
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 11:25:14 +01:00 |
Alex Moreno
|
575784c870
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-02-03 10:03:59 +01:00 |
Alex Moreno
|
15c1cdfcef
|
Merge pull request 'fixes #5170-feat(recover-password): use user' (!1300) from 5170-recover-password_use_user into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1300
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2023-02-03 08:18:28 +00:00 |
Alex Moreno
|
e16c16c194
|
Merge branch 'dev' into 5170-recover-password_use_user
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 08:12:54 +00:00 |
Juan Ferrer
|
f4fc597c2c
|
Merge pull request 'master to test' (!1302) from master into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1302
|
2023-02-03 08:12:09 +00:00 |
Pau
|
6c8609e180
|
Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 07:52:14 +00:00 |
Vicent Llopis
|
508bce73bc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-03 08:41:35 +01:00 |
Pau
|
be68d56af3
|
Merge pull request 'fixes #5174 Refactor ticket weekly to use smartTable' (!1275) from 5174-refactor-ticket-weekly into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1275
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-02-03 07:41:27 +00:00 |
Pau
|
e3de54b811
|
changed styles on summary
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 08:35:15 +01:00 |
Pau
|
199dd2ba8d
|
Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 06:09:38 +00:00 |
Pau
|
af1e68675f
|
Merge branch 'dev' into 5174-refactor-ticket-weekly
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 06:04:52 +00:00 |
Alexandre Riera
|
6533b92ad3
|
Merge branch 'master' into hotFix-balance-compensation
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 14:15:05 +00:00 |
Alexandre Riera
|
21281e09db
|
hotfix removed supplier
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-02 15:13:53 +01:00 |
Alex Moreno
|
8a50c56284
|
fix(updateWorkCenter): use vnNew()
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 14:52:40 +01:00 |
Alex Moreno
|
6c772643a8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-02-02 11:55:11 +01:00 |
Vicent Llopis
|
cf54415e61
|
Merge pull request '5084-monitor.index_tickets' (!1301) from 5084-monitor.index_tickets into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1301
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-02-02 10:52:51 +00:00 |
Alex Moreno
|
d5cf1f4ff8
|
Merge pull request 'fix: getRate2' (!1290) from hotFix_getRate2 into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1290
|
2023-02-02 10:50:03 +00:00 |
Joan Sanchez
|
eded1ebf20
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-02 11:42:48 +01:00 |
Vicent Llopis
|
9f0f8729f5
|
Merge branch 'dev' into 5084-monitor.index_tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 10:35:15 +00:00 |
Vicent Llopis
|
15429293dd
|
fix: frontTest
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 11:34:13 +01:00 |
Alexandre Riera
|
16a6167db0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 10:39:26 +01:00 |
Pau
|
6807d8d5b1
|
Merge pull request '4797-lilium-worker-notifications' (!1229) from 4797-lilium-worker-notifications into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1229
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-02-02 08:53:28 +00:00 |
Alexandre Riera
|
3b0e8c2412
|
Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 08:40:57 +00:00 |