From aca4388202310eefda0deb386d4b4a840371a56c Mon Sep 17 00:00:00 2001 From: Jay Vora Date: Mon, 15 Dec 2008 17:34:01 +0530 Subject: [PATCH 1/2] Misc. changes bzr revid: jvo@tinyerp.com-20081215120401-g8x1llt6dtlfqnfj --- addons/account/account.py | 1 - addons/account/account_move_line.py | 1 - 2 files changed, 2 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index d80c77df52c..997fe2b3c59 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -832,7 +832,6 @@ class account_move(osv.osv): if 'line_id' in vals: c = context.copy() c['novalidate'] = True - print 'XXXXXXXXXXXXXXXXXXX : ',vals result = super(account_move, self).create(cr, uid, vals, c) self.validate(cr, uid, [result], context) else: diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index ef63c5e6890..be15a444ad7 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -728,7 +728,6 @@ class account_move_line(osv.osv): if vals.get('date', False): todo_date = vals['date'] del vals['date'] - print 'Writing', vals, 'to move_line', ids result = super(account_move_line, self).write(cr, uid, ids, vals, context) if check: From 55251a498e5f25f2a2fd00323993837d48a0fee2 Mon Sep 17 00:00:00 2001 From: Sofia Date: Mon, 15 Dec 2008 17:37:28 +0530 Subject: [PATCH 2/2] Tax array added while amount is zero [done by vir] bzr revid: sahibsofia@gmail.com-20081215120728-sbbwcclm6eyrx3tj --- addons/account/report/invoice.rml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index 6247ca00818..e1a65319898 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -327,7 +327,7 @@ [[ l.name ]] - [[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) or '0.00' ]] + [[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) or '' ]] [[ formatLang(l.quantity) or '0.00' ]] @@ -463,7 +463,7 @@ - [[ format(o.amount_tax or removeParentNode('blockTable')) ]] + @@ -491,10 +491,10 @@ [[ t.name ]] - [[ formatLang(t.base) ]] + [[ formatLang(t.base) or '0.00' ]] - [[ formatLang(t.amount) or 0.00 ]] + [[ formatLang(t.amount) or '0.00' ]] @@ -559,4 +559,4 @@ - + \ No newline at end of file