From f6352985d4a0d07dbf102a6fe8a1b2dc1de49ef6 Mon Sep 17 00:00:00 2001
From: "Sbh (OpenERP)" <sbh@tinyerp.com>
Date: Mon, 10 Jan 2011 18:58:32 +0530
Subject: [PATCH 1/6] [Fix] report: if header is false then not display header

bzr revid: sbh@tinyerp.com-20110110132832-z4ksl1osqpddbvpf
---
 bin/report/report_sxw.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 45c40450970..46633aa545d 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -412,7 +412,8 @@ class report_sxw(report_rml, preprocess.report):
                 report_xml = a(title=title, report_type=report_type, report_rml_content=rml, name=title, attachment=False, header=self.header)
             finally:
                 report_file.close()
-        report_xml.header = self.header
+        if report_xml.header:
+            report_xml.header = self.header
         report_type = report_xml.report_type
         if report_type in ['sxw','odt']:
             fnct = self.create_source_odt

From 237717c8b0cd261870b40f32be240fbc75c959bf Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 12 Jan 2011 18:18:58 +0100
Subject: [PATCH 2/6] [IMP] Added two fields in publisher warranty contracts.

bzr revid: nicolas.vanhoren@openerp.com-20110112171858-4dcrcjxp5pi0cfzg
---
 .../publisher_warranty/publisher_warranty.py  | 30 ++++++++++++++-----
 .../publisher_warranty_view.xml               |  6 ++--
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/bin/addons/base/publisher_warranty/publisher_warranty.py b/bin/addons/base/publisher_warranty/publisher_warranty.py
index 4fc5a37735f..7d564cc7fa7 100644
--- a/bin/addons/base/publisher_warranty/publisher_warranty.py
+++ b/bin/addons/base/publisher_warranty/publisher_warranty.py
@@ -165,14 +165,26 @@ class publisher_warranty_contract(osv.osv):
             contracts = result["contracts"]
             for contract in contracts:
                 c_id = self.search(cr, uid, [("name","=",contract)])[0]
-                date_from = contracts[contract][0]
-                date_to = contracts[contract][1]
-                state = contracts[contract][2]
-                self.write(cr, uid, c_id, {
-                    "date_start": date_from,
-                    "date_stop": date_to,
-                    "state": state,
-                })
+                # for backward compatibility
+                if type(contracts[contract]) == tuple:
+                    self.write(cr, uid, c_id, {
+                        "date_start": contracts[contract][0],
+                        "date_stop": contracts[contract][1],
+                        "state": contracts[contract][2],
+                        "check_support": False,
+                        "check_opw": False,
+                        "kind": "",
+                    })
+                else:
+                    self.write(cr, uid, c_id, {
+                        "date_start": contracts[contract]["date_from"],
+                        "date_stop": contracts[contract]["date_to"],
+                        "state": contracts[contract]["state"],
+                        "check_support": contracts[contract]["check_support"],
+                        "check_opw": contracts[contract]["check_opw"],
+                        "kind": contracts[contract]["kind"],
+                    })
+
 
             limit_date = (datetime.datetime.now() - _PREVIOUS_LOG_CHECK).strftime(misc.DEFAULT_SERVER_DATETIME_FORMAT)
             for message in result["messages"]:
@@ -226,6 +238,8 @@ class publisher_warranty_contract(osv.osv):
         'state' : fields.selection([('unvalidated', 'Unvalidated'), ('valid', 'Valid')
                             , ('terminated', 'Terminated'), ('canceled', 'Canceled')], string="State", readonly=True),
         'kind' : fields.char('Kind', size=64, readonly=True),
