Guillermo Bonet
|
2b41bf7eb1
|
refs #6199 Requested changes
|
2023-10-11 07:39:41 +02:00 |
Guillermo Bonet
|
d2ce920f13
|
refs #6199 Added minQuantity in catalog and more
|
2023-10-10 13:49:11 +02:00 |
Guillermo Bonet
|
03afea3b8e
|
refs #6199 Added minQuantity in item
|
2023-10-10 10:51:02 +02:00 |
Pablo Natek
|
020de5d754
|
Merge branch 'dev' into 3126-changePackageFkTopackagingFk
|
2023-10-05 07:57:46 +00:00 |
Pablo Natek
|
99d65804e8
|
refs #6278 fixFilter
|
2023-10-02 13:29:39 +02:00 |
Sergio De la torre
|
3ba349b74a
|
refs #5890 feat: itemShelvingSaleAsignado more calls
|
2023-10-02 09:14:30 +02:00 |
Carlos Andrés
|
52cba80dc8
|
Merge branch 'dev' into 5890--itemShelvingAsignado
|
2023-09-28 15:13:37 +02:00 |
Alex Moreno
|
28dfb895ca
|
refs #6224 deploy: correct sql folder and fix sql
|
2023-09-28 13:49:58 +02:00 |
Alex Moreno
|
e51df063d3
|
refs #5890 feat: add userId in rawSql
|
2023-09-28 13:26:05 +02:00 |
Alex Moreno
|
75e54bd82f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado
|
2023-09-28 13:21:12 +02:00 |
Sergio De la torre
|
22f71e6147
|
Merge branch 'dev' into 5134-ModelsSalix
|
2023-09-28 08:18:15 +02:00 |
Sergio De la torre
|
4048627c76
|
refs #5890 fix: format
|
2023-09-28 08:08:40 +02:00 |
Sergio De la torre
|
ac3e9c811d
|
refs #5890 feat: itemShelvingSaleAsignado
|
2023-09-27 14:01:17 +02:00 |
Sergio De la torre
|
ed1d8ca94f
|
refs #5134 feat: models
|
2023-09-22 12:29:56 +02:00 |
Pablo Natek
|
a854fff94f
|
refs #3126 changes
|
2023-09-22 10:59:48 +02:00 |
Carlos Satorres
|
daf5b343fd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
|
2023-09-19 13:58:13 +02:00 |
Carlos Satorres
|
4918e3ccc7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
|
2023-09-06 14:02:53 +02:00 |
Sergio De la torre
|
022d3d08e6
|
refs #5652 feat:itemTrash_new
|
2023-09-01 12:34:33 +02:00 |
Carlos Satorres
|
0b9199688e
|
refs #5843 userFk remove and vchange
|
2023-08-30 12:48:57 +02:00 |
Vicent Llopis
|
dd1dbcbd4a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
|
2023-08-22 13:39:09 +02:00 |
Vicent Llopis
|
2f2611a705
|
Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel
|
2023-08-22 10:31:17 +00:00 |
Carlos Satorres
|
b1b6bd13ea
|
refs #5843 change userFk
|
2023-08-22 10:45:41 +02:00 |
Alex Moreno
|
83d0a394e3
|
refs #5973 refactor(item_fetched-tags): restyle empty tags
|
2023-08-03 15:59:09 +02:00 |
Vicent Llopis
|
65b9cadd9e
|
refs #5804 refactor: sustituido activeBuyers por getItemTypeWorker
|
2023-07-27 12:51:14 +02:00 |
Alex Moreno
|
44ceeac9c4
|
refs #5983 feat(itemShelving): add userFk field
|
2023-07-25 10:21:54 +02:00 |
Vicent Llopis
|
8f7caa1183
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel
|
2023-07-20 11:42:10 +02:00 |
Vicent Llopis
|
04ca5743a2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
|
2023-07-20 09:40:41 +02:00 |
Sergio De la torre
|
6344c11d1e
|
Merge branch 'dev' into 5983_inventory_parking
|
2023-07-19 14:29:18 +00:00 |
Sergio De la torre
|
49c656928e
|
refs #5983 feat(itemShelving): add visible
|
2023-07-18 15:43:11 +02:00 |
Carlos Satorres
|
bd723bb7ba
|
refs #5824 mod ng
|
2023-07-18 15:01:58 +02:00 |
Sergio De la torre
|
9076553070
|
refs #5983 test(itemShelving): add getInventory
|
2023-07-18 14:11:50 +02:00 |
Sergio De la torre
|
93da129239
|
refs #5983 feat(itemShelving): add getInventory
|
2023-07-18 08:54:45 +02:00 |
Vicent Llopis
|
28eedbfd23
|
Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel
|
2023-07-14 11:04:06 +00:00 |
Vicent Llopis
|
75a66571ba
|
refs #5244 refactor: modificados todos los url='activeWith...'
|
2023-07-13 12:59:39 +02:00 |
Vicent Llopis
|
bd85cf4e90
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
|
2023-07-12 12:29:17 +02:00 |
Carlos Satorres
|
7291b793ae
|
refs #5949 fix traduct
|
2023-07-11 08:41:43 +02:00 |
Carlos Satorres
|
ba109dccc5
|
refs #5949 trad
|
2023-07-11 07:58:18 +02:00 |
Carlos Satorres
|
d1c8f0ff11
|
refs #5949 itemRecycle
|
2023-07-11 07:37:51 +02:00 |
Carlos Satorres
|
9c9b53917a
|
refs #5334 fix error
|
2023-07-06 08:20:33 +02:00 |
Vicent Llopis
|
7b4e8570aa
|
refs #5244 refactor: se sustituyen los activeWithRole con where="{role: {inq: ['logistic', 'buyer']}}" por getItemTypeWorker
|
2023-06-30 12:03:26 +02:00 |
Alex Moreno
|
8723cf2958
|
refs #5753 fix legacy bugs
|
2023-06-28 14:10:21 +02:00 |
Carlos Satorres
|
66c5eda6f2
|
refs #5325 remove defaultSearch
|
2023-06-13 16:08:11 +02:00 |
Carlos Satorres
|
59642ab3ca
|
refs #5325 defaultSearch
|
2023-06-12 15:44:22 +02:00 |
Alexandre Riera
|
81a96e7d82
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
|
2023-06-09 09:03:23 +02:00 |
Juan Ferrer
|
9a63ce86aa
|
refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models
|
2023-06-07 23:54:27 +02:00 |
Alexandre Riera
|
7121b1e516
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
|
2023-06-07 08:50:53 +02:00 |
Vicent Llopis
|
024cb1e3f4
|
refs #5561 feat: permite modificar registros
|
2023-06-06 11:56:14 +02:00 |
Alex Moreno
|
bca7224f74
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-06-05 08:09:16 +02:00 |
Alexandre Riera
|
f9528b922c
|
refs #5595 added userId in options
|
2023-06-01 08:32:06 +02:00 |
Alex Moreno
|
0aed2c2c08
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2023-05-31 13:10:25 +02:00 |
Carlos Satorres
|
41b1b2fb3f
|
fix >
|
2023-05-29 10:02:21 +02:00 |
Carlos Satorres
|
1593b4b626
|
Merge branch 'dev' into 5398-Agencys&WarehousesData
|
2023-05-29 07:09:08 +00:00 |
Juan Ferrer
|
2e0721b101
|
refs #5667 Fixes: Id filter, translations
|
2023-05-25 18:22:46 +02:00 |
Carlos Satorres
|
fa8fd8d5bc
|
refs #5398 update from oldbranch
|
2023-05-25 11:41:14 +02:00 |
Alex Moreno
|
dd83b25bb2
|
Merge branch 'master' into hotfix-item_getBalance
|
2023-05-25 09:37:38 +00:00 |
Alexandre Riera
|
dfac44a87b
|
hotfix 3rd parameter to null
|
2023-05-25 11:35:25 +02:00 |
Alexandre Riera
|
de313b6418
|
refs #3628 Show what's before the inventory
|
2023-05-24 13:40:26 +02:00 |
Alexandre Riera
|
49bd9c35b4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto
|
2023-05-24 12:19:45 +02:00 |
Juan Ferrer
|
da0aa57539
|
Merge branch 'test' into dev
|
2023-05-22 19:06:20 +02:00 |
Alexandre Riera
|
2591d2d115
|
refs #3628 added check & date-picker
|
2023-05-18 11:42:22 +02:00 |
Alexandre Riera
|
4bcb461d36
|
refs #3628 added check & date-picker
|
2023-05-18 11:41:46 +02:00 |
Carlos Satorres
|
60bfb1b079
|
refs #5689 fix pixels
|
2023-05-17 12:53:18 +02:00 |
Juan Ferrer
|
f9fdf80350
|
refs #5667 Item translations added
|
2023-05-17 12:06:31 +02:00 |
Juan Ferrer
|
fa40bd9811
|
refs #5667 Style & translation fixes
|
2023-05-17 10:18:41 +02:00 |
Juan Ferrer
|
a48e197e46
|
refs #5517 E2E fixes
|
2023-05-05 08:12:38 +02:00 |
Juan Ferrer
|
677764f302
|
refs #5517 Fix e2e
|
2023-05-04 10:00:21 +02:00 |
Juan Ferrer
|
2cfd2d9dda
|
Merge branch 'dev' into 5517-improveLogs+translations
|
2023-04-27 18:13:24 +02:00 |
Juan Ferrer
|
49368a837b
|
refs #5517 Filter improved
|
2023-04-24 19:10:04 +02:00 |
Juan Ferrer
|
081b4af6d6
|
Merge branch 'dev' into 5517-improveLogs+translations
|
2023-04-24 10:44:42 +02:00 |
Carlos Satorres
|
4473cc11c7
|
Merge branch 'dev' into 5439-inheritRole
|
2023-04-24 08:43:19 +00:00 |
Alex Moreno
|
7a79dfd4d1
|
deploy: 231401 test to dev
|
2023-04-21 12:49:03 +02:00 |
Juan Ferrer
|
9694a35343
|
refs #5517 Added: Tests, filter panel, model and props titles
|
2023-04-20 19:46:57 +02:00 |
Juan Ferrer
|
6f1744baff
|
Merge branch 'dev' into 5517-improveLogs+translations
|
2023-04-20 16:30:24 +02:00 |
Carlos Satorres
|
33c296c34d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-inheritRole
|
2023-04-20 14:31:46 +02:00 |
Alex Moreno
|
63e0031bc6
|
deploy(231401): test to master
|
2023-04-20 08:24:43 +02:00 |
Joan Sanchez
|
32c9e22d96
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
|
2023-04-18 11:41:55 +02:00 |
Alexandre Riera
|
2df362327f
|
Merge branch 'dev' into 5418-buscador-lateral-fixed-price
|
2023-04-18 08:33:15 +00:00 |
Joan Sanchez
|
3ee29553b4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
|
2023-04-17 09:00:52 +02:00 |
Joan Sanchez
|
610f51aaf8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-04-17 08:59:49 +02:00 |
Joan Sanchez
|
f53ebb7641
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2023-04-17 08:59:34 +02:00 |
Carlos Satorres
|
af8603185c
|
refs #5439 inheritedRole
|
2023-04-17 08:35:44 +02:00 |
Juan Ferrer
|
add3a8b1fa
|
merge with dev
|
2023-04-15 01:49:23 +02:00 |
Joan Sanchez
|
35f94c58b7
|
reafactor(image): upload image using gm library
|
2023-04-14 13:04:40 +02:00 |
Alexandre Riera
|
b9b52c6b1d
|
Merge branch 'dev' into 5418-buscador-lateral-fixed-price
|
2023-04-14 07:08:02 +00:00 |
Alexandre Riera
|
ac4772e44e
|
refs #5418 mistake doing git pull origin dev
|
2023-04-13 13:46:29 +02:00 |
Vicent Llopis
|
3790e3457f
|
refs #5517 añadidas más traducciones
|
2023-04-13 08:43:42 +02:00 |
Vicent Llopis
|
2a2d03e05a
|
refs #5517 añadidas traducciones de algunos modelos
|
2023-04-12 15:02:21 +02:00 |
Alexandre Riera
|
0666163ca0
|
refs #5546 deleted log property, fixed back tests
|
2023-04-12 12:33:14 +02:00 |
Pablo Natek
|
ccf26c5413
|
Merge branch 'dev' into 5211-cleanItemShelvings
|
2023-04-11 11:56:33 +00:00 |
Vicent Llopis
|
ec03c6edfa
|
fix intermittent backTest
|
2023-04-11 10:23:33 +02:00 |
Alexandre Riera
|
161fc25c5b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price
|
2023-04-11 10:01:21 +02:00 |
Vicent Llopis
|
ba31613ac9
|
Merge branch 'dev' into 5275-item.fixed-price_refactor
|
2023-04-06 09:58:07 +00:00 |
David Domenech
|
44d4df9c21
|
Merge branch 'dev' into 5211-cleanItemShelvings
|
2023-04-05 11:00:08 +00:00 |
Carlos Satorres
|
8741a9f913
|
Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra
|
2023-04-05 06:51:21 +00:00 |
Vicent Llopis
|
fb5969a120
|
refs #5275 add test
|
2023-04-05 08:43:47 +02:00 |
Carlos Satorres
|
77b91b77b2
|
refs #5439 requesterFk solve
|
2023-04-05 08:19:50 +02:00 |
Vicent Llopis
|
e97b5a9f80
|
refs #5275 fix backTest
|
2023-04-05 07:54:56 +02:00 |
Vicent Llopis
|
28a12d0706
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5275-item.fixed-price_refactor
|
2023-04-05 07:36:53 +02:00 |
Joan Sanchez
|
c126c6044a
|
Updated format
|
2023-04-04 13:55:44 +02:00 |
Alexandre Riera
|
1a14c793cd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price
|
2023-04-04 09:47:31 +02:00 |
Joan Sanchez
|
8b4c70e8ba
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
|
2023-03-30 14:57:00 +02:00 |
Vicent Llopis
|
67689695e4
|
refs #5275 filtra por defecto por el this.vnConfig.warehouseFk
|
2023-03-30 14:29:19 +02:00 |
Joan Sanchez
|
26bddef5e5
|
Merge pull request 'refs #5425 modificacion de los campos' (!1394) from 5425-modCamposBasicos(pesoycaja) into dev
Reviewed-on: #1394
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-03-30 05:19:50 +00:00 |
Vicent Llopis
|
3b615d9879
|
refs #5275 fix: actualiza correctamete los elementos del checkedDummy
|
2023-03-29 09:11:40 +02:00 |
Vicent Llopis
|
c53c54b6cd
|
refs #5275 feat: modificar masivamente
|
2023-03-28 14:59:08 +02:00 |
Vicent Llopis
|
b4e04fcdad
|
refs #5275 feat: colorear fechas
|
2023-03-28 14:40:14 +02:00 |
Vicent Llopis
|
fb1b39da17
|
refs #5275 fix: al añadir artículo desde cero se muestra el nombre y se establecen las fechas por defecto
|
2023-03-28 10:30:02 +02:00 |
Vicent Llopis
|
06ac8f9910
|
refs #5275 fix: si tenia valor el minPrice el checkbox siempre se marcaba. El checkbox no funcionaba cuando le pulsabas
|
2023-03-28 09:41:39 +02:00 |
Alexandre Riera
|
0c8fe855ac
|
refs #5418 lateral search panel added, missing e2e
|
2023-03-27 09:11:29 +02:00 |
Carlos Satorres
|
fa78649607
|
refs #5439 url filter
|
2023-03-24 08:54:03 +01:00 |
Carlos Satorres
|
36af9d45e7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-newFilterEnPeticionesDeCompra
|
2023-03-23 11:56:40 +01:00 |
Alexandre Riera
|
4e5364dc0b
|
refs #5036 fix tests logs
|
2023-03-23 10:05:02 +01:00 |
Carlos Satorres
|
79c42384ee
|
refs #5439 role actualizado
|
2023-03-23 08:26:06 +01:00 |
Joan Sanchez
|
7b5e0bae8e
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-03-23 08:20:33 +01:00 |
Carlos Satorres
|
3fd1e7a086
|
refs #5439 se elimina el filtro de fecha añadido
|
2023-03-22 15:41:36 +01:00 |
Carlos Satorres
|
1ab8570ed3
|
Merge branch 'dev' into 5425-modCamposBasicos(pesoycaja)
|
2023-03-22 13:28:07 +00:00 |
Alexandre Riera
|
60eabbf7a0
|
Merge branch 'test' into hotfix-added-grabUser-logs
|
2023-03-22 10:37:57 +00:00 |
Alexandre Riera
|
59c3ef23de
|
grabUser added
|
2023-03-22 11:03:13 +01:00 |
Carlos Satorres
|
1bc3103d9f
|
refs #5439 filtro comercial
|
2023-03-21 08:44:28 +01:00 |
Carlos Satorres
|
306573b1bf
|
refs #5439 campos fecha y salesperson
|
2023-03-20 15:11:55 +01:00 |
Carlos Satorres
|
78d8bbd82a
|
refs #5423 tercer decimal en entrada
|
2023-03-20 10:44:44 +01:00 |
Carlos Satorres
|
9e42ab52ce
|
refs #5425 modificación usuario
|
2023-03-17 09:32:20 +01:00 |
Carlos Satorres
|
9565bb33f2
|
refs #5425 modificacion de los campos
|
2023-03-16 14:12:54 +01:00 |
Carlos Satorres
|
70beaf9b6c
|
refs #5423 añadido 3r decimal
|
2023-03-16 09:03:16 +01:00 |
Joan Sanchez
|
1f52326091
|
Merge pull request 'feat(print): added reusable pdf print functions' (!1390) from 5182-print_publish into dev
Reviewed-on: #1390
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
|
2023-03-16 06:22:45 +00:00 |
Joan Sanchez
|
596a017cfd
|
Don't throw error on file unlink
|
2023-03-16 07:18:29 +01:00 |
Joan Sanchez
|
a947666838
|
refactor(imageQueue): remplaced sharp with gm
|
2023-03-15 14:24:30 +01:00 |
Joan Sanchez
|
6495e016a8
|
Endpoints refactor
|
2023-03-14 08:17:46 +01:00 |
Joan Sanchez
|
1b984f4325
|
Event callback
|
2023-03-12 20:51:22 +01:00 |
Pablo Natek
|
8a4d9bd2bf
|
refs #5211
|
2023-03-10 12:52:51 +01:00 |
Joan Sanchez
|
aeb50b2c19
|
Removed callback syntax
|
2023-03-08 10:19:02 +01:00 |
Joan Sanchez
|
37043beb68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
|
2023-03-03 07:44:31 +01:00 |
Joan Sanchez
|
b8881a050c
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-03-02 07:41:16 +01:00 |
Joan Sanchez
|
ee6d292d6a
|
Merge pull request 'fixes #5063 Añadir campo doPhoto en la ficha de Item' (!1264) from 5063-item-module-doPhoto into dev
Reviewed-on: #1264
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-03-02 06:34:45 +00:00 |
Alexandre Riera
|
d744cbb1a3
|
hotFix itemDiary reload card conditional
|
2023-03-01 12:22:01 +01:00 |
Alexandre Riera
|
7aedbda98b
|
refs #5202 changed vn-tr for a
|
2023-03-01 10:08:51 +01:00 |
Alexandre Riera
|
698a3396fc
|
refs #5063 deleted changes in item hook
|
2023-02-24 10:40:24 +01:00 |
Alexandre Riera
|
9da3593dff
|
Merge branch '5063-item-module-doPhoto' of https://gitea.verdnatura.es/verdnatura/salix into 5063-item-module-doPhoto
|
2023-02-24 10:37:38 +01:00 |
Alexandre Riera
|
6d6fa11da1
|
refs #5063 fixed front test
|
2023-02-24 10:37:35 +01:00 |
Alexandre Riera
|
113b37e56f
|
Merge branch 'dev' into 5063-item-module-doPhoto
|
2023-02-24 09:25:44 +00:00 |
Alexandre Riera
|
afb14044cc
|
refs #5063 deleted item checked in image, added front test
|
2023-02-24 10:25:08 +01:00 |
Joan Sanchez
|
3d8add4d6f
|
Merge branch 'dev' into 5192-db_export
|
2023-02-21 13:12:27 +00:00 |
Joan Sanchez
|
0d16f71fd3
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-02-21 14:10:36 +01:00 |
Vicent Llopis
|
c30242f9cc
|
fix: front test
|
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
|
2023-02-21 11:48:56 +01:00 |
Joan Sanchez
|
58548164d2
|
Merge branch 'dev' into 5192-db_export
|
2023-02-21 09:20:30 +00:00 |
Joan Sanchez
|
c9840f6985
|
Updated entry structure
|
2023-02-21 08:32:46 +01:00 |
Alexandre Riera
|
04877c1425
|
refs #5063 refactor hook
|
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
Refs: #5266
|
2023-02-20 12:40:13 +01:00 |
Alexandre Riera
|
c7f22a10ba
|
refs #5063 refactored hook
|
2023-02-20 10:39:12 +01:00 |
Alexandre Riera
|
08476fe2a6
|
Merge branch 'dev' into 5063-item-module-doPhoto
|
2023-02-17 13:30:47 +00:00 |
Joan Sanchez
|
ceab11cc41
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2023-02-17 13:33:34 +01:00 |
Vicent Llopis
|
853e06f523
|
fix: card reload automatic
|
2023-02-17 12:38:07 +01:00 |
Vicent Llopis
|
3dd870f7df
|
fix: test e2e
|
2023-02-16 09:44:20 +01:00 |
Vicent Llopis
|
bb2eddc462
|
fix: test front
|
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
|
2023-02-15 15:08:58 +01:00 |
Pau
|
6a732819ba
|
Merge branch 'dev' into 5063-item-module-doPhoto
|
2023-02-14 09:58:10 +00:00 |
Alexandre Riera
|
4787de3df5
|
fixing merge
|
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
|
2023-02-10 09:02:44 +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
|
2023-02-09 09:16:30 +01:00 |
Vicent Llopis
|
b70311999d
|
refactor: eliminado codigo innecesario y quitado update que se hará directamente en producción
|
2023-02-08 09:41:09 +01:00 |
Vicent Llopis
|
cec7602e1b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
|
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
|
2023-02-07 13:40:39 +01:00 |
Vicent Llopis
|
4f76465246
|
fix: no recarga cada vez
|
2023-02-06 12:24:26 +01:00 |
Vicent Llopis
|
ba5616055b
|
feat: item.descriptor en summary coge el warehouse por defecto
|
2023-02-03 14:31:50 +01:00 |
Juan Ferrer
|
f4fc597c2c
|
Merge pull request 'master to test' (!1302) from master into test
Reviewed-on: #1302
|
2023-02-03 08:12:09 +00:00 |
Vicent Llopis
|
508bce73bc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
|
2023-02-03 08:41:35 +01:00 |
Pau
|
e3de54b811
|
changed styles on summary
|
2023-02-03 08:35:15 +01:00 |
Joan Sanchez
|
7a700de5c2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
|
2023-02-02 08:23:17 +01:00 |
Pau
|
ec73b512fc
|
Merge branch 'dev' into 5063-item-module-doPhoto
|
2023-02-01 09:26:25 +01:00 |
Alex Moreno
|
2528b2d3ad
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-02-01 07:10:51 +01:00 |
Alex Moreno
|
292898708b
|
result not null
|
2023-01-31 11:24:09 +01:00 |
Alex Moreno
|
320ceb3e2c
|
fix: getRate2
|
2023-01-31 11:17:31 +01:00 |
Vicent Llopis
|
19120ef102
|
feat: el descriptor coge el warehouseFk dependiendo de la sección
|
2023-01-31 09:28:28 +01:00 |
Alexandre Riera
|
444d2ae4c4
|
refs #5104 grouping/packing unified
|
2023-01-30 15:28:47 +01:00 |
Alex Moreno
|
c990b9a564
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-01-30 14:37:24 +01:00 |
Alex Moreno
|
4e65e88621
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-01-30 07:56:12 +01:00 |
Vicent Llopis
|
79bf1739ba
|
fix: backTest
|
2023-01-27 13:52:14 +01:00 |
Vicent Llopis
|
29c6ca35ff
|
fix: test e2e
|
2023-01-27 13:39:19 +01:00 |
Joan Sanchez
|
9bf4cd5cff
|
Merge branch 'dev' into 4480-vnUser
|
2023-01-27 08:20:32 +00:00 |
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
|
caf1dcd690
|
feat: añadido almacén por defecto
|
2023-01-25 15:19:33 +01:00 |
Pau
|
ef6b06e147
|
added logs
|
2023-01-25 14:44:00 +01:00 |
Joan Sanchez
|
3076123c04
|
Updated models relation
|
2023-01-24 09:05:50 +01:00 |
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
|
2023-01-23 07:21:53 +01:00 |
Pau
|
2e988ea701
|
doPhoto updated on item upload
|
2023-01-20 13:34:36 +01:00 |
Alexandre Riera
|
a473d3a6f9
|
refs #4945 changed input-number for autocomplete
|
2023-01-20 12:01:13 +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 |
Vicent Llopis
|
eefafb3ac2
|
fix: available is cero
|
2023-01-19 15:14:31 +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 |
Pau
|
99338bb6f8
|
isPhotoRequired implemented
|
2023-01-17 10:11:41 +01:00 |
Alexandre Riera
|
4e1c43eb4d
|
refs #4945 nombre temporal removed
|
2023-01-17 10:01:49 +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 |
Alex Moreno
|
e27a559416
|
refactor: replace all Date
|
2023-01-16 15:18:24 +01:00 |
Vicent Llopis
|
2451d00998
|
Merge branch 'dev' into 4925-item.tags
|
2023-01-12 07:59:43 +00:00 |
Vicent Llopis
|
e4603a06f2
|
refacotor: borrados los await para que devuelva la promesa
|
2023-01-12 08:59:24 +01:00 |
Vicent Llopis
|
ff653ad834
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
|
2023-01-10 09:18:02 +01:00 |
Vicent Llopis
|
cdee85e1e8
|
refacotor: change description
|
2023-01-10 08:31:32 +01:00 |
Vicent Llopis
|
3abbfc4fa7
|
refacotr
|
2023-01-05 10:35:55 +01:00 |
Vicent Llopis
|
fd9ca3a4c1
|
add test
|
2023-01-05 10:35:49 +01:00 |
Vicent Llopis
|
21a62a0fab
|
refactor
|
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
|
22d0da273e
|
refs #4925 fix: coge únicamente los últimos cambios aplicados
|
2023-01-03 13:21:51 +01:00 |
Vicent Llopis
|
3792a80ad5
|
refs #4925 feat: añadido back para editar tags
|
2022-12-29 14:24:32 +01:00 |
Vicent Llopis
|
d5b626434b
|
refactor: add translations, change css...
|
2022-12-28 12:42:51 +01:00 |
Vicent Llopis
|
3dd0c79629
|
feat: add ItemShelvingSales/filter
|
2022-12-27 15:00:49 +01:00 |
Alexandre Riera
|
96a6f0b9d9
|
refs #4926 packingOut added
|
2022-12-27 07:48:09 +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
|
502a692521
|
test(item_fixedPrice_rate2): backTest and e2e
|
2022-12-21 12:55:11 +01:00 |
Alex Moreno
|
5d2b69d063
|
test(item_fixedPrice): front recalculateRate2
|
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
|
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
|
37292cee89
|
remove comments
|
2022-11-04 08:12:46 +01:00 |
Pau
|
11cf1ba414
|
fix back test error
|
2022-11-04 07:50:54 +01:00 |
Pau
|
7d7af6eb49
|
Modified model to allow modifications to isLaid
|
2022-11-04 07:42:21 +01:00 |
Alex Moreno
|
ec9139f985
|
Merge branch 'dev' into 4159-tableQ_filter
|
2022-11-03 07:24:05 +00:00 |
Alex Moreno
|
9891f7060d
|
fix(smart-table): monitor only ticketFilter use url and add ?q in routes
|
2022-11-02 09:40:09 +01:00 |
Pau
|
ff5e601a1e
|
Item islaid and test
|
2022-10-31 14:43:31 +01:00 |
Vicent Llopis
|
21e2945d4f
|
refactor: delete destroyAll
|
2022-10-26 09:30:17 +02:00 |
Vicent Llopis
|
8a3573474a
|
refactor: move 'lastEntries' to thrid position in descriptor
|
2022-10-25 07:40:32 +02:00 |
Vicent Llopis
|
888f612dbb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
|
2022-10-21 11:41:53 +02:00 |
Alex Moreno
|
74383b61e7
|
hotFix(monitor): use left join in ticketState
|
2022-10-13 09:22:53 +02:00 |
Vicent Llopis
|
bfefec397e
|
feat: add testFront
|
2022-10-11 09:13:29 +02: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 |
Joan Sanchez
|
e3606c7273
|
Updated unit test
|
2022-10-10 14:46:06 +02:00 |
Joan Sanchez
|
7f023d7456
|
Set user default warehouse
|
2022-10-10 12:23:40 +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 |
Joan Sanchez
|
377a0f7228
|
Attachments refactor
|
2022-10-04 13:41:37 +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 |
Javi Gallego
|
eb48685484
|
selectores reparados
|
2022-09-30 14:55:31 +02: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
|
901007d34b
|
change test case to expect the image to be defined
|
2022-09-27 13:58:27 +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 |
Joan Sanchez
|
410e651edd
|
Buyer waste
|
2022-09-27 07:24:45 +02:00 |
Joan Sanchez
|
85698410db
|
Templates refactor
|
2022-09-26 08:07: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
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
|
2022-09-15 06:35:03 +00:00 |
Vicent Llopis
|
eb7bd3dc59
|
update brach
|
2022-09-14 14:03:15 +02:00 |
Alex Moreno
|
6b252f7e33
|
refactor(item_waste): refactor table and add totals in table_head
|
2022-09-14 10:13:30 +02:00 |
Joan Sanchez
|
5a46444875
|
Use POST request method instead of GET
|
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
|
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
|
d0185017b7
|
Removed translate from grouping and packing
|
2022-08-11 08:29:24 +02:00 |
Joan Sanchez
|
768e4d5e77
|
Resolved conflicts
|
2022-08-10 12:13:31 +02:00 |
Vicent Llopis
|
8f54365350
|
refator: parametrizardo con ?
|
2022-08-10 09:19:23 +02:00 |
Vicent Llopis
|
c3d396b042
|
fix: test e2e
|
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
|
2022-07-29 13:38:23 +02:00 |
Vicent Llopis
|
224ea61a62
|
fix: delete warehouseFk from itemType model
|
2022-07-29 13:07:25 +02:00 |
Vicent Llopis
|
840e792d13
|
fix: backTest
|
2022-07-29 12:52:53 +02:00 |
Vicent Llopis
|
605da52286
|
fix: replace it.warehouseFk by userConfig.warehouseFk
|
2022-07-29 12:22:03 +02:00 |
Joan Sanchez
|
468da0c5a9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2022-07-27 08:12:06 +02:00 |
Joan Sanchez
|
f4825488c6
|
refactor(Tasks API): ghanged method to GET
|
2022-07-26 11:47:43 +02:00 |
Vicent Llopis
|
7bf9a8c100
|
delete itemType.warehouseFk
|
2022-07-12 11:52:47 +02:00 |
Vicent Llopis
|
6f3d4792d5
|
update backTest
|
2022-07-12 10:03:58 +02:00 |
Vicent Llopis
|
eaa7658b23
|
delete it.warehouseFk
|
2022-07-12 10:03:50 +02:00 |
Joan Sanchez
|
fc87039571
|
Merge pull request '4213-item.summary' (#1011) from 4213-item.summary into dev
Reviewed-on: #1011
|
2022-07-01 09:25:07 +00: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 |
Vicent Llopis
|
24159cd3e8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4213-item.summary
|
2022-06-29 14:28:54 +02:00 |
Vicent Llopis
|
d49a2666f1
|
refactor: don´t show 'description' if it is empty
|
2022-06-29 14:28:23 +02:00 |
Alex Moreno
|
a98a927663
|
fix back test and e2e that now fail
|
2022-06-27 11:17:45 +02:00 |
Vicent Llopis
|
2c721867fc
|
feat(item.summary): add description
|
2022-06-22 14:30:25 +02:00 |
Alex Moreno
|
eb9bd66ddb
|
prepare for static dates
|
2022-06-09 13:33:01 +02:00 |
Alex Moreno
|
7eec9de0aa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
|
2022-06-09 07:47:03 +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
|
76515bdd3f
|
add: search-panel
|
2022-05-17 09:54:49 +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 |
Alex Moreno
|
5021315ed4
|
refactor(clientCredit): test and types
|
2022-05-12 09:47:47 +02:00 |
Vicent Llopis
|
16fdf982c8
|
feat(item.itemtype): add frontTest
|
2022-05-12 07:40:24 +02:00 |
Vicent Llopis
|
13a6f1f8c1
|
feat(item): add section itemType
|
2022-05-11 14:47:54 +02:00 |
Vicent Llopis
|
734f9cb60d
|
feat(item.itemType): added section itemType
|
2022-05-11 07:28:17 +02:00 |
Vicent Llopis
|
a6b8674302
|
feat(invoiceIn.tax): add button for create an expence
|
2022-05-09 14:34:20 +02:00 |
Carlos Jimenez Ruiz
|
b2f930911f
|
fixed problems in two spec files
|
2022-04-29 09:18:06 +02:00 |
Vicent Llopis
|
bad90c12f4
|
feat: add required fields and models
|
2022-04-27 14:17:41 +02:00 |
Alex Moreno
|
e00d63d7af
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
|
2022-04-20 14:30:23 +02:00 |
Joan Sanchez
|
91f111f609
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2022-04-13 11:33:49 +02:00 |