[FIX] website and all derived addons: fixed imports broken when moving
website.py to models/ directory in website (revision 9491 revid:xmo@openerp.com-20130930145358-qh7xdicgg21prsk4). bzr revid: tde@openerp.com-20131001085739-hoczgpqrv2nrr6lb
This commit is contained in:
parent
635999b9e9
commit
726cda367e
|
@ -14,7 +14,7 @@ import werkzeug.wrappers
|
||||||
from PIL import Image
|
from PIL import Image
|
||||||
|
|
||||||
import openerp
|
import openerp
|
||||||
from openerp.addons.website import website
|
from openerp.addons.website.models import website
|
||||||
from openerp.addons.web import http
|
from openerp.addons.web import http
|
||||||
from openerp.addons.web.http import request
|
from openerp.addons.web.http import request
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
from openerp.addons.web import http
|
from openerp.addons.web import http
|
||||||
from openerp.addons.web.http import request
|
from openerp.addons.web.http import request
|
||||||
from openerp.addons.website import website
|
from openerp.addons.website.models import website
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
from openerp.tools.safe_eval import safe_eval
|
from openerp.tools.safe_eval import safe_eval
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ import openerp
|
||||||
from openerp.addons.web import http
|
from openerp.addons.web import http
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
from openerp.addons.web.http import request
|
from openerp.addons.web.http import request
|
||||||
from openerp.addons.website import website
|
from openerp.addons.website.models import website
|
||||||
import urllib
|
import urllib
|
||||||
|
|
||||||
class website_contract(http.Controller):
|
class website_contract(http.Controller):
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
from openerp.addons.web import http
|
from openerp.addons.web import http
|
||||||
from openerp.addons.web.http import request
|
from openerp.addons.web.http import request
|
||||||
from openerp.addons.website import website
|
from openerp.addons.website.models import website
|
||||||
|
|
||||||
from urllib import quote_plus
|
from urllib import quote_plus
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ import openerp
|
||||||
from openerp.addons.web import http
|
from openerp.addons.web import http
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
from openerp.addons.web.http import request
|
from openerp.addons.web.http import request
|
||||||
from openerp.addons.website import website
|
from openerp.addons.website.models import website
|
||||||
import urllib
|
import urllib
|
||||||
|
|
||||||
class website_crm_partner_assign(http.Controller):
|
class website_crm_partner_assign(http.Controller):
|
||||||
|
|
|
@ -24,7 +24,7 @@ from openerp.addons.web import http
|
||||||
from openerp.addons.web.http import request
|
from openerp.addons.web.http import request
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
from openerp.addons import website_sale
|
from openerp.addons import website_sale
|
||||||
from openerp.addons.website import website
|
from openerp.addons.website.models import website
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from dateutil.relativedelta import relativedelta
|
from dateutil.relativedelta import relativedelta
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
import openerp
|
import openerp
|
||||||
from openerp.addons.web import http
|
from openerp.addons.web import http
|
||||||
from openerp.addons.web.http import request
|
from openerp.addons.web.http import request
|
||||||
from openerp.addons.website import website
|
from openerp.addons.website.models import website
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
class google_map(http.Controller):
|
class google_map(http.Controller):
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
from openerp.addons.web import http
|
from openerp.addons.web import http
|
||||||
from openerp.addons.web.http import request
|
from openerp.addons.web.http import request
|
||||||
from openerp.addons.website import website
|
from openerp.addons.website.models import website
|
||||||
|
|
||||||
class website_hr(http.Controller):
|
class website_hr(http.Controller):
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
from openerp import SUPERUSER_ID
|
from openerp import SUPERUSER_ID
|
||||||
from openerp.addons.web import http
|
from openerp.addons.web import http
|
||||||
from openerp.addons.web.http import request
|
from openerp.addons.web.http import request
|
||||||
from openerp.addons.website import website
|
from openerp.addons.website.models import website
|
||||||
|
|
||||||
|
|
||||||
class WebsiteMail(http.Controller):
|
class WebsiteMail(http.Controller):
|
||||||
|
|
|
@ -4,7 +4,7 @@ import openerp
|
||||||
from openerp.addons.web import http
|
from openerp.addons.web import http
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
from openerp.addons.web.http import request
|
from openerp.addons.web.http import request
|
||||||
from openerp.addons.website import website
|
from openerp.addons.website.models import website
|
||||||
import urllib
|
import urllib
|
||||||
|
|
||||||
class website_crm_partner_assign(http.Controller):
|
class website_crm_partner_assign(http.Controller):
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
from openerp.addons.web import http
|
from openerp.addons.web import http
|
||||||
from openerp.addons.web.http import request
|
from openerp.addons.web.http import request
|
||||||
from openerp.addons.website import website
|
from openerp.addons.website.models import website
|
||||||
from openerp.osv import osv
|
from openerp.osv import osv
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ from openerp import SUPERUSER_ID
|
||||||
from openerp.osv import osv
|
from openerp.osv import osv
|
||||||
from openerp.addons.web import http
|
from openerp.addons.web import http
|
||||||
from openerp.addons.web.http import request
|
from openerp.addons.web.http import request
|
||||||
from openerp.addons.website import website
|
from openerp.addons.website.models import website
|
||||||
import random
|
import random
|
||||||
|
|
||||||
def get_order(order_id=None):
|
def get_order(order_id=None):
|
||||||
|
|
Loading…
Reference in New Issue