From e254b6aa76ee8713844338dd29e8ba8efb5ac938 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 25 Mar 2009 17:39:59 +0100 Subject: [PATCH 1/3] [FIX] Typo bzr revid: stephane@tinyerp.com-20090325163959-t4shlax6p6z69o9h --- addons/account_analytic_plans/account_analytic_plans.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py index 3694f1d8390..393c681dc01 100644 --- a/addons/account_analytic_plans/account_analytic_plans.py +++ b/addons/account_analytic_plans/account_analytic_plans.py @@ -190,7 +190,7 @@ class account_analytic_plan_instance(osv.osv): if self.pool.get('account.analytic.account').search(cr,uid,[('parent_id','child_of',[item.root_analytic_id.id]),('id','=',tempo[2]['analytic_account_id'])]): total_per_plan += tempo[2]['rate'] if total_per_plan < item.min_required or total_per_plan > item.max_required: - raise osv.except_osv(_('Value Error') ,_('The Total Should be Between %s and %s" % (str(item.min_required), str(item.max_required)))) + raise osv.except_osv(_('Value Error') ,_('The Total Should be Between %s and %s') % (str(item.min_required), str(item.max_required))) return super(account_analytic_plan_instance, self).create(cr, uid, vals, context) From b682baa174aa2dfa8525bf5a13ae19a4a8d3ba02 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Thu, 26 Mar 2009 14:48:20 +0100 Subject: [PATCH 2/3] [FIX] base_vat - Includes B2CK in the copyright lp bug: https://launchpad.net/bugs/348446 fixed bzr revid: stephane@tinyerp.com-20090326134820-2ge00s8vuqajckbv --- addons/base_vat/partner.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/addons/base_vat/partner.py b/addons/base_vat/partner.py index fc05376a2ce..a95ae1a051a 100644 --- a/addons/base_vat/partner.py +++ b/addons/base_vat/partner.py @@ -3,6 +3,7 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved +# Copyright (C) 2008-2009 B2CK, Cedric Krier, Bertrand Chenal (the methods "check_vat_[a-z]{2}" # $Id$ # # This program is free software: you can redistribute it and/or modify @@ -20,13 +21,6 @@ # ############################################################################## -# -# The methods "check_vat_[a-z]{2}" are copyrighted: -# - Cedric Krier. -# - Bertrand Chenal -# - B2CK -# - from osv import osv from osv import fields From faed2862147ce96b05212fcb2cc39bb751004756 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Mon, 30 Mar 2009 15:54:15 +0530 Subject: [PATCH 3/3] [FIX] Bug 351494: Project timesheet write-unlink methods corrected bzr revid: jvo@tinyerp.com-20090330102415-cnd6uxfrtaktq4cv --- addons/project_timesheet/project_timesheet.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index ceb7f499071..7d91c654f1e 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -85,15 +85,15 @@ class project_work(osv.osv): vals_line['date'] = vals['date'][:10] if 'hours' in vals: vals_line['unit_amount'] = vals['hours'] - vals_line['amount'] = (-1) * vals['hours'] * obj.browse(cr, uid, line_id.id).product_id.standard_price - obj.write(cr, uid, [line_id.id], vals_line, {}) + vals_line['amount'] = (-1) * vals['hours'] * obj.browse(cr, uid, line_id).product_id.standard_price + obj.write(cr, uid, [line_id], vals_line, {}) return super(project_work,self).write(cr, uid, ids, vals, context) def unlink(self, cr, uid, ids, *args, **kwargs): for timesheet_id in self.pool.get('project.task.work').browse(cr, uid, ids): if timesheet_id.hr_analytic_timesheet_id: - obj = self.pool.get('hr.analytic.timesheet').unlink(cr, uid, [timesheet_id.hr_analytic_timesheet_id.id], *args, **kwargs) + obj = self.pool.get('hr.analytic.timesheet').unlink(cr, uid, [timesheet_id.hr_analytic_timesheet_id], *args, **kwargs) return super(project_work,self).unlink(cr, uid, ids, *args, **kwargs) _columns={