Joan Sanchez
|
89eb065f6d
|
Updated models
|
2023-01-24 09:04:43 +01:00 |
Alex Moreno
|
8a844917ce
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-01-23 08:07:14 +01:00 |
Pau
|
b446f5cf5f
|
Merge branch 'dev' into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-23 07:21:53 +01:00 |
Pau
|
2e988ea701
|
doPhoto updated on item upload
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-20 13:34:36 +01:00 |
Vicent Llopis
|
ef7a0508ed
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-20 08:29:42 +01:00 |
Vicent Llopis
|
eefafb3ac2
|
fix: available is cero
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-19 15:14:31 +01:00 |
Alexandre Riera
|
200a256016
|
Merge branch 'dev' into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-18 12:15:12 +00:00 |
Alexandre Riera
|
be5f987b0a
|
refs #4945 added defaultTag, validPriorities, defaultPriority in itemConfig
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-18 13:14:49 +01:00 |
Alexandre Riera
|
98d6322b0e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5020-borradoLogico-IPT
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-18 08:00:20 +01:00 |
Pau
|
99338bb6f8
|
isPhotoRequired implemented
|
2023-01-17 10:11:41 +01:00 |
Alexandre Riera
|
4e1c43eb4d
|
refs #4945 nombre temporal removed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-17 10:01:49 +01:00 |
Alexandre Riera
|
c47cac7d55
|
refs #5020 isActive column added, filter in front
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-17 08:54:26 +01:00 |
Alex Moreno
|
ff39a81b8c
|
Merge branch 'dev' into 4523-item_fixed-price_rate2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-17 06:07:14 +00:00 |
Alex Moreno
|
e27a559416
|
refactor: replace all Date
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-16 15:18:24 +01:00 |
Vicent Llopis
|
2451d00998
|
Merge branch 'dev' into 4925-item.tags
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-12 07:59:43 +00:00 |
Vicent Llopis
|
e4603a06f2
|
refacotor: borrados los await para que devuelva la promesa
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-12 08:59:24 +01:00 |
Vicent Llopis
|
cdee85e1e8
|
refacotor: change description
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-10 08:31:32 +01:00 |
Vicent Llopis
|
fd9ca3a4c1
|
add test
|
2023-01-05 10:35:49 +01:00 |
Vicent Llopis
|
21a62a0fab
|
refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-03 13:29:44 +01:00 |
Vicent Llopis
|
fec965a8dd
|
refs 4925 refactor: borrados console.log y actualizada descripción
|
2023-01-03 13:29:27 +01:00 |
Vicent Llopis
|
3792a80ad5
|
refs #4925 feat: añadido back para editar tags
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-29 14:24:32 +01:00 |
Vicent Llopis
|
d5b626434b
|
refactor: add translations, change css...
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-28 12:42:51 +01:00 |
Vicent Llopis
|
3dd0c79629
|
feat: add ItemShelvingSales/filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-27 15:00:49 +01:00 |
Vicent Llopis
|
d3a9e9ac89
|
delete: columnas que ya no existen en la tabla
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-23 12:17:24 +01:00 |
Vicent Llopis
|
16c20e4700
|
feat: add itemShelvingSale popup
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-23 12:08:16 +01:00 |
Alex Moreno
|
502a692521
|
test(item_fixedPrice_rate2): backTest and e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-21 12:55:11 +01:00 |
Alex Moreno
|
5d2b69d063
|
test(item_fixedPrice): front recalculateRate2
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 15:06:59 +01:00 |
Alex Moreno
|
f82870bec6
|
feat(item_fixed-price): recalculate rate2 and when change item keep minPrice of item
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 14:39:38 +01:00 |
Pau
|
da8ebf1509
|
Merge branch '4492-item.create-same-as-item.isLaid' of https://gitea.verdnatura.es/verdnatura/salix into 4492-item.create-same-as-item.isLaid
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 07:17:57 +01:00 |
Pau
|
638fd62aae
|
added requested changes, refs #4492 @40m
|
2022-11-10 07:17:54 +01:00 |
Pau
|
ae95b5d3ef
|
Merge branch 'dev' into 4492-item.create-same-as-item.isLaid
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 07:22:37 +00:00 |
Pau
|
37292cee89
|
remove comments
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 08:12:46 +01:00 |
Pau
|
11cf1ba414
|
fix back test error
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 07:50:54 +01:00 |
Pau
|
7d7af6eb49
|
Modified model to allow modifications to isLaid
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 07:42:21 +01:00 |
Pau
|
ff5e601a1e
|
Item islaid and test
|
2022-10-31 14:43:31 +01:00 |
Vicent Llopis
|
21e2945d4f
|
refactor: delete destroyAll
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 09:30:17 +02:00 |
Vicent Llopis
|
9c52508a88
|
feat: add total labels
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-11 08:40:22 +02:00 |
Vicent Llopis
|
7b7e01f49e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-11 07:09:20 +02:00 |
Vicent Llopis
|
ddbe1057ad
|
feat: add new section
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 09:47:53 +02:00 |
Vicent Llopis
|
2f17257e46
|
feat: add new sub section itemShelving
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-05 15:13:48 +02:00 |
Vicent Llopis
|
761563edc5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-10-05 13:38:17 +02:00 |
Vicent Llopis
|
68e4f3a8bc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-04 09:10:15 +02:00 |
Joan Sanchez
|
a065d77929
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-03 13:37:59 +02:00 |
Joan Sanchez
|
c177c0366d
|
Item PDF
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-03 13:35:49 +02:00 |
Joan Sanchez
|
e4b61f81a9
|
Merge pull request '#4226-remove-density' (#1066) from #4226-remove-density into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1066
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-10-03 07:41:58 +00:00 |
Joan Sanchez
|
1ac35c0b68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-29 14:52:31 +02:00 |
Joan Sanchez
|
660842ca31
|
Osticket & waste refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-27 14:20:57 +02:00 |
Pau
|
901007d34b
|
change test case to expect the image to be defined
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-27 13:58:27 +02:00 |
Pau
|
2dd6de1d47
|
Modified Fixtures, clone.js and the item model
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-27 13:46:23 +02:00 |
Javi Gallego
|
a662bb90a2
|
Merge branch 'dev' into #4226-remove-density
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-27 09:32:48 +02:00 |
Joan Sanchez
|
410e651edd
|
Buyer waste
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-27 07:24:45 +02:00 |
Joan Sanchez
|
f9f09440ec
|
Merge pull request '4363-refactor(item_waste): refactor table and add totals in table_head' (#1053) from 4363-item_waste_refactor into dev
gitea/salix/pipeline/head This commit is unstable
Details
Reviewed-on: #1053
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-09-16 07:10:48 +00:00 |
Joan
|
90229112e9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-15 06:35:03 +00:00 |
Vicent Llopis
|
eb7bd3dc59
|
update brach
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-14 14:03:15 +02:00 |
Alex Moreno
|
6b252f7e33
|
refactor(item_waste): refactor table and add totals in table_head
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-14 10:13:30 +02:00 |
Joan Sanchez
|
5a46444875
|
Use POST request method instead of GET
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-13 13:53:44 +02:00 |
Vicent Llopis
|
1fd97f167c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-13 11:35:15 +02:00 |
Javi Gallego
|
5cf102c7fd
|
sustituido density por weightByPiece
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-08-24 14:13:26 +02:00 |
Joan Sanchez
|
768e4d5e77
|
Resolved conflicts
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-10 12:13:31 +02:00 |
Vicent Llopis
|
8f54365350
|
refator: parametrizardo con ?
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-10 09:19:23 +02:00 |
Vicent Llopis
|
c3d396b042
|
fix: test e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-04 13:52:59 +02:00 |
Vicent Llopis
|
537c383cd2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-29 13:38:23 +02:00 |
Vicent Llopis
|
224ea61a62
|
fix: delete warehouseFk from itemType model
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-29 13:07:25 +02:00 |
Vicent Llopis
|
840e792d13
|
fix: backTest
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-29 12:52:53 +02:00 |
Vicent Llopis
|
605da52286
|
fix: replace it.warehouseFk by userConfig.warehouseFk
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-29 12:22:03 +02:00 |
Joan Sanchez
|
468da0c5a9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-27 08:12:06 +02:00 |
Joan Sanchez
|
f4825488c6
|
refactor(Tasks API): ghanged method to GET
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-07-26 11:47:43 +02:00 |
Vicent Llopis
|
7bf9a8c100
|
delete itemType.warehouseFk
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-12 11:52:47 +02:00 |
Vicent Llopis
|
6f3d4792d5
|
update backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-12 10:03:58 +02:00 |
Vicent Llopis
|
eaa7658b23
|
delete it.warehouseFk
|
2022-07-12 10:03:50 +02:00 |
Joan Sanchez
|
ae79163048
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-30 13:17:04 +02:00 |
Joan Sanchez
|
140af7e808
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-30 13:14:08 +02:00 |
Joan Sanchez
|
ad021265c7
|
Deprecated field taxTypeFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-30 11:42:37 +02:00 |
Alex Moreno
|
a98a927663
|
fix back test and e2e that now fail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-27 11:17:45 +02:00 |
Alex Moreno
|
eb9bd66ddb
|
prepare for static dates
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-09 13:33:01 +02:00 |
Alex Moreno
|
7eec9de0aa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-09 07:47:03 +02:00 |
Carlos Jimenez Ruiz
|
a76dd11825
|
Merge branch 'dev' into 3870-models
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-23 12:33:08 +00:00 |
Vicent Llopis
|
1b3f0ee026
|
refactor: added itemPackingType and temperature relations
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-05-23 12:40:11 +02:00 |
Vicent Llopis
|
3c9800a7a3
|
refactor: pull request changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-20 12:33:12 +02:00 |
Vicent Llopis
|
ebbb0466a0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-05-17 10:13:05 +02:00 |
Vicent Llopis
|
3335cb8a01
|
feat(item.itemType): add fields
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-17 08:32:45 +02:00 |
Vicent Llopis
|
7ad56327a1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType
|
2022-05-17 08:21:49 +02:00 |
Carlos Jimenez Ruiz
|
d31f7f1b6b
|
all type Dates replaced to date as per convention
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-16 10:19:43 +02:00 |
Carlos Jimenez Ruiz
|
b5ccd32800
|
Merge branch 'dev' into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-16 07:23:08 +00:00 |
Alex Moreno
|
5021315ed4
|
refactor(clientCredit): test and types
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-12 09:47:47 +02:00 |
Vicent Llopis
|
13a6f1f8c1
|
feat(item): add section itemType
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-11 14:47:54 +02:00 |
Vicent Llopis
|
734f9cb60d
|
feat(item.itemType): added section itemType
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-11 07:28:17 +02:00 |
Vicent Llopis
|
a6b8674302
|
feat(invoiceIn.tax): add button for create an expence
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-09 14:34:20 +02:00 |
Carlos Jimenez Ruiz
|
b2f930911f
|
fixed problems in two spec files
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-29 09:18:06 +02:00 |
Vicent Llopis
|
bad90c12f4
|
feat: add required fields and models
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-27 14:17:41 +02:00 |
Alex Moreno
|
e00d63d7af
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-20 14:30:23 +02:00 |
Alex Moreno
|
c7b8b61a08
|
feat(item): add model itemPackingType
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-08 10:34:36 +02:00 |
Vicent Llopis
|
eba3ac40a5
|
refactor: delete item.compression
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-06 11:48:12 +02:00 |
Alex Moreno
|
c904bf0bdf
|
feat(back): new Date mocked time
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-01 13:55:45 +02:00 |
Alex Moreno
|
eec1c1ff86
|
feat(db): static dates
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-03-30 12:45:01 +02:00 |
Alex Moreno
|
b56e1810c3
|
test(item_fixedPrice): fix back test & e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-18 10:30:30 +01:00 |
Alex Moreno
|
56331da20b
|
feat(item_index): add column producer
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-01 09:37:11 +01:00 |
Vicent Llopis
|
a6e5123949
|
feat: add filter by item.longName
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-22 13:16:45 +01:00 |
Alex Moreno
|
eea9413628
|
fix(item_basic-data): controller, test e2e and model
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 08:34:32 +01:00 |
Alex Moreno
|
02d89e5774
|
feat(item): add field genericFk in basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-24 08:51:07 +01:00 |
Carlos Jimenez Ruiz
|
51a3673160
|
Merge branch 'dev' into 3369-filterValue_sqli
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-23 08:54:50 +00:00 |
Carlos Jimenez Ruiz
|
1f2417b55e
|
Merge branch 'dev' into 3290-entry_latest-buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 15:34:55 +00:00 |
Carlos Jimenez Ruiz
|
cae3322c6b
|
Merge branch 'dev' into 3332-item_search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 15:28:21 +00:00 |
Joan Sanchez
|
4ebad6b372
|
filter order was not properly being applied
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 15:54:01 +01:00 |
Joan Sanchez
|
3a2e4c54b6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3369-filterValue_sqli
|
2021-11-22 15:49:43 +01:00 |
Joan Sanchez
|
a940d14256
|
fix(filterValue): fixed sql injection vulnerability
gitea/salix/pipeline/head There was a failure building this commit
Details
Refs: 3369
|
2021-11-22 14:40:03 +01:00 |
Alex Moreno
|
fe46dbd343
|
feat(entry_last-buys): add filter isFloramondo
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 11:49:30 +01:00 |
Alex Moreno
|
97a66754a7
|
feat(item and entry): add back test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 08:58:54 +01:00 |
Alex Moreno
|
d2729e67e9
|
feat(item and latest-buys: add supplier filter
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 08:27:14 +01:00 |
Carlos Jimenez Ruiz
|
ca0c3be843
|
Merge branch 'dev' into 3381-item_diary-claim
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-19 12:55:11 +00:00 |
Carlos Jimenez Ruiz
|
e5977be502
|
Merge branch 'dev' into 3374-itemPackingType
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-19 11:47:37 +00:00 |
Alex Moreno
|
ac9ed90f4a
|
feat(item): modify item_getBalance and do test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-19 10:02:40 +01:00 |
Carlos Jimenez Ruiz
|
3eb7b4cf55
|
refactor(item.filter): buildFilter switch refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-18 14:49:05 +01:00 |
Carlos Jimenez Ruiz
|
2bfcaa810c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel
|
2021-11-18 12:40:50 +01:00 |
Carlos Jimenez Ruiz
|
4fc01e6a0d
|
typos corrected
|
2021-11-18 11:18:45 +01:00 |
Carlos Jimenez Ruiz
|
1d253fc53d
|
definitions corrected for myOptions of endpoints
|
2021-11-18 11:17:30 +01:00 |
Vicent Llopis
|
f87f60f00a
|
feat(item-itemPackingType): add model and dumpedFixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-18 09:16:36 +01:00 |
Alex Moreno
|
26815ad5a3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-17 08:36:35 +01:00 |
Alex Moreno
|
6fa60e597a
|
refactor(item): activeBuyer.spec.js
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-16 14:13:15 +01:00 |
Alex Moreno
|
f27420c14a
|
refactor(item): activeBuyers
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-16 13:56:09 +01:00 |
Alex Moreno
|
23b567046b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-16 12:30:28 +01:00 |
Alex Moreno
|
ec25df39e4
|
transaction activeWithBuyer.js
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-15 14:50:02 +01:00 |
Alex Moreno
|
54dc9aacaa
|
feat(item): add checkbox isFloramondo in search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-15 13:53:18 +01:00 |
Alex Moreno
|
adf295ebf3
|
fix(item): add ng-model, add fixture and transaction back test
|
2021-11-15 12:14:34 +01:00 |
Alex Moreno
|
5c7efbb838
|
feat(item): back filter buyer in search panel ans test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-11 10:33:21 +01:00 |
Carlos Jimenez Ruiz
|
d87e8ac226
|
refactor(entry.lastBuys): usage of smart table on latests buys
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-10 17:07:16 +01:00 |
Carlos Jimenez Ruiz
|
262e46d7c9
|
added autocompletes to item index
|
2021-11-08 17:46:40 +01:00 |
Carlos Jimenez Ruiz
|
cec04a307d
|
refactor:(item): deprecation of isBargain and isOnOffer columns at model and fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-18 12:05:38 +02:00 |
Carlos Jimenez Ruiz
|
e690febc7f
|
refactor(updateAll): usage of documented methods as update alias is not documented in loopback
|
2021-09-29 08:26:10 +02:00 |
Carlos Jimenez Ruiz
|
46b59473a3
|
refactor(lastbuyrefresh): moved last buy refresh calls to fixtures + some more fixtures
|
2021-09-09 16:06:44 +02:00 |
Carlos Jimenez Ruiz
|
538805828e
|
refactor(item): item index now shows last buy landing
|
2021-09-08 10:39:54 +02:00 |
Carlos Jimenez Ruiz
|
3e0f2b5c26
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3070_deprecate_item_niches
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-30 13:31:57 +02:00 |
Carlos Jimenez Ruiz
|
e6bc856b35
|
removed niches model, relations and its usages
|
2021-08-30 13:29:16 +02:00 |
Joan Sanchez
|
74dfa9f757
|
3063 - Get item from card without a name
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-30 11:23:46 +02:00 |
Carlos Jimenez Ruiz
|
7a7bbe2ba8
|
more module transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-13 16:46:44 +02:00 |
Joan Sanchez
|
531937ebbc
|
2985 - Create a manual invoice from a ticket or client
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-27 09:07:04 +02:00 |
Carlos Jimenez Ruiz
|
4cbaf247ed
|
removed unused showfield in model log
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 09:33:45 +02:00 |
Carlos Jimenez Ruiz
|
29f1f7e89e
|
itemTaxCountry and item bonanical no longer use the bonanical prop
|
2021-07-19 14:46:18 +02:00 |
Carlos Jimenez Ruiz
|
98a691c152
|
minor changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 15:00:20 +02:00 |
Carlos Jimenez Ruiz
|
21e34de1dd
|
item module transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 12:54:59 +02:00 |
Carlos Jimenez Ruiz
|
243636ccf6
|
item category name as category
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 12:34:30 +02:00 |
Carlos Jimenez Ruiz
|
2469540f66
|
item category filter is now working again
|
2021-06-30 10:48:19 +02:00 |
Carlos Jimenez Ruiz
|
8344a58ab8
|
updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 13:24:23 +02:00 |
Carlos Jimenez Ruiz
|
7370269e4d
|
ticket.sale now shows Packing type
|
2021-06-16 17:06:11 +02:00 |
Carlos Jimenez Ruiz
|
7004ad5ade
|
removed several columns from bulk edit and added packingOut
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-15 12:47:40 +02:00 |
Carlos Jimenez Ruiz
|
c776d34cdf
|
invoiceIn basic data and summary added some fields
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-10 17:08:21 +02:00 |
Carlos Jimenez Ruiz
|
e418d6239b
|
fixed getSummary unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-24 11:28:23 +02:00 |
Carlos Jimenez Ruiz
|
2a4ff5a97b
|
fixed a problem where warehouseFk wasn't yet defined upon updateStock call
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-24 10:31:51 +02:00 |
Carlos Jimenez Ruiz
|
72a0b774de
|
add and get sales now sets item.price from packaging for EMB items
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-19 14:15:28 +02:00 |
Joan Sanchez
|
93399d6de6
|
Updated description
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-07 11:18:44 +02:00 |
Joan Sanchez
|
65dc0e3780
|
2615 - Waste breakdown
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-06 13:46:38 +02:00 |
Joan Sanchez
|
5ef3ff40ce
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail
|
2021-04-06 09:14:11 +02:00 |
Joan Sanchez
|
a2144405ab
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-02 17:04:37 +02:00 |
Joan Sanchez
|
9bbf43c590
|
Replace http with https
gitea/salix/pipeline/head This commit looks good
Details
|
2021-04-02 14:34:16 +02:00 |
Joan Sanchez
|
4aa616601e
|
2615 - Waste changes
|
2021-03-30 10:28:44 +02:00 |
Carlos Jimenez Ruiz
|
767665e3c9
|
endpoint indentation + type updated yo array of objects
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-26 10:39:19 +01:00 |
Carlos Jimenez Ruiz
|
3c8ed85e69
|
sum is now made on backend and html amends
|
2021-03-26 10:33:53 +01:00 |
jorgebl
|
e01b7420d9
|
Added total cost of item
|
2021-03-24 13:54:29 +01:00 |
jorgebl
|
32ea2dbda6
|
Added permisions from models in table salix ACL
|
2021-03-08 12:32:35 +01:00 |
jorgebl
|
63ac492845
|
Added message for duplicated names
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-05 08:45:14 +01:00 |
jorgebl
|
4cc3fc90c5
|
conditionals if name already exists
|
2021-03-04 21:30:56 +01:00 |
jorgebl
|
300f78f31e
|
added permisions logistic boss
|
2021-03-04 20:07:45 +01:00 |
jorgebl
|
92db67292c
|
Removed botanical field and changes "edi" for "vn"
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-04 07:56:31 +01:00 |
Joan Sanchez
|
89abf424fb
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-25 08:17:26 +01:00 |
Joan Sanchez
|
c2a2204437
|
Regex change
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-24 16:04:09 +01:00 |
Joan Sanchez
|
ddb77a5c05
|
Regex change
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-24 15:55:09 +01:00 |
Joan Sanchez
|
d3879635a8
|
Regex changes
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2021-02-24 15:54:02 +01:00 |
jorgebl
|
f1c481de64
|
QA refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-24 14:49:58 +01:00 |
Joan Sanchez
|
1c819e692e
|
Floramondo image download fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-24 14:37:49 +01:00 |
jorgebl
|
df9ca2ad3e
|
Fixed filter description
|
2021-02-24 12:24:50 +01:00 |
Joan Sanchez
|
347ac77878
|
Changes to file names
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-24 09:59:41 +01:00 |
jorgebl
|
69f53972d5
|
Added filter for selection
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-22 16:43:40 +01:00 |
Joan Sanchez
|
ddb443ab8f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-18 13:17:34 +01:00 |
Joan Sanchez
|
8ddbcc24a7
|
Added priority to image download queue
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-18 13:03:49 +01:00 |
Carlos Jimenez Ruiz
|
3d948ef317
|
warning color added lines with clientType loses
|
2021-02-09 10:43:19 +01:00 |
Joan Sanchez
|
f041e0d897
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-04 18:44:25 +01:00 |
Joan Sanchez
|
215e0c9fc4
|
Image download fix for images without extension
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-03 15:01:09 +01:00 |
Joan Sanchez
|
a845f53f0a
|
Bug fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-03 12:43:30 +01:00 |
Carlos Jimenez Ruiz
|
ff94b182a1
|
error is not a required field
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-03 10:16:46 +01:00 |
Joan Sanchez
|
7bcbf5303e
|
Fix where
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-28 16:08:57 +01:00 |
Joan Sanchez
|
9d5d2e9177
|
Added method prune again
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-28 15:57:33 +01:00 |
Joan Sanchez
|
ca47fe6827
|
2476 - downloadImages() method refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-28 12:23:18 +01:00 |
Carlos Jimenez Ruiz
|
fe04f00c28
|
fixed unit test for upsertFixedPrice
|
2021-01-20 14:39:23 +01:00 |
Carlos Jimenez Ruiz
|
464366fdbe
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed
|
2021-01-18 17:17:02 +01:00 |
Carlos Jimenez Ruiz
|
3ec641f733
|
filter unit tests
|
2021-01-18 15:42:38 +01:00 |
Carlos Jimenez Ruiz
|
8d6dd3e03a
|
minor refactors
|
2021-01-18 14:17:01 +01:00 |
Carlos Jimenez Ruiz
|
3251d737e6
|
fixed price index implementation
|
2021-01-18 14:16:39 +01:00 |
Jorge Padawan
|
97c8faaf50
|
Add column multiplier on item section
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-18 11:43:48 +01:00 |
Joan Sanchez
|
42cd2356a2
|
Refactor v2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-12-18 17:23:04 +01:00 |
Joan Sanchez
|
1ba1d27ba0
|
2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-27 13:10:39 +01:00 |
Joan Sanchez
|
7693a1c449
|
2569 - Section changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-20 15:05:57 +01:00 |
Joan Sanchez
|
dfbe1a02d2
|
Removed unused import
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-10 14:06:41 +01:00 |
Joan Sanchez
|
08af948eb0
|
Merge branch 'dev' into 2574-itemTag_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-10 12:39:17 +00:00 |
Carlos Jimenez Ruiz
|
54d31f15bb
|
fixed collection tests pollution
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-09 14:53:26 +01:00 |
Joan Sanchez
|
a30cfd2218
|
Added unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-05 09:21:20 +01:00 |
Joan Sanchez
|
a325ef2a78
|
2574 - ItemTag refactor sourceTable
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-04 11:29:10 +01:00 |
Carlos Jimenez Ruiz
|
c622175192
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-15 18:57:33 +02:00 |
Carlos Jimenez Ruiz
|
dd6035606f
|
some more tests fixed + refactors
|
2020-10-15 18:57:27 +02:00 |
Bernat Exposito
|
0fbbe9b2ae
|
Merge pull request 'new module supplier, created section index and searchpanel' (#413) from 2501-supplier_index into dev
gitea/salix/pipeline/head Build queued...
Details
Reviewed-on: #413
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2020-10-15 07:57:57 +00:00 |
Bernat Exposito Domenech
|
cc35998f62
|
new module supplier, created section index and searchpanel
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-15 08:15:04 +02:00 |
Carlos Jimenez Ruiz
|
30d00d0f63
|
fix getWasteDetail test
|
2020-10-14 10:53:20 +02:00 |
Joan Sanchez
|
2e3402b0cd
|
Updated method description
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-14 07:18:39 +02:00 |
Carlos Jimenez Ruiz
|
c04b7a0657
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-13 10:31:06 +02:00 |
Bernat Exposito Domenech
|
6e081df4e8
|
fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-13 08:17:00 +02:00 |
Carlos Jimenez Ruiz
|
b6b84cfea7
|
more tests fixed + small refactors
|
2020-10-08 16:00:19 +02:00 |
Javi Gallego
|
1b13e58e10
|
item basic-data añadir isFragile
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-17 09:58:00 +02:00 |
Joan Sanchez
|
d0ac1b621c
|
Merge branch 'dev' into 2385-worker_descriptor_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-09 09:06:11 +00:00 |
Joan Sanchez
|
004c9d7341
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-09 08:27:08 +02:00 |
Joan Sanchez
|
5ef9afdb53
|
Empty url fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-08 15:07:57 +02:00 |
Carlos Jimenez Ruiz
|
a00f64e7a2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create
|
2020-09-03 16:29:38 +02:00 |
Joan Sanchez
|
b848fa52f2
|
2385 - Replaced worker nickname
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-03 15:11:16 +02:00 |
Joan Sanchez
|
a3382300f9
|
2402 - Added create entry section
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-02 14:08:56 +02:00 |
Carlos Jimenez Ruiz
|
9fa3f17a9a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section
|
2020-09-01 17:45:00 +02:00 |
Joan Sanchez
|
0a542a2057
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-01 07:38:03 +02:00 |
Joan Sanchez
|
8aa9918d84
|
2409 - Added filter by selection
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-31 15:03:00 +02:00 |
Carlos Jimenez Ruiz
|
c70ad808a0
|
refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-27 17:54:43 +02:00 |
Carlos Jimenez Ruiz
|
a66656dcce
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section
|
2020-08-27 15:14:41 +02:00 |
Joan Sanchez
|
a75938b6d0
|
Updated error handler
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-27 14:23:40 +02:00 |
Joan Sanchez
|
55d047c0dd
|
Renamed error var
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-27 14:11:22 +02:00 |
Joan Sanchez
|
fd67a85fe8
|
Changed to 1 second
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-27 14:09:21 +02:00 |
Joan Sanchez
|
6f3fb83cd7
|
Changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-27 13:53:11 +02:00 |
Carlos Jimenez Ruiz
|
3a82ef0e06
|
2375 entry lastBuy seccion
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-26 16:33:47 +02:00 |
Carlos Jimenez Ruiz
|
d23e3eff76
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section
|
2020-08-26 09:49:52 +02:00 |
Joan Sanchez
|
ea4f561bcf
|
Added try-catch
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2020-08-26 07:33:00 +02:00 |
Joan Sanchez
|
4ef540c8f3
|
Changed download path
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-18 09:48:02 +02:00 |
Joan Sanchez
|
2a7495bac9
|
Image queue fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2020-08-18 09:45:26 +02:00 |
Joan Sanchez
|
1ef6637ad3
|
Added clearInterval()
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-18 08:37:39 +02:00 |
Joan Sanchez
|
8968f41b75
|
Queue changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-18 08:10:40 +02:00 |
Carlos Jimenez Ruiz
|
dee3ab166a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section
|
2020-08-17 14:18:44 +02:00 |
Joan Sanchez
|
a10e091b62
|
Added limit
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-13 16:26:35 +02:00 |
Joan Sanchez
|
7a3de746cc
|
Added limit
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-13 14:00:40 +02:00 |
Joan Sanchez
|
bbf15da16f
|
Changed tmp uri
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-13 13:38:52 +02:00 |
Joan Sanchez
|
c0794808f0
|
Updated tmp directory
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-13 13:09:53 +02:00 |
Joan Sanchez
|
c9ed17d981
|
Changes to dowload item photos endpoint
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-13 12:16:25 +02:00 |
Carlos Jimenez Ruiz
|
f2730dd51c
|
some parts of latestsBuys WIP
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-07-20 11:31:47 +02:00 |
Joan Sanchez
|
da3d20bb16
|
Restored limit
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-15 12:11:44 +02:00 |
Joan Sanchez
|
72dfa4262a
|
Removed limit
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-15 12:00:38 +02:00 |
Joan Sanchez
|
68c19fa22a
|
Removed test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-14 11:17:53 +02:00 |
Joan Sanchez
|
e557bd2815
|
Renamed method
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-14 11:16:50 +02:00 |
Joan Sanchez
|
3074c9ce35
|
Fixed async image registration
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-14 09:32:50 +02:00 |
Joan Sanchez
|
80075a6471
|
Added limit
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-13 14:46:00 +02:00 |
Joan Sanchez
|
99aa6b666d
|
Mkdir recursive
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-13 14:31:50 +02:00 |
Joan Sanchez
|
838b8a5382
|
Fix scope var
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-13 14:22:19 +02:00 |
Joan Sanchez
|
ee19ea2993
|
Restricted to itemFk
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-13 14:13:21 +02:00 |
Joan Sanchez
|
ccc5b95b48
|
Updated mount paths
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-07-13 12:23:47 +02:00 |
Joan Sanchez
|
159b5f3bb8
|
#2351 Item image queue scheduler
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-13 11:58:31 +02:00 |
Javi Gallego
|
762c39eb23
|
:: para watcher
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-08 07:52:30 +02:00 |
Javi Gallego
|
d8871c0bce
|
cr
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 10:37:52 +02:00 |
Javi Gallego
|
3815edfbea
|
falta CR
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-05-15 12:17:34 +02:00 |
Javi Gallego
|
8453d25852
|
#2224item.diary provar directiva $anchorScroll
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-06 18:42:50 +02:00 |