 Alexandre Riera
|
bca9e757d4
|
hotfix parsed description array to string
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-23 15:52:47 +01:00 |
 Robert Ferrús
|
1e23dfe34e
|
Merge branch 'dev' into 5115-transfer_sales
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-23 10:00:32 +00:00 |
 Alex Moreno
|
8597497429
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4998-claim_photos_back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-22 14:31:31 +01:00 |
|
Alexandre Riera
|
3a3dcc941b
|
Merge branch '5172-cliente-impagado' of https://gitea.verdnatura.es/verdnatura/salix into 5172-cliente-impagado
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-22 14:24:33 +01:00 |
|
Alexandre Riera
|
0263a4833e
|
refs #5172 added changelog
|
2023-02-22 14:24:31 +01:00 |
|
Alexandre Riera
|
ca1f5480ae
|
refs #5235 added setClientSample(), fixed tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-22 13:04:27 +01:00 |
|
Alexandre Riera
|
42b8f08a4d
|
refs #5168 checked sales with logs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-22 12:14:17 +01:00 |
 Joan Sanchez
|
3d8add4d6f
|
Merge branch 'dev' into 5192-db_export
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-21 13:12:27 +00:00 |
|
Joan Sanchez
|
0d16f71fd3
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-21 14:10:36 +01:00 |
 Vicent Llopis
|
c30242f9cc
|
fix: front test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-21 12:17:16 +01:00 |
|
Vicent Llopis
|
eda70b009b
|
fix: cuando haces F5 en cualquier sección que no sea Diary, te coge el warehouse por defecto
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-21 11:48:56 +01:00 |
|
Vicent Llopis
|
432c8a9ab8
|
refactor: cambiados estilos de los chips
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-21 10:56:46 +01:00 |
|
Joan Sanchez
|
58548164d2
|
Merge branch 'dev' into 5192-db_export
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-21 09:20:30 +00:00 |
|
Joan Sanchez
|
4c2878e232
|
Updated unit tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-21 09:48:47 +01:00 |
|
Joan Sanchez
|
45c4f2ff45
|
Updated test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-21 08:51:50 +01:00 |
|
Joan Sanchez
|
c9840f6985
|
Updated entry structure
|
2023-02-21 08:32:46 +01:00 |
|
Alex Moreno
|
cc5a867bf4
|
feat(claim_model): add claimDms relations
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-20 15:16:19 +01:00 |
|
Alexandre Riera
|
063c60b4a1
|
Merge branch 'dev' into 5172-cliente-impagado
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-20 13:58:31 +00:00 |
|
Joan Sanchez
|
ab6ca12862
|
Merge branch 'dev' into 5266-image_fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-20 13:15:40 +00:00 |
|
Alexandre Riera
|
271a6d898d
|
Merge branch 'dev' into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-20 12:17:03 +00:00 |
|
Alexandre Riera
|
04877c1425
|
refs #5063 refactor hook
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-20 13:15:47 +01:00 |
|
Joan Sanchez
|
90e1136ee2
|
fix(image): store images with a name generated through uuid instead of url path
gitea/salix/pipeline/head This commit looks good
Details
Refs: #5266
|
2023-02-20 12:40:13 +01:00 |
|
Vicent Llopis
|
26d72a7b3f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund
|
2023-02-20 11:49:17 +01:00 |
|
Alexandre Riera
|
c7f22a10ba
|
refs #5063 refactored hook
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-20 10:39:12 +01:00 |
|
Alexandre Riera
|
5c2c99e397
|
refs #5172 changed icon name
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-20 09:44:14 +01:00 |
|
Alexandre Riera
|
08476fe2a6
|
Merge branch 'dev' into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 13:30:47 +00:00 |
|
Joan Sanchez
|
86dd299292
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 13:33:52 +01:00 |
|
Joan Sanchez
|
ceab11cc41
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 13:33:34 +01:00 |
|
Vicent Llopis
|
39a3c8a7fa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 13:06:30 +01:00 |
|
Vicent Llopis
|
853e06f523
|
fix: card reload automatic
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 12:38:07 +01:00 |
|
Joan Sanchez
|
527caf9ca0
|
refactor(zerofill): deprecated zerofill and removed function
gitea/salix/pipeline/head This commit looks good
Details
Refs: #5207
|
2023-02-17 11:19:35 +01:00 |
|
Vicent Llopis
|
373be40986
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies
|
2023-02-17 10:42:50 +01:00 |
|
Vicent Llopis
|
4001a75916
|
Merge branch 'dev' into 5180-invoice-out_refund
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 08:57:48 +00:00 |
|
Vicent Llopis
|
874f459956
|
refactor: borrada variable innecesaria
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 09:49:47 +01:00 |
|
Alexandre Riera
|
8b088e831a
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-16 14:43:51 +01:00 |
|
Vicent Llopis
|
b5d2d53435
|
fix: test back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-16 10:45:13 +01:00 |
|
Vicent Llopis
|
3096738b84
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-16 09:52:18 +01:00 |
|
Vicent Llopis
|
3dd870f7df
|
fix: test e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-16 09:44:20 +01:00 |
|
Vicent Llopis
|
bb2eddc462
|
fix: test front
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-16 07:32:44 +01:00 |
|
Vicent Llopis
|
73ae45c2c0
|
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-15 15:08:58 +01:00 |
|
Alexandre Riera
|
dca5ae0f72
|
refs #5223 added params
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-15 13:14:52 +01:00 |
|
Vicent Llopis
|
7439b12d98
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-15 09:31:20 +01:00 |
|
Alexandre Riera
|
ea2fd59cdc
|
refs #5223 changed ref and email text
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-14 12:41:36 +01:00 |
|
Vicent Llopis
|
a5a0256e44
|
feat: añadido parametro que indica si genera uno o multiples ticket de abono
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-14 10:58:41 +01:00 |
 Pau
