Sergio De la torre
|
2ed5237568
|
Merge branch 'dev' into 6964_itemOlder
|
2024-04-04 13:45:20 +00:00 |
Guillermo Bonet
|
c685000b47
|
hotfix: refs #6930 Rollback tokenMultimedia
|
2024-04-04 10:13:56 +02:00 |
Javier Segarra
|
8ab9063b50
|
refs #6436 feat: use mocks
|
2024-04-01 11:00:55 +02:00 |
Sergio De la torre
|
b62905c5ef
|
Merge branch 'dev' into 6964_itemOlder
|
2024-03-28 10:08:56 +00:00 |
Alex Moreno
|
8cccc78b88
|
Merge branch 'dev' into 6532-deleteMermas
|
2024-03-28 06:42:39 +00:00 |
Sergio De la torre
|
7634d82d8b
|
refs #6964 feat:hasItemOlder
|
2024-03-28 07:15:30 +01:00 |
Sergio De la torre
|
9240732c00
|
refs #6964 feat:advice for olderItem
|
2024-03-27 07:49:51 +01:00 |
Sergio De la torre
|
ff8522cfd1
|
refs #6964 feat:advice for olderItem
|
2024-03-27 07:09:18 +01:00 |
Sergio De la torre
|
678eb2928f
|
refs #6964 feat:hasItemOlder
|
2024-03-26 10:30:17 +01:00 |
Sergio De la torre
|
c265896224
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder
|
2024-03-26 10:24:27 +01:00 |
Alex Moreno
|
dce0155c00
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2024-03-26 08:18:47 +01:00 |
Sergio De la torre
|
a40234ba9b
|
refs #6964 feat:hasItemOlder
|
2024-03-25 08:20:08 +01:00 |
Sergio De la torre
|
22f78dbb91
|
refs #6964 feat:hasItemOlder
|
2024-03-25 07:54:51 +01:00 |
Sergio De la torre
|
c4fcb2cd12
|
refs #6964 feat:advice for olderItem
|
2024-03-22 13:04:16 +01:00 |
Sergio De la torre
|
61b649fdc5
|
refs #6964 feat:advice for olderItem
|
2024-03-22 11:47:12 +01:00 |
Sergio De la torre
|
976c5b7ba8
|
refs #6964 feat:advice for olderItem
|
2024-03-22 11:42:19 +01:00 |
Sergio De la torre
|
027aa86662
|
refs #6964 feat:advice for olderItem
|
2024-03-22 10:08:20 +01:00 |
Sergio De la torre
|
2a976664ec
|
refs #6276 feat:newWarehouse
|
2024-03-21 12:05:34 +01:00 |
Sergio De la torre
|
5135bee2d2
|
refs #6276 feat:newWarehouse
|
2024-03-21 12:02:57 +01:00 |
Sergio De la torre
|
d8da317339
|
Merge branch 'dev' into 6964_itemOlder
|
2024-03-21 10:10:57 +00:00 |
Sergio De la torre
|
1d37d3d8bf
|
refs #6276 feat:newWarehouse
|
2024-03-21 10:33:49 +01:00 |
Sergio De la torre
|
3fbf32bd52
|
refs #6276 feat:newWarehouse
|
2024-03-21 10:32:36 +01:00 |
Carlos Satorres
|
b352fc10e7
|
refs #6532 redirect grafana, remove mermas
|
2024-03-20 14:44:06 +01:00 |
Alex Moreno
|
0ad052c34a
|
refs #7033 deploy(2412): dev to test
|
2024-03-14 08:36:19 +01:00 |
Sergio De la torre
|
def9aaf41a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder
|
2024-03-13 07:15:45 +01:00 |
Javier Segarra
|
486b51bcfa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia
|
2024-03-12 12:46:46 +01:00 |
Alex Moreno
|
dbbebbe73c
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2024-03-07 11:39:03 +01:00 |
Alex Moreno
|
01cd2709cc
|
deploy: refs #6995 skip test
|
2024-03-07 11:38:30 +01:00 |
Javier Segarra
|
6c06f70121
|
Merge branch 'dev' into 6930_scopedToken_Multimedia
|
2024-03-06 18:18:34 +00:00 |
Sergio De la torre
|
09923d2509
|
refs #6964 feat:advice for olderItem
|
2024-03-04 18:35:36 +01:00 |
Jorge Penadés
|
854a9b62af
|
fix: refs #6276 refactor updateInTime & changes
|
2024-03-04 09:21:41 +01:00 |
Jorge Penadés
|
b86110c898
|
fix: refs #6276 changes
|
2024-02-27 10:29:49 +01:00 |
Javier Segarra
|
04086e37ee
|
refs #6930 feat: add accessScopes: ['read:multimedia'] forEarch method
|
2024-02-26 06:57:17 +01:00 |
Jorge Penadés
|
e9f7fbed86
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2024-02-19 14:46:56 +01:00 |
Jorge Penadés
|
d5a3413307
|
fix: refs #6776 method names & chanmges
|
2024-02-19 14:46:42 +01:00 |
Jorge Penadés
|
fc6e34ddfd
|
fix: refs #6776 replace name
|
2024-02-19 11:18:05 +01:00 |
Jorge Penadés
|
69acebb43c
|
fix: refs #6776 replace name
|
2024-02-16 13:48:55 +01:00 |
Jorge Penadés
|
63c615655b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2024-02-16 08:34:05 +01:00 |
Jorge Penadés
|
f11aa2605b
|
feat: refs #6776 back & procedure modified
|
2024-02-15 14:48:30 +01:00 |
Jorge Penadés
|
be7a570314
|
fix: refs #6776 test
|
2024-02-15 11:18:01 +01:00 |
Jorge Penadés
|
bec574ff99
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti
|
2024-02-15 11:03:33 +01:00 |
Jorge Penadés
|
30069ded15
|
fix: refs #6806 fix date filter
|
2024-02-08 16:01:34 +01:00 |
Jorge Penadés
|
21cf05ddd0
|
fix: refs #6276 fix tests & errors
|
2024-02-02 09:23:29 +01:00 |
Jorge Penadés
|
2c1b8bd9db
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2024-01-31 10:02:58 +01:00 |
Sergio De la torre
|
a8b483078f
|
refs #6186 feat:deprecated packingShelve
|
2024-01-31 08:52:36 +01:00 |
Jorge Penadés
|
2a6abffef9
|
fix: refs #6276 fix errors & refactor
|
2024-01-30 16:07:33 +01:00 |
Jorge Penadés
|
5690da0a18
|
fix: refs #6776 add userId
|
2024-01-30 16:05:56 +01:00 |
Jorge Penadés
|
e17fc91415
|
fix: refs #6276 fix acl, addSaleByCode & tests
|
2024-01-30 14:58:11 +01:00 |
Jorge Penadés
|
afa34c6296
|
feat: refs #6776 makeMulti
|
2024-01-30 14:00:08 +01:00 |
Jorge Penadés
|
e6335548ad
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2024-01-25 12:23:08 +01:00 |
Jorge Penadés
|
63fb3db8a1
|
fix: refs #6276 test item_card & general fixes
|
2024-01-25 12:14:14 +01:00 |
Jorge Penadés
|
02e38eb711
|
fix: refs #6276 fix tests
|
2024-01-25 08:13:47 +01:00 |
Jorge Penadés
|
5c0425b942
|
feat: refs #6276 test machineWorker_update
|
2024-01-19 09:52:49 +01:00 |
Carlos Satorres
|
3be194356f
|
fix expense
|
2024-01-19 09:31:25 +01:00 |
Jorge Penadés
|
34420375cd
|
feat: refs #6276 test item_updateFromSale
|
2024-01-18 15:03:17 +01:00 |
Jorge Penadés
|
b33594e0da
|
fix: refs #6276 item_card & wip test
|
2024-01-18 14:35:51 +01:00 |
Jorge Penadés
|
c8bfb35cf6
|
feat: refs #6276 test itemShelvingMake_multi
|
2024-01-18 13:28:22 +01:00 |
Jorge Penadés
|
6f35c62cd5
|
feat: refs #6276 test collection_addItem
|
2024-01-18 11:51:21 +01:00 |
Jorge Penadés
|
8e5be5f5da
|
feat: refs #6276 test itemBarcode_delete
|
2024-01-17 15:26:04 +01:00 |
Jorge Penadés
|
c0398d17bf
|
feat: refs #6276 test itemShelving_return
|
2024-01-17 14:21:50 +01:00 |
Jorge Penadés
|
1fbb84ae9f
|
fix: refs #6276 itemShelving_return
|
2024-01-17 12:58:57 +01:00 |
Jorge Penadés
|
07e9b737c5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2024-01-17 07:50:21 +01:00 |
Carlos Satorres
|
3ebeebc159
|
refs #6230 remove basic-data columns
|
2024-01-16 11:47:45 +01:00 |
Jorge Penadés
|
8a5da43503
|
refactor: sectorCollection_getSale refs #6276
|
2024-01-04 16:00:25 +01:00 |
Jorge Penadés
|
7a64b57a2a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2024-01-04 15:07:33 +01:00 |
Sergio De la torre
|
0b5ffcc81c
|
refs #6276:modify back silex→salix
|
2024-01-03 12:50:53 +01:00 |
Javier Segarra
|
4510f0a037
|
Merge branch 'dev' into 5666-loggable_to_mixin
|
2024-01-02 09:26:18 +00:00 |
Jorge Penadés
|
68ef193a19
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2024-01-02 09:58:30 +01:00 |
Robert Ferrús
|
b9efbc7d44
|
refs #5854
|
2023-12-13 14:30:29 +01:00 |
Jorge Penadés
|
8d61473d4f
|
refs #6276 fixtures & itemBarcode_delete
|
2023-12-13 11:43:19 +01:00 |
Jorge Penadés
|
a4c3d78e31
|
refs #6276 drop fixtures & fix getSale
|
2023-12-13 09:45:01 +01:00 |
Jorge Penadés
|
64c10f3b8e
|
refs #6276 sectorCollection_getSales
|
2023-12-13 08:52:43 +01:00 |
Robert Ferrús
|
5f4adab017
|
refs #5854
|
2023-12-12 18:03:09 +01:00 |
Javier Segarra
|
1d92bbf4a2
|
refs #5666 feat: replace base value and add mixins
|
2023-12-05 07:48:56 +01:00 |
Jorge Penadés
|
4690dca4f9
|
refs #6276 getItemPackingType
|
2023-12-01 13:54:09 +01:00 |
Jorge Penadés
|
660e77be55
|
refs #6276 updateFromSale refactored
|
2023-12-01 12:48:21 +01:00 |
Jorge Penadés
|
7e57640758
|
refs #6276 itemShelving_updateFromSale
|
2023-12-01 11:43:07 +01:00 |
Jorge Penadés
|
d2769f4c21
|
refs #6276 return fixed
|
2023-12-01 11:38:30 +01:00 |
Jorge Penadés
|
f2ab44bb8f
|
refs #6276 itemShelving_return
|
2023-12-01 10:14:32 +01:00 |
Jorge Penadés
|
3333c83702
|
refs #6276 WIP itemShelving_return
|
2023-11-30 16:25:13 +01:00 |
Jorge Penadés
|
40236fdb7b
|
refs #6276 itemShelvingMake_multi
|
2023-11-30 13:23:10 +01:00 |
Jorge Penadés
|
133fe1065a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2023-11-29 09:44:09 +01:00 |
Robert Ferrús
|
5f26553092
|
Merge branch 'dev' into 5854-itemShelvingTraduciones
|
2023-11-27 11:05:50 +00:00 |
Robert Ferrús
|
62fab4e744
|
refs #5854 itemShelving traducciones
|
2023-11-27 11:52:37 +01:00 |
Guillermo Bonet
|
aefff68c29
|
refactor: refs #3222 Requested changes
|
2023-11-27 09:51:56 +01:00 |
Guillermo Bonet
|
2be1639e9f
|
refactor: refs #3222 Expence to expense
|
2023-11-24 12:42:25 +01:00 |
Jorge Penadés
|
251578146e
|
refs #6276 several methods created
|
2023-11-21 12:32:36 +01:00 |
Alex Moreno
|
5bdf6a7338
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2023-11-16 07:56:23 +01:00 |
Sergio De la torre
|
692c5eb164
|
refs #5652 fix: setVisibleDiscard add parameter null
|
2023-11-15 12:38:08 +01:00 |
Juan Ferrer
|
99c88e6f5d
|
fix: refs #6390 Loggable set as base for ItemShelving
|
2023-11-05 09:33:18 +01:00 |
Alex Moreno
|
013b010c22
|
refs #6278 test(itemRequest): fix e2e, correct selector
|
2023-10-26 07:56:57 +02:00 |
Pablo Natek
|
25c13e42ab
|
Merge branch '6278-ticketRequestFixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6278-ticketRequestFixFilter
|
2023-10-20 11:36:24 +02:00 |
Pablo Natek
|
243a32dff5
|
remove(expand): quito expand de la columna requester refs #6278
|
2023-10-20 11:36:11 +02:00 |
Pablo Natek
|
9cb4e57951
|
Merge branch 'dev' into 6278-ticketRequestFixFilter
|
2023-10-20 05:31:12 +00:00 |
Pablo Natek
|
f26595bb62
|
Merge branch 'dev' into 3126-changePackageFkTopackagingFk
|
2023-10-19 12:15:43 +00:00 |
Guillermo Bonet
|
5c51d7fb04
|
Merge branch 'test' into dev
|
2023-10-19 13:22:33 +02:00 |
Pablo Natek
|
e2f7ce8b35
|
Merge branch 'dev' into 3126-changePackageFkTopackagingFk
|
2023-10-19 08:58:50 +00:00 |
Pablo Natek
|
44bc30adf7
|
Merge branch 'dev' into 6278-ticketRequestFixFilter
|
2023-10-18 10:35:53 +00:00 |
Alex Moreno
|
f00a4e63a6
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6199---Cantidad-mínima-back
|
2023-10-13 13:08:54 +02:00 |
Carlos Andrés
|
9c0334619d
|
refs #6199
|
2023-10-13 11:56:50 +02:00 |
Sergio De la torre
|
35c0ec0d04
|
Merge branch 'dev' into 5134-ModelsSalix
|
2023-10-11 15:14:13 +00:00 |
Guillermo Bonet
|
6b1dded222
|
refs #6199 Requested change, position of input
|
2023-10-11 08:28:52 +02:00 |
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 |