fix 9.0-dev branch

For unknown reason merge from 9.0 to 9.0-dev 421253c skipped some changes
yelizariev · Feb 21, 2016 · 2c17db7 · 2c17db7
1 parent cc3668c
commit 2c17db7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/docs/development.rst b/docs/development.rst
@@ -0,0 +1,10 @@
+Development
+===========
+
+Structure of SaaS system:
+-------------------------
+
+* SaaS Portal - main database for control servers and clients, manage client templates and plans.
+* SaaS Servers - technical databases to control client databases. SaaS server create, edit, delete databases. Each SaaS Server can be installed on a separate machine (e.g. VPS)
+* SaaS Clients - client database to be used by customers. Each SaaS Client is attached to a SaaS Server.
+
diff --git a/oauth_provider/models/oauth_provider.py b/oauth_provider/models/oauth_provider.py
@@ -2,7 +2,11 @@
 from openerp import models, fields, api
 from datetime import datetime, timedelta
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
-from oauthlib import common as oauthlib_common
+
+try:
+    from oauthlib import common as oauthlib_common
+except:
+    pass
 
 import uuid