Commit Graph

617 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 315eb097c9 change view for save hash 2021-06-15 12:38:24 +02:00
Cayo Puigdefabregas b1414cf143 redefine models 2021-06-15 12:38:02 +02:00
Cayo Puigdefabregas 7cee2693ff resolve conflict 2021-06-15 11:22:17 +02:00
Cayo Puigdefabregas 0d4c70a74e fixing bug 2021-06-11 15:49:31 +02:00
Cayo Puigdefabregas ab32b996bd resolve conflict 2021-06-11 12:52:39 +02:00
Cayo Puigdefabregas b12d54d6f1 drop id of trade action 2021-06-11 12:27:14 +02:00
Cayo Puigdefabregas 2cfb126c6c fixing litle bug in delete dev of a lot 2021-06-11 12:26:36 +02:00
Cayo Puigdefabregas 94d4b57be9 fixing id of trading 2021-06-09 12:02:31 +02:00
cayop a0d26a104f
Merge pull request #140 from eReuse/feature/endpoint-confirm
Feature/endpoint confirm
2021-06-09 11:46:32 +02:00
Cayo Puigdefabregas c0558733ec fixing remove decvices from a temporary lot 2021-06-09 11:36:11 +02:00
Cayo Puigdefabregas eaea1c3fa3 Merge branch 'feature/endpoint-confirm' into feature/trade-documents 2021-06-08 16:14:54 +02:00
Cayo Puigdefabregas 99fe0407f0 clean 2021-06-08 16:14:30 +02:00
Cayo Puigdefabregas 1e0d993cfe resolve conflict 2021-06-08 09:30:13 +02:00
Cayo Puigdefabregas e9a09ec2ae fixing automatic confirmation 2021-06-07 17:12:30 +02:00
Cayo Puigdefabregas 6546332fe5 swap @s for _s in code 2021-06-07 16:04:33 +02:00
Cayo Puigdefabregas a9b341076a fixed 2021-06-07 15:48:55 +02:00
Cayo Puigdefabregas f9189ea413 confirm check 2021-06-07 15:45:32 +02:00
Cayo Puigdefabregas 8289f24b69 fixing confirm and code in schema 2021-06-07 15:45:04 +02:00
Cayo Puigdefabregas 589c399231 fixing relation files interdependences 2021-06-07 13:10:28 +02:00
Cayo Puigdefabregas f3f65efeaf resolve conflicts 2021-06-07 12:08:55 +02:00
Cayo Puigdefabregas 289126a8a7 fixing revoke 2021-06-07 11:48:50 +02:00
Cayo Puigdefabregas 21cdcb5350 simplify the algorithm for to manager the confirms flow 2021-06-07 10:50:08 +02:00
Cayo Puigdefabregas 6dc7fb830b fixing bug of filter devices 2021-06-06 10:02:24 +02:00
Cayo Puigdefabregas 80e74b6d3d fixing supplier and receiver 2021-06-04 19:27:01 +02:00
Cayo Puigdefabregas a0824f986b not allow than other users can insert devices, show better the status of trade for devices 2021-06-03 19:05:57 +02:00
Cayo Puigdefabregas 8d1e6bb2d7 drop istemporary lot 2021-06-03 12:11:14 +02:00
Cayo Puigdefabregas e4554a9e27 use open filter for checke frontend trade 2021-06-02 15:33:03 +02:00
Cayo Puigdefabregas 0c99a85361 add raise instead of assert 2021-06-02 13:46:28 +02:00
Cayo Puigdefabregas 20e029b359 bugfix: restriction delete lot by the owner 2021-06-02 10:11:20 +02:00
Cayo Puigdefabregas 57c9269907 add trade instead of deliverynote in lots view 2021-06-02 10:10:36 +02:00
Cayo Puigdefabregas 6c689878a4 Fixing schema trade 2021-06-01 15:59:54 +02:00
Cayo Puigdefabregas e1348e3809 adding isTemporary lot 2021-05-31 11:34:46 +02:00
Cayo Puigdefabregas 6142b89f41 adding confirm_status in devices 2021-05-27 15:56:10 +02:00
Cayo Puigdefabregas ef2e800281 change confirm for confirms field 2021-05-27 15:55:24 +02:00
Cayo Puigdefabregas 8731d90d9a add lots in csv of devices 2021-05-26 11:43:53 +02:00
Cayo Puigdefabregas 145cc2ec3e Merge branch 'testing' of https://github.com/eReuse/devicehub-teal into testing 2021-05-26 11:01:13 +02:00
Cayo Puigdefabregas 816411aa7b fixing settings.ini wbconf 2021-05-26 11:00:43 +02:00
Cayo Puigdefabregas ab3510b67b fixed bug 2021-05-25 12:57:21 +02:00
Cayo Puigdefabregas 1098ef773f resolve conflict 2021-05-25 09:03:34 +02:00
Cayo Puigdefabregas b34feee800 fixing bug 2021-05-24 13:00:03 +02:00
Cayo Puigdefabregas 2a66fb94a3 actions trade for documents 2021-05-21 13:16:30 +02:00
Cayo Puigdefabregas 28da6a953d adding trade for documents 2021-05-19 13:59:59 +02:00
Cayo Puigdefabregas 020e6afd53 saved phisical documents to disk 2021-05-19 09:47:14 +02:00
Cayo Puigdefabregas 4b11372719 Definition of endpoint, view and scheme for basic document 2021-05-14 12:58:56 +02:00
Cayo Puigdefabregas c21de78982 base for documents 2021-05-13 13:35:46 +02:00
Cayo Puigdefabregas 821178359e resolve conflicts 2021-05-12 19:06:03 +02:00
Cayo Puigdefabregas a1119b6130 Merge branch 'testing' into feature/endpoint-confirm 2021-05-12 18:52:50 +02:00
Cayo Puigdefabregas c7ff58273f fixing bug changing database model 2021-05-12 13:02:36 +02:00
Cayo Puigdefabregas 5222f2ceb7 add actionDocuments and drop documents field from Trade action 2021-05-12 11:48:52 +02:00
Cayo Puigdefabregas e2898b22a3 fixing defs 2021-05-10 11:52:10 +02:00