[MERGE]
authorNajlaâ <nel@tinyerp.com>
Tue, 10 Jan 2012 13:07:02 +0000 (14:07 +0100)
committerNajlaâ <nel@tinyerp.com>
Tue, 10 Jan 2012 13:07:02 +0000 (14:07 +0100)
bzr revid: nel@tinyerp.com-20120110130702-l5mzdi4z8v2ogcky

1  2 
addons/account/invoice.py

Simple merge