Commit Graph

814 Commits

Author SHA1 Message Date
Cayo Puigdefabregas e326e8ccdf fixing revoke when the device is in one future trade 2021-11-11 22:21:58 +01:00
Cayo Puigdefabregas 872a0be866 rebuild trading function 2021-11-11 22:08:28 +01:00
Cayo Puigdefabregas cef22f01ce fixing deletr_from_trade 2021-11-11 17:23:45 +01:00
Cayo Puigdefabregas 54977d432d refactory in delete_from_trade function 2021-11-11 17:06:26 +01:00
Cayo Puigdefabregas 9dc79a59dc fixing revokeView and reset_owner 2021-11-10 18:59:44 +01:00
Cayo Puigdefabregas f06007e199 fixing conflict 2021-11-08 18:07:07 +01:00
Cayo Puigdefabregas c7ced04e9d fixing bug for documents 2021-11-08 17:33:22 +01:00
Cayo Puigdefabregas f8be48d524 fixing schema 2021-11-05 13:10:23 +01:00
Cayo Puigdefabregas 6bf1354109 fixing change status next trade 2021-11-05 13:00:01 +01:00
Cayo Puigdefabregas 5ebf4f48b5 adding trade in status actions 2021-11-05 12:35:10 +01:00
Cayo Puigdefabregas 56df40c81a fixing actions for computer 2021-11-04 13:27:25 +01:00
Cayo Puigdefabregas 6de83ce4d2 Fixing order of actions_multiple devices 2021-11-04 11:58:15 +01:00
Cayo Puigdefabregas b233b7bb75 fixed 2021-11-03 10:37:15 +01:00
Cayo Puigdefabregas 34def7bd70 fixint trading fuction 2021-11-02 14:25:49 +01:00
Cayo Puigdefabregas c34cbb5c26 fixing metrics 2021-11-02 12:47:23 +01:00
Cayo Puigdefabregas 283f869b4d drop remove 2021-10-28 12:19:49 +02:00
Cayo Puigdefabregas 03238acb9f fixing session in listener 2021-10-26 16:35:41 +02:00
Cayo Puigdefabregas 5861d2fd6f fixing session in listener 2021-10-26 16:21:05 +02:00
Cayo Puigdefabregas 5cce2f4efb change some sintaxis 2021-10-25 13:24:22 +02:00
Cayo Puigdefabregas 15fa4546d1 fixing general case for devices 2021-10-25 12:20:16 +02:00
Cayo Puigdefabregas 1c2f6ba92c fixing tests 2021-10-23 13:02:10 +02:00
Cayo Puigdefabregas 9faa1697a7 fixing event device 2021-10-22 21:14:10 +02:00
Cayo Puigdefabregas 6091f31c17 adding event instead of reuse create_code function 2021-10-22 19:26:27 +02:00
Cayo Puigdefabregas 2ade5a14d4 adding tag when there are a new device 2021-10-22 14:19:42 +02:00
Cayo Puigdefabregas 7c6b20597b fixing supplier permitions 2021-10-20 14:53:33 +02:00
Cayo Puigdefabregas f099a579fb fixing rows 2021-10-19 19:25:17 +02:00
Cayo Puigdefabregas 87f30a1391 adding metrics for tradeDocuments 2021-10-19 18:19:25 +02:00
Cayo Puigdefabregas 31de27769d Merge branch 'testing' into feature/new-metrix 2021-10-18 11:53:05 +02:00
Cayo Puigdefabregas 2d37baca8d fixing minor changes of review 2021-10-18 11:20:05 +02:00
Cayo Puigdefabregas 0eed8330ce adding metrics for documents 2021-10-15 15:04:58 +02:00
Cayo Puigdefabregas 17f8aebb94 fixing rows 2021-10-14 18:13:20 +02:00
Cayo Puigdefabregas 5e9b9bf08d new metrics 2021-10-14 12:56:33 +02:00
Cayo Puigdefabregas aa7a3ffe12 Merge branch 'feature/new-recycling-action' into feature/new-metrix 2021-10-11 14:11:59 +02:00
Cayo Puigdefabregas 35e891bf5d trace in metrics 2021-10-11 14:11:56 +02:00
Cayo Puigdefabregas 007e9a96c6 Merge branch 'testing' into feature/new-recycling-action 2021-10-06 12:49:42 +02:00
Cayo Puigdefabregas ab74240d6c fixing 3 bugs, #168 2021-10-04 13:35:51 +02:00
Cayo Puigdefabregas 920937a51f fixing bug of trade without devices 2021-10-01 13:30:39 +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 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 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 b195e380a9 adding basic action reuse and recycling 2021-09-22 14:01:49 +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