+        "check_support": fields.boolean("Support Level 1"),
+        "check_opw": fields.boolean("OPW"),
     }
 
     _defaults = {
diff --git a/bin/addons/base/publisher_warranty/publisher_warranty_view.xml b/bin/addons/base/publisher_warranty/publisher_warranty_view.xml
index da6e7042306..b30f4c52755 100644
--- a/bin/addons/base/publisher_warranty/publisher_warranty_view.xml
+++ b/bin/addons/base/publisher_warranty/publisher_warranty_view.xml
@@ -22,19 +22,21 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Publisher Warranty Contract">
-                    <group col="2" colspan="4">
+                    <group col="3" colspan="4">
                         <group col="2">
                             <field name="name"/>
                         </group>
                         <group col="2">
                             <field name="date_start"/>
                             <field name="date_stop"/>
+                            <field name="check_support"/>
                         </group>
                         <group col="2">
                             <field name="state"/>
                             <field name="kind"/>
+                            <field name="check_opw"/>
                         </group>
-                        <group col="2">
+                        <group col="2" colspan="3">
                             <button name="check_validity" string="Validate" type="object"
                             attrs="{'invisible':[('state','in',['valid', 'terminated', 'canceled'])]}"/>
                             <button name="check_validity" string="Refresh Validation Dates" type="object"

From 8b06838dd2e7571d75db56ae011222abb4e9e583 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 13 Jan 2011 10:41:00 +0100
Subject: [PATCH 3/6] [IMP] re-enable sending web module translations after
 fixing web client

bzr revid: xmo@openerp.com-20110113094100-0tw906wfm92yg6po
---
 bin/addons/base/module/module.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index cac621c746a..2e276433e63 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -629,9 +629,8 @@ class module(osv.osv):
         for module in modules:
             web_data = addons.zip_directory(
                 addons.get_module_resource(module.name, 'web'), False)
-            #Temporarily disabled until web client is fixed
-            #if self._translations_subdir(module):
-            #    web_data = self._add_translations(module, web_data)
+            if self._translations_subdir(module):
+                web_data = self._add_translations(module, web_data)
             modules_data.append({
                 'name': module.name,
                 'version': module.installed_version,

From 0d4383f970e7a050983fdb8f55576bcf9ea904ae Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Jan 2011 11:46:11 +0100
Subject: [PATCH 4/6] [IMP] web_livechat: change url

bzr revid: chs@openerp.com-20110113104611-tv0ts5opuh3pdpl0
---
 addons/web_livechat/publisher_warranty.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_livechat/publisher_warranty.py b/addons/web_livechat/publisher_warranty.py
index a0726c63c40..dfbef00c507 100644
--- a/addons/web_livechat/publisher_warranty.py
+++ b/addons/web_livechat/publisher_warranty.py
@@ -32,7 +32,7 @@ class publisher_warranty_contract(osv.osv):
 
     @cache(skiparg=3)
     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()
 

From 6c3c49ece1808deb11ab8ffc303de2578db7b8c6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 13 Jan 2011 12:42:00 +0100
Subject: [PATCH 5/6] [FIX] addons: upgrade base module properly when
 --update=all is used

bzr revid: odo@openerp.com-20110113114200-8k9u3lg2nm56qzjs
---
 bin/addons/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 8c5903366dd..bbf391603a2 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -822,8 +822,8 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
         report = tools.assertion_report()
         # NOTE: Try to also load the modules that have been marked as uninstallable previously...
         STATES_TO_LOAD = ['installed', 'to upgrade', 'uninstallable']
-        if 'base' in tools.config['update']:
-            cr.execute("update ir_module_module set state=%s where name=%s", ('to upgrade', 'base'))
+        if 'base' in tools.config['update'] or 'all' in tools.config['update']:
+            cr.execute("update ir_module_module set state=%s where name=%s and state=%s", ('to upgrade', 'base', 'installed'))
 
         # STEP 1: LOAD BASE (must be done before module dependencies can be computed for later steps) 
         graph = create_graph(cr, ['base'], force)

From 9d3113fa43698cd55e9aa90b16c75e54b7da8787 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 13 Jan 2011 15:29:04 +0100
Subject: [PATCH 6/6] [FIX] base_contact: enable PL/pgSQL before using it

lp bug: https://launchpad.net/bugs/701985 fixed

bzr revid: odo@openerp.com-20110113142904-zl7gb9cywkhd8687
---
 addons/base_contact/base_contact_installer.py | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/addons/base_contact/base_contact_installer.py b/addons/base_contact/base_contact_installer.py
index 3936b336e9f..febba654350 100644
--- a/addons/base_contact/base_contact_installer.py
+++ b/addons/base_contact/base_contact_installer.py
@@ -37,25 +37,30 @@ class base_contact_installer(osv.osv_memory):
         """
         obj = self.pool.get("base.contact.installer").browse(cr, uid, uid, context=context)
         if obj.migrate:
-            cr.execute("""DROP TRIGGER  IF EXISTS contactjob on res_partner_contact;
-                            CREATE OR REPLACE FUNCTION add_to_job() RETURNS TRIGGER AS $contactjob$
+            # 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;
+                          CREATE OR REPLACE FUNCTION add_to_job() RETURNS TRIGGER AS $contactjob$
                             DECLARE
                             new_name varchar;
                             new_phonenum varchar;
                             BEGIN
-                            IF(TG_OP='INSERT') THEN
-                            INSERT INTO res_partner_job(contact_id, address_id, function, state) VALUES(NEW.id, NEW.website::integer,NEW.first_name, 'current');
-                            UPDATE res_partner_contact set first_name=Null, website=Null, active=True where id=NEW.id;
+                               IF(TG_OP='INSERT') THEN
+                               INSERT INTO res_partner_job(contact_id, address_id, function, state) VALUES(NEW.id, NEW.website::integer,NEW.first_name, 'current');
+                               UPDATE res_partner_contact set first_name=Null, website=Null, active=True where id=NEW.id;
                             END IF;
                             RETURN NEW;
                             END;
-                            $contactjob$ LANGUAGE plpgsql;
-                            CREATE TRIGGER contactjob AFTER INSERT ON res_partner_contact FOR EACH ROW EXECUTE PROCEDURE add_to_job();""")
+                          $contactjob$ LANGUAGE plpgsql;
+                          CREATE TRIGGER contactjob AFTER INSERT ON res_partner_contact FOR EACH ROW EXECUTE PROCEDURE add_to_job();""")
 
             cr.execute("INSERT into res_partner_contact (name, title, email, first_name, website)  (SELECT coalesce(name, 'Noname'), title, email, function , to_char(id, '99999999') from res_partner_address)")
 
             cr.execute("DROP TRIGGER  IF EXISTS contactjob  on res_partner_contact")
-            
+
             cr.execute("DROP FUNCTION IF EXISTS  add_to_job()")
 
 base_contact_installer()