merged

bzr revid: mra@tinyerp.com-20081003120636-vt70hi9l25zjwf40

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:

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: