Commit Graph

949 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 76271ce430 drop tradeNotes 2021-04-29 11:25:17 +02:00
Cayo Puigdefabregas 4afa21d7d7 Merge branch 'testing' into feature/#135-trade-without-to 2021-04-29 11:23:00 +02:00
Cayo Puigdefabregas faf45e118b upgrade version to 1.0.6b 2021-04-27 21:33:38 +02:00
cayop 9c2b8b6eb3
Merge pull request #139 from eReuse/bugfix/#138-search-device-for-devicehubId
Bugfix/#138 search device for devicehub
2021-04-26 16:53:57 +02:00
Cayo Puigdefabregas ead8fe00ce change changelog 2021-04-26 15:23:41 +02:00
Cayo Puigdefabregas a65e4ffb82 fixing bug 2021-04-26 15:22:30 +02:00
Cayo Puigdefabregas e496f8009c replicate bug in test 2021-04-26 15:22:09 +02:00
Cayo Puigdefabregas e2fbe87c6a clean actionView of Snapshot section put in other class 2021-04-22 13:40:45 +02:00
Cayo Puigdefabregas 39dc489cb3 clean ActionView with more classes 2021-04-22 13:04:38 +02:00
Cayo Puigdefabregas cc687fa4ea update changelog 2021-04-22 11:50:34 +02:00
Cayo Puigdefabregas f57b65107e fixing enum in migration 2021-04-20 21:45:43 +02:00
Cayo Puigdefabregas 85e514bb6d fixing enum in migration 2021-04-20 21:37:00 +02:00
Cayo Puigdefabregas 1b9aaf538a fixing migrations 2021-04-20 19:12:07 +02:00
Cayo Puigdefabregas c6f908041b adding tradenote to migration 2021-04-20 16:26:58 +02:00
Cayo Puigdefabregas 6822c5bbf8 made one automatic note when add/remove one device of one lot 2021-04-20 16:21:02 +02:00
Cayo Puigdefabregas a0981d1430 adding test_automatic_note_to_trade 2021-04-20 16:20:24 +02:00
Cayo Puigdefabregas 220e864681 fixing test 2021-04-20 16:19:55 +02:00
Cayo Puigdefabregas afea2cff79 adding confirmation model 2021-04-20 16:19:40 +02:00
Cayo Puigdefabregas aaafb2a5fa test about trade notes 2021-04-19 21:31:22 +02:00
Cayo Puigdefabregas 006fe4b855 fixing definitions 2021-04-19 19:37:26 +02:00
Cayo Puigdefabregas 387c2e15e5 fixing view action trade 2021-04-19 19:34:22 +02:00
Cayo Puigdefabregas fa4edfb9a2 fixing tests 2021-04-19 19:33:55 +02:00
Cayo Puigdefabregas 3bb7482876 fixing schemas and states 2021-04-19 19:33:35 +02:00
Cayo Puigdefabregas e058e2491f change model for trade 2021-04-19 19:33:05 +02:00
Cayo Puigdefabregas 55e27caa83 change migrations 2021-04-19 19:32:32 +02:00
Cayo Puigdefabregas e9d85e3d9e resolv conflict 2021-04-16 15:46:19 +02:00
cayop 02fdcb1d42
Merge pull request #131 from eReuse/feature/#130-code-for-device
code for device
2021-04-16 15:05:09 +02:00
Cayo Puigdefabregas 5dc319486a update changelog 2021-04-16 14:49:03 +02:00
Cayo Puigdefabregas e6f098abc8 Merge branch 'testing' into feature/#130-code-for-device 2021-04-16 14:44:49 +02:00
Cayo Puigdefabregas d46db11813 adding devices from lot 2021-04-14 13:02:39 +02:00
Cayo Puigdefabregas e1cca540c4 change verification link for erasure certificate doc 2021-04-13 19:02:16 +02:00
Cayo Puigdefabregas 0138162bdf enlarge test of phantom account and components 2021-04-09 22:22:39 +02:00
Cayo Puigdefabregas 22633054ba fixing phantom account existing 2021-04-09 22:21:13 +02:00
Cayo Puigdefabregas a882396f09 check the propertary of the devices 2021-04-09 22:20:30 +02:00
Cayo Puigdefabregas 48894567c3 check if the validate user is one of the users of the trade 2021-04-09 20:12:30 +02:00
Cayo Puigdefabregas affeea4f52 check trade.confirm_transfer 2021-04-09 20:11:43 +02:00
Cayo Puigdefabregas 4157aa8273 adding test of active and phantom login 2021-04-09 20:10:52 +02:00
Cayo Puigdefabregas eae5422d42 resolve conflict 2021-04-09 14:57:26 +02:00
cayop 9d4e0d934e
Merge pull request #134 from eReuse/bugfix/dummy
fixing for todo trade pr
2021-04-09 14:54:27 +02:00
Cayo Puigdefabregas c5ef11e670 fixing for todo trade pr 2021-04-09 14:43:20 +02:00
Cayo Puigdefabregas 2ab9afa1e4 fixing migration 2021-04-08 21:31:50 +02:00
Cayo Puigdefabregas e88a508efb create correct migrations 2021-04-08 21:22:10 +02:00
Cayo Puigdefabregas b80322355f create automatic trade and creation of phantom account in the view 2021-04-08 21:21:29 +02:00
Cayo Puigdefabregas f7f60f6988 remove pdbs 2021-04-08 21:20:14 +02:00
Cayo Puigdefabregas 17a744a660 add filter active and phantom for login view 2021-04-08 21:19:24 +02:00
Cayo Puigdefabregas 9a43ab0097 add new columns in user model, (active and phantom fields) 2021-04-08 19:13:28 +02:00
Cayo Puigdefabregas a9ec5de237 do a better check from schema 2021-04-08 19:11:27 +02:00
Cayo Puigdefabregas ac5b55d04a new trade tests 2021-04-08 19:10:08 +02:00
Cayo Puigdefabregas 054f59453d fixing tests 2021-04-08 19:09:52 +02:00
Cayo Puigdefabregas 6fde0cabc6 change offer with new requirements 2021-04-07 10:49:28 +02:00