 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
|
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 |
|
Joan Sanchez
|
d45c0cb99a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 08:59:39 +01:00 |
|
Joan Sanchez
|
4477486f8e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2023-02-02 08:58:44 +01:00 |
|
Alexandre Riera
|
5f656a894f
|
buscador
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-02 08:52:38 +01:00 |
|
Joan Sanchez
|
85bde58752
|
Merge pull request 'fixes #4927 supplier.fiscal-data permitir 'Razón social' duplicada' (!1230) from 4927-permitir-razonSocial-duplicada into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1230
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-02-02 07:47:38 +00:00 |
|
Alexandre Riera
|
780018e4df
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-02 08:40:49 +01:00 |
|
Alexandre Riera
|
52a3f77bc5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 08:39:28 +01:00 |
|
Alex Moreno
|
5b228c5e71
|
Merge branch 'master' into hotFix_getRate2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 07:35:34 +00:00 |
|
Alexandre Riera
|
547c7a336b
|
Merge branch 'dev' into 5072-comprobar-email-clientFiscalData
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-01 08:52:17 +00:00 |
|
Alexandre Riera
|
73b7a1d761
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5138-cambiarOrdenCampos-routeSummary
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-01 08:52:53 +01:00 |
|
Alexandre Riera
|
62766706b1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData
|
2023-02-01 08:52:03 +01:00 |
|
Alexandre Riera
|
7d7e1a74da
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-01 08:46:28 +01:00 |
|
Alexandre Riera
|
d17f9396ad
|
refs #3291 save button
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-01 08:43:13 +01:00 |
|
Alex Moreno
|
00ffc82f8d
|
use CURDATE() in rawSQL
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-01 08:34:14 +01:00 |
|
Pau
|
dcd74bacc0
|
refs #5181 @1h30
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-01 08:32:22 +01:00 |
|
Alex Moreno
|
ae6e0f0772
|
Merge branch 'master' into hotFix_getRate2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-01 06:20:48 +00:00 |
|
Alex Moreno
|
2528b2d3ad
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-01 07:10:51 +01:00 |
|
Guillermo Bonet
|
909f0c3532
|
Merge branch 'master' into 4975-mdbConfig-and-upload
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-01 06:09:44 +00:00 |
|
Alexandre Riera
|
11a605ea04
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-31 15:40:54 +01:00 |
|
Alexandre Riera
|
c6f87f9084
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5131-cambios-ticketAdvance
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 15:39:03 +01:00 |
|
Alexandre Riera
|
349829e5ed
|
refs #5131 fixed tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 15:29:00 +01:00 |
|
Alexandre Riera
|
3622eda589
|
refs #5131 added lines liters to origin ticket
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 15:09:16 +01:00 |
|
Guillermo Bonet
|
18168b07bb
|
refs #4975 Changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 14:47:24 +01:00 |
|
Alexandre Riera
|
19d7e7e610
|
refs #5131 totalWithVat order
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 14:23:40 +01:00 |
|
Alexandre Riera
|
b70557ee86
|
refs #5131 agencies icon
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 14:20:08 +01:00 |
|
Juan Ferrer
|
5045a8f670
|
#5175 TpvTransaction.confirm(): Return response
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 14:00:10 +01:00 |
|
Guillermo Bonet
|
e12f183968
|
refs #4975 Added chat/send in mdbVersion/upload
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 13:46:42 +01:00 |
|
Juan Ferrer
|
5a4ae7d742
|
refs #5174 TpvTransaction: Methods start & end added, fixes & refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 13:29:17 +01:00 |
|
Alexandre Riera
|
87bef62e35
|
refs #5131 hasStock refers to origin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 13:21:51 +01:00 |
|
Alexandre Riera
|
e5b7ebd8b4
|
refs #5131 IPT null or value
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 13:06:58 +01:00 |
|
Alexandre Riera
|
331b278726
|
refs #5131 checkbox pending origin destination
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-31 13:00:25 +01:00 |
|
Pau
|
20ffcff219
|
Merge branch 'dev' into 5174-refactor-ticket-weekly
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 10:57:56 +00:00 |
|
Alexandre Riera
|
906f80da5a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5104-convert-prices
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 11:56:41 +01:00 |
|
Alexandre Riera
|
9d0891e080
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 11:43:49 +01:00 |
|
Alexandre Riera
|
c121f184b6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 11:43:26 +01:00 |
|
Alexandre Riera
|
1b12770655
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 11:31:01 +01:00 |
|
Alex Moreno
|
292898708b
|
result not null
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 11:24:09 +01:00 |
|
Alex Moreno
|
320ceb3e2c
|
fix: getRate2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 11:17:31 +01:00 |
|
Alexandre Riera
|
ca967a7223
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5138-cambiarOrdenCampos-routeSummary
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 11:15:46 +01:00 |
|
Alex Moreno
|
62cd6ab0c9
|
Merge branch 'dev' into fix_e2e_state_and_date
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 09:39:08 +00:00 |
|
Alex Moreno
|
4740cdbbb9
|
fix: e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 10:37:18 +01:00 |
|
Vicent Llopis
|
19120ef102
|
feat: el descriptor coge el warehouseFk dependiendo de la sección
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-31 09:28:28 +01:00 |
|
Alexandre Riera
|
7d617c0ac4
|
refs #5129 translations and userErrors added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-31 09:04:45 +01:00 |
|
Juan Ferrer
|
82bc7307f0
|
#5174 Signature verification fixed & enabled
gitea/salix/pipeline/head Build queued...
Details
|
2023-01-31 00:41:36 +01:00 |
|
Juan Ferrer
|
424dcb954c
|
refs #5174 Hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-30 20:23:52 +01:00 |
|
Juan Ferrer
|
64d8ae1f49
|
refs #5174 Hotfix
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2023-01-30 20:22:52 +01:00 |
|
Juan Ferrer
|
339cdab3c4
|
refs #5174 Debug enabled
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-30 19:59:46 +01:00 |