 Vicent Llopis
|
67a64582e9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
|
2023-01-27 08:21:30 +01:00 |
|
Vicent Llopis
|
ef7a0508ed
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
|
2023-01-20 08:29:42 +01:00 |
 Alexandre Riera
|
200a256016
|
Merge branch 'dev' into 4945-dejar-buscar-tag-nombreTemporal
|
2023-01-18 12:15:12 +00:00 |
|
Alexandre Riera
|
be5f987b0a
|
refs #4945 added defaultTag, validPriorities, defaultPriority in itemConfig
|
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
|
2023-01-18 08:00:20 +01:00 |
|
Alexandre Riera
|
c47cac7d55
|
refs #5020 isActive column added, filter in front
|
2023-01-17 08:54:26 +01:00 |
 Alex Moreno
|
ff39a81b8c
|
Merge branch 'dev' into 4523-item_fixed-price_rate2
|
2023-01-17 06:07:14 +00:00 |
|
Vicent Llopis
|
2451d00998
|
Merge branch 'dev' into 4925-item.tags
|
2023-01-12 07:59:43 +00:00 |
|
Vicent Llopis
|
21a62a0fab
|
refactor
|
2023-01-03 13:29:44 +01:00 |
|
Vicent Llopis
|
3792a80ad5
|
refs #4925 feat: añadido back para editar tags
|
2022-12-29 14:24:32 +01:00 |
|
Vicent Llopis
|
3dd0c79629
|
feat: add ItemShelvingSales/filter
|
2022-12-27 15:00:49 +01:00 |
|
Vicent Llopis
|
d3a9e9ac89
|
delete: columnas que ya no existen en la tabla
|
2022-12-23 12:17:24 +01:00 |
|
Vicent Llopis
|
16c20e4700
|
feat: add itemShelvingSale popup
|
2022-12-23 12:08:16 +01:00 |
|
Alex Moreno
|
f82870bec6
|
feat(item_fixed-price): recalculate rate2 and when change item keep minPrice of item
|
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
|
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
|
2022-11-04 07:22:37 +00:00 |
|
Pau
|
7d7af6eb49
|
Modified model to allow modifications to isLaid
|
2022-11-04 07:42:21 +01:00 |
|
Pau
|
ff5e601a1e
|
Item islaid and test
|
2022-10-31 14:43:31 +01:00 |
|
Vicent Llopis
|
9c52508a88
|
feat: add total labels
|
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
|
2022-10-11 07:09:20 +02:00 |
|
Vicent Llopis
|
ddbe1057ad
|
feat: add new section
|
2022-10-06 09:47:53 +02:00 |
|
Vicent Llopis
|
2f17257e46
|
feat: add new sub section itemShelving
|
2022-10-05 15:13:48 +02:00 |
|
Vicent Llopis
|
761563edc5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
|
2022-10-05 13:38:17 +02:00 |
|
Vicent Llopis
|
68e4f3a8bc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
|
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
|
2022-10-03 13:37:59 +02:00 |
|
Joan Sanchez
|
c177c0366d
|
Item PDF
|
2022-10-03 13:35:49 +02:00 |
|
Joan Sanchez
|
e4b61f81a9
|
Merge pull request '#4226-remove-density' (#1066) from #4226-remove-density into dev
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
|
2022-09-29 14:52:31 +02:00 |
|
Joan Sanchez
|
660842ca31
|
Osticket & waste refactor
|
2022-09-27 14:20:57 +02:00 |
|
Pau
|
2dd6de1d47
|
Modified Fixtures, clone.js and the item model
|
2022-09-27 13:46:23 +02:00 |
 Javi Gallego
|
a662bb90a2
|
Merge branch 'dev' into #4226-remove-density
|
2022-09-27 09:32:48 +02:00 |
|
Vicent Llopis
|
eb7bd3dc59
|
update brach
|
2022-09-14 14:03:15 +02:00 |
|
Vicent Llopis
|
1fd97f167c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
|
2022-09-13 11:35:15 +02:00 |
|
Javi Gallego
|
5cf102c7fd
|
sustituido density por weightByPiece
|
2022-08-24 14:13:26 +02:00 |
|
Joan Sanchez
|
768e4d5e77
|
Resolved conflicts
|
2022-08-10 12:13:31 +02:00 |
|
Vicent Llopis
|
c3d396b042
|
fix: test e2e
|
2022-08-04 13:52:59 +02:00 |
|
Vicent Llopis
|
224ea61a62
|
fix: delete warehouseFk from itemType model
|
2022-07-29 13:07:25 +02:00 |
|
Joan Sanchez
|
ae79163048
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2022-06-30 13:17:04 +02:00 |
|
Joan Sanchez
|
140af7e808
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2022-06-30 13:14:08 +02:00 |
|
Joan Sanchez
|
ad021265c7
|
Deprecated field taxTypeFk
|
2022-06-30 11:42:37 +02:00 |
|
Alex Moreno
|
a98a927663
|
fix back test and e2e that now fail
|
2022-06-27 11:17:45 +02:00 |
 Carlos Jimenez Ruiz
|
a76dd11825
|
Merge branch 'dev' into 3870-models
|
2022-05-23 12:33:08 +00:00 |
|
Vicent Llopis
|
1b3f0ee026
|
refactor: added itemPackingType and temperature relations
|
2022-05-23 12:40:11 +02:00 |
|
Vicent Llopis
|
3c9800a7a3
|
refactor: pull request changes
|
2022-05-20 12:33:12 +02:00 |
|
Vicent Llopis
|
ebbb0466a0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models
|
2022-05-17 10:13:05 +02:00 |
|
Vicent Llopis
|
3335cb8a01
|
feat(item.itemType): add fields
|
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
|
2022-05-16 10:19:43 +02:00 |
|
Carlos Jimenez Ruiz
|
b5ccd32800
|
Merge branch 'dev' into 3409-clientCredit_maxRows
|
2022-05-16 07:23:08 +00:00 |