[MERGE] merged with main addons branch
bzr revid: qdp-launchpad@tinyerp.com-20110113175502-a4utblielhflx4fk
This commit is contained in:
commit
6cdbba5379
|
@ -37,6 +37,11 @@ class base_contact_installer(osv.osv_memory):
|
||||||
"""
|
"""
|
||||||
obj = self.pool.get("base.contact.installer").browse(cr, uid, uid, context=context)
|
obj = self.pool.get("base.contact.installer").browse(cr, uid, uid, context=context)
|
||||||
if obj.migrate:
|
if obj.migrate:
|
||||||
|
# Enable PL/pgSQL if not enabled yet in the database
|
||||||
|
cr.execute("SELECT 1 FROM pg_language WHERE lanname = 'plpgsql'")
|
||||||
|
if not cr.fetchone():
|
||||||
|
cr.execute("CREATE LANGUAGE plpgsql;")
|
||||||
|
|
||||||
cr.execute("""DROP TRIGGER IF EXISTS contactjob on res_partner_contact;
|
cr.execute("""DROP TRIGGER IF EXISTS contactjob on res_partner_contact;
|
||||||
CREATE OR REPLACE FUNCTION add_to_job() RETURNS TRIGGER AS $contactjob$
|
CREATE OR REPLACE FUNCTION add_to_job() RETURNS TRIGGER AS $contactjob$
|
||||||
DECLARE
|
DECLARE
|
||||||
|
|
|
@ -32,7 +32,7 @@ class publisher_warranty_contract(osv.osv):
|
||||||
|
|
||||||
@cache(skiparg=3)
|
@cache(skiparg=3)
|
||||||
def get_default_livechat_text(self, cr, uid):
|
def get_default_livechat_text(self, cr, uid):
|
||||||
return '<a href="http://www.openerp.com/services/subscribe-onsite" target="_blank"><img src="/web_livechat/static/images/busy.png"/>Support</a>'
|
return '<a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank"><img src="/web_livechat/static/images/busy.png"/>Support</a>'
|
||||||
|
|
||||||
publisher_warranty_contract()
|
publisher_warranty_contract()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue