From 8575d47abc01a79ab97171e59b5691659ec804aa Mon Sep 17 00:00:00 2001 From: Niels Huylebroeck Date: Thu, 11 Dec 2008 20:07:19 +0100 Subject: [PATCH 1/7] Fixed typo in separator in warning_view.xml bzr revid: niels@bubbles-it.be-20081211190719-mjyjgb43iv0glcdw --- addons/warning/warning_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/warning/warning_view.xml b/addons/warning/warning_view.xml index 2adba29c996..6ea8b5cef0e 100644 --- a/addons/warning/warning_view.xml +++ b/addons/warning/warning_view.xml @@ -13,7 +13,7 @@ - + From 68afd07dddfd4c0064029faabec144caed8fb506 Mon Sep 17 00:00:00 2001 From: Niels Huylebroeck Date: Thu, 11 Dec 2008 20:09:14 +0100 Subject: [PATCH 2/7] Another typo on the product form bzr revid: niels@bubbles-it.be-20081211190914-lpf3vx2xefmsvbfh --- addons/warning/warning_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/warning/warning_view.xml b/addons/warning/warning_view.xml index 6ea8b5cef0e..3f9f7f24ec2 100644 --- a/addons/warning/warning_view.xml +++ b/addons/warning/warning_view.xml @@ -38,7 +38,7 @@ - + From 3e3f364abfe84c3c09a44d9a141f8b47794252b6 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 12 Dec 2008 00:49:48 +0100 Subject: [PATCH 3/7] [FIX] Use a temporary variable for the fetchall lp bug: https://launchpad.net/bugs/307284 fixed bzr revid: stephane@tinyerp.com-20081211234948-8h825jmr6qhluc2l --- addons/crm_profiling/crm_profiling.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py index 65f11e8bfba..c5a8b118b0f 100644 --- a/addons/crm_profiling/crm_profiling.py +++ b/addons/crm_profiling/crm_profiling.py @@ -131,22 +131,23 @@ class questionnaire(osv.osv): query = """ select name, id from crm_profiling_question - where id in ( select question from profile_questionnaire_quest_rel where questionnaire = %s)"""% data['form']['questionnaire_name'] - cr.execute(query) + where id in ( select question from profile_questionnaire_quest_rel where questionnaire = %s)""" + res = cr.execute(query, data['form']['questionnaire_name']) + result = cr.fetchall() quest_fields={} quest_form='''
''' % _('Questionnaire') - for x in cr.fetchall(): + for x in result: quest_form = quest_form + '''''' quest_fields['quest_form'+str(x[1])] = {'string': str(x[0]), 'type': 'many2one', 'relation': 'crm_profiling.answer', 'domain': [('question_id','=',x[1])] } quest_form = quest_form + '''''' return quest_form,quest_fields - _columns={ + _columns = { 'name': fields.char("Questionnaire",size=128, required=True), 'description':fields.text("Description", required=True), 'questions_ids': fields.many2many('crm_profiling.question','profile_questionnaire_quest_rel','questionnaire', 'question', "Questions"), - } + } questionnaire() From 5cc55266a70e7f16b2a281064c463f52cc29ba96 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 12 Dec 2008 01:02:09 +0100 Subject: [PATCH 4/7] [FIX] Use dict.get() instead of r['name'] or '' lp bug: https://launchpad.net/bugs/307248 fixed bzr revid: stephane@tinyerp.com-20081212000209-ak5e4ibl21jlv2tx --- addons/base_contact/base_contact.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py index d24b9bde649..12df255c5e6 100644 --- a/addons/base_contact/base_contact.py +++ b/addons/base_contact/base_contact.py @@ -59,10 +59,10 @@ class res_partner_contact(osv.osv): res = [] for r in self.read(cr, user, ids, ['name','first_name','title']): addr = r['title'] and str(r['title'])+" " or '' - addr +=str(r['name'] or '') + addr += r.get('name', '') if r['name'] and r['first_name']: addr += ' ' - addr += str(r['first_name'] or '') + addr += r.get('first_name', '') res.append((r['id'], addr)) return res res_partner_contact() @@ -79,7 +79,7 @@ class res_partner_address(osv.osv): res.append((r['id'], r['partner_id'][1])) else: addr = str('') - addr += str(r['street'] or '') + ' ' + str(r['zip'] or '') + ' ' + str(r['city'] or '') + addr += "%s %s %s" % ( r.get('street', ''), r.get('zip', ''), r.get('city', '') ) res.append((r['id'], addr.strip() or '/')) return res From 4c29b48db7fade62cc87b858b7feecd63a0ff1a5 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 12 Dec 2008 01:53:47 +0100 Subject: [PATCH 5/7] [FIX] Specify the osv class for the except_osv exception lp bug: https://launchpad.net/bugs/307319 fixed bzr revid: stephane@tinyerp.com-20081212005347-o71d4vzfrogih3xs --- addons/delivery/delivery.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py index 320560dd0a8..b33fff49b85 100644 --- a/addons/delivery/delivery.py +++ b/addons/delivery/delivery.py @@ -21,7 +21,7 @@ ############################################################################## import time import netsvc -from osv import fields,osv,orm +from osv import fields,osv from tools.translate import _ class delivery_carrier(osv.osv): @@ -124,7 +124,7 @@ class delivery_grid(osv.osv): ok = True break if not ok: - raise except_osv(_('No price avaible !'), _('No line matched this order in the choosed delivery grids !')) + raise osv.except_osv(_('No price avaible !'), _('No line matched this order in the choosed delivery grids !')) return price From 0cc9056f9bff5307e8e49340190a96508a444a2a Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 12 Dec 2008 01:55:57 +0100 Subject: [PATCH 6/7] [FIX] Typo bzr revid: stephane@tinyerp.com-20081212005557-u8e9u6ai78maeyh4 --- addons/delivery/delivery.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py index b33fff49b85..2ff5c122472 100644 --- a/addons/delivery/delivery.py +++ b/addons/delivery/delivery.py @@ -124,7 +124,7 @@ class delivery_grid(osv.osv): ok = True break if not ok: - raise osv.except_osv(_('No price avaible !'), _('No line matched this order in the choosed delivery grids !')) + raise osv.except_osv(_('No price available !'), _('No line matched this order in the choosed delivery grids !')) return price From d08f820ca295f6b0e4adf4ecf5d5bcccd33c8ff8 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 12 Dec 2008 02:19:20 +0100 Subject: [PATCH 7/7] [FIX] Patch from the debian repository lp bug: https://launchpad.net/bugs/303130 fixed bzr revid: stephane@tinyerp.com-20081212011920-a3wgsu5pq793t8r4 --- addons/auction/barcode/test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/auction/barcode/test.py b/addons/auction/barcode/test.py index 5bbd508184d..d22df49b08d 100644 --- a/addons/auction/barcode/test.py +++ b/addons/auction/barcode/test.py @@ -1,4 +1,4 @@ -#!/usr/pkg/bin/python +#!/usr/bin/python from common import * from code39 import * from code93 import * @@ -52,4 +52,4 @@ def run(): if __name__=='__main__': run() - \ No newline at end of file +