[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Tue, 16 Nov 2010 07:15:54 +0000 (12:45 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Tue, 16 Nov 2010 07:15:54 +0000 (12:45 +0530)
bzr revid: ara@tinyerp.com-20101116071554-91h4snhiegd46o4z

1  2 
addons/account/invoice.py

Simple merge