 Joan Sanchez
|
ebee9144b4
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-09 09:16:30 +01:00 |
|
Joan Sanchez
|
461799f137
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-09 08:56:30 +01:00 |
 Vicent Llopis
|
222032aae7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
|
2023-02-09 08:38:08 +01:00 |
 Alexandre Riera
|
0e75a5f23a
|
Merge pull request 'hotfix ticketFutureAdvance warehouse' (!1316) from hotFix-ticketFutureAdvance-warehouse into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1316
|
2023-02-09 07:18:06 +00:00 |
 Alex Moreno
|
f06fc92ae8
|
refactor(chat): not use transactions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-08 15:15:26 +01:00 |
|
Alexandre Riera
|
725b7b9bce
|
Merge branch 'master' into hotFix-ticketFutureAdvance-warehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-08 12:48:23 +00:00 |
|
Alexandre Riera
|
ef5b29d6f3
|
hotfix ticketFutureAdvance warehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-08 13:47:35 +01:00 |
|
Alex Moreno
|
b209ecb011
|
feat: create post route for debug
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-08 10:56:51 +01:00 |
|
Alexandre Riera
|
4413c8828b
|
refs #5152 added confirmation popup
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-08 10:54:21 +01:00 |
|
Vicent Llopis
|
b70311999d
|
refactor: eliminado codigo innecesario y quitado update que se hará directamente en producción
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-08 09:41:09 +01:00 |
|
Vicent Llopis
|
be539a54ce
|
delete console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-08 09:31:03 +01:00 |
|
Alex Moreno
|
9ec2f731ae
|
Merge branch 'dev' into 4858-chat_realTime
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-08 07:30:37 +00:00 |
|
Alexandre Riera
|
549d530690
|
.
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-08 07:35:52 +01:00 |
 Javi Gallego
|
4a562c3110
|
unificado todo a claimState isEditable
|
2023-02-07 15:40:03 +01:00 |
|
Vicent Llopis
|
cda7a6e3fd
|
fix: no mostraba los numeros de la semana al inicio
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-07 15:01:33 +01:00 |
 Pau
|
86e6672e49
|
Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-07 13:39:36 +00:00 |
|
Vicent Llopis
|
cec7602e1b
|
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-07 13:44:53 +01:00 |
|
Vicent Llopis
|
6cb3930be0
|
feat: añadido icono info, que indica de que almacén se saca la información
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-07 13:40:39 +01:00 |
|
Alexandre Riera
|
0e8848b31c
|
Merge pull request 'entrLatestBuys addFilter' (!1311) from entryLatestBuys-addFilter into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1311
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-02-07 11:41:47 +00:00 |
|
Alexandre Riera
|
9f2ff4e4b7
|
addFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-07 12:30:30 +01:00 |
|
Joan Sanchez
|
71c9ed3a4e
|
Merge pull request 'MASTER-fix(invoiceIn_descriptor): supplier.email' (!1307) from hotFix_invoiceIn_supplier_email into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1307
|
2023-02-07 08:39:16 +00:00 |
|
Alex Moreno
|
3d27879ce8
|
Merge branch 'master' into hotFix_invoiceIn_supplier_email
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-07 08:09:10 +00:00 |
|
Joan Sanchez
|
90830e7ce9
|
Merge pull request 'hotfix balanceCompensation' (!1303) from hotFix-balance-compensation into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1303
|
2023-02-07 07:39:02 +00:00 |
|
Alexandre Riera
|
d3564209ba
|
findById
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-07 08:05:48 +01:00 |
|
Alex Moreno
|
f891b5a00f
|
Merge branch 'master' into hotFix_invoiceIn_supplier_email
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 14:12:51 +00:00 |
|
Vicent Llopis
|
2e8aabab14
|
fix: type relation in models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 14:32:54 +01:00 |
|
Vicent Llopis
|
499c9fa706
|
refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 14:03:38 +01:00 |
|
Vicent Llopis
|
a2f93e68b1
|
feat: add 'parking' column
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 13:57:04 +01:00 |
|
Alexandre Riera
|
6d3bcc97f3
|
Merge branch 'master' into hotFix-balance-compensation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-06 12:00:03 +00:00 |
|
Alexandre Riera
|
c397757762
|
sql version updated
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-06 12:26:54 +01:00 |
|
Vicent Llopis
|
4f76465246
|
fix: no recarga cada vez
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-06 12:24:26 +01:00 |
|
Alexandre Riera
|
68b4d269ff
|
Merge branch 'dev' into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 09:18:13 +00:00 |
|
Alex Moreno
|
44055775cb
|
fix: not use variables and direct send in send
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-06 10:11:41 +01:00 |
|
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 |