[Merge]: Merge from trunk.
authorrch-openerp <rch@tinyerp.com>
Fri, 19 Nov 2010 13:40:29 +0000 (19:10 +0530)
committerrch-openerp <rch@tinyerp.com>
Fri, 19 Nov 2010 13:40:29 +0000 (19:10 +0530)
bzr revid: rch@tinyerp.com-20101119134029-g7s9fotsw59mx9ww

1  2 
addons/account/account.py
addons/account/invoice.py

Simple merge
Simple merge