Commit Graph

1336 Commits

Author SHA1 Message Date
Cayo Puigdefabregas cae0ca8711 changelog 2021-10-06 12:52:04 +02:00
Cayo Puigdefabregas 007e9a96c6 Merge branch 'testing' into feature/new-recycling-action 2021-10-06 12:49:42 +02:00
Cayo Puigdefabregas 09a106e446 resolve conflict 2021-10-06 12:49:10 +02:00
Cayo Puigdefabregas 406d3d6449 changelog 2021-10-06 12:48:03 +02:00
Cayo Puigdefabregas 8a7e7049a5 change changelog 2021-10-06 12:44:59 +02:00
Cayo Puigdefabregas fbf74643e9 resolve conflict 2021-10-06 12:11:05 +02:00
Cayo Puigdefabregas 2e564862e8 excluding when it is in one trade action 2021-10-06 11:53:41 +02:00
Cayo Puigdefabregas 03cfbfaa35 fixing model action device 2021-10-06 10:51:53 +02:00
Cayo Puigdefabregas aa4ebeb504 fixing, vanish deactivate devices 2021-10-05 14:33:28 +02:00
Cayo Puigdefabregas 9ea0a05de6 migration file 2021-10-05 14:00:55 +02:00
Cayo Puigdefabregas 7eff54f86a fixing base test 2021-10-05 12:19:23 +02:00
Cayo Puigdefabregas 6dd54d9645 deactivate devices 2021-10-05 12:17:07 +02:00
Cayo Puigdefabregas ec2d286ed3 adding action delete 2021-10-05 11:56:19 +02:00
Cayo Puigdefabregas dc3b9ebf2d fixing test 2021-10-05 11:55:43 +02:00
Cayo Puigdefabregas 83c4cc2d8b test of delete devices 2021-10-05 09:56:57 +02:00
cayop 97176879f5
Merge pull request #169 from eReuse/bugfix/#168
Bugfix/#168
2021-10-04 13:50:58 +02:00
Cayo Puigdefabregas ab74240d6c fixing 3 bugs, #168 2021-10-04 13:35:51 +02:00
Cayo Puigdefabregas b02f9dfac5 fixing test bug #168 2021-10-04 13:34:49 +02:00
Cayo Puigdefabregas b83bbe25a0 test bug 168 2021-10-01 18:01:39 +02:00
Cayo Puigdefabregas 920937a51f fixing bug of trade without devices 2021-10-01 13:30:39 +02:00
Cayo Puigdefabregas 2d305f5a43 adding trade without devices 2021-10-01 13:18:56 +02:00
Cayo Puigdefabregas 2790a7756c test action trade without devices and documents 2021-10-01 12:56:12 +02:00
Cayo Puigdefabregas 7a43eaa30f fixing name reuse in test 2021-10-01 11:42:31 +02:00
Cayo Puigdefabregas e30c6c2250 fixing test 2021-10-01 11:26:56 +02:00
Cayo Puigdefabregas 6599f4b66c fixing bug 2021-10-01 10:46:08 +02:00
Cayo Puigdefabregas eeb6db7bc2 test for recycling documents 2021-09-29 21:12:46 +02:00
Cayo Puigdefabregas 7e4af161d3 solve conflict 2021-09-29 14:13:42 +02:00
Cayo Puigdefabregas aff86a8f94 using ActionWithMultipleTradeDocuments intead of ActionWithMultipleDevices 2021-09-29 12:59:44 +02:00
cayop baa5fccda0
Merge pull request #163 from eReuse/feature/container
Feature/container
2021-09-29 12:58:01 +02:00
Cayo Puigdefabregas 2828c0755a adding test for check if you are not the owner 2021-09-29 11:04:56 +02:00
Cayo Puigdefabregas 88780d4949 adding test for history and status calls 2021-09-28 15:44:56 +02:00
Cayo Puigdefabregas 84da94430e fixing bug 2021-09-28 15:44:25 +02:00
Cayo Puigdefabregas f10f2b848f get the status and history status of one devices 2021-09-28 13:05:58 +02:00
Cayo Puigdefabregas 4ce316a9ac fixing tests status actions 2021-09-28 11:25:57 +02:00
Cayo Puigdefabregas 38db59b150 put the correct user un rol_user 2021-09-27 14:58:25 +02:00
Cayo Puigdefabregas c2b0e6341f adding new models for Use, Recycling, Refurbish and Management actions 2021-09-24 12:37:33 +02:00
Cayo Puigdefabregas e861ae3bf8 adding tests for recycling and reuse 2021-09-22 14:33:46 +02:00
Cayo Puigdefabregas b195e380a9 adding basic action reuse and recycling 2021-09-22 14:01:49 +02:00
cayop 4adcff0d6e
Merge pull request #165 from eReuse/changes/dhid
adding dhid
2021-09-22 12:28:25 +02:00
Cayo Puigdefabregas 23cb5a2bf6 fixing test 2021-09-22 12:18:10 +02:00
Cayo Puigdefabregas 4eb4c1a480 downgrade of version 2021-09-22 11:35:06 +02:00
Cayo Puigdefabregas 328facab50 adding dhid 2021-09-22 11:30:37 +02:00
Cayo Puigdefabregas 9df5872a44 upgrade version 2021-09-21 12:45:58 +02:00
Cayo Puigdefabregas 1466cbc4f4 fixing bug of csv 2021-09-21 12:44:07 +02:00
Cayo Puigdefabregas 7f4bd91fdd modify changelog 2021-09-21 11:05:16 +02:00
Cayo Puigdefabregas 3559b98535 fixing bug 2021-09-20 16:16:53 +02:00
Cayo Puigdefabregas bcaf907255 adding total weight in lots 2021-09-10 14:07:35 +02:00
Cayo Puigdefabregas b7396b4f23 adding action moveOn inside of tradeDocuments 2021-09-09 13:34:24 +02:00
Cayo Puigdefabregas 1e86515391 fixing test moveOnDocument 2021-09-08 14:17:48 +02:00
Cayo Puigdefabregas 6cd28a3e3a Adding MoveOnDocument in migration and fixing schema 2021-09-08 13:54:10 +02:00