Merge branch 'master' of github.com:openprocurement/openprocurement.api

myroslav · myroslav · commit 856b9b3ce444 · 2014-11-07T23:06:00.000+02:00
diff --git a/src/openprocurement/api/views.py b/src/openprocurement/api/views.py
@@ -210,7 +210,7 @@ def collection_post(self):
                     },
                     "minimalStep": {
                         "amount": 35,
-                        "currency", "UAH"
+                        "currency": "UAH"
                     }
                 }
             }
@@ -282,7 +282,7 @@ def collection_post(self):
                     },
                     "minimalStep": {
                         "amount": 35,
-                        "currency", "UAH"
+                        "currency": "UAH"
                     }
                 }
             }
@@ -383,7 +383,7 @@ def get(self):
                     },
                     "minimalStep": {
                         "amount": 35,
-                        "currency", "UAH"
+                        "currency": "UAH"
                     }
                 }
             }
@@ -793,12 +793,10 @@ def get(self):
 
             {
                 "data": {
-                    {
-                        "totalValue": {
-                            "amount": 600,
-                            "currency": "UAH",
-                            "valueAddedTaxIncluded": true
-                        }
+                    "totalValue": {
+                        "amount": 600,
+                        "currency": "UAH",
+                        "valueAddedTaxIncluded": true
                     }
                 }
             }
@@ -847,12 +845,10 @@ def patch(self):
 
             {
                 "data": {
-                    {
-                        "totalValue": {
-                            "amount": 600,
-                            "currency": "UAH",
-                            "valueAddedTaxIncluded": true
-                        }
+                    "totalValue": {
+                        "amount": 600,
+                        "currency": "UAH",
+                        "valueAddedTaxIncluded": true
                     }
                 }
             }
@@ -906,12 +902,10 @@ def delete(self):
 
             {
                 "data": {
-                    {
-                        "totalValue": {
-                            "amount": 489,
-                            "currency": "UAH",
-                            "valueAddedTaxIncluded": true
-                        }
+                    "totalValue": {
+                        "amount": 489,
+                        "currency": "UAH",
+                        "valueAddedTaxIncluded": true
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ def collection_post(self):`
`210`	`210`	`},`
`211`	`211`	`"minimalStep": {`
`212`	`212`	`"amount": 35,`
`213`		`- "currency", "UAH"`
	`213`	`+ "currency": "UAH"`
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`	`}`
`@@ -282,7 +282,7 @@ def collection_post(self):`
`282`	`282`	`},`
`283`	`283`	`"minimalStep": {`
`284`	`284`	`"amount": 35,`
`285`		`- "currency", "UAH"`
	`285`	`+ "currency": "UAH"`
`286`	`286`	`}`
`287`	`287`	`}`
`288`	`288`	`}`
`@@ -383,7 +383,7 @@ def get(self):`
`383`	`383`	`},`
`384`	`384`	`"minimalStep": {`
`385`	`385`	`"amount": 35,`
`386`		`- "currency", "UAH"`
	`386`	`+ "currency": "UAH"`
`387`	`387`	`}`
`388`	`388`	`}`
`389`	`389`	`}`
`@@ -793,12 +793,10 @@ def get(self):`
`793`	`793`
`794`	`794`	`{`
`795`	`795`	`"data": {`
`796`		`- {`
`797`		`- "totalValue": {`
`798`		`- "amount": 600,`
`799`		`- "currency": "UAH",`
`800`		`- "valueAddedTaxIncluded": true`
`801`		`- }`
	`796`	`+ "totalValue": {`
	`797`	`+ "amount": 600,`
	`798`	`+ "currency": "UAH",`
	`799`	`+ "valueAddedTaxIncluded": true`
`802`	`800`	`}`
`803`	`801`	`}`
`804`	`802`	`}`
`@@ -847,12 +845,10 @@ def patch(self):`
`847`	`845`
`848`	`846`	`{`
`849`	`847`	`"data": {`
`850`		`- {`
`851`		`- "totalValue": {`
`852`		`- "amount": 600,`
`853`		`- "currency": "UAH",`
`854`		`- "valueAddedTaxIncluded": true`
`855`		`- }`
	`848`	`+ "totalValue": {`
	`849`	`+ "amount": 600,`
	`850`	`+ "currency": "UAH",`
	`851`	`+ "valueAddedTaxIncluded": true`
`856`	`852`	`}`
`857`	`853`	`}`
`858`	`854`	`}`
`@@ -906,12 +902,10 @@ def delete(self):`
`906`	`902`
`907`	`903`	`{`
`908`	`904`	`"data": {`
`909`		`- {`
`910`		`- "totalValue": {`
`911`		`- "amount": 489,`
`912`		`- "currency": "UAH",`
`913`		`- "valueAddedTaxIncluded": true`
`914`		`- }`
	`905`	`+ "totalValue": {`
	`906`	`+ "amount": 489,`
	`907`	`+ "currency": "UAH",`
	`908`	`+ "valueAddedTaxIncluded": true`
`915`	`909`	`}`
`916`	`910`	`}`
`917`	`911`	`}`