Commit Graph

311 Commits

Author SHA1 Message Date
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 b2f930911f fixed problems in two spec files
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 09:18:06 +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
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
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
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 262e46d7c9 added autocompletes to item index 2021-11-08 17:46:40 +01: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 e6bc856b35 removed niches model, relations and its usages 2021-08-30 13:29:16 +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
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 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
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
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 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 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 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
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
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 5ef9afdb53 Empty url fix
gitea/salix/pipeline/head This commit looks good Details
2020-09-08 15:07:57 +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
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 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
Bernat Exposito Domenech 3f978bd32b entry index refactor
gitea/salix/2122-entry_index This commit looks good Details
2020-02-18 10:33:17 +01:00
Joan Sanchez 844b27acb9 2118 - Create new intrastat
gitea/salix/2113-item_data_add_instrastat There was a failure building this commit Details
2020-02-17 12:47:03 +01:00
Joan Sanchez d9ed7cda38 Added form dialog
gitea/salix/2113-item_data_add_instrastat There was a failure building this commit Details
2020-02-17 07:22:55 +01:00
Bernat Exposito Domenech 960b3c3f75 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-22 09:51:35 +01:00
Bernat Exposito Domenech 0b848adf03 fix back test
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-22 09:43:10 +01:00
Joan Sanchez 1d6edabb10 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-01-21 09:23:58 +01:00
Joan Sanchez e93e9d2947 getWasteDetail() now calls weekWaste_getDetail()
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-21 09:17:55 +01:00
Joan Sanchez 826dfe8092 changes to percentage filter
gitea/salix/master This commit looks good Details
2020-01-17 11:46:45 +01:00
Joan Sanchez 2b2e6532f6 changes to percentage filter
gitea/salix/2008-item_buyer_waste_detail This commit looks good Details
2020-01-16 13:39:32 +01:00
Joan Sanchez 5273e90a30 Added params to ticket method & updated unit tests
gitea/salix/1935-ticket_create_auto_fill This commit looks good Details
2019-12-26 07:12:34 +01:00
Joan Sanchez 780f1e4773 renamed expence to expense and added field
gitea/salix/1919-ticket_service_type There was a failure building this commit Details
2019-12-13 11:59:25 +01:00
Joan Sanchez 5bb7f7f14a deprecated getItemVisibleAvailable() #1887
gitea/salix/dev This commit has test failures Details
2019-11-20 11:14:11 +01:00
Joan Sanchez e2a7c09e4a Uploadfile parameters are now required + fixed date filters
gitea/salix/dev This commit looks good Details
2019-10-21 08:31:14 +02:00
Carlos Jimenez Ruiz da2c763573 #1705 item.index optimizar velocidad 2019-10-04 10:07:45 +02:00
Bernat cbbce91def #1693 export structure, data and fix back test 2019-09-17 13:52:29 +02:00
Bernat 6daabed202 #1645 first part, delete hasVisible
gitea/salix/dev This commit looks good Details
2019-08-28 12:17:06 +02:00
Joan Sanchez 6f3b023644 Create postcode form #1585
gitea/salix/dev This commit looks good Details
2019-07-08 14:07:09 +02:00
Bernat 65ec629221 Tarea #1518 route.tickets al eliminar un ticket de la ruta, tiene que logearse 2019-07-03 08:29:40 +02:00
Bernat dd38a21e8d Refactor #1569 claim.delete, update fixtures and fix test
gitea/salix/dev This commit looks good Details
2019-07-01 11:56:16 +02:00
Bernat 682a75ac76 #1533 update fixtures and fix test
gitea/salix/dev This commit looks good Details
2019-06-25 14:00:55 +02:00
Joan Sanchez dae43bb9b0 transactions refactor #1546
gitea/salix/dev This commit has test failures Details
2019-06-21 08:26:59 +02:00
Carlos Jimenez Ruiz fcc0ad6098 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-14 12:27:54 +02:00
Carlos Jimenez Ruiz b8a4861f01 #1526 refactor fixtures 2019-06-14 12:27:41 +02:00