|
6a732819ba
|
Merge branch 'dev' into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-14 09:58:10 +00:00 |
|
Alexandre Riera
|
b1a6713a3d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-14 09:04:08 +01:00 |
|
Alexandre Riera
|
139dac0bc1
|
refs #4588 moved hook from entryObservation to entry
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-14 08:08:48 +01:00 |
|
Alexandre Riera
|
e5e86de8d2
|
Merge branch 'dev' into 5152-ticketBasicData-stepTwo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-14 07:07:12 +00:00 |
|
Alexandre Riera
|
f6ec6da1c4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-13 13:48:12 +01:00 |
|
Alexandre Riera
|
bfc21a7c97
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5172-cliente-impagado
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-13 13:36:58 +01:00 |
|
Alexandre Riera
|
4c7aae95aa
|
refs #5172 added default icon
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-13 13:04:22 +01:00 |
|
Alexandre Riera
|
76ed4d2d4b
|
refs #5194 fixed tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-13 10:16:28 +01:00 |
|
Vicent Llopis
|
4da8546bdf
|
Merge branch 'dev' into 2952-ticket.sale-tracking_part2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-13 07:14:28 +00:00 |
|
Alexandre Riera
|
a7e9e52ad4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-13 07:34:13 +01:00 |
|
Pau
|
294b4acbe2
|
Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-13 06:03:21 +00:00 |
|
Alexandre Riera
|
6cb815faaf
|
.
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-10 10:13:41 +01:00 |
|
Alexandre Riera
|
4787de3df5
|
fixing merge
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-10 09:04:49 +01:00 |
|
Alexandre Riera
|
a468fb2c66
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head Build queued...
Details
|
2023-02-10 09:02:44 +01:00 |
|
Alexandre Riera
|
9dc07d88d6
|
fixing e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-10 08:56:30 +01:00 |
|
Alexandre Riera
|
194069c0c2
|
refs #5194 fixed stock, lines
|
2023-02-10 08:46:54 +01:00 |
|
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 |
|
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 |
|
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 |
|
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
|
9f2ff4e4b7
|
addFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-07 12:30:30 +01:00 |
|
Alexandre Riera
|
d3564209ba
|
findById
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-07 08:05:48 +01: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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
|
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
|
575784c870
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-02-03 10:03:59 +01: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
|
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 |
|
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 |
|
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
|
cadd525380
|
Merge branch 'dev' into 5174-refactor-ticket-weekly
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 08:36:07 +00:00 |