Merge branch 'master' into dev

katyukha · Mar 10, 2016 · 97a9523 · 97a9523
2 parents 1dea047 + 7f35c44
commit 97a9523
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/openerp_proxy/service/report.py b/openerp_proxy/service/report.py
@@ -238,10 +238,11 @@ def report_get(self, report_id):
             :param int report_id: int that represents ID of report to get
                                   (value returned by report method)
             :return: dictinary with keys:
-                        - 'state': boolean, True if report generated correctly
-                        - 'result': base64 encoded content of report file
-                        - 'format': string representing format,
-                                    report generated in
+
+                     - 'state': boolean, True if report generated correctly
+                     - 'result': base64 encoded content of report file
+                     - 'format': string representing format,
+                       report generated in
 
             :rtype: dict
         """

diff --git a/openerp_proxy/version.py b/openerp_proxy/version.py
@@ -1 +1 @@
-version = "0.6.5.dev0"  # pragma: no cover
+version = "0.6.6.dev0"  # pragma: no cover