From d3423744be29ffcdcfb19ec12ce2bef8616276d9 Mon Sep 17 00:00:00 2001 From: Jay Vora Date: Fri, 3 Oct 2008 15:46:40 +0530 Subject: [PATCH 1/2] Bugfix :removed unnecessary code bzr revid: jvo@tinyerp.com-20081003101640-ktv1w0b3z455by9q --- addons/account_budget/report/budget_report.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_budget/report/budget_report.py b/addons/account_budget/report/budget_report.py index 156b4a18c50..05c92fb1746 100644 --- a/addons/account_budget/report/budget_report.py +++ b/addons/account_budget/report/budget_report.py @@ -71,10 +71,10 @@ class budget_report(report_sxw.rml_parse): res = [] for a in post_obj.account_ids: self.cr.execute("SELECT COALESCE(SUM(debit-credit), 0) FROM account_move_line WHERE account_id=%d AND date>=%s AND date<=%s and state<>'draft'", (a.id, date1, date2)) - achievements = float(self.cr.fetchone()[0]) * (post_obj.sens=='produit' and -1 or 1) + achievements = float(self.cr.fetchone()[0]) res.append({'name': a.name, 'code': a.code, 'achievements': achievements}) return res -report_sxw.report_sxw('report.account.budget', 'account.budget.post', 'addons/account_budget/report/budget_report.rml',parser=budget_report) +report_sxw.report_sxw('report.account.budget', 'account.budget.post', 'addons/account_budget/report/budget_report.rml',parser=budget_report,header=False) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From a947b447c249646513bf73aeaab21c07c6036532 Mon Sep 17 00:00:00 2001 From: Harshad Modi Date: Fri, 3 Oct 2008 17:08:00 +0530 Subject: [PATCH 2/2] fixed bug : on change product on purchase line bzr revid: hmo@tinyerp.com-20081003113800-5e0tp5pzcv1jkwk1 --- addons/purchase/purchase.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index d0f2951de54..08828a33a75 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -419,6 +419,8 @@ class purchase_order_line(osv.osv): def product_id_change(self, cr, uid, ids, pricelist, product, qty, uom, partner_id, date_order=False): + if not product: + return {'value':{}} prod= self.pool.get('product.product').browse(cr, uid,product) if not pricelist: raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist in the purchase form !\nPlease set one before choosing a product.')) @@ -454,7 +456,7 @@ class purchase_order_line(osv.osv): if taxep_id: taxep=self.pool.get('account.tax').browse(cr, uid,taxep_id) if not taxep or not taxep.id: - res['value']['taxes_id'] = [x.id for x in product.taxes_id] + res['value']['taxes_id'] = [x.id for x in taxes] else: res5 = [taxep.id] for t in taxes: