diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-01-06 14:57:00 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-01-06 14:57:00 +0100 |
| commit | 49c0b7a82003a889edc19cb189d0d6d0ebda2c5f (patch) | |
| tree | d24c9d3fe3baad3ba06f11d4bf334e2504fb6092 /addons/web_linkedin | |
| parent | c4c268c902a134efdf0f097053c9b28d6b14417c (diff) | |
| parent | ced63415b7319e12fb9d31a3e370850278f697c1 (diff) | |
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
Diffstat (limited to 'addons/web_linkedin')
| -rw-r--r-- | addons/web_linkedin/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/web_linkedin/web_linkedin.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/addons/web_linkedin/__openerp__.py b/addons/web_linkedin/__openerp__.py index 6ce78cfca47..508ca240780 100644 --- a/addons/web_linkedin/__openerp__.py +++ b/addons/web_linkedin/__openerp__.py @@ -10,7 +10,7 @@ OpenERP Web LinkedIn module. This module provides the Integration of the LinkedIn with OpenERP. """, 'data': ['web_linkedin_view.xml'], - 'depends' : ['crm'], + 'depends' : ['web','crm'], 'js': ['static/src/js/*.js'], 'css': ['static/src/css/*.css'], 'qweb': ['static/src/xml/*.xml'], diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py index a07dcd50ea0..83132511a17 100644 --- a/addons/web_linkedin/web_linkedin.py +++ b/addons/web_linkedin/web_linkedin.py @@ -24,6 +24,7 @@ import urllib2 from urlparse import urlparse, urlunparse import openerp +import openerp.addons.web from openerp.osv import fields, osv class Binary(openerp.http.Controller): @@ -88,4 +89,4 @@ class web_linkedin_fields(osv.Model): 'linkedin_url': fields.char(string="LinkedIn url", size=100, store=True), 'linkedin_public_url': fields.function(_get_url, type='text', string="LinkedIn url", help="This url is set automatically when you join the partner with a LinkedIn account."), - }
\ No newline at end of file + } |