From 9db91380565883ee640fdb3ac831793b816258ae Mon Sep 17 00:00:00 2001 From: Niels Huylebroeck Date: Fri, 4 Jan 2013 18:16:31 +0100 Subject: [PATCH 01/31] [FIX] When extracting strings from mako reports we specify a correcter method for string extraction. lp bug: https://launchpad.net/bugs/1096138 fixed bzr revid: nh@agaplan.eu-20130104171631-p72mjfkfsvm2tdr8 --- openerp/tools/translate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py index e7476827093..e6d7047dc8d 100644 --- a/openerp/tools/translate.py +++ b/openerp/tools/translate.py @@ -850,7 +850,7 @@ def trans_generate(lang, modules, cr): for fname in fnmatch.filter(files, '*.py'): babel_extract_terms(fname, path, root) for fname in fnmatch.filter(files, '*.mako'): - babel_extract_terms(fname, path, root, trans_type='report') + babel_extract_terms(fname, path, root, 'mako', trans_type='report') # Javascript source files in the static/src/js directory, rest is ignored (libs) if fnmatch.fnmatch(root, '*/static/src/js*'): for fname in fnmatch.filter(files, '*.js'): From a4f560de877b81be1d02e64d1450a7881188677b Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Thu, 10 Jan 2013 14:42:40 +0100 Subject: [PATCH 02/31] [FIX] partner_id was only present in an else clause and not in the corresponding if. This caused a traceback when the if was executed. bzr revid: cbi@openerp.com-20130110134240-0jveuv3pnmn75nu1 --- addons/mail/mail_thread.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index f2cea9b4538..d75a9199369 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -839,6 +839,7 @@ class mail_thread(osv.AbstractModel): ids = partner_obj.search(cr, SUPERUSER_ID, [('email', '=', email)], context=context) if ids: partner_ids.append(ids[0]) + partner_id = ids[0] else: partner_id = partner_obj.create(cr, uid, { 'name': name or email, From 34b330c5fa409aa342be5896d7d84101fced58a7 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 10 Jan 2013 18:09:06 +0100 Subject: [PATCH 03/31] [FIX]Add ondelete casacde to alias_model_id for mail_alias, otherwise impossible to uninstall project properly bzr revid: dle@openerp.com-20130110170906-mw0u5d92rv4j2f88 --- addons/mail/mail_alias.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py index ef204d7a8cb..d9c49d833ab 100644 --- a/addons/mail/mail_alias.py +++ b/addons/mail/mail_alias.py @@ -66,7 +66,7 @@ class mail_alias(osv.Model): 'alias_name': fields.char('Alias', required=True, help="The name of the email alias, e.g. 'jobs' " "if you want to catch emails for ",), - 'alias_model_id': fields.many2one('ir.model', 'Aliased Model', required=True, + 'alias_model_id': fields.many2one('ir.model', 'Aliased Model', required=True, ondelete="cascade", help="The model (OpenERP Document Kind) to which this alias " "corresponds. Any incoming email that does not reply to an " "existing record will cause the creation of a new record " From 943453798652f3749f1b40fb9f350be743a9eac0 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 10 Jan 2013 18:11:00 +0100 Subject: [PATCH 04/31] [FIX] contracts: use correct quantity field to avoid mismatching values `quantity` is a recursive sum of quantities of all types, including child accounts, while `hours_quantity` is the local sum of quantities in `general` analytic journals. The latter is what corresponds to the `Units consumed` value for contracts, and what is used to compute the `remaining_hours`, so we must used that. bzr revid: odo@openerp.com-20130110171100-el2g1i3ou89p2yjc --- .../account_analytic_analysis_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index 61c18abdae6..f8f718882af 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -22,8 +22,8 @@