Merge branch 'master' of https://github.com/openprocurement/openprocu…

…rement.tender.openua

docs/source/complaints-award.rst

@@ -1,61 +1,30 @@
 .. Kicking page rebuild 2014-10-30 17:00:08
 
-Claim/Complaint Retrieval
+Complaint Retrieval
 =========================
 
-Tender Award Claim/Complaint Retrieval
+Tender Award Complaint Retrieval
 -------------------------------------------
 
-You can list all Tender Award Claims/Complaints:
+You can list all Tender Award Complaints:
 
 .. include:: tutorial/award-complaints-list.http
    :code:
 
-And check individual complaint or claim:
+And check individual complaint:
 
 .. include:: tutorial/award-complaint.http
    :code:
 
-Claim Submission
-================
-
-If tender conditions are favoriting only one provider, or in any other viable case, one can submit Tender Award Claim.
-
-Tender Award Claim Submission (with documents)
----------------------------------------------------
-
-At first create a claim:
-
-.. include:: tutorial/award-complaint-submission.http
-   :code:
-
-Then upload necessary documents:
-
-.. include:: tutorial/award-complaint-submission-upload.http
-   :code:
-
-Submit tender award claim:
-
-.. include:: tutorial/award-complaint-claim.http
-   :code:
-
-Tender Award Claim Submission (without documents)
-------------------------------------------------------
-
-You can submit claim that does not need additional documents:
-
-.. include:: tutorial/award-complaint-submission-claim.http
-   :code:
-
 Complaint Submission
 ====================
 
-If tender conditions are favoriting only one provider, or in any other viable case, one can submit Tender Award Claim.
+If tender award is favoriting certain supplier, or in any other viable case, one can submit Tender Award Complaint.
 
 Tender Award Complaint Submission (with documents)
 ---------------------------------------------------
 
-At first create a claim:
+At first create a complaint:
 
 .. include:: tutorial/award-complaint-submission.http
    :code:
@@ -78,33 +47,6 @@ You can submit complaint that does not need additional documents:
 .. include:: tutorial/award-complaint-submission-complaint.http
    :code:
 
-Claim's Answer
-==============
-
-Answer to resolved claim
-------------------------
-
-.. include:: tutorial/award-complaint-answer.http
-   :code:
-
-
-Satisfied Claim
-===============
-
-Satisfying resolution
----------------------
-
-.. include:: tutorial/award-complaint-satisfy.http
-   :code:
-
-
-Escalate claim to complaint
----------------------------
-
-.. include:: tutorial/award-complaint-escalate.http
-   :code:
-
-
 Complaint Resolution
 ====================
 
@@ -115,6 +57,13 @@ Rejecting Tender Award Complaint
    :code:
 
 
+Accepting Tender Award Complaint
+-------------------------------------
+
+.. include:: tutorial/award-complaint-accept.http
+   :code:
+
+
 Submitting Tender Award Complaint Resolution
 -------------------------------------------------
 
@@ -132,4 +81,15 @@ Or declines it:
 
 .. include:: tutorial/award-complaint-decline.http
    :code:
-
+
+Submitting Resolution Confirmation
+----------------------------------
+
+.. include:: tutorial/award-complaint-resolved.http
+   :code:
+
+Cancelling Tender Award Complaint
+=================================
+
+.. include:: tutorial/award-complaint-cancel.http
+   :code:

docs/source/complaints-tender.rst

@@ -114,6 +114,13 @@ Rejecting Tender Conditions Complaint
    :code:
 
 
+Accepting Tender Conditions Complaint
+-------------------------------------
+
+.. include:: tutorial/complaint-accept.http
+   :code:
+
+
 Submitting Tender Conditions Complaint Resolution
 -------------------------------------------------
 
@@ -131,4 +138,15 @@ Or declines it:
 
 .. include:: tutorial/complaint-decline.http
    :code:
-
+
+Submitting Resolution Confirmation
+----------------------------------
+
+.. include:: tutorial/complaint-resolved.http
+   :code:
+
+Cancelling Tender Conditions Complaint
+======================================
+
+.. include:: tutorial/complaint-cancel.http
+   :code:

docs/source/complaints.rst

@@ -23,7 +23,7 @@ Tender Conditions Claims/Complaints
 
     complaints-tender
 
-Tender Award Claims/Complaints
+Tender Award Complaints
 ------------------------------
 
 .. image:: award_complaint_w.png