From 8b8dcf26d3c6a81069c4c53a67ebbc4b12c59555 Mon Sep 17 00:00:00 2001 From: jam-openerp Date: Wed, 24 Nov 2010 12:48:26 +0530 Subject: [PATCH 1/2] [IMP]Thunde3rbird Plugin Shell Script Usability Improvement bzr revid: jam@tinyerp.com-20101124071826-37mcuzlvg6n3ujez --- addons/thunderbird/plugin/openerp_plugin/packaging.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/thunderbird/plugin/openerp_plugin/packaging.sh b/addons/thunderbird/plugin/openerp_plugin/packaging.sh index 140e254a056..5c1f48a9050 100755 --- a/addons/thunderbird/plugin/openerp_plugin/packaging.sh +++ b/addons/thunderbird/plugin/openerp_plugin/packaging.sh @@ -1,3 +1,6 @@ +# Use this Shell Script for Cleaning & Compressing the chnages in Plugin +# Run this script using jar command. + rm chrome/openerp_plugin.jar rm ../openerp_plugin.xpi cd chrome/openerp_plugin/ From e76438c44944c4ea3729652ec0e47900a6759449 Mon Sep 17 00:00:00 2001 From: jam-openerp Date: Wed, 24 Nov 2010 14:33:42 +0530 Subject: [PATCH 2/2] [BUG] lp:673895 bzr revid: jam@tinyerp.com-20101124090342-mtgw7mkiuc95dtfo --- addons/crm/crm_meeting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py index fc4d1235f29..13784741892 100644 --- a/addons/crm/crm_meeting.py +++ b/addons/crm/crm_meeting.py @@ -188,7 +188,7 @@ class res_users(osv.osv): view_id = data_obj.browse(cr, uid, data_id, context=context).res_id self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = { 'user_id': user_id}, context=context) - except ValueError: + except: # Tolerate a missing shortcut. See product/product.py for similar code. logging.getLogger('orm').warning('Skipped Products shortcut for user "%s"', data.get('